diff mbox

[dpdk-dev,v2] vfio: Fix vfio disable INTx

Message ID 1490745247-32001-1-git-send-email-nikhil.rao@intel.com (mailing list archive)
State Accepted, archived
Headers

Checks

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

Commit Message

Rao, Nikhil March 28, 2017, 11:54 p.m. UTC 
  The flags member of irq_set should be ORed with VFIO_IRQ_SET_ACTION_MASK
and not VFIO_IRQ_SET_ACTION_UNMASK. The bug was found by code inspection.

Fixes: 5c782b3928b8 (\"vfio: interrupts\")

Signed-off-by: Nikhil Rao <nikhil.rao@intel.com>
---
Changes since v1:
* Better summary
* Fix error message

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

Comments

Burakov, Anatoly March 28, 2017, 3:28 p.m. UTC | #1 
> From: Rao, Nikhil
> Sent: Wednesday, March 29, 2017 12:54 AM
> To: Burakov, Anatoly <anatoly.burakov@intel.com>
> Cc: dev@dpdk.org
> Subject: [PATCH v2] vfio: Fix vfio disable INTx
> 
> The flags member of irq_set should be ORed with
> VFIO_IRQ_SET_ACTION_MASK and not VFIO_IRQ_SET_ACTION_UNMASK.
> The bug was found by code inspection.
> 
> Fixes: 5c782b3928b8 (\"vfio: interrupts\")
> 
> Signed-off-by: Nikhil Rao <nikhil.rao@intel.com>

Great find!

Acked-by: Anatoly  Burakov <anatoly.burakov@intel.com>
Thomas Monjalon March 30, 2017, 3 p.m. UTC | #2 
2017-03-28 15:28, Burakov, Anatoly:
> > From: Rao, Nikhil
> > Sent: Wednesday, March 29, 2017 12:54 AM
> > To: Burakov, Anatoly <anatoly.burakov@intel.com>
> > Cc: dev@dpdk.org
> > Subject: [PATCH v2] vfio: Fix vfio disable INTx
> > 
> > The flags member of irq_set should be ORed with
> > VFIO_IRQ_SET_ACTION_MASK and not VFIO_IRQ_SET_ACTION_UNMASK.
> > The bug was found by code inspection.
> > 
> > Fixes: 5c782b3928b8 (\"vfio: interrupts\")
> > 
> > Signed-off-by: Nikhil Rao <nikhil.rao@intel.com>
> 
> Great find!
> 
> Acked-by: Anatoly  Burakov <anatoly.burakov@intel.com>

Applied, thanks
diff mbox

Patch

diff --git a/lib/librte_eal/linuxapp/eal/eal_interrupts.c b/lib/librte_eal/linuxapp/eal/eal_interrupts.c
index 5bb833e..029a147 100644
--- a/lib/librte_eal/linuxapp/eal/eal_interrupts.c
+++ b/lib/librte_eal/linuxapp/eal/eal_interrupts.c
@@ -194,14 +194,14 @@  vfio_disable_intx(const struct rte_intr_handle *intr_handle) {
 	irq_set = (struct vfio_irq_set *) irq_set_buf;
 	irq_set->argsz = len;
 	irq_set->count = 1;
-	irq_set->flags = VFIO_IRQ_SET_DATA_NONE | VFIO_IRQ_SET_ACTION_UNMASK;
+	irq_set->flags = VFIO_IRQ_SET_DATA_NONE | VFIO_IRQ_SET_ACTION_MASK;
 	irq_set->index = VFIO_PCI_INTX_IRQ_INDEX;
 	irq_set->start = 0;
 
 	ret = ioctl(intr_handle->vfio_dev_fd, VFIO_DEVICE_SET_IRQS, irq_set);
 
 	if (ret) {
-		RTE_LOG(ERR, EAL, "Error unmasking INTx interrupts for fd %d\n",
+		RTE_LOG(ERR, EAL, "Error masking INTx interrupts for fd %d\n",
 						intr_handle->fd);
 		return -1;
 	}