From: Ming Lei <ming.lei@redhat.com>
To: Christoph Hellwig <hch@lst.de>,
Bjorn Helgaas <helgaas@kernel.org>,
Thomas Gleixner <tglx@linutronix.de>
Cc: Jens Axboe <axboe@kernel.dk>,
linux-block@vger.kernel.org, Sagi Grimberg <sagi@grimberg.me>,
linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org,
linux-pci@vger.kernel.org, Keith Busch <keith.busch@intel.com>,
Ming Lei <ming.lei@redhat.com>
Subject: [PATCH V4 4/4] PCI: Document .calc_sets as required in case of multiple interrupt sets
Date: Thu, 14 Feb 2019 20:23:47 +0800 [thread overview]
Message-ID: <20190214122347.17372-5-ming.lei@redhat.com> (raw)
In-Reply-To: <20190214122347.17372-1-ming.lei@redhat.com>
Now NVMe has implemented the .calc_sets callback for calculating size of
interrupt set.
For other cases of multiple IRQ sets, pre-calculating each set's size
before allocating IRQ vectors can't work too because the available
interrupt number for this device is unknown at that time.
So document .calc_sets as required explicitly for multiple interrupt sets.
Reviewed-by: Jens Axboe <axboe@kernel.dk>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
---
drivers/pci/msi.c | 14 ++++++++------
include/linux/interrupt.h | 3 ++-
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index 96978459e2a0..64383ab5f53f 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -1036,10 +1036,11 @@ static int __pci_enable_msi_range(struct pci_dev *dev, int minvec, int maxvec,
return -ERANGE;
/*
- * If the caller is passing in sets, we can't support a range of
- * vectors. The caller needs to handle that.
+ * If the caller requests multiple sets of IRQs where each set
+ * requires different affinity, it must also supply a ->calc_sets()
+ * callback to compute size of each interrupt set
*/
- if (affd && affd->nr_sets && minvec != maxvec)
+ if (affd && affd->nr_sets > 1 && !affd->calc_sets)
return -EINVAL;
if (WARN_ON_ONCE(dev->msi_enabled))
@@ -1094,10 +1095,11 @@ static int __pci_enable_msix_range(struct pci_dev *dev,
return -ERANGE;
/*
- * If the caller is passing in sets, we can't support a range of
- * supported vectors. The caller needs to handle that.
+ * If the caller requests multiple sets of IRQs where each set
+ * requires different affinity, it must also supply a ->calc_sets()
+ * callback to compute size of each interrupt set
*/
- if (affd && affd->nr_sets && minvec != maxvec)
+ if (affd && affd->nr_sets > 1 && !affd->calc_sets)
return -EINVAL;
if (WARN_ON_ONCE(dev->msix_enabled))
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
index acb9c5ad6bc1..0da2a5cea8f3 100644
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
@@ -269,7 +269,8 @@ struct irq_affinity_notify {
* the MSI(-X) vector space
* @nr_sets: Length of passed in *sets array
* @set_size: Number of affinitized sets
- * @calc_sets: Callback for caculating interrupt sets size
+ * @calc_sets: Callback for caculating set size, required for
+ * multiple interrupt sets.
* @priv: Private data of @calc_sets
*/
struct irq_affinity {
--
2.9.5
prev parent reply other threads:[~2019-02-14 12:24 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-14 12:23 [PATCH V4 0/4] genirq/affinity: add .calc_sets for improving IRQ allocation & spread Ming Lei
2019-02-14 12:23 ` [PATCH V4 1/4] genirq/affinity: store interrupt sets size in 'struct irq_affinity' Ming Lei
2019-02-14 14:04 ` Thomas Gleixner
2019-02-14 18:38 ` Thomas Gleixner
2019-02-14 12:23 ` [PATCH V4 2/4] genirq/affinity: add new callback for caculating interrupt sets size Ming Lei
2019-02-14 14:50 ` Thomas Gleixner
2019-02-14 20:14 ` Bjorn Helgaas
2019-02-14 12:23 ` [PATCH V4 3/4] nvme-pci: Simplify interrupt allocation Ming Lei
2019-02-14 12:59 ` Thomas Gleixner
2019-02-14 12:23 ` Ming Lei [this message]
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=20190214122347.17372-5-ming.lei@redhat.com \
--to=ming.lei@redhat.com \
--cc=axboe@kernel.dk \
--cc=hch@lst.de \
--cc=helgaas@kernel.org \
--cc=keith.busch@intel.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=linux-pci@vger.kernel.org \
--cc=sagi@grimberg.me \
--cc=tglx@linutronix.de \
/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).