From: Sam Bradshaw Date: Tue, 29 Jul 2014 20:31:36 +0000 (-0700) Subject: NVMe: Correctly handle IOCTL_SUBMIT_IO when cpus > online queues X-Git-Tag: v3.19-rc1~87^2~45 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5905535610fc6b11379a999ff45bfa39f0d605b6;p=karo-tx-linux.git NVMe: Correctly handle IOCTL_SUBMIT_IO when cpus > online queues nvme_submit_io_cmd() uses smp_processor_id() to pick an IO queue index. This patch fixes the case where there are more cpus from which the ioctl call can originate than online queues, which can happen when a device supports or was allocated fewer interrupt vectors than exist cpu cores. Thanks to Keith Busch for the implementation suggestion. Signed-off-by: Sam Bradshaw Signed-off-by: Matthew Wilcox Signed-off-by: Jens Axboe --- diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c index 48a1be4ab24c..5d44c9344522 100644 --- a/drivers/block/nvme-core.c +++ b/drivers/block/nvme-core.c @@ -984,8 +984,8 @@ int nvme_submit_admin_cmd(struct nvme_dev *dev, struct nvme_command *cmd, int nvme_submit_io_cmd(struct nvme_dev *dev, struct nvme_command *cmd, u32 *result) { - return nvme_submit_sync_cmd(dev, smp_processor_id() + 1, cmd, result, - NVME_IO_TIMEOUT); + return nvme_submit_sync_cmd(dev, this_cpu_read(*dev->io_queue), cmd, + result, NVME_IO_TIMEOUT); } static int nvme_submit_admin_cmd_async(struct nvme_dev *dev,