summaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2017-08-17 12:24:47 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-08-24 17:12:20 -0700
commitd8c20af0085898f9c818dd599b0afb0d0c99dab2 (patch)
tree85981b663d364fea5fbf7f9cba9cecdf0e6abd35 /block
parent6c7f3756d072050d612e5c5c04108f90f1985435 (diff)
downloadlinux-stable-d8c20af0085898f9c818dd599b0afb0d0c99dab2.tar.gz
linux-stable-d8c20af0085898f9c818dd599b0afb0d0c99dab2.tar.bz2
linux-stable-d8c20af0085898f9c818dd599b0afb0d0c99dab2.zip
blk-mq-pci: add a fallback when pci_irq_get_affinity returns NULL
commit c005390374957baacbc38eef96ea360559510aa7 upstream. While pci_irq_get_affinity should never fail for SMP kernel that implement the affinity mapping, it will always return NULL in the UP case, so provide a fallback mapping of all queues to CPU 0 in that case. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Omar Sandoval <osandov@fb.com> Signed-off-by: Jens Axboe <axboe@kernel.dk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'block')
-rw-r--r--block/blk-mq-pci.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/block/blk-mq-pci.c b/block/blk-mq-pci.c
index 966c2169762e..ee9d3d958fbe 100644
--- a/block/blk-mq-pci.c
+++ b/block/blk-mq-pci.c
@@ -36,12 +36,18 @@ int blk_mq_pci_map_queues(struct blk_mq_tag_set *set, struct pci_dev *pdev)
for (queue = 0; queue < set->nr_hw_queues; queue++) {
mask = pci_irq_get_affinity(pdev, queue);
if (!mask)
- return -EINVAL;
+ goto fallback;
for_each_cpu(cpu, mask)
set->mq_map[cpu] = queue;
}
return 0;
+
+fallback:
+ WARN_ON_ONCE(set->nr_hw_queues > 1);
+ for_each_possible_cpu(cpu)
+ set->mq_map[cpu] = 0;
+ return 0;
}
EXPORT_SYMBOL_GPL(blk_mq_pci_map_queues);