From: Keith Busch <keith.busch@intel.com>
To: Alexander Gordeev <agordeev@redhat.com>
Cc: Keith Busch <keith.busch@intel.com>,
Bjorn Helgaas <bhelgaas@google.com>,
Matthew Wilcox <willy@linux.intel.com>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
linux-nvme@lists.infradead.org,
"linux-pci@vger.kernel.org" <linux-pci@vger.kernel.org>
Subject: Re: [PATCH] nvme: Cleanup nvme_dev_start() and fix IRQ leak
Date: Mon, 20 Jan 2014 15:48:56 -0700 (MST) [thread overview]
Message-ID: <alpine.LRH.2.03.1401201541000.25844@AMR> (raw)
In-Reply-To: <20140120084212.GC19068@dhcp-26-207.brq.redhat.com>
On Mon, 20 Jan 2014, Alexander Gordeev wrote:
> This is an attempt to make handling of admin queue in a
> single scope. This update also fixes a IRQ leak in case
> nvme_setup_io_queues() failed to allocate enough iomem
> and bailed out with -ENOMEM errno.
This definitely seems to improve the code flow, but this leak was already
fixed in the latest linux-nvme tree with this commit:
http://git.infradead.org/users/willy/linux-nvme.git/commit/c5dc9192d52a4a3a479f701e97386347d454af84
> Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
> ---
> drivers/block/nvme-core.c | 44 +++++++++++++++++++++++---------------------
> 1 files changed, 23 insertions(+), 21 deletions(-)
>
> diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c
> index 3e1ae55..e1e4ad4 100644
> --- a/drivers/block/nvme-core.c
> +++ b/drivers/block/nvme-core.c
> @@ -1287,6 +1287,7 @@ static int nvme_configure_admin_queue(struct nvme_dev *dev)
> if (result)
> return result;
>
> + dev->entry[0].vector = pdev->pci_dev->irq;
> result = queue_request_irq(dev, nvmeq, "nvme admin");
> if (result)
> return result;
> @@ -1297,6 +1298,11 @@ static int nvme_configure_admin_queue(struct nvme_dev *dev)
> return result;
> }
>
> +static int nvme_teardown_admin_queue(struct nvme_dev *dev)
> +{
> + free_irq(dev->entry[0].vector, dev->queues[0]);
> +}
> +
> struct nvme_iod *nvme_map_user_pages(struct nvme_dev *dev, int write,
> unsigned long addr, unsigned length)
> {
> @@ -1744,17 +1750,10 @@ static size_t db_bar_size(struct nvme_dev *dev, unsigned nr_io_queues)
> return 4096 + ((nr_io_queues + 1) << (dev->db_stride + 3));
> }
>
> -static int nvme_setup_io_queues(struct nvme_dev *dev)
> +static int nvme_setup_io_queues(struct nvme_dev *dev, int nr_io_queues)
> {
> struct pci_dev *pdev = dev->pci_dev;
> - int result, cpu, i, vecs, nr_io_queues, size, q_depth;
> -
> - nr_io_queues = num_online_cpus();
> - result = set_queue_count(dev, nr_io_queues);
> - if (result < 0)
> - return result;
> - if (result < nr_io_queues)
> - nr_io_queues = result;
> + int result, cpu, i, vecs, size, q_depth;
>
> size = db_bar_size(dev, nr_io_queues);
> if (size > 8192) {
> @@ -1771,20 +1770,15 @@ static int nvme_setup_io_queues(struct nvme_dev *dev)
> dev->queues[0]->q_db = dev->dbs;
> }
>
> - /* Deregister the admin queue's interrupt */
> - free_irq(dev->entry[0].vector, dev->queues[0]);
> -
> for (i = 0; i < nr_io_queues; i++)
> dev->entry[i].entry = i;
> vecs = pci_enable_msix_range(pdev, dev->entry, 1, nr_io_queues);
> if (vecs < 0) {
> vecs = pci_enable_msi_range(pdev, 1, min(nr_io_queues, 32));
> - if (vecs < 0) {
> + if (vecs < 0)
> vecs = 1;
> - } else {
> - for (i = 0; i < vecs; i++)
> - dev->entry[i].vector = i + pdev->irq;
> - }
> + for (i = 0; i < vecs; i++)
> + dev->entry[i].vector = i + pdev->irq;
> }
>
> /*
> @@ -1928,7 +1922,6 @@ static int nvme_dev_map(struct nvme_dev *dev)
> if (pci_enable_device_mem(pdev))
> return result;
>
> - dev->entry[0].vector = pdev->irq;
> pci_set_master(pdev);
> bars = pci_select_bars(pdev, IORESOURCE_MEM);
> if (pci_request_selected_regions(pdev, bars, "nvme"))
> @@ -2116,11 +2109,20 @@ static int nvme_dev_start(struct nvme_dev *dev)
> list_add(&dev->node, &dev_list);
> spin_unlock(&dev_list_lock);
>
> - result = nvme_setup_io_queues(dev);
> - if (result && result != -EBUSY)
> + result = set_queue_count(dev, num_online_cpus());
> + if (result == -EBUSY)
> + return -EBUSY;
> +
> + nvme_teardown_admin_queue(dev);
> +
> + if (result)
> goto disable;
>
> - return result;
> + result = nvme_setup_io_queues(dev, result);
> + if (result)
> + goto disable;
> +
> + return 0;
>
> disable:
> spin_lock(&dev_list_lock);
> --
next prev parent reply other threads:[~2014-01-20 22:49 UTC|newest]
Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-17 16:02 [PATCH v2 0/9] Phase out pci_enable_msi_block() Alexander Gordeev
2014-01-17 9:26 ` [PATCH 10/9] PCI/MSI: Undeprecate pci_enable_msi() Alexander Gordeev
2014-01-29 22:10 ` Bjorn Helgaas
2014-01-17 9:27 ` [PATCH 11/9] PCI/MSI: Phase out pci_enable_msi_block() Alexander Gordeev
2014-01-29 22:22 ` Bjorn Helgaas
2014-01-17 16:02 ` [PATCH v2 1/9] ahci: Fix broken fallback to single MSI mode Alexander Gordeev
2014-01-17 16:02 ` [PATCH v2 2/9] ahci: Use pci_enable_msi_range() Alexander Gordeev
2014-01-17 16:02 ` [PATCH v2 3/9] ipr: Get rid of superfluous call to pci_disable_msi/msix() Alexander Gordeev
2014-01-17 16:02 ` [PATCH v2 4/9] ipr: Use pci_enable_msi_range() and pci_enable_msix_range() Alexander Gordeev
2014-01-28 9:54 ` Alexander Gordeev
2014-01-28 15:28 ` Brian King
2014-01-29 13:26 ` Alexander Gordeev
2014-01-30 14:06 ` Alexander Gordeev
2014-01-30 14:09 ` [PATCH v2 1/2] ipr: Get rid of superfluous call to pci_disable_msi/msix() Alexander Gordeev
2014-02-03 15:20 ` Brian King
2014-01-30 14:10 ` [PATCH v2 2/2] ipr: Use pci_enable_msi_range() and pci_enable_msix_range() Alexander Gordeev
2014-02-03 15:22 ` Brian King
2014-02-24 8:12 ` [PATCH v2 4/9] " Alexander Gordeev
2014-02-26 15:02 ` Brian King
2014-01-17 16:02 ` [PATCH v2 5/9] nvme: Fix invalid call to irq_set_affinity_hint() Alexander Gordeev
2014-01-17 19:40 ` Bjorn Helgaas
2014-01-17 22:01 ` Keith Busch
2014-01-20 8:38 ` Alexander Gordeev
2014-01-20 8:40 ` [PATCH v3 6/9] nvme: Use pci_enable_msi_range() and pci_enable_msix_range() Alexander Gordeev
2014-02-05 13:07 ` Alexander Gordeev
2014-02-18 17:54 ` Keith Busch
2014-01-20 8:42 ` [PATCH] nvme: Cleanup nvme_dev_start() and fix IRQ leak Alexander Gordeev
2014-01-20 22:48 ` Keith Busch [this message]
2014-01-21 10:03 ` Alexander Gordeev
2014-01-21 10:06 ` [PATCH 1/2] Revert "NVMe: Disable admin queue on init failure" Alexander Gordeev
2014-01-21 10:07 ` [PATCH 2/2] nvme: Cleanup nvme_dev_start() and fix IRQ leak Alexander Gordeev
2014-01-21 19:06 ` Keith Busch
2014-01-20 8:43 ` [PATCH] nvme: Cleanup nvme_dev_start() Alexander Gordeev
2014-01-20 16:41 ` Keith Busch
2014-01-17 16:02 ` [PATCH v2 6/9] nvme: Use pci_enable_msi_range() and pci_enable_msix_range() Alexander Gordeev
2014-01-17 16:02 ` [PATCH v2 7/9] vfio: " Alexander Gordeev
2014-01-29 21:36 ` Bjorn Helgaas
2014-01-17 16:02 ` [PATCH v2 8/9] ath10k: Use pci_enable_msi_range() Alexander Gordeev
2014-01-30 13:48 ` [PATCH 1/3] ath10k: Get rid of superfluous call to pci_disable_msi() Alexander Gordeev
2014-02-04 18:32 ` Kalle Valo
2014-02-04 19:09 ` Alexander Gordeev
2014-02-05 8:21 ` Kalle Valo
2014-02-05 8:50 ` Alexander Gordeev
2014-02-05 8:54 ` Kalle Valo
2014-02-12 0:31 ` Bjorn Helgaas
2014-02-12 13:38 ` Alexander Gordeev
2014-02-12 19:28 ` Bjorn Helgaas
2014-02-12 21:30 ` Kalle Valo
2014-02-12 21:40 ` Bjorn Helgaas
2014-02-13 10:29 ` Kalle Valo
2014-02-13 13:18 ` Alexander Gordeev
2014-02-13 16:04 ` Kalle Valo
2014-01-30 13:48 ` [PATCH 2/3] ath10k: Disable MSI in case IRQ configuration is unknown Alexander Gordeev
2014-01-30 13:49 ` [PATCH v3 3/3] ath10k: Use pci_enable_msi_range() Alexander Gordeev
2014-02-03 11:02 ` [PATCH v2 8/9] " Alexander Gordeev
2014-01-17 16:02 ` [PATCH v2 9/9] wil6210: " Alexander Gordeev
2014-01-29 21:37 ` Bjorn Helgaas
2014-02-07 14:46 ` [PATCH] wil6210: Fix switch operator "missing break?" warning Alexander Gordeev
2014-02-10 10:54 ` Vladimir Kondratiev
2014-02-10 12:16 ` Alexander Gordeev
2014-02-11 1:32 ` Fengguang Wu
2014-01-17 21:00 ` [PATCH v2 0/9] Phase out pci_enable_msi_block() Bjorn Helgaas
2014-01-18 7:15 ` Alexander Gordeev
2014-01-18 14:38 ` Bjorn Helgaas
2014-01-18 14:59 ` Tejun Heo
2014-01-29 21:48 ` Bjorn Helgaas
2014-01-29 13:59 ` Alexander Gordeev
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.LRH.2.03.1401201541000.25844@AMR \
--to=keith.busch@intel.com \
--cc=agordeev@redhat.com \
--cc=bhelgaas@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=linux-pci@vger.kernel.org \
--cc=willy@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).