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

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 20.11.4

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/12/21. 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/steevenlee/dpdk

This queued commit can be viewed at:
https://github.com/steevenlee/dpdk/commit/dd6e6e33c7cf046becb5a373f44228489cf01af2

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From dd6e6e33c7cf046becb5a373f44228489cf01af2 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand at redhat.com>
Date: Tue, 31 Aug 2021 17:54:11 +0200
Subject: [PATCH] net/virtio-user: fix Rx interrupts with multi-queue
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 848e93d9001e74fdbcb31b7ac5cdc1991b9e3f03 ]

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

Fixes: 3d4fb6fd2505 ("net/virtio-user: support Rx interrupt")

Signed-off-by: David Marchand <david.marchand at redhat.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin 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 e93e1919ab..73f6fd7313 100644
--- a/drivers/net/virtio/virtio_user/virtio_user_dev.c
+++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c
@@ -312,7 +312,7 @@ virtio_user_fill_intr_handle(struct virtio_user_dev *dev)
 	}
 
 	for (i = 0; i < dev->max_queue_pairs; ++i)
-		eth_dev->intr_handle->efds[i] = dev->callfds[i];
+		eth_dev->intr_handle->efds[i] = dev->callfds[2 * i];
 	eth_dev->intr_handle->nb_efd = dev->max_queue_pairs;
 	eth_dev->intr_handle->max_intr = dev->max_queue_pairs + 1;
 	eth_dev->intr_handle->type = RTE_INTR_HANDLE_VDEV;
-- 
2.33.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-11-10 14:17:04.418669644 +0800
+++ 0052-net-virtio-user-fix-Rx-interrupts-with-multi-queue.patch	2021-11-10 14:17:01.804079970 +0800
@@ -1 +1 @@
-From 848e93d9001e74fdbcb31b7ac5cdc1991b9e3f03 Mon Sep 17 00:00:00 2001
+From dd6e6e33c7cf046becb5a373f44228489cf01af2 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 848e93d9001e74fdbcb31b7ac5cdc1991b9e3f03 ]
@@ -9 +11,0 @@
-Cc: stable at dpdk.org
@@ -18 +20 @@
-index 16c58710d7..89f8b2271f 100644
+index e93e1919ab..73f6fd7313 100644
@@ -21 +23 @@
-@@ -416,7 +416,7 @@ virtio_user_fill_intr_handle(struct virtio_user_dev *dev)
+@@ -312,7 +312,7 @@ virtio_user_fill_intr_handle(struct virtio_user_dev *dev)