patch 'net/virtio: fix link state interrupt vector setting' has been queued to stable release 20.11.10

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 20.11.10

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/10/23. 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/bluca/dpdk-stable

This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/1945571d8bb3d300c5ca30f2e57b162df6032533

Thanks.

Luca Boccassi

---
>From 1945571d8bb3d300c5ca30f2e57b162df6032533 Mon Sep 17 00:00:00 2001
From: Wenwu Ma <wenwux.ma at intel.com>
Date: Mon, 23 Oct 2023 09:46:12 +0800
Subject: [PATCH] net/virtio: fix link state interrupt vector setting

[ upstream commit efc3f842b3dd69c4e65dbdf6cdaccde8c759b5d9 ]

Setting the vector for link state interrupts should be
done before the device initialization is completed.

Fixes: ee85024cf5f7 ("net/virtio: complete init stage at the right place")

Signed-off-by: Wenwu Ma <wenwux.ma at intel.com>
Tested-by: Wei Ling <weix.ling at intel.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin at redhat.com>
---
 drivers/net/virtio/virtio_ethdev.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c
index 1ee738f8cc..867b3ff548 100644
--- a/drivers/net/virtio/virtio_ethdev.c
+++ b/drivers/net/virtio/virtio_ethdev.c
@@ -1924,6 +1924,14 @@ virtio_init_device(struct rte_eth_dev *eth_dev, uint64_t req_features)
 		}
 	}
 
+	if (eth_dev->data->dev_flags & RTE_ETH_DEV_INTR_LSC)
+		/* Enable vector (0) for Link State Interrupt */
+		if (VTPCI_OPS(hw)->set_config_irq(hw, 0) ==
+				VIRTIO_MSI_NO_VECTOR) {
+			PMD_DRV_LOG(ERR, "failed to set config vector");
+			return -EBUSY;
+		}
+
 	vtpci_reinit_complete(hw);
 
 	if (pci_dev)
@@ -2408,14 +2416,6 @@ virtio_dev_configure(struct rte_eth_dev *dev)
 	hw->has_tx_offload = tx_offload_enabled(hw);
 	hw->has_rx_offload = rx_offload_enabled(hw);
 
-	if (dev->data->dev_flags & RTE_ETH_DEV_INTR_LSC)
-		/* Enable vector (0) for Link State Interrupt */
-		if (VTPCI_OPS(hw)->set_config_irq(hw, 0) ==
-				VIRTIO_MSI_NO_VECTOR) {
-			PMD_DRV_LOG(ERR, "failed to set config vector");
-			return -EBUSY;
-		}
-
 	if (vtpci_packed_queue(hw)) {
 #if defined(RTE_ARCH_X86_64) && defined(CC_AVX512_SUPPORT)
 		if ((hw->use_vec_rx || hw->use_vec_tx) &&
-- 
2.39.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-08 19:23:52.170369761 +0000
+++ 0005-net-virtio-fix-link-state-interrupt-vector-setting.patch	2023-11-08 19:23:51.729395382 +0000
@@ -1 +1 @@
-From efc3f842b3dd69c4e65dbdf6cdaccde8c759b5d9 Mon Sep 17 00:00:00 2001
+From 1945571d8bb3d300c5ca30f2e57b162df6032533 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit efc3f842b3dd69c4e65dbdf6cdaccde8c759b5d9 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -20 +21 @@
-index 3ab56ef769..c2c0a1a111 100644
+index 1ee738f8cc..867b3ff548 100644
@@ -23 +24 @@
-@@ -1912,6 +1912,14 @@ virtio_init_device(struct rte_eth_dev *eth_dev, uint64_t req_features)
+@@ -1924,6 +1924,14 @@ virtio_init_device(struct rte_eth_dev *eth_dev, uint64_t req_features)
@@ -29 +30 @@
-+		if (VIRTIO_OPS(hw)->set_config_irq(hw, 0) ==
++		if (VTPCI_OPS(hw)->set_config_irq(hw, 0) ==
@@ -35 +36 @@
- 	virtio_reinit_complete(hw);
+ 	vtpci_reinit_complete(hw);
@@ -37,2 +38,2 @@
- 	return 0;
-@@ -2237,14 +2245,6 @@ virtio_dev_configure(struct rte_eth_dev *dev)
+ 	if (pci_dev)
+@@ -2408,14 +2416,6 @@ virtio_dev_configure(struct rte_eth_dev *dev)
@@ -44 +45 @@
--		if (VIRTIO_OPS(hw)->set_config_irq(hw, 0) ==
+-		if (VTPCI_OPS(hw)->set_config_irq(hw, 0) ==
@@ -50 +51 @@
- 	if (virtio_with_packed_queue(hw)) {
+ 	if (vtpci_packed_queue(hw)) {