From: Qi Zhang <qi.z.zhang@intel.com>
To: thomas.monjalon@6wind.com
Cc: dev@dpdk.org, Qi Zhang <qi.z.zhang@intel.com>
Subject: [dpdk-dev] [PATCH v2 1/3] vfio: keep interrupt source read only
Date: Tue, 7 Mar 2017 04:19:26 -0500 [thread overview]
Message-ID: <20170307091928.57990-2-qi.z.zhang@intel.com> (raw)
In-Reply-To: <20170307091928.57990-1-qi.z.zhang@intel.com>
Remove the inappropriate modification on get_max_intr
field that keep the intr_source read only.
Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
---
lib/librte_eal/linuxapp/eal/eal_interrupts.c | 36 ++++------------------------
1 file changed, 4 insertions(+), 32 deletions(-)
diff --git a/lib/librte_eal/linuxapp/eal/eal_interrupts.c b/lib/librte_eal/linuxapp/eal/eal_interrupts.c
index 92a19cb..b50dad8 100644
--- a/lib/librte_eal/linuxapp/eal/eal_interrupts.c
+++ b/lib/librte_eal/linuxapp/eal/eal_interrupts.c
@@ -278,29 +278,6 @@ vfio_disable_msi(const struct rte_intr_handle *intr_handle) {
return ret;
}
-static int
-get_max_intr(const struct rte_intr_handle *intr_handle)
-{
- struct rte_intr_source *src;
-
- TAILQ_FOREACH(src, &intr_sources, next) {
- if (src->intr_handle.fd != intr_handle->fd)
- continue;
-
- if (src->intr_handle.max_intr < intr_handle->max_intr)
- src->intr_handle.max_intr = intr_handle->max_intr;
- if (!src->intr_handle.max_intr)
- src->intr_handle.max_intr = 1;
- else if (src->intr_handle.max_intr > RTE_MAX_RXTX_INTR_VEC_ID)
- src->intr_handle.max_intr
- = RTE_MAX_RXTX_INTR_VEC_ID + 1;
-
- return src->intr_handle.max_intr;
- }
-
- return -1;
-}
-
/* enable MSI-X interrupts */
static int
vfio_enable_msix(const struct rte_intr_handle *intr_handle) {
@@ -313,15 +290,10 @@ vfio_enable_msix(const struct rte_intr_handle *intr_handle) {
irq_set = (struct vfio_irq_set *) irq_set_buf;
irq_set->argsz = len;
-
- ret = get_max_intr(intr_handle);
- if (ret < 0) {
- RTE_LOG(ERR, EAL, "Invalid number of MSI-X irqs for fd %d\n",
- intr_handle->fd);
- return -1;
- }
-
- irq_set->count = ret;
+ /* 0 < irq_set->count < RTE_MAX_RXTX_INTR_VEC_ID + 1 */
+ irq_set->count = intr_handle->max_intr ?
+ (intr_handle->max_intr > RTE_MAX_RXTX_INTR_VEC_ID + 1 ?
+ RTE_MAX_RXTX_INTR_VEC_ID + 1 : intr_handle->max_intr) : 1;
irq_set->flags = VFIO_IRQ_SET_DATA_EVENTFD | VFIO_IRQ_SET_ACTION_TRIGGER;
irq_set->index = VFIO_PCI_MSIX_IRQ_INDEX;
irq_set->start = 0;
--
2.9.3
next prev parent reply other threads:[~2017-03-07 8:28 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-22 22:17 [dpdk-dev] [PATCH 0/2] eal: clean up interrupt handle Qi Zhang
2017-02-22 22:17 ` [dpdk-dev] [PATCH 1/2] " Qi Zhang
2017-02-27 16:19 ` Jan Blunck
2017-02-28 1:22 ` Zhang, Qi Z
2017-02-22 22:17 ` [dpdk-dev] [PATCH 2/2] test: update test code Qi Zhang
2017-03-07 9:19 ` [dpdk-dev] [PATCH v2 0/3] clean up interrupt handle Qi Zhang
2017-03-07 9:19 ` Qi Zhang [this message]
2017-03-10 13:05 ` [dpdk-dev] [PATCH v2 1/3] vfio: keep interrupt source read only Thomas Monjalon
2017-03-10 13:26 ` Burakov, Anatoly
2017-03-07 9:19 ` [dpdk-dev] [PATCH v2 2/3] eal: clean up interrupt handle Qi Zhang
2017-03-30 16:39 ` Thomas Monjalon
2017-03-31 0:57 ` Zhang, Qi Z
2017-03-07 9:19 ` [dpdk-dev] [PATCH v2 3/3] app/test: update test code Qi Zhang
2017-03-10 13:04 ` Thomas Monjalon
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=20170307091928.57990-2-qi.z.zhang@intel.com \
--to=qi.z.zhang@intel.com \
--cc=dev@dpdk.org \
--cc=thomas.monjalon@6wind.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).