patch 'net/netvsc: remove device if its net devices removed' has been queued to stable release 23.11.4
Xueming Li
xuemingl at nvidia.com
Tue Apr 8 09:44:28 CEST 2025
Hi,
FYI, your patch has been queued to stable release 23.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 04/10/25. 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://git.dpdk.org/dpdk-stable/log/?h=23.11-staging
This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=8848621c74fa30b4ebe3566438bd2ac25b555def
Thanks.
Xueming Li <xuemingl at nvidia.com>
---
>From 8848621c74fa30b4ebe3566438bd2ac25b555def Mon Sep 17 00:00:00 2001
From: Long Li <longli at microsoft.com>
Date: Thu, 13 Feb 2025 10:58:24 -0800
Subject: [PATCH] net/netvsc: remove device if its net devices removed
Cc: Xueming Li <xuemingl at nvidia.com>
[ upstream commit 1ec0995e173da14f2871ee19326f275f94f412c4 ]
An RTE device can have multiple Ethernet devices. On hot plug events, it
can't be removed until all its Ethernet devices have been removed.
Fixes: a2a23a794b3a ("net/netvsc: support VF device hot add/remove")
Signed-off-by: Long Li <longli at microsoft.com>
---
drivers/net/netvsc/hn_vf.c | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/drivers/net/netvsc/hn_vf.c b/drivers/net/netvsc/hn_vf.c
index a4e958419d..7d61376e63 100644
--- a/drivers/net/netvsc/hn_vf.c
+++ b/drivers/net/netvsc/hn_vf.c
@@ -102,6 +102,7 @@ static void hn_remove_delayed(void *args)
uint16_t port_id = hv->vf_ctx.vf_port;
struct rte_device *dev = rte_eth_devices[port_id].device;
int ret;
+ bool all_eth_removed;
/* Tell VSP to switch data path to synthetic */
hn_vf_remove(hv);
@@ -138,7 +139,17 @@ static void hn_remove_delayed(void *args)
PMD_DRV_LOG(ERR, "rte_eth_dev_close failed port_id=%u ret=%d",
port_id, ret);
- ret = rte_dev_remove(dev);
+ /* Remove the rte device when all its eth devices are removed */
+ all_eth_removed = true;
+ RTE_ETH_FOREACH_DEV_OF(port_id, dev) {
+ if (rte_eth_devices[port_id].state != RTE_ETH_DEV_UNUSED) {
+ all_eth_removed = false;
+ break;
+ }
+ }
+ if (all_eth_removed)
+ ret = rte_dev_remove(dev);
+
hv->vf_ctx.vf_state = vf_removed;
rte_rwlock_write_unlock(&hv->vf_lock);
--
2.34.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2025-04-08 15:39:06.160262106 +0800
+++ 0003-net-netvsc-remove-device-if-its-net-devices-removed.patch 2025-04-08 15:39:05.856436604 +0800
@@ -1 +1 @@
-From 1ec0995e173da14f2871ee19326f275f94f412c4 Mon Sep 17 00:00:00 2001
+From 8848621c74fa30b4ebe3566438bd2ac25b555def Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 1ec0995e173da14f2871ee19326f275f94f412c4 ]
@@ -10 +12,0 @@
-Cc: stable at dpdk.org
@@ -18 +20 @@
-index b664beaa5d..5d8058774d 100644
+index a4e958419d..7d61376e63 100644
More information about the stable
mailing list