diff mbox

[dpdk-dev,v7,1/2] vfio: keep interrupt source read only

Message ID 20170406124222.18172-2-qi.z.zhang@intel.com (mailing list archive)
State Accepted, archived
Headers

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK

Commit Message

Qi Zhang April 6, 2017, 12:42 p.m. UTC 
  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>
---

v4:

- Add back this patch to make patch set complete though it already be applied.

v2:

- Seperate patch 1 of v1 into 2 patches.(part 1)

 lib/librte_eal/linuxapp/eal/eal_interrupts.c | 36 ++++------------------------
 1 file changed, 4 insertions(+), 32 deletions(-)

Comments

Thomas Monjalon April 6, 2017, 7:15 p.m. UTC | #1 
2017-04-06 20:42, Qi Zhang:
> 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>

v2 was 
Acked-by: Anatoly  Burakov <anatoly.burakov@intel.com>
diff mbox

Patch

diff --git a/lib/librte_eal/linuxapp/eal/eal_interrupts.c b/lib/librte_eal/linuxapp/eal/eal_interrupts.c
index e293728..3069779 100644
--- a/lib/librte_eal/linuxapp/eal/eal_interrupts.c
+++ b/lib/librte_eal/linuxapp/eal/eal_interrupts.c
@@ -279,29 +279,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) {
@@ -314,15 +291,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;