Skip to contentSkip to conversation

net/netvsc: scan all net devices under the PCI device

PATCH Superseded [email protected] 3 participants 12 messages Jan 28, 2025 – Feb 7, 2025 Network drivers

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/4 net/netvsc: scan all net devices under the PCI device

From: Long Li <[email protected]>

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")
---
 drivers/net/netvsc/hn_ethdev.c | 29 ++++++++++++-----------------
 1 file changed, 12 insertions(+), 17 deletions(-)
drivers/net/netvsc/hn_ethdev.c +12 -17
index 1736cb5d07..f848157b49 100644
@@ -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);
Signature · 1 line
2.34.1
#1 lore raw

PATCH 2/4 net/netvsc: remove RTE device if all its net devices are removed

From: Long Li <[email protected]>

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")
---
 drivers/net/netvsc/hn_vf.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)
drivers/net/netvsc/hn_vf.c +12 -1
index b664beaa5d..5d8058774d 100644
@@ -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);
Signature · 1 line
2.34.1
#2 lore raw

PATCH 3/4 net/netvsc: log error on failure to switch data path

In reply to [email protected]

From: Long Li <[email protected]>

There is no recovery code path if netvsc failed to switch data path.

Log an error in this case for troubleshooting.

---
 drivers/net/netvsc/hn_vf.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/netvsc/hn_vf.c +3 -2
index 5d8058774d..4ff766ec8b 100644
@@ -316,8 +316,9 @@ static void hn_vf_remove(struct hn_data *hv)
 	} else {
 		/* Stop incoming packets from arriving on VF */
 		ret = hn_nvs_set_datapath(hv, NVS_DATAPATH_SYNTHETIC);
-		if (ret == 0)
-			hv->vf_ctx.vf_vsc_switched = false;
+		if (ret)
+			PMD_DRV_LOG(ERR, "Failed to switch to synthetic");
+		hv->vf_ctx.vf_vsc_switched = false;
 	}
 	rte_rwlock_write_unlock(&hv->vf_lock);
 }
Signature · 1 line
2.34.1
#3 lore raw

PATCH 4/4 net/netvsc: cache device parameters for hot plug events

In reply to [email protected]

From: Long Li <[email protected]>

If a device is hot removed and hot plugged, it needs the same driver parameters that are passed to EAL. However, during device removal, all EAL driver parameters are freed as part of the cleanup.

Cache those driver parameters for future hot plug events. Because we don't know which device will show up, cache all the PCI driver parameters.

---
 drivers/net/netvsc/hn_ethdev.c | 107 +++++++++++++++++++++++++++++----
 drivers/net/netvsc/hn_var.h    |   1 -
 drivers/net/netvsc/hn_vf.c     |   4 --
 3 files changed, 94 insertions(+), 18 deletions(-)
drivers/net/netvsc/hn_ethdev.c +94 -13
index f848157b49..afbbccd822 100644
@@ -95,6 +95,16 @@ static const uint8_t rss_default_key[NDIS_HASH_KEYSIZE_TOEPLITZ] = {
 	0x06, 0x3c, 0x25, 0xf3,	0xfc, 0x1f, 0xdc, 0x2a,
 };
 
+static rte_spinlock_t netvsc_lock = RTE_SPINLOCK_INITIALIZER;
+struct da_cache {
+	LIST_ENTRY(da_cache) list;
+	char name[RTE_DEV_NAME_MAX_LEN];
+	char *drv_str;
+};
+
+LIST_HEAD(da_cache_list, da_cache) da_cache_list;
+static unsigned int da_cache_usage;
+
 static struct rte_eth_dev *
 eth_dev_vmbus_allocate(struct rte_vmbus_device *dev, size_t private_data_size)
 {
@@ -623,16 +633,21 @@ static void netvsc_hotplug_retry(void *args)
 		       RTE_DIM(eth_addr.addr_bytes));
 
 		if (rte_is_same_ether_addr(&eth_addr, dev->data->mac_addrs)) {
+			struct da_cache *cache;
+
+			LIST_FOREACH(cache, &da_cache_list, list) {
+				if (strcmp(cache->name, d->name) == 0)
+					break;
+			}
+
 			PMD_DRV_LOG(NOTICE,
-				    "Found matching MAC address, adding device %s network name %s",
-				    d->name, dir->d_name);
+				    "Found matching MAC address, adding device %s network name %s args %s",
+				    d->name, dir->d_name, cache ? cache->drv_str : "");
 
 			/* If this device has been hot removed from this
 			 * parent device, restore its args.
 			 */
-			ret = rte_eal_hotplug_add(d->bus->name, d->name,
-						  hv->vf_devargs ?
-						  hv->vf_devargs : "");
+			ret = rte_eal_hotplug_add(d->bus->name, d->name, cache ? cache->drv_str : "");
 			if (ret) {
 				PMD_DRV_LOG(ERR,
 					    "Failed to add PCI device %s",
@@ -1409,9 +1424,6 @@ eth_hn_dev_uninit(struct rte_eth_dev *eth_dev)
 	ret_stop = hn_dev_stop(eth_dev);
 	hn_dev_close(eth_dev);
 
-	free(hv->vf_devargs);
-	hv->vf_devargs = NULL;
-
 	hn_detach(hv);
 	hn_chim_uninit(eth_dev);
 	rte_vmbus_chan_close(hv->channels[0]);
@@ -1423,6 +1435,61 @@ eth_hn_dev_uninit(struct rte_eth_dev *eth_dev)
 	return ret_stop;
 }
 
+static int populate_cache_list(void)
+{
+	int ret;
+	struct rte_devargs *da;
+
+	rte_spinlock_lock(&netvsc_lock);
+	da_cache_usage++;
+	if (da_cache_usage > 1) {
+		ret = 0;
+		goto out;
+	}
+
+	LIST_INIT(&da_cache_list);
+	RTE_EAL_DEVARGS_FOREACH("pci", da) {
+		struct da_cache *cache;
+
+		cache = rte_zmalloc("NETVSC-HOTADD", sizeof(*cache), rte_mem_page_size());
+		if (!cache) {
+			ret = -ENOMEM;
+			goto out;
+		}
+
+		strncpy(cache->name, da->name, sizeof(da->name));
+		cache->drv_str = strdup(da->drv_str);
+		if (!cache->drv_str) {
+			rte_free(cache);
+			ret = -ENOMEM;
+			goto out;
+		}
+
+		LIST_INSERT_HEAD(&da_cache_list, cache, list);
+	}
+out:
+	rte_spinlock_unlock(&netvsc_lock);
+	return ret;
+}
+
+static void remove_cache_list(void)
+{
+	struct da_cache *cache;
+
+	rte_spinlock_lock(&netvsc_lock);
+	da_cache_usage--;
+	if (da_cache_usage)
+		goto out;
+
+	LIST_FOREACH(cache, &da_cache_list, list) {
+		LIST_REMOVE(cache, list);
+		free(cache->drv_str);
+		rte_free(cache);
+	}
+out:
+	rte_spinlock_unlock(&netvsc_lock);
+}
+
 static int eth_hn_probe(struct rte_vmbus_driver *drv __rte_unused,
 			struct rte_vmbus_device *dev)
 {
@@ -1431,24 +1498,35 @@ static int eth_hn_probe(struct rte_vmbus_driver *drv __rte_unused,
 
 	PMD_INIT_FUNC_TRACE();
 
+	ret = populate_cache_list();
+	if (ret)
+		return ret;
+
 	ret = rte_dev_event_monitor_start();
 	if (ret) {
 		PMD_DRV_LOG(ERR, "Failed to start device event monitoring");
-		return ret;
+		goto fail;
 	}
 
 	eth_dev = eth_dev_vmbus_allocate(dev, sizeof(struct hn_data));
-	if (!eth_dev)
-		return -ENOMEM;
+	if (!eth_dev) {
+		rte_dev_event_monitor_stop();
+		ret = -ENOMEM;
+		goto fail;
+	}
 
 	ret = eth_hn_dev_init(eth_dev);
 	if (ret) {
 		eth_dev_vmbus_release(eth_dev);
 		rte_dev_event_monitor_stop();
-	} else {
-		rte_eth_dev_probing_finish(eth_dev);
+		goto fail;
 	}
 
+	rte_eth_dev_probing_finish(eth_dev);
+	return 0;
+
+fail:
+	remove_cache_list();
 	return ret;
 }
 
@@ -1469,6 +1547,9 @@ static int eth_hn_remove(struct rte_vmbus_device *dev)
 
 	eth_dev_vmbus_release(eth_dev);
 	rte_dev_event_monitor_stop();
+
+	remove_cache_list();
+
 	return 0;
 }
 
drivers/net/netvsc/hn_var.h +0 -1
index 0f638bc5fd..d2263e03e8 100644
@@ -184,7 +184,6 @@ struct hn_data {
 
 	rte_spinlock_t	hotadd_lock;
 	LIST_HEAD(hotadd_list, hv_hotadd_context) hotadd_list;
-	char		*vf_devargs;
 };
 
 static inline struct vmbus_channel *
drivers/net/netvsc/hn_vf.c +0 -4
index 4ff766ec8b..d922e685f4 100644
@@ -130,10 +130,6 @@ static void hn_remove_delayed(void *args)
 		PMD_DRV_LOG(ERR, "rte_eth_dev_stop failed port_id=%u ret=%d",
 			    port_id, ret);
 
-	/* Record the device parameters for possible hotplug events */
-	if (dev->devargs && dev->devargs->args)
-		hv->vf_devargs = strdup(dev->devargs->args);
-
 	ret = rte_eth_dev_close(port_id);
 	if (ret)
 		PMD_DRV_LOG(ERR, "rte_eth_dev_close failed port_id=%u ret=%d",
Signature · 1 line
2.34.1
#4 lore raw

Re: [PATCH 4/4] net/netvsc: cache device parameters for hot plug events

Quoted 36 lines · On Mon, 27 Jan 2025 17:35:06 -0800 [email protected] wrote:
drivers/net/netvsc/hn_ethdev.c +22 -3
@@ -1409,9 +1424,6 @@ eth_hn_dev_uninit(struct rte_eth_dev *eth_dev)
 	ret_stop = hn_dev_stop(eth_dev);
 	hn_dev_close(eth_dev);
 
-	free(hv->vf_devargs);
-	hv->vf_devargs = NULL;
-
 	hn_detach(hv);
 	hn_chim_uninit(eth_dev);
 	rte_vmbus_chan_close(hv->channels[0]);
@@ -1423,6 +1435,61 @@ eth_hn_dev_uninit(struct rte_eth_dev *eth_dev)
 	return ret_stop;
 }
 
+static int populate_cache_list(void)
+{
+	int ret;
+	struct rte_devargs *da;
+
+	rte_spinlock_lock(&netvsc_lock);
+	da_cache_usage++;
+	if (da_cache_usage > 1) {
+		ret = 0;
+		goto out;
+	}
+
+	LIST_INIT(&da_cache_list);
+	RTE_EAL_DEVARGS_FOREACH("pci", da) {
+		struct da_cache *cache;
+
+		cache = rte_zmalloc("NETVSC-HOTADD", sizeof(*cache), rte_mem_page_size());
+		if (!cache) {
+			ret = -ENOMEM;
+			goto out;
+		}
+

drivers/net/netvsc/hn_ethdev.c eth_hn_dev_uninit(struct rte_eth_dev *eth_dev) · line 1469

Quoted 10 lines
drivers/net/netvsc/hn_ethdev.c +10 -0
+		strncpy(cache->name, da->name, sizeof(da->name));
+		cache->drv_str = strdup(da->drv_str);
+		if (!cache->drv_str) {
+			rte_free(cache);
+			ret = -ENOMEM;
+			goto out;
+		}
+
+		LIST_INSERT_HEAD(&da_cache_list, cache, list);
+	}

Why do you need to cache entry to be page aligned, that seems unnecessary wasteful? Why does it need to be huge pages? versus normal malloc?
The string is coming from malloc (strdup) so it can't be used by secondary process.

Since you are allocating a devargs cache entry, you could just as well use flexible array where entry was like:

struct da_cache {
	LIST_ENTRY(da_cache) list;
	char name[RTE_DEV_NAME_MAX_LEN];
	char drv_str[];
};
	cache = malloc(sizeof(*cache) + strlen(da->drv_str) + 1);
...
	strcpy(cache->drv_str, da->drv_str);
#5 lore raw

RE: [EXTERNAL] Re: [PATCH 4/4] net/netvsc: cache device parameters for hot plug events

Quoted 48 lines

Subject: [EXTERNAL] Re: [PATCH 4/4] net/netvsc: cache device parameters for hot plug events

Quoted 21 lines · On Mon, 27 Jan 2025 17:35:06 -0800 [email protected] wrote:
drivers/net/netvsc/hn_ethdev.c +7 -3
@@ -1409,9 +1424,6 @@ eth_hn_dev_uninit(struct rte_eth_dev *eth_dev)
 	ret_stop = hn_dev_stop(eth_dev);
 	hn_dev_close(eth_dev);
 
-	free(hv->vf_devargs);
-	hv->vf_devargs = NULL;
-
 	hn_detach(hv);
 	hn_chim_uninit(eth_dev);
 	rte_vmbus_chan_close(hv->channels[0]);
@@ -1423,6 +1435,61 @@ eth_hn_dev_uninit(struct rte_eth_dev *eth_dev)
 	return ret_stop;
 }
 
+static int populate_cache_list(void)
+{
+	int ret;
+	struct rte_devargs *da;
+
+	rte_spinlock_lock(&netvsc_lock);
+	da_cache_usage++;

drivers/net/netvsc/hn_ethdev.c eth_hn_dev_uninit(struct rte_eth_dev *eth_dev) · line 1454

Quoted 10 lines
drivers/net/netvsc/hn_ethdev.c +10 -0
+	if (da_cache_usage > 1) {
+		ret = 0;
+		goto out;
+	}
+
+	LIST_INIT(&da_cache_list);
+	RTE_EAL_DEVARGS_FOREACH("pci", da) {
+		struct da_cache *cache;
+
+		cache = rte_zmalloc("NETVSC-HOTADD", sizeof(*cache),

rte_mem_page_size());

Quoted 10 lines
drivers/net/netvsc/hn_ethdev.c +10 -0
+		if (!cache) {
+			ret = -ENOMEM;
+			goto out;
+		}
+
+		strncpy(cache->name, da->name, sizeof(da->name));
+		cache->drv_str = strdup(da->drv_str);
+		if (!cache->drv_str) {
+			rte_free(cache);
+			ret = -ENOMEM;
Quoted 8 lines

drivers/net/netvsc/hn_ethdev.c eth_hn_dev_uninit(struct rte_eth_dev *eth_dev) · line 1469

Quoted 5 lines
drivers/net/netvsc/hn_ethdev.c +5 -0
+			goto out;
+		}
+
+		LIST_INSERT_HEAD(&da_cache_list, cache, list);
+	}

Why do you need to cache entry to be page aligned, that seems unnecessary wasteful?

You are right it doesn't need to. I'm removing the alignment.

Quoted 1 line

Why does it need to be huge pages? versus normal malloc?

I thought it would make it easier to debug memory leaks through EAL. But normal malloc is fine because this data is not shared between primary/secondary.

Quoted 9 lines

The string is coming from malloc (strdup) so it can't be used by secondary process.

Since you are allocating a devargs cache entry, you could just as well use flexible array where entry was like:

struct da_cache {
	LIST_ENTRY(da_cache) list;
	char name[RTE_DEV_NAME_MAX_LEN];
	char drv_str[];
};

This is difficult as I don't know how big it is for drv_str[].

Quoted 4 lines

	cache = malloc(sizeof(*cache) + strlen(da->drv_str) + 1); ...
	strcpy(cache->drv_str, da->drv_str);

Another approach is to modify EAL to never delete driver arguments when a device is removed. i.e., It doesn't call rte_devargs_remove() on device removal, instead keep those devargs for the lifetime of the process. Do you think this is a better approach? This will save work if other drivers want to cache devargs list for device hot plug events.

Thanks,
Long

#6 lore raw

Re: [EXTERNAL] Re: [PATCH 4/4] net/netvsc: cache device parameters for hot plug events

Quoted 73 lines · On Wed, 29 Jan 2025 00:10:12 +0000 Long Li <[email protected]> wrote:
Quoted 48 lines

Subject: [EXTERNAL] Re: [PATCH 4/4] net/netvsc: cache device parameters for hot plug events

Quoted 21 lines · On Mon, 27 Jan 2025 17:35:06 -0800 [email protected] wrote:
drivers/net/netvsc/hn_ethdev.c +7 -3
@@ -1409,9 +1424,6 @@ eth_hn_dev_uninit(struct rte_eth_dev *eth_dev)
 	ret_stop = hn_dev_stop(eth_dev);
 	hn_dev_close(eth_dev);
 
-	free(hv->vf_devargs);
-	hv->vf_devargs = NULL;
-
 	hn_detach(hv);
 	hn_chim_uninit(eth_dev);
 	rte_vmbus_chan_close(hv->channels[0]);
@@ -1423,6 +1435,61 @@ eth_hn_dev_uninit(struct rte_eth_dev *eth_dev)
 	return ret_stop;
 }
 
+static int populate_cache_list(void)
+{
+	int ret;
+	struct rte_devargs *da;
+
+	rte_spinlock_lock(&netvsc_lock);
+	da_cache_usage++;

drivers/net/netvsc/hn_ethdev.c eth_hn_dev_uninit(struct rte_eth_dev *eth_dev) · line 1454

Quoted 10 lines
drivers/net/netvsc/hn_ethdev.c +10 -0
+	if (da_cache_usage > 1) {
+		ret = 0;
+		goto out;
+	}
+
+	LIST_INIT(&da_cache_list);
+	RTE_EAL_DEVARGS_FOREACH("pci", da) {
+		struct da_cache *cache;
+
+		cache = rte_zmalloc("NETVSC-HOTADD", sizeof(*cache),  

rte_mem_page_size());

Quoted 10 lines
drivers/net/netvsc/hn_ethdev.c +10 -0
+		if (!cache) {
+			ret = -ENOMEM;
+			goto out;
+		}
+
+		strncpy(cache->name, da->name, sizeof(da->name));
+		cache->drv_str = strdup(da->drv_str);
+		if (!cache->drv_str) {
+			rte_free(cache);
+			ret = -ENOMEM;
Quoted 8 lines

drivers/net/netvsc/hn_ethdev.c eth_hn_dev_uninit(struct rte_eth_dev *eth_dev) · line 1469

Quoted 5 lines
drivers/net/netvsc/hn_ethdev.c +5 -0
+			goto out;
+		}
+
+		LIST_INSERT_HEAD(&da_cache_list, cache, list);
+	}  

Why do you need to cache entry to be page aligned, that seems unnecessary wasteful?

You are right it doesn't need to. I'm removing the alignment.

Quoted 1 line

Why does it need to be huge pages? versus normal malloc?

I thought it would make it easier to debug memory leaks through EAL. But normal malloc is fine because this data is not shared between primary/secondary.

Quoted 9 lines

The string is coming from malloc (strdup) so it can't be used by secondary process.

Since you are allocating a devargs cache entry, you could just as well use flexible array where entry was like:

struct da_cache {
	LIST_ENTRY(da_cache) list;
	char name[RTE_DEV_NAME_MAX_LEN];
	char drv_str[];
};  
Quoted 1 line

This is difficult as I don't know how big it is for drv_str[].

That is why the malloc adds extra space for drv_str, see below. Flexible array allow one array at end of structure

Quoted 6 lines
Quoted 4 lines

	cache = malloc(sizeof(*cache) + strlen(da->drv_str) + 1); ...
	strcpy(cache->drv_str, da->drv_str);  

Another approach is to modify EAL to never delete driver arguments when a device is removed. i.e., It doesn't call rte_devargs_remove() on device removal, instead keep those devargs for the lifetime of the process. Do you think this is a better approach? This will save work if other drivers want to cache devargs list for device hot plug events.

Not sure, right now I don't think it is possible to pre-add devargs for future hot plug

#7 lore raw

RE: [EXTERNAL] Re: [PATCH 4/4] net/netvsc: cache device parameters for hot plug events

Quoted 90 lines

-----Original Message-----
From: Stephen Hemminger <[email protected]>
Sent: Tuesday, January 28, 2025 4:32 PM
To: Long Li <[email protected]>
Cc: [email protected]; Ferruh Yigit <[email protected]>; Andrew Rybchenko <[email protected]>; Wei Hu <[email protected]>; [email protected]
Subject: Re: [EXTERNAL] Re: [PATCH 4/4] net/netvsc: cache device parameters for hot plug events

Quoted 10 lines · On Wed, 29 Jan 2025 00:10:12 +0000 Long Li <[email protected]> wrote:
Quoted 10 lines

Subject: [EXTERNAL] Re: [PATCH 4/4] net/netvsc: cache device parameters for hot plug events

Quoted 4 lines · On Mon, 27 Jan 2025 17:35:06 -0800 [email protected] wrote:
drivers/net/netvsc/hn_ethdev.c +0 -0
@@ -1409,9 +1424,6 @@ eth_hn_dev_uninit(struct rte_eth_dev *eth_dev)
 	ret_stop = hn_dev_stop(eth_dev);
 	hn_dev_close(eth_dev);
 
Quoted 7 lines
Quoted 7 lines

drivers/net/netvsc/hn_ethdev.c eth_hn_dev_uninit(struct rte_eth_dev

Quoted 7 lines
drivers/net/netvsc/hn_ethdev.c +0 -3
-	free(hv->vf_devargs);
-	hv->vf_devargs = NULL;
-
 	hn_detach(hv);
 	hn_chim_uninit(eth_dev);
 	rte_vmbus_chan_close(hv->channels[0]);
@@ -1423,6 +1435,61 @@ eth_hn_dev_uninit(struct rte_eth_dev

*eth_dev)

Quoted 39 lines
Quoted 30 lines
Quoted 9 lines
drivers/net/netvsc/hn_ethdev.c +6 -0
 	return ret_stop;
 }
 
+static int populate_cache_list(void) {
+	int ret;
+	struct rte_devargs *da;
+
+	rte_spinlock_lock(&netvsc_lock);
+	da_cache_usage++;

drivers/net/netvsc/hn_ethdev.c eth_hn_dev_uninit(struct rte_eth_dev *eth_dev)

Quoted 10 lines
drivers/net/netvsc/hn_ethdev.c +10 -0
+	if (da_cache_usage > 1) {
+		ret = 0;
+		goto out;
+	}
+
+	LIST_INIT(&da_cache_list);
+	RTE_EAL_DEVARGS_FOREACH("pci", da) {
+		struct da_cache *cache;
+
+		cache = rte_zmalloc("NETVSC-HOTADD", sizeof(*cache),

rte_mem_page_size());

Quoted 10 lines
drivers/net/netvsc/hn_ethdev.c +10 -0
+		if (!cache) {
+			ret = -ENOMEM;
+			goto out;
+		}
+
+		strncpy(cache->name, da->name, sizeof(da->name));
+		cache->drv_str = strdup(da->drv_str);
+		if (!cache->drv_str) {
+			rte_free(cache);
+			ret = -ENOMEM;
Quoted 8 lines

drivers/net/netvsc/hn_ethdev.c eth_hn_dev_uninit(struct rte_eth_dev *eth_dev) · line 1469

Quoted 5 lines
drivers/net/netvsc/hn_ethdev.c +5 -0
+			goto out;
+		}
+
+		LIST_INSERT_HEAD(&da_cache_list, cache, list);
+	}

Why do you need to cache entry to be page aligned, that seems unnecessary wasteful?

Quoted 5 lines

You are right it doesn't need to. I'm removing the alignment.

Quoted 1 line

Why does it need to be huge pages? versus normal malloc?

I thought it would make it easier to debug memory leaks through EAL. But

normal malloc is fine because this data is not shared between primary/secondary.

Quoted 2 lines
Quoted 2 lines

The string is coming from malloc (strdup) so it can't be used by secondary

process.

Quoted 9 lines
Quoted 8 lines

Since you are allocating a devargs cache entry, you could just as well use flexible array where entry was like:

struct da_cache {
	LIST_ENTRY(da_cache) list;
	char name[RTE_DEV_NAME_MAX_LEN];
	char drv_str[];
};
Quoted 9 lines
Quoted 1 line

This is difficult as I don't know how big it is for drv_str[].

That is why the malloc adds extra space for drv_str, see below. Flexible array allow one array at end of structure

Quoted 5 lines
Quoted 4 lines

	cache = malloc(sizeof(*cache) + strlen(da->drv_str) + 1); ...
	strcpy(cache->drv_str, da->drv_str);

Thank you, got it.

#8 lore raw

Re: [EXTERNAL] Re: [PATCH 4/4] net/netvsc: cache device parameters for hot plug events

In reply to Long Li
Quoted 1 line · On Wed, 29 Jan 2025 00:10:12 +0000 Long Li <[email protected]> wrote:

Another approach is to modify EAL to never delete driver arguments when a device is removed. i.e., It doesn't call rte_devargs_remove() on device removal, instead keep those devargs for the lifetime of the process. Do you think this is a better approach? This will save work if other drivers want to cache devargs list for device hot plug events.

Agree, that having devargs be smart enough to maintain the list for future hotplug is sensible.
Do other drivers that support hotplug have the same issue, or does no one ever use devargs with things like failsafe.

#9 lore raw

RE: [EXTERNAL] Re: [PATCH 4/4] net/netvsc: cache device parameters for hot plug events

Quoted 18 lines

From: Stephen Hemminger <[email protected]>
Sent: Wednesday, January 29, 2025 7:59 PM
To: Long Li <[email protected]>
Cc: [email protected]; Ferruh Yigit <[email protected]>; Andrew Rybchenko <[email protected]>; Wei Hu <[email protected]>; [email protected]
Subject: Re: [EXTERNAL] Re: [PATCH 4/4] net/netvsc: cache device parameters for hot plug events

Quoted 1 line · On Wed, 29 Jan 2025 00:10:12 +0000 Long Li <[email protected]> wrote:

Another approach is to modify EAL to never delete driver arguments when a

device is removed. i.e., It doesn't call rte_devargs_remove() on device removal, instead keep those devargs for the lifetime of the process. Do you think this is a better approach? This will save work if other drivers want to cache devargs list for device hot plug events.

Quoted 4 lines

Agree, that having devargs be smart enough to maintain the list for future hotplug is sensible.
Do other drivers that support hotplug have the same issue, or does no one ever use devargs with things like failsafe.

This usage is most from netvsc and failsafe. The other driver using it is ifpga. But it looks it doesn't handle hot remove. I'm going to write a patch to have EAL cache devargs.

Ferruh, is it okay that the first three patches can be merged?

Thanks,
Long

#10 lore raw

Re: [PATCH 4/4] net/netvsc: cache device parameters for hot plug events

In reply to [email protected]
Quoted 10 lines · On Mon, 27 Jan 2025 17:35:06 -0800 [email protected] wrote:

From: Long Li <[email protected]>

If a device is hot removed and hot plugged, it needs the same driver parameters that are passed to EAL. However, during device removal, all EAL driver parameters are freed as part of the cleanup.

Cache those driver parameters for future hot plug events. Because we don't know which device will show up, cache all the PCI driver parameters.

*Build Failed #1:
OS: OpenAnolis8.9-64
Target: x86_64-native-linuxapp-gcc
FAILED: drivers/libtmp_rte_net_netvsc.a.p/net_netvsc_hn_ethdev.c.o
gcc -Idrivers/libtmp_rte_net_netvsc.a.p -Idrivers -I../drivers -Idrivers/net/netvsc -I../drivers/net/netvsc -Ilib/ethdev -I../lib/ethdev -I. -I.. -Iconfig -I../config -Ilib/eal/include -I../lib/eal/include -Ilib/eal/linux/include -I../lib/eal/linux/include -Ilib/eal/x86/include -I../lib/eal/x86/include -I../kernel/linux -Ilib/eal/common -I../lib/eal/common -Ilib/eal -I../lib/eal -Ilib/kvargs -I../lib/kvargs -Ilib/log -I../lib/log -Ilib/metrics -I../lib/metrics -Ilib/telemetry -I../lib/telemetry -Ilib/net -I../lib/net -Ilib/mbuf -I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/meter -I../lib/meter -Idrivers/bus/pci -I../drivers/bus/pci -I../drivers/bus/pci/linux -Ilib/pci -I../lib/pci -Idrivers/bus/vdev -I../drivers/bus/vdev -Idrivers/bus/vmbus -I../drivers/bus/vmbus -I../drivers/bus/vmbus/linux -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -Werror -std=c11 -O3 -include rte_config.h -Wcast-qual -Wdeprecated -Wformat -Wformat-nonliteral -Wformat-security -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wold-style-definition -Wpointer-arith -Wsign-compare -Wstrict-prototypes -Wundef -Wwrite-strings -Wno-packed-not-aligned -Wno-missing-field-initializers -D_GNU_SOURCE -fPIC -march=native -mrtm -DALLOW_EXPERIMENTAL_API -DALLOW_INTERNAL_API -Wno-format-truncation -DRTE_LOG_DEFAULT_LOGTYPE=pmd.net.netvsc -MD -MQ drivers/libtmp_rte_net_netvsc.a.p/net_netvsc_hn_ethdev.c.o -MF drivers/libtmp_rte_net_netvsc.a.p/net_netvsc_hn_ethdev.c.o.d -o drivers/libtmp_rte_net_netvsc.a.p/net_netvsc_hn_ethdev.c.o -c ../drivers/net/netvsc/hn_ethdev.c ../drivers/net/netvsc/hn_ethdev.c: In function ‘populate_cache_list’:
../drivers/net/netvsc/hn_ethdev.c:1460:40: error: argument to ‘sizeof’ in ‘strncpy’ call is the same expression as the source; did you mean to use the size of the destination? [-Werror=sizeof-pointer-memaccess]

   strncpy(cache->name, da->name, sizeof(da->name));
                                        ^
../drivers/net/netvsc/hn_ethdev.c: In function ‘eth_hn_probe’:
../drivers/net/netvsc/hn_ethdev.c:1502:5: error: ‘ret’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
  if (ret)
     ^
#11 lore raw
In reply to [email protected]
Quoted 85 lines

Subject: [EXTERNAL] [PATCH 1/4] net/netvsc: scan all net devices under the PCI device

From: Long Li <[email protected]>

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")
---
 drivers/net/netvsc/hn_ethdev.c | 29 ++++++++++++-----------------
 1 file changed, 12 insertions(+), 17 deletions(-)
drivers/net/netvsc/hn_ethdev.c +12 -18
index 1736cb5d07..f848157b49 100644
@@ -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);
--
Quoted 1 line

2.34.1

Hi Stephen, Ferruh

I'm going to work an EAL patch to replace the 4th patch in the series as suggested by Stephen.

Is it okay to merge the first three patches of this series?

Thanks,
Long