patch 'net/netvsc: scan all net devices under the PCI device' has been queued to stable release 23.11.4
Xueming Li
xuemingl at nvidia.com
Tue Apr 8 09:44:27 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=8ba3b764b2ce365201ffb95f391af504b3ce33f0
Thanks.
Xueming Li <xuemingl at nvidia.com>
---
>From 8ba3b764b2ce365201ffb95f391af504b3ce33f0 Mon Sep 17 00:00:00 2001
From: Long Li <longli at microsoft.com>
Date: Thu, 13 Feb 2025 10:58:23 -0800
Subject: [PATCH] net/netvsc: scan all net devices under the PCI device
Cc: Xueming Li <xuemingl at nvidia.com>
[ upstream commit 7690b9ca7b0e5f54ffa7e94957e3fc04bcdc92e4 ]
The current code has the wrong assumption that a PCI device can have only
one Ethernet device. This is not correct as a PCI device can be multi
functional and have multiple Ethernet devices.
Fix this by scanning all the devices under a PCI device.
Fixes: a2a23a794b3a ("net/netvsc: support VF device hot add/remove")
Signed-off-by: Long Li <longli at microsoft.com>
---
drivers/net/netvsc/hn_ethdev.c | 29 ++++++++++++-----------------
1 file changed, 12 insertions(+), 17 deletions(-)
diff --git a/drivers/net/netvsc/hn_ethdev.c b/drivers/net/netvsc/hn_ethdev.c
index 1736cb5d07..f848157b49 100644
--- a/drivers/net/netvsc/hn_ethdev.c
+++ b/drivers/net/netvsc/hn_ethdev.c
@@ -570,7 +570,7 @@ static void netvsc_hotplug_retry(void *args)
struct rte_devargs *d = &hot_ctx->da;
char buf[256];
- DIR *di;
+ DIR *di = NULL;
struct dirent *dir;
struct ifreq req;
struct rte_ether_addr eth_addr;
@@ -590,7 +590,9 @@ static void netvsc_hotplug_retry(void *args)
if (!di) {
PMD_DRV_LOG(DEBUG, "%s: can't open directory %s, "
"retrying in 1 second", __func__, buf);
- goto retry;
+ /* The device is still being initialized, retry after 1 second */
+ rte_eal_alarm_set(1000000, netvsc_hotplug_retry, hot_ctx);
+ return;
}
while ((dir = readdir(di))) {
@@ -614,10 +616,9 @@ static void netvsc_hotplug_retry(void *args)
dir->d_name);
break;
}
- if (req.ifr_hwaddr.sa_family != ARPHRD_ETHER) {
- closedir(di);
- goto free_hotadd_ctx;
- }
+ if (req.ifr_hwaddr.sa_family != ARPHRD_ETHER)
+ continue;
+
memcpy(eth_addr.addr_bytes, req.ifr_hwaddr.sa_data,
RTE_DIM(eth_addr.addr_bytes));
@@ -636,22 +637,16 @@ static void netvsc_hotplug_retry(void *args)
PMD_DRV_LOG(ERR,
"Failed to add PCI device %s",
d->name);
- break;
}
+
+ break;
}
- /* When the code reaches here, we either have already added
- * the device, or its MAC address did not match.
- */
- closedir(di);
- goto free_hotadd_ctx;
}
- closedir(di);
-retry:
- /* The device is still being initialized, retry after 1 second */
- rte_eal_alarm_set(1000000, netvsc_hotplug_retry, hot_ctx);
- return;
free_hotadd_ctx:
+ if (di)
+ closedir(di);
+
rte_spinlock_lock(&hv->hotadd_lock);
LIST_REMOVE(hot_ctx, list);
rte_spinlock_unlock(&hv->hotadd_lock);
--
2.34.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2025-04-08 15:39:06.137544313 +0800
+++ 0002-net-netvsc-scan-all-net-devices-under-the-PCI-device.patch 2025-04-08 15:39:05.856436604 +0800
@@ -1 +1 @@
-From 7690b9ca7b0e5f54ffa7e94957e3fc04bcdc92e4 Mon Sep 17 00:00:00 2001
+From 8ba3b764b2ce365201ffb95f391af504b3ce33f0 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 7690b9ca7b0e5f54ffa7e94957e3fc04bcdc92e4 ]
@@ -13 +15,0 @@
-Cc: stable at dpdk.org
More information about the stable
mailing list