Re: [PATCH v2 5/9] nvme: Fix invalid call to irq_set_affinity_hint()

From: Bjorn Helgaas
Date: Fri Jan 17 2014 - 14:41:21 EST


On Fri, Jan 17, 2014 at 9:02 AM, Alexander Gordeev <agordeev@xxxxxxxxxx> wrote:
> In case MSI-X and MSI initialization failed the function
> irq_set_affinity_hint() is called with uninitialized value
> in dev->entry[0].vector. This update fixes the issue.

dev->entry[0].vector is initialized in nvme_dev_map(), and it's used
for free_irq() above the area of your patch, so I don't think this is
actually a bug, though it might be somewhat confusing.

> Signed-off-by: Alexander Gordeev <agordeev@xxxxxxxxxx>
> ---
> drivers/block/nvme-core.c | 12 ++++++------
> 1 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c
> index 26d03fa..e292450 100644
> --- a/drivers/block/nvme-core.c
> +++ b/drivers/block/nvme-core.c
> @@ -1790,15 +1790,15 @@ static int nvme_setup_io_queues(struct nvme_dev *dev)
> vecs = 32;
> for (;;) {
> result = pci_enable_msi_block(pdev, vecs);
> - if (result == 0) {
> - for (i = 0; i < vecs; i++)
> - dev->entry[i].vector = i + pdev->irq;
> - break;
> + if (result > 0) {
> + vecs = result;
> + continue;
> } else if (result < 0) {
> vecs = 1;
> - break;
> }
> - vecs = result;
> + for (i = 0; i < vecs; i++)
> + dev->entry[i].vector = i + pdev->irq;
> + break;
> }
> }
>
> --
> 1.7.7.6
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-pci" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/