patch 'net/virtio-user: fix Rx interrupts with multi-queue' has been queued to stable release 21.11.2

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 21.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 07/08/22. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/36f4c8e67fd41186ea8c1b4567bc4bb684ae75ee

Thanks.

Luca Boccassi

---
>From 36f4c8e67fd41186ea8c1b4567bc4bb684ae75ee Mon Sep 17 00:00:00 2001
From: Yuan Wang <yuanx.wang at intel.com>
Date: Mon, 4 Jul 2022 15:04:28 +0800
Subject: [PATCH] net/virtio-user: fix Rx interrupts with multi-queue

[ upstream commit 23ab0c59bcc8c91fe66762a10d64cd07e5acd69c ]

The callfds[] array stores eventfds sequentially for Rx and Tx vq.

Fixes: d61138d4f0e2 ("drivers: remove direct access to interrupt handle")

Signed-off-by: Yuan Wang <yuanx.wang at intel.com>
Reviewed-by: David Marchand <david.marchand at redhat.com>
---
 drivers/net/virtio/virtio_user/virtio_user_dev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c b/drivers/net/virtio/virtio_user/virtio_user_dev.c
index 35aa76b1ff..f9cada05e4 100644
--- a/drivers/net/virtio/virtio_user/virtio_user_dev.c
+++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c
@@ -417,7 +417,7 @@ virtio_user_fill_intr_handle(struct virtio_user_dev *dev)
 
 	for (i = 0; i < dev->max_queue_pairs; ++i) {
 		if (rte_intr_efds_index_set(eth_dev->intr_handle, i,
-				dev->callfds[i]))
+				dev->callfds[2 * i + VTNET_SQ_RQ_QUEUE_IDX]))
 			return -rte_errno;
 	}
 
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-07-06 21:07:54.147174258 +0100
+++ 0017-net-virtio-user-fix-Rx-interrupts-with-multi-queue.patch	2022-07-06 21:07:53.547518784 +0100
@@ -1 +1 @@
-From 23ab0c59bcc8c91fe66762a10d64cd07e5acd69c Mon Sep 17 00:00:00 2001
+From 36f4c8e67fd41186ea8c1b4567bc4bb684ae75ee Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 23ab0c59bcc8c91fe66762a10d64cd07e5acd69c ]
+
@@ -9 +10,0 @@
-Cc: stable at dpdk.org