dmaengine: idxd: fix array index when int_handles are being used

Commit Message

Dave Jiang June 24, 2021, 7:09 p.m. UTC

The index to the irq vector should be local and has no relation to
the assigned interrupt handle. Assign the MSIX interrupt index that is
programmed for the descriptor. The interrupt handle only matters when it
comes to hardware descriptor programming.

Fixes: eb15e7154fbf ("dmaengine: idxd: add interrupt handle request and release support")
Signed-off-by: Dave Jiang <[e-mail]>
---
 drivers/dma/idxd/submit.c |   15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

Comments

Vinod Koul July 14, 2021, 6:57 a.m. UTC | #1

On 24-06-21, 12:09, Dave Jiang wrote:
> The index to the irq vector should be local and has no relation to
> the assigned interrupt handle. Assign the MSIX interrupt index that is
> programmed for the descriptor. The interrupt handle only matters when it
> comes to hardware descriptor programming.

Applied, thanks

Patch

diff --git a/drivers/dma/idxd/submit.c b/drivers/dma/idxd/submit.c
index b0f1ddf75d31..736def129fa8 100644
--- a/drivers/dma/idxd/submit.c
+++ b/drivers/dma/idxd/submit.c
@@ -130,19 +130,8 @@  int idxd_submit_desc(struct idxd_wq *wq, struct idxd_desc *desc)
 	 * Pending the descriptor to the lockless list for the irq_entry
 	 * that we designated the descriptor to.
 	 */
-	if (desc->hw->flags & IDXD_OP_FLAG_RCI) {
-		int vec;
-
-		/*
-		 * If the driver is on host kernel, it would be the value
-		 * assigned to interrupt handle, which is index for MSIX
-		 * vector. If it's guest then can't use the int_handle since
-		 * that is the index to IMS for the entire device. The guest
-		 * device local index will be used.
-		 */
-		vec = !idxd->int_handles ? desc->hw->int_handle : desc->vector;
-		llist_add(&desc->llnode, &idxd->irq_entries[vec].pending_llist);
-	}
+	if (desc->hw->flags & IDXD_OP_FLAG_RCI)
+		llist_add(&desc->llnode, &idxd->irq_entries[desc->vector].pending_llist);
 
 	return 0;
 }