eal/common: fix inconsistent representation of PCI numbers
Subsystems (5)
PATCH 1/1 eal/common: fix inconsistent representation of PCI numbers
DPDK allows for two ways to specify PCI device numbers:
a full version ("0000:08:00.0") and a short version ("08:00.0"). The problem arises when the application uses one format (e.g., full) when running testpmd, but then tries to use the other format (e.g., short) in a subsequent command, leading to a failure.
The cmp_dev_name func, which is responsible for comparing PCI device names, is not handling the inconsistent PCI number representations correctly. The suggested fix is to use the pci_parse function, which can parse the PCI device name and fill a struct rte_pci_addr with the standardized representation of the PCI number.
By comparing the struct rte_pci_addr instances instead of the string representations, the application can ensure consistent handling of PCI device numbers, regardless of the format used.
--- app/test/test_vdev.c | 10 ++-------- drivers/bus/pci/pci_common.c | 10 ++++++++++ lib/eal/common/eal_common_dev.c | 11 ++++++----- lib/eal/common/hotplug_mp.c | 11 ++--------- lib/eal/include/bus_driver.h | 18 ++++++++++++++++++ lib/eal/include/rte_dev.h | 16 ++++++++++++++++ lib/eal/linux/eal_dev.c | 10 +--------- lib/eal/version.map | 3 +++ 8 files changed, 58 insertions(+), 31 deletions(-)
app/test/test_vdev.c +2 -8
@@ -20,12 +20,6 @@ static const char * const valid_keys[] = { NULL, }; -static int -cmp_dev_name (const struct rte_device *dev,const void *name) -{ -return strcmp (rte_dev_name (dev), name); -} -static int cmp_dev_match (const struct rte_device *dev,const void *_kvlist) {
@@ -82,7 +76,7 @@ test_vdev_bus(void)printf ("Failed to create vdev net_null_test0\n" ); goto fail; } - dev0 = vdev_bus->find_device (NULL , cmp_dev_name,"net_null_test0" ); + dev0 = vdev_bus->find_device (NULL , rte_cmp_dev_name,"net_null_test0" );if (dev0 ==NULL ) {printf ("Cannot find net_null_test0 vdev\n" ); goto fail;
@@ -93,7 +87,7 @@ test_vdev_bus(void)printf ("Failed to create vdev net_null_test1\n" ); goto fail; } - dev1 = vdev_bus->find_device (NULL , cmp_dev_name,"net_null_test1" ); + dev1 = vdev_bus->find_device (NULL , rte_cmp_dev_name,"net_null_test1" );if (dev1 ==NULL ) {printf ("Cannot find net_null_test1 vdev\n" ); goto fail;
drivers/bus/pci/pci_common.c +10 -0
@@ -501,6 +501,15 @@ rte_pci_dump(FILE *f)pci_dump_one_device (f, dev); } } +static int +pci_cmp_name (const struct rte_device *dev1,const void *name2) +{ +const struct rte_pci_device *dev =RTE_DEV_TO_PCI_CONST (dev1); +char name2_addr[sizeof (struct rte_pci_addr )] = {0 }; + dev1->bus->parse (name2, (void *)&name2_addr); + +return memcmp (&name2_addr, &(dev->addr),sizeof (struct rte_pci_addr )); +}static int pci_parse (const char *name,void *addr)
@@ -956,6 +965,7 @@ struct rte_pci_bus rte_pci_bus = { .plug = pci_plug, .unplug = pci_unplug, .parse = pci_parse, + .cmp_name = pci_cmp_name, .devargs_parse = rte_pci_devargs_parse, .dma_map = pci_dma_map, .dma_unmap = pci_dma_unmap,
lib/eal/common/eal_common_dev.c +6 -5
@@ -107,11 +107,12 @@ struct dev_next_ctx {#define CLSCTX (ptr) \ (((struct dev_next_ctx *)(intptr_t)ptr)->cls_str) -static int cmp_dev_name (const struct rte_device *dev,const void *_name) +int rte_cmp_dev_name (const struct rte_device *dev1,const void *name2) { -const char *name = _name; +if (dev1->bus->cmp_name) +return dev1->bus->cmp_name (dev1, name2); -return strcmp (dev->name, name); +return strcmp (dev1->name, (const char *)name2); }int
@@ -197,7 +198,7 @@ local_dev_probe(const char *devargs, struct rte_device **new_dev)if (ret) goto err_devarg; - dev = da->bus->find_device (NULL , cmp_dev_name, da->name); + dev = da->bus->find_device (NULL , rte_cmp_dev_name, da->name);if (dev ==NULL ) {EAL_LOG (ERR ,"Cannot find device (%s)" , da->name);
@@ -335,7 +336,7 @@ rte_eal_hotplug_remove(const char *busname, const char *devname)return -ENOENT ; } - dev = bus->find_device (NULL , cmp_dev_name, devname); + dev = bus->find_device (NULL , rte_cmp_dev_name, devname);if (dev ==NULL ) {EAL_LOG (ERR ,"Cannot find plugged device (%s)" , devname);return -EINVAL ;
lib/eal/common/hotplug_mp.c +2 -9
@@ -21,13 +21,6 @@ struct mp_reply_bundle {void *peer; }; -static int cmp_dev_name (const struct rte_device *dev,const void *_name) -{ -const char *name = _name; - -return strcmp (dev->name, name); -} -/** * Secondary to primary request. * start from function eal_dev_hotplug_request_to_primary.
@@ -135,7 +128,7 @@ __handle_secondary_request(void *param) goto finish; } - dev = bus->find_device (NULL , cmp_dev_name, da.name); + dev = bus->find_device (NULL , rte_cmp_dev_name, da.name);if (dev ==NULL ) {EAL_LOG (ERR ,"Cannot find plugged device (%s)" , da.name); ret = -ENOENT ;
@@ -262,7 +255,7 @@ static void __handle_primary_request(void *param) goto quit; } - dev = bus->find_device (NULL , cmp_dev_name, da->name); + dev = bus->find_device (NULL , rte_cmp_dev_name, da->name);if (dev ==NULL ) {EAL_LOG (ERR ,"Cannot find plugged device (%s)" , da->name); ret = -ENOENT ;
lib/eal/include/bus_driver.h +18 -0
@@ -118,6 +118,23 @@ typedef int (*rte_bus_unplug_t)(struct rte_device *dev);*/ typedef int (*rte_bus_parse_t )(const char *name,void *addr); +/** +* Bus specific device name comparison function. +* +* This type of function is used to compare a bus name with an arbitrary +* name. +* +* @param dev +* Device handle. +* +* @param name +* Name to compare against. +* +* @return +* 0 if the device matches the name. Nonzero otherwise. +*/ +typedef int (*rte_bus_cmp_name_t )(const struct rte_device *dev,const void *name); +/** * Parse bus part of the device arguments. *
@@ -258,6 +275,7 @@ struct rte_bus {rte_bus_plug_t plug;/**< Probe single device for drivers */ rte_bus_unplug_t unplug;/**< Remove single device from driver */ rte_bus_parse_t parse;/**< Parse a device name */ +rte_bus_cmp_name_t cmp_name;/**< Compare device name */ rte_bus_devargs_parse_t devargs_parse;/**< Parse bus devargs */ rte_dev_dma_map_t dma_map;/**< DMA map for device in the bus */ rte_dev_dma_unmap_t dma_unmap;/**< DMA unmap for device in the bus */
lib/eal/include/rte_dev.h +16 -0
@@ -21,6 +21,7 @@ extern "C" {#include <rte_config.h> #include <rte_common.h> +#include <rte_compat.h> #include <rte_log.h> struct rte_bus ;
@@ -170,6 +171,21 @@ int rte_dev_is_probed(const struct rte_device *dev);int rte_eal_hotplug_add (const char *busname,const char *devname,const char *drvargs); +/** +* General device name comparison. Will compare by using the specific bus +* compare function or by comparing the names directly. +* +* @param dev +* Device handle. +* @param name +* Name to compare against. +* @return +* 0 if the device matches the name. Nonzero otherwise. +*/ +__rte_experimental +int +rte_cmp_dev_name (const struct rte_device *dev,const void *name); +/** * Add matching devices. *
lib/eal/linux/eal_dev.c +1 -9
@@ -91,14 +91,6 @@ static void sigbus_handler(int signum, siginfo_t *info,EAL_LOG (DEBUG ,"Success to handle SIGBUS for hot-unplug!" ); } -static int cmp_dev_name (const struct rte_device *dev, -const void *_name) -{ -const char *name = _name; - -return strcmp (dev->name, name); -} -static int dev_uev_socket_fd_create (void ) {
@@ -280,7 +272,7 @@ dev_uev_handler(__rte_unused void *param) goto failure_handle_err; } - dev = bus->find_device (NULL , cmp_dev_name, + dev = bus->find_device (NULL , rte_cmp_dev_name, uevent.devname);if (dev ==NULL ) { EAL_LOG(ERR, "Cannot find device (%s) on "
lib/eal/version.map +3 -0
@@ -396,6 +396,9 @@ EXPERIMENTAL { # added in 24.03 rte_vfio_get_device_info; # WINDOWS_NO_EXPORT + + # added in 24.07 + rte_cmp_dev_name; }; INTERNAL {
Signature · 1 line
2.34.1
drivers/bus/pci/pci_common.c rte_pci_dump(FILE *f) · line 505
Quoted 8 lines · On Mon, 1 Jul 2024 23:01:17 +0300 Shani Peretz <[email protected]> wrote:
drivers/bus/pci/pci_common.c +2
-0@@ -501,6 +501,15 @@ rte_pci_dump(FILE *f)pci_dump_one_device (f, dev); } } +static int +pci_cmp_name (const struct rte_device *dev1,const void *name2)
Blank line between functions please
drivers/bus/pci/pci_common.c rte_pci_dump(FILE *f) · line 508
Quoted 3 lines
drivers/bus/pci/pci_common.c +3
-0+{ +const struct rte_pci_device *dev =RTE_DEV_TO_PCI_CONST (dev1); +char name2_addr[sizeof (struct rte_pci_addr )] = {0 };
This should just be a rte_pci_addr type, not char. And don't need to initialize it.
drivers/bus/pci/pci_common.c rte_pci_dump(FILE *f) · line 509
Quoted 1 line
drivers/bus/pci/pci_common.c +1
-0+ dev1->bus->parse (name2, (void *)&name2_addr);
If it was the correct type, cast would not be needed.
drivers/bus/pci/pci_common.c rte_pci_dump(FILE *f) · line 511
Quoted 2 lines
drivers/bus/pci/pci_common.c +2
-0+ +return memcmp (&name2_addr, &(dev->addr),sizeof (struct rte_pci_addr ));
Use existing rte_pci_addr_cmp()
Quoted 1 line
drivers/bus/pci/pci_common.c +1
-0+}
PATCH v3 1/1 eal/common: fix inconsistent representation of PCI numbers
In reply to Shani PeretzDPDK allows for two ways to specify PCI device numbers:
a full version ("0000:08:00.0") and a short version ("08:00.0"). The problem arises when the application uses one format (e.g., full) when running testpmd, but then tries to use the other format (e.g., short) in a subsequent command, leading to a failure.
The cmp_dev_name func, which is responsible for comparing PCI device names, is not handling the inconsistent PCI number representations correctly. The suggested fix is to use the pci_parse function, which can parse the PCI device name and fill a struct rte_pci_addr with the standardized representation of the PCI number.
By comparing the struct rte_pci_addr instances instead of the string representations, the application can ensure consistent handling of PCI device numbers, regardless of the format used.
--- app/test/test_vdev.c | 10 ++-------- drivers/bus/pci/pci_common.c | 11 +++++++++++ lib/eal/common/eal_common_dev.c | 11 ++++++----- lib/eal/common/hotplug_mp.c | 11 ++--------- lib/eal/include/bus_driver.h | 18 ++++++++++++++++++ lib/eal/include/rte_dev.h | 16 ++++++++++++++++ lib/eal/linux/eal_dev.c | 10 +--------- lib/eal/version.map | 3 +++ 8 files changed, 59 insertions(+), 31 deletions(-)
app/test/test_vdev.c +2 -8
@@ -20,12 +20,6 @@ static const char * const valid_keys[] = { NULL, }; -static int -cmp_dev_name (const struct rte_device *dev,const void *name) -{ -return strcmp (rte_dev_name (dev), name); -} -static int cmp_dev_match (const struct rte_device *dev,const void *_kvlist) {
@@ -82,7 +76,7 @@ test_vdev_bus(void)printf ("Failed to create vdev net_null_test0\n" ); goto fail; } - dev0 = vdev_bus->find_device (NULL , cmp_dev_name,"net_null_test0" ); + dev0 = vdev_bus->find_device (NULL , rte_cmp_dev_name,"net_null_test0" );if (dev0 ==NULL ) {printf ("Cannot find net_null_test0 vdev\n" ); goto fail;
@@ -93,7 +87,7 @@ test_vdev_bus(void)printf ("Failed to create vdev net_null_test1\n" ); goto fail; } - dev1 = vdev_bus->find_device (NULL , cmp_dev_name,"net_null_test1" ); + dev1 = vdev_bus->find_device (NULL , rte_cmp_dev_name,"net_null_test1" );if (dev1 ==NULL ) {printf ("Cannot find net_null_test1 vdev\n" ); goto fail;
drivers/bus/pci/pci_common.c +11 -0
@@ -502,6 +502,16 @@ rte_pci_dump(FILE *f) } } +static int +pci_cmp_name (const struct rte_device *dev,const void *name2) +{ +struct rte_pci_addr name2_addr; +const struct rte_pci_device *dev1 =RTE_DEV_TO_PCI_CONST (dev); + + dev->bus->parse (name2, &name2_addr); +return rte_pci_addr_cmp (&dev1->addr, &name2_addr); +} +static int pci_parse (const char *name,void *addr) {
@@ -956,6 +966,7 @@ struct rte_pci_bus rte_pci_bus = { .plug = pci_plug, .unplug = pci_unplug, .parse = pci_parse, + .cmp_name = pci_cmp_name, .devargs_parse = rte_pci_devargs_parse, .dma_map = pci_dma_map, .dma_unmap = pci_dma_unmap,
lib/eal/common/eal_common_dev.c +6 -5
@@ -107,11 +107,12 @@ struct dev_next_ctx {#define CLSCTX (ptr) \ (((struct dev_next_ctx *)(intptr_t)ptr)->cls_str) -static int cmp_dev_name (const struct rte_device *dev,const void *_name) +int rte_cmp_dev_name (const struct rte_device *dev1,const void *name2) { -const char *name = _name; +if (dev1->bus->cmp_name) +return dev1->bus->cmp_name (dev1, name2); -return strcmp (dev->name, name); +return strcmp (dev1->name, (const char *)name2); }int
@@ -197,7 +198,7 @@ local_dev_probe(const char *devargs, struct rte_device **new_dev)if (ret) goto err_devarg; - dev = da->bus->find_device (NULL , cmp_dev_name, da->name); + dev = da->bus->find_device (NULL , rte_cmp_dev_name, da->name);if (dev ==NULL ) {EAL_LOG (ERR ,"Cannot find device (%s)" , da->name);
@@ -335,7 +336,7 @@ rte_eal_hotplug_remove(const char *busname, const char *devname)return -ENOENT ; } - dev = bus->find_device (NULL , cmp_dev_name, devname); + dev = bus->find_device (NULL , rte_cmp_dev_name, devname);if (dev ==NULL ) {EAL_LOG (ERR ,"Cannot find plugged device (%s)" , devname);return -EINVAL ;
lib/eal/common/hotplug_mp.c +2 -9
@@ -21,13 +21,6 @@ struct mp_reply_bundle {void *peer; }; -static int cmp_dev_name (const struct rte_device *dev,const void *_name) -{ -const char *name = _name; - -return strcmp (dev->name, name); -} -/** * Secondary to primary request. * start from function eal_dev_hotplug_request_to_primary.
@@ -135,7 +128,7 @@ __handle_secondary_request(void *param) goto finish; } - dev = bus->find_device (NULL , cmp_dev_name, da.name); + dev = bus->find_device (NULL , rte_cmp_dev_name, da.name);if (dev ==NULL ) {EAL_LOG (ERR ,"Cannot find plugged device (%s)" , da.name); ret = -ENOENT ;
@@ -262,7 +255,7 @@ static void __handle_primary_request(void *param) goto quit; } - dev = bus->find_device (NULL , cmp_dev_name, da->name); + dev = bus->find_device (NULL , rte_cmp_dev_name, da->name);if (dev ==NULL ) {EAL_LOG (ERR ,"Cannot find plugged device (%s)" , da->name); ret = -ENOENT ;
lib/eal/include/bus_driver.h +18 -0
@@ -118,6 +118,23 @@ typedef int (*rte_bus_unplug_t)(struct rte_device *dev);*/ typedef int (*rte_bus_parse_t )(const char *name,void *addr); +/** +* Bus specific device name comparison function. +* +* This type of function is used to compare a bus name with an arbitrary +* name. +* +* @param dev +* Device handle. +* +* @param name +* Name to compare against. +* +* @return +* 0 if the device matches the name. Nonzero otherwise. +*/ +typedef int (*rte_bus_cmp_name_t )(const struct rte_device *dev,const void *name); +/** * Parse bus part of the device arguments. *
@@ -258,6 +275,7 @@ struct rte_bus {rte_bus_plug_t plug;/**< Probe single device for drivers */ rte_bus_unplug_t unplug;/**< Remove single device from driver */ rte_bus_parse_t parse;/**< Parse a device name */ +rte_bus_cmp_name_t cmp_name;/**< Compare device name */ rte_bus_devargs_parse_t devargs_parse;/**< Parse bus devargs */ rte_dev_dma_map_t dma_map;/**< DMA map for device in the bus */ rte_dev_dma_unmap_t dma_unmap;/**< DMA unmap for device in the bus */
lib/eal/include/rte_dev.h +16 -0
@@ -21,6 +21,7 @@ extern "C" {#include <rte_config.h> #include <rte_common.h> +#include <rte_compat.h> #include <rte_log.h> struct rte_bus ;
@@ -170,6 +171,21 @@ int rte_dev_is_probed(const struct rte_device *dev);int rte_eal_hotplug_add (const char *busname,const char *devname,const char *drvargs); +/** +* General device name comparison. Will compare by using the specific bus +* compare function or by comparing the names directly. +* +* @param dev +* Device handle. +* @param name +* Name to compare against. +* @return +* 0 if the device matches the name. Nonzero otherwise. +*/ +__rte_experimental +int +rte_cmp_dev_name (const struct rte_device *dev,const void *name); +/** * Add matching devices. *
lib/eal/linux/eal_dev.c +1 -9
@@ -91,14 +91,6 @@ static void sigbus_handler(int signum, siginfo_t *info,EAL_LOG (DEBUG ,"Success to handle SIGBUS for hot-unplug!" ); } -static int cmp_dev_name (const struct rte_device *dev, -const void *_name) -{ -const char *name = _name; - -return strcmp (dev->name, name); -} -static int dev_uev_socket_fd_create (void ) {
@@ -280,7 +272,7 @@ dev_uev_handler(__rte_unused void *param) goto failure_handle_err; } - dev = bus->find_device (NULL , cmp_dev_name, + dev = bus->find_device (NULL , rte_cmp_dev_name, uevent.devname);if (dev ==NULL ) { EAL_LOG(ERR, "Cannot find device (%s) on "
lib/eal/version.map +3 -0
@@ -396,6 +396,9 @@ EXPERIMENTAL { # added in 24.03 rte_vfio_get_device_info; # WINDOWS_NO_EXPORT + + # added in 24.07 + rte_cmp_dev_name; }; INTERNAL {
Signature · 1 line
2.34.1
Quoted 16 lines · Shani Peretz
DPDK allows for two ways to specify PCI device numbers:
a full version ("0000:08:00.0") and a short version ("08:00.0"). The problem arises when the application uses one format (e.g., full) when running testpmd, but then tries to use the other format (e.g., short) in a subsequent command, leading to a failure.The
cmp_dev_namefunc, which is responsible for comparing PCI device names, is not handling the inconsistent PCI number representations correctly. The suggested fix is to use thepci_parsefunction, which can parse the PCI device name and fill a structrte_pci_addrwith the standardized representation of the PCI number.
By comparing the structrte_pci_addrinstances instead of the string representations, the application can ensure consistent handling of PCI device numbers, regardless of the format used.
Quoted 6 lines
Fixes a3ee360f4440 ("eal: add hotplug add/remove device")Signed-off-by Shani Peretz <[email protected]>Acked-by Thomas Monjalon <[email protected]>
I find it strange that Thomas acked this patch (for example, the commit title prefix is wrong).
I don't understand the issue.
Please provide a reproducer.
And ideally we need a unit test to track regressions on this topic.
Thanks.
Signature · 1 line
David Marchand
12/07/2024 15:49, David Marchand:
Quoted 24 lines · Shani Peretz
Quoted 16 lines
DPDK allows for two ways to specify PCI device numbers:
a full version ("0000:08:00.0") and a short version ("08:00.0"). The problem arises when the application uses one format (e.g., full) when running testpmd, but then tries to use the other format (e.g., short) in a subsequent command, leading to a failure.The
cmp_dev_namefunc, which is responsible for comparing PCI device names, is not handling the inconsistent PCI number representations correctly. The suggested fix is to use thepci_parsefunction, which can parse the PCI device name and fill a structrte_pci_addrwith the standardized representation of the PCI number.
By comparing the structrte_pci_addrinstances instead of the string representations, the application can ensure consistent handling of PCI device numbers, regardless of the format used.Quoted 6 lines
Fixes a3ee360f4440 ("eal: add hotplug add/remove device")Signed-off-by Shani Peretz <[email protected]>Acked-by Thomas Monjalon <[email protected]>
Quoted 6 lines
I find it strange that Thomas acked this patch (for example, the commit title prefix is wrong).
I don't understand the issue.
Please provide a reproducer.
And ideally we need a unit test to track regressions on this topic.
Indeed, Shani we shouldn't add "Acked-by" until all is reviewed in detail.
PATCH v4 1/1 bus: fix inconsistent representation of PCI numbers
In reply to Shani PeretzDPDK provides two formats for specifying PCI device numbers:
a full version ("0000:08:00.0") and a short version ("08:00.0"). Issues can occur when an application uses one format (e.g., short) while running testpmd, then attempts to use the other format (e.g., full) in a later command, resulting in a failure.
The issue is that find_device goes over the list of devices and compares the user-provided string to the rte_device structure's device->name (device->name is just the string received from devargs (i.e "08:00.0" or "0000:08:00.0")).
Notice that there's another field that represents the device name, but this one is in the rte_pci_bus struct. This name is actually the result of the PCI parse function ("0000:08:00.0").
If we want to accurately compare these names, we'll need to bring both sides to the same representation by invoking the parse function on the user input.
To make the cmp_dev_name function applicable to all buses—not just PCI— the proposed solution is to utilize the parse function implemented by each bus. When comparing names, we will call parse on the supplied string as well as on the device name itself and compare the results. This will allow consistent comparisons between different representations of same devices.
Also, the pci_common_set function has been modified to improve naming consistency for PCI buses.
Now, the name stored in rte_device for PCI buses will match the parsed name that is also stored in rte_pci_device name,
rather than using the user-provided string from devargs.
As a result, when a new PCI device is registered, the name displayed in the device list will be the parsed version.
Added tests that compare and find devices in various forms of names under test_devargs.
--- app/test/test_devargs.c | 123 ++++++++++++++++++++++- app/test/test_vdev.c | 10 +- drivers/bus/auxiliary/auxiliary_common.c | 17 +++- drivers/bus/cdx/cdx.c | 13 ++- drivers/bus/dpaa/dpaa_bus.c | 7 +- drivers/bus/fslmc/fslmc_bus.c | 9 +- drivers/bus/ifpga/ifpga_bus.c | 14 ++- drivers/bus/pci/pci_common.c | 22 ++-- drivers/bus/platform/platform.c | 15 ++- drivers/bus/uacce/uacce.c | 14 ++- drivers/bus/vdev/vdev.c | 23 ++++- drivers/bus/vmbus/vmbus_common.c | 9 +- drivers/dma/idxd/idxd_bus.c | 9 +- drivers/raw/ifpga/ifpga_rawdev.c | 8 +- lib/eal/common/eal_common_bus.c | 2 +- lib/eal/common/eal_common_dev.c | 41 +++++++- lib/eal/common/hotplug_mp.c | 11 +- lib/eal/include/bus_driver.h | 24 ++++- lib/eal/include/rte_dev.h | 15 +++ lib/eal/linux/eal_dev.c | 10 +- lib/eal/version.map | 1 + 21 files changed, 305 insertions(+), 92 deletions(-)
app/test/test_devargs.c +122 -1
@@ -12,7 +12,9 @@#include <rte_kvargs.h> #include <bus_driver.h> #include <rte_class.h> +#include <rte_bus_vdev.h> +#include "virtual_pmd.h" #include "test.h" /* Check layer arguments. */
@@ -171,7 +173,7 @@ test_valid_devargs(void)int ret; ret =test_valid_devargs_cases (list,RTE_DIM (list)); -if (vdev_bus !=NULL && vdev_bus->parse ("net_ring0" ,NULL ) ==0 ) +if (vdev_bus !=NULL && vdev_bus->parse ("net_ring0" ,NULL ,NULL ) ==0 )/* Ring vdev driver enabled. */ ret |=test_valid_devargs_cases (legacy_ring_list,RTE_DIM (legacy_ring_list));
@@ -302,6 +304,119 @@ test_invalid_devargs_parsing(void)return fail; } +static struct rte_device * +create_pci_dev (const char *name) +{ +int port_id; +uint8_t slave_mac1[] = {0x00 ,0xFF ,0x00 ,0xFF ,0x00 ,0x00 }; +struct rte_ether_addr *mac_addr = (struct rte_ether_addr *)slave_mac1; +char pmd_name[RTE_ETH_NAME_MAX_LEN ]; + + mac_addr->addr_bytes[RTE_ETHER_ADDR_LEN -1 ] =0 ; +strlcpy (pmd_name, name,RTE_ETH_NAME_MAX_LEN ); + + port_id =virtual_ethdev_create (pmd_name, + mac_addr,rte_socket_id (),1 ); + +if (port_id <0 ) +return NULL ; + +return (&rte_eth_devices[port_id])->device; +} + +static int +test_pci (struct rte_bus *pci_bus,const char *dev_name,const char *name2) +{ +struct rte_device *pci_dev =create_pci_dev (dev_name); + +if (pci_dev ==NULL ) +return -1 ; + + pci_dev->bus = pci_bus; + +if (rte_cmp_dev_name (pci_dev, name2) !=0 ) { +printf ("rte_cmp_dev_name(%s, %s) device name (%s) not expected (%s)\n" , + pci_dev->name, name2, pci_dev->name, name2); +return -1 ; + } +return 0 ; +} + +static int +test_vdev (struct rte_bus *vdev_bus,const char *dev_name,const char *name2) +{ +/* create vdev */ +if (rte_vdev_init (dev_name,"" ) <0 ) { +printf ("Failed to create vdev %s\n" , dev_name); +return -1 ; + } + +struct rte_device *vdev_dev = vdev_bus->find_device (NULL , rte_cmp_dev_name, dev_name); +if (vdev_dev ==NULL ) { +printf ("Cannot find %s vdev\n" , dev_name); +rte_vdev_uninit (dev_name); +return -1 ; + } +int ret =rte_cmp_dev_name (vdev_dev, name2); +if (ret !=0 ) { +printf ("rte_cmp_dev_name(%s, %s) device name (%s) not expected (%s)\n" , + vdev_dev->name, name2, vdev_dev->name, name2); +return -1 ; + } + +if (vdev_dev != vdev_bus->find_device (NULL , rte_cmp_dev_name, name2)) { +printf ("rte_cmp_dev_name(%s, %s) device name (%s) not expected (%s)\n" , + vdev_dev->name, name2, vdev_dev->name, name2); +return -1 ; + } + +rte_vdev_uninit (dev_name); +return 0 ; +} + +static int +test_valid_cmp_dev_name (void ) +{ +struct rte_bus *pci_bus =rte_bus_find_by_name ("pci" ); +struct rte_bus *vdev_bus =rte_bus_find_by_name ("vdev" ); + +if (pci_bus) { +if ((test_pci (pci_bus,"0000:08:11.0" ,"08:11.0" ) !=0 ) || + (test_pci (pci_bus,"08:12.0" ,"0000:08:12.0" ) !=0 ) || + (test_pci (pci_bus,"08:13.0" ,"08:13.0" ) !=0 ) || + (test_pci (pci_bus,"0000:08:14.0" ,"0000:08:14.0" ) !=0 )) +return -1 ; + } + +if (vdev_bus) { +if (test_vdev (vdev_bus,"net_null_test0" ,"net_null_test0" ) !=0 ) +return -1 ; + } +return 0 ; +} + +static int +test_invalid_cmp_dev_name (void ) +{ +struct rte_bus *pci_bus =rte_bus_find_by_name ("pci" ); +struct rte_bus *vdev_bus =rte_bus_find_by_name ("vdev" ); + +if (pci_bus) { +if ((test_pci (pci_bus,"0000:08:15.0" ,"08:00.0" ) ==0 ) || + (test_pci (pci_bus,"08:16.0" ,"0000:08:15.0" ) ==0 ) || + (test_pci (pci_bus,"08:17.0" ,"08:13.0" ) ==0 ) || + (test_pci (pci_bus,"0000:08:18.0" ,"0000:08:14.0" ) ==0 )) +return -1 ; + } + +if (vdev_bus) { +if ((test_vdev (vdev_bus,"net_null_test0" ,"net_null_test" ) ==0 ) || + (test_vdev (vdev_bus,"net_null_test1" ,"net_null_test2" ) ==0 )) +return -1 ; + } +return 0 ; +} +static int test_devargs (void ) {
@@ -317,6 +432,12 @@ test_devargs(void)printf ("== test devargs parsing invalid case ==\n" );if (test_invalid_devargs_parsing () <0 )return -1 ; +printf ("== test find device valid case ==\n" ); +if (test_valid_cmp_dev_name () <0 ) +return -1 ; +printf ("== test find device invalid case ==\n" ); +if (test_invalid_cmp_dev_name () <0 ) +return -1 ;return 0 ; }
app/test/test_vdev.c +2 -8
@@ -20,12 +20,6 @@ static const char * const valid_keys[] = { NULL, }; -static int -cmp_dev_name (const struct rte_device *dev,const void *name) -{ -return strcmp (rte_dev_name (dev), name); -} -static int cmp_dev_match (const struct rte_device *dev,const void *_kvlist) {
@@ -82,7 +76,7 @@ test_vdev_bus(void)printf ("Failed to create vdev net_null_test0\n" ); goto fail; } - dev0 = vdev_bus->find_device (NULL , cmp_dev_name,"net_null_test0" ); + dev0 = vdev_bus->find_device (NULL , rte_cmp_dev_name,"net_null_test0" );if (dev0 ==NULL ) {printf ("Cannot find net_null_test0 vdev\n" ); goto fail;
@@ -93,7 +87,7 @@ test_vdev_bus(void)printf ("Failed to create vdev net_null_test1\n" ); goto fail; } - dev1 = vdev_bus->find_device (NULL , cmp_dev_name,"net_null_test1" ); + dev1 = vdev_bus->find_device (NULL , rte_cmp_dev_name,"net_null_test1" );if (dev1 ==NULL ) {printf ("Cannot find net_null_test1 vdev\n" ); goto fail;
drivers/bus/auxiliary/auxiliary_common.c +12 -5
@@ -237,10 +237,9 @@ auxiliary_probe(void) }static int -auxiliary_parse (const char *name,void *addr) +auxiliary_parse (const char *name,void *addr,int *size) {struct rte_auxiliary_driver *drv =NULL ; -const char **out = addr;/* Allow empty device name "auxiliary:" to bypass entire bus scan. */ if (strlen (name) ==0 )
@@ -250,9 +249,17 @@ auxiliary_parse(const char *name, void *addr)if (drv->match (name))break ; } -if (drv !=NULL && addr !=NULL ) - *out = name; -return drv !=NULL ?0 :-1 ; + +if (drv ==NULL ) +return -1 ; + +if (size !=NULL ) + *size =strlen (name) +1 ; + +if (addr !=NULL ) +rte_strscpy (addr, name,strlen (name) +1 ); + +return 0 ; }/* Register a driver */
drivers/bus/cdx/cdx.c +9 -4
@@ -464,15 +464,20 @@ cdx_probe(void) }static int -cdx_parse (const char *name,void *addr) +cdx_parse (const char *name,void *addr,int *size) { -const char **out = addr;int ret; ret =strncmp (name,CDX_DEV_PREFIX ,strlen (CDX_DEV_PREFIX )); -if (ret ==0 && addr) - *out = name; +if (ret !=0 ) +return ret; + +if (size !=NULL ) + *size =strlen (name) +1 ; + +if (addr !=NULL ) +rte_strscpy (addr, name,strlen (name) +1 );return ret; }
drivers/bus/dpaa/dpaa_bus.c +5 -2
@@ -153,7 +153,7 @@ dpaa_devargs_lookup(struct rte_dpaa_device *dev)char dev_name[32 ]; RTE_EAL_DEVARGS_FOREACH("dpaa_bus", devargs) { - devargs->bus->parse (devargs->name, &dev_name); + devargs->bus->parse (devargs->name, &dev_name,NULL );if (strcmp (dev_name, dev->device.name) ==0 ) {DPAA_BUS_INFO ("**Devargs matched %s" , dev_name);return devargs;
@@ -447,7 +447,7 @@ dpaa_portal_finish(void *arg) }static int -rte_dpaa_bus_parse (const char *name,void *out) +rte_dpaa_bus_parse (const char *name,void *out,int *size) {unsigned int i, j;size_t delta, dev_delta;
@@ -494,6 +494,9 @@ rte_dpaa_bus_parse(const char *name, void *out) max_name_len =sizeof ("fm.-mac.." ) -1 ; } +if (size !=NULL ) + *size = max_name_len +1 ; +if (out !=NULL ) {char *out_name = out;
drivers/bus/fslmc/fslmc_bus.c +6 -3
@@ -103,7 +103,7 @@ fslmc_devargs_lookup(struct rte_dpaa2_device *dev)char dev_name[32 ]; RTE_EAL_DEVARGS_FOREACH("fslmc", devargs) { - devargs->bus->parse (devargs->name, &dev_name); + devargs->bus->parse (devargs->name, &dev_name,NULL );if (strcmp (dev_name, dev->device.name) ==0 ) {DPAA2_BUS_INFO ("**Devargs matched %s" , dev_name);return devargs;
@@ -235,7 +235,7 @@ scan_one_fslmc_device(char *dev_name) }static int -rte_fslmc_parse (const char *name,void *addr) +rte_fslmc_parse (const char *name,void *addr,int *size) {uint16_t dev_id;char *t_ptr;
@@ -298,7 +298,10 @@ rte_fslmc_parse(const char *name, void *addr) goto err_out; } -if (addr) +if (size !=NULL ) + *size =strlen (sep) +1 ; + +if (addr !=NULL )strcpy (addr, sep); ret =0 ;
drivers/bus/ifpga/ifpga_bus.c +9 -5
@@ -459,9 +459,8 @@ ifpga_find_device(const struct rte_device *start,return NULL ; }static int -ifpga_parse (const char *name,void *addr) +ifpga_parse (const char *name,void *addr,int *size) { -int *out = addr;struct rte_rawdev *rawdev =NULL ;char rawdev_name[RTE_RAWDEV_NAME_MAX_LEN ];char *c1 =NULL ;
@@ -491,9 +490,14 @@ ifpga_parse(const char *name, void *addr) rawdev =rte_rawdev_pmd_get_named_dev (rawdev_name);if ((port <IFPGA_BUS_DEV_PORT_MAX ) && - rawdev && - (addr !=NULL )) - *out = port; + rawdev) { +if (size !=NULL ) + *size =sizeof (port); + +if (addr !=NULL ) + *(int *)addr = port; + } +if ((port <IFPGA_BUS_DEV_PORT_MAX ) && rawdev)
drivers/bus/pci/pci_common.c +8 -14
@@ -84,7 +84,7 @@ pci_devargs_lookup(const struct rte_pci_addr *pci_addr)struct rte_pci_addr addr; RTE_EAL_DEVARGS_FOREACH("pci", devargs) { - devargs->bus->parse (devargs->name, &addr); + devargs->bus->parse (devargs->name, &addr,NULL );if (!rte_pci_addr_cmp (pci_addr, &addr))return devargs; }
@@ -99,21 +99,11 @@ pci_common_set(struct rte_pci_device *dev)/* Each device has its internal, canonical name set. */ rte_pci_device_name (&dev->addr, dev->name,sizeof (dev->name)); + dev->device.name = dev->name; + devargs =pci_devargs_lookup (&dev->addr); dev->device.devargs = devargs; -/* When using a blocklist, only blocked devices will have -* an rte_devargs. Allowed devices won't have one. -*/ -if (devargs !=NULL ) -/* If an rte_devargs exists, the generic rte_device uses the -* given name as its name. -*/ - dev->device.name = dev->device.devargs->name; -else -/* Otherwise, it uses the internal, canonical form. */ - dev->device.name = dev->name; -if (dev->bus_info !=NULL ||asprintf (&dev->bus_info,"vendor_id=%" PRIx16", device_id=%" PRIx16, dev->id.vendor_id, dev->id.device_id) !=-1 )
@@ -497,15 +487,19 @@ rte_pci_dump(FILE *f) }static int -pci_parse (const char *name,void *addr) +pci_parse (const char *name,void *addr,int *size) {struct rte_pci_addr *out = addr;struct rte_pci_addr pci_addr;bool parse; +if (size !=NULL ) + *size =sizeof (struct rte_pci_addr ); + parse = (rte_pci_addr_parse (name, &pci_addr) ==0 );if (parse && addr !=NULL ) *out = pci_addr; +return parse == false; }
drivers/bus/platform/platform.c +10 -5
@@ -542,11 +542,10 @@ platform_bus_unplug(struct rte_device *dev) }static int -platform_bus_parse (const char *name,void *addr) +platform_bus_parse (const char *name,void *addr,int *size) {struct rte_platform_device pdev = { };struct rte_platform_driver *pdrv; -const char **out = addr;rte_strscpy (pdev.name, name,sizeof (pdev.name));
@@ -555,10 +554,16 @@ platform_bus_parse(const char *name, void *addr)break ; } -if (pdrv !=NULL && addr !=NULL ) - *out = name; +if (pdrv ==NULL ) +return -ENODEV ; + +if (size !=NULL ) + *size =strlen (name) +1 ; -return pdrv !=NULL ?0 : -ENODEV ; +if (addr !=NULL ) +rte_strscpy (addr, name,strlen (name) +1 ); + +return 0 ; } static int
drivers/bus/uacce/uacce.c +10 -4
@@ -20,6 +20,7 @@#include <rte_errno.h> #include <rte_log.h> #include <rte_kvargs.h> +#include <rte_string_fns.h> #include <bus_driver.h> #include "bus_uacce_driver.h"
@@ -529,15 +530,20 @@ uacce_find_device(const struct rte_device *start, rte_dev_cmp_t cmp, const void }static int -uacce_parse (const char *name,void *addr) +uacce_parse (const char *name,void *addr,int *size) { -const char **out = addr;int ret; ret =strncmp (name,UACCE_DEV_PREFIX ,strlen (UACCE_DEV_PREFIX )); -if (ret ==0 && addr) - *out = name; +if (ret !=0 ) +return ret; + +if (size !=NULL ) + *size =strlen (name) +1 ; + +if (addr !=NULL ) +rte_strscpy (addr, name,strlen (name) +1 );return ret; }
drivers/bus/vdev/vdev.c +20 -3
@@ -113,7 +113,7 @@ rte_vdev_remove_custom_scan(rte_vdev_scan_callback callback, void *user_arg) }static int -vdev_parse (const char *name,void *addr) +vdev_find_driver (const char *name,void *addr) {struct rte_vdev_driver **out = addr;struct rte_vdev_driver *driver =NULL ;
@@ -197,7 +197,7 @@ vdev_probe_all_drivers(struct rte_vdev_device *dev) name =rte_vdev_device_name (dev);VDEV_LOG (DEBUG ,"Search driver to probe device %s" , name); -if (vdev_parse (name, &driver)) +if (vdev_find_driver (name, &driver))return -1 ; iova_mode =rte_eal_iova_mode ();
@@ -232,6 +232,23 @@ find_vdev(const char *name)return NULL ; } +static int +vdev_parse (const char *name,void *addr,int *size) +{ +struct rte_vdev_device *dev =find_vdev (name); + +if (dev ==NULL ) +return 1 ; + +if (size !=NULL ) + *size =strlen (name) +1 ; + +if (addr !=NULL ) +rte_strscpy (addr, name,strlen (name) +1 ); + +return 0 ; +} +static struct rte_devargs *alloc_devargs (const char *name,const char *args) {
@@ -647,7 +664,7 @@ vdev_get_iommu_class(void) TAILQ_FOREACH(dev, &vdev_device_list, next) { name =rte_vdev_device_name (dev); -if (vdev_parse (name, &driver)) +if (vdev_find_driver (name, &driver))continue ;if (driver->drv_flags &RTE_VDEV_DRV_NEED_IOVA_AS_VA )
drivers/bus/vmbus/vmbus_common.c +6 -3
@@ -245,13 +245,16 @@ rte_vmbus_cleanup(void) }static int -vmbus_parse (const char *name,void *addr) +vmbus_parse (const char *name,void *addr,int *size) {rte_uuid_t guid;int ret; +if (size !=NULL ) + *size =sizeof (guid); + ret =rte_uuid_parse (name, guid); -if (ret ==0 && addr) +if (ret ==0 && addr !=NULL )memcpy (addr, &guid,sizeof (guid));return ret;
@@ -269,7 +272,7 @@ vmbus_devargs_lookup(struct rte_vmbus_device *dev)rte_uuid_t addr; RTE_EAL_DEVARGS_FOREACH("vmbus", devargs) { -vmbus_parse (devargs->name, &addr); +vmbus_parse (devargs->name, &addr,NULL );if (rte_uuid_compare (dev->device_id, addr) ==0 )return devargs;
drivers/dma/idxd/idxd_bus.c +6 -3
@@ -47,7 +47,7 @@ static int dsa_probe(void);static struct rte_device *dsa_find_device (const struct rte_device *start,rte_dev_cmp_t cmp,const void *data);static enum rte_iova_mode dsa_get_iommu_class (void ); -static int dsa_addr_parse (const char *name,void *addr); +static int dsa_addr_parse (const char *name,void *addr,int *size);/** List of devices */ TAILQ_HEAD (dsa_device_list, rte_dsa_device);
@@ -345,7 +345,7 @@ dsa_scan(void)closedir (dev_dir);return -ENOMEM ; } -if (dsa_addr_parse (wq->d_name, &dev->addr) <0 ) { +if (dsa_addr_parse (wq->d_name, &dev->addr,NULL ) <0 ) {IDXD_PMD_ERR ("Error parsing WQ name: %s" , wq->d_name);free (dev);continue ;
@@ -391,11 +391,14 @@ dsa_get_iommu_class(void) }static int -dsa_addr_parse (const char *name,void *addr) +dsa_addr_parse (const char *name,void *addr,int *size) {struct dsa_wq_addr *wq = addr;unsigned int device_id, wq_id; +if (size !=NULL ) + *size =sizeof (struct dsa_wq_addr ); +if (sscanf (name,"wq%u.%u" , &device_id, &wq_id) !=2 ) {IDXD_PMD_DEBUG ("Parsing WQ name failed: %s" , name);return -1 ;
drivers/raw/ifpga/ifpga_rawdev.c +1 -7
@@ -1833,12 +1833,6 @@ ifpga_cfg_probe(struct rte_vdev_device *vdev)return ret; } -static int cmp_dev_name (const struct rte_device *dev,const void *_name) -{ -const char *name = _name; -return strcmp (dev->name, name); -} -static int ifpga_cfg_remove (struct rte_vdev_device *vdev) {
@@ -1874,7 +1868,7 @@ ifpga_cfg_remove(struct rte_vdev_device *vdev) args.port, args.bdf); bus =rte_bus_find_by_name (RTE_STR (IFPGA_BUS_NAME ));if (bus) { -if (bus->find_device (NULL , cmp_dev_name, dev_name)) { +if (bus->find_device (NULL , rte_cmp_dev_name, dev_name)) { ret =rte_eal_hotplug_remove (RTE_STR (IFPGA_BUS_NAME ), dev_name); }
lib/eal/common/eal_common_bus.c +1 -1
@@ -200,7 +200,7 @@ bus_can_parse(const struct rte_bus *bus, const void *_name) {const char *name = _name; -return !(bus->parse && bus->parse (name,NULL ) ==0 ); +return !(bus->parse && bus->parse (name,NULL ,NULL ) ==0 ); } struct rte_bus *
lib/eal/common/eal_common_dev.c +36 -5
61 lines not on this page · raw message
lib/eal/common/hotplug_mp.c +2 -9
@@ -21,13 +21,6 @@ struct mp_reply_bundle {void *peer; }; -static int cmp_dev_name (const struct rte_device *dev,const void *_name) -{ -const char *name = _name; - -return strcmp (dev->name, name); -} -/** * Secondary to primary request. * start from function eal_dev_hotplug_request_to_primary.
@@ -135,7 +128,7 @@ __handle_secondary_request(void *param) goto finish; } - dev = bus->find_device (NULL , cmp_dev_name, da.name); + dev = bus->find_device (NULL , rte_cmp_dev_name, da.name);if (dev ==NULL ) {EAL_LOG (ERR ,"Cannot find plugged device (%s)" , da.name); ret = -ENOENT ;
@@ -262,7 +255,7 @@ static void __handle_primary_request(void *param) goto quit; } - dev = bus->find_device (NULL , cmp_dev_name, da->name); + dev = bus->find_device (NULL , rte_cmp_dev_name, da->name);if (dev ==NULL ) {EAL_LOG (ERR ,"Cannot find plugged device (%s)" , da->name); ret = -ENOENT ;
lib/eal/include/bus_driver.h +23 -1
@@ -112,11 +112,32 @@ typedef int (*rte_bus_unplug_t)(struct rte_device *dev);* should be written. If NULL, nothing should be written, which * is not an error. * +* @param[out] size +* device information size. If NULL, nothing should +* be written, which is not an error. +* * @return * 0 if parsing was successful. * !0 for any error. */ -typedef int (*rte_bus_parse_t )(const char *name,void *addr); +typedef int (*rte_bus_parse_t )(const char *name,void *addr,int *size); + +/** +* Bus specific device name comparison function. +* +* This type of function is used to compare a bus name with an arbitrary +* name. +* +* @param dev +* Device handle. +* +* @param name +* Name to compare against. +* +* @return +* 0 if the device matches the name. Nonzero otherwise. +*/ +typedef int (*rte_bus_cmp_name_t )(const struct rte_device *dev,const void *name);/** * Parse bus part of the device arguments.
@@ -258,6 +279,7 @@ struct rte_bus {rte_bus_plug_t plug;/**< Probe single device for drivers */ rte_bus_unplug_t unplug;/**< Remove single device from driver */ rte_bus_parse_t parse;/**< Parse a device name */ +rte_bus_cmp_name_t cmp_name;/**< Compare device name */ rte_bus_devargs_parse_t devargs_parse;/**< Parse bus devargs */ rte_dev_dma_map_t dma_map;/**< DMA map for device in the bus */ rte_dev_dma_unmap_t dma_unmap;/**< DMA unmap for device in the bus */
lib/eal/include/rte_dev.h +15 -0
@@ -17,6 +17,7 @@#include <rte_config.h> #include <rte_common.h> +#include <rte_compat.h> #include <rte_log.h> #ifdef __cplusplus
@@ -170,6 +171,20 @@ int rte_dev_is_probed(const struct rte_device *dev);int rte_eal_hotplug_add (const char *busname,const char *devname,const char *drvargs); +/** +* General device name comparison. Will compare by using the specific bus +* compare function or by comparing the names directly. +* +* @param dev +* Device handle. +* @param name +* Name to compare against. +* @return +* 0 if the device matches the name. Nonzero otherwise. +*/ +__rte_internal +int rte_cmp_dev_name(const struct rte_device *dev, const void *name); +/** * Add matching devices. *
lib/eal/linux/eal_dev.c +1 -9
@@ -91,14 +91,6 @@ static void sigbus_handler(int signum, siginfo_t *info,EAL_LOG (DEBUG ,"Success to handle SIGBUS for hot-unplug!" ); } -static int cmp_dev_name (const struct rte_device *dev, -const void *_name) -{ -const char *name = _name; - -return strcmp (dev->name, name); -} -static int dev_uev_socket_fd_create (void ) {
@@ -280,7 +272,7 @@ dev_uev_handler(__rte_unused void *param) goto failure_handle_err; } - dev = bus->find_device (NULL , cmp_dev_name, + dev = bus->find_device (NULL , rte_cmp_dev_name, uevent.devname);if (dev ==NULL ) { EAL_LOG(ERR, "Cannot find device (%s) on "
lib/eal/version.map +1 -0
@@ -448,4 +448,5 @@ INTERNAL { rte_mem_unmap; rte_thread_create_internal_control; rte_thread_set_prefixed_name; + rte_cmp_dev_name; };
Signature · 1 line
2.34.1
Re: [PATCH v4] bus: fix inconsistent representation of PCI numbers
Quoted 32 lines · Shani Peretz
DPDK provides two formats for specifying PCI device numbers:
a full version ("0000:08:00.0") and a short version ("08:00.0"). Issues can occur when an application uses one format (e.g., short) while running testpmd, then attempts to use the other format (e.g., full) in a later command, resulting in a failure.The issue is that
find_devicegoes over the list of devices and compares the user-provided string to therte_devicestructure'sdevice->name(device->nameis just the string received from devargs (i.e "08:00.0" or "0000:08:00.0")).
Notice that there's another field that represents the device name, but this one is in therte_pci_busstruct. This name is actually the result of the PCI parse function ("0000:08:00.0").
If we want to accurately compare these names, we'll need to bring both sides to the same representation by invoking the parse function on the user input.To make the
cmp_dev_namefunction applicable to all buses—not just PCI— the proposed solution is to utilize the parse function implemented by each bus. When comparing names, we will call parse on the supplied string as well as on the device name itself and compare the results. This will allow consistent comparisons between different representations of same devices.Also, the
pci_common_setfunction has been modified to improve naming consistency for PCI buses.
Now, the name stored inrte_devicefor PCI buses will match the parsed name that is also stored inrte_pci_devicename,
rather than using the user-provided string from devargs.
As a result, when a new PCI device is registered, the name displayed in the device list will be the parsed version.
Quoted 7 lines
Added tests that compare and find devices in various forms of names under
test_devargs.Fixes a3ee360f4440 ("eal: add hotplug add/remove device")Signed-off-by Shani Peretz <[email protected]>---
Thanks, I believe this fixes issues that I previously encountered.
However, there are a lot of changes in this one patch, so review would be easier if it could be split a bit. Could you please look to split it up. For example, one possible split might be:
* have one patch to adjust the bus parse function to add the extra parameter there. That should clear most/all of the non-pci driver changes.
* have a separate patch at the end for testing code.
* the middle patch can therefore be focused on rest of the problem statement and especially on the PCI bus and EAL changes.
Would such a split work?
Thanks,
/Bruce
Quoted 23 lines
app/test/test_devargs.c | 123 ++++++++++++++++++++++- app/test/test_vdev.c | 10 +- drivers/bus/auxiliary/auxiliary_common.c | 17 +++- drivers/bus/cdx/cdx.c | 13 ++- drivers/bus/dpaa/dpaa_bus.c | 7 +- drivers/bus/fslmc/fslmc_bus.c | 9 +- drivers/bus/ifpga/ifpga_bus.c | 14 ++- drivers/bus/pci/pci_common.c | 22 ++-- drivers/bus/platform/platform.c | 15 ++- drivers/bus/uacce/uacce.c | 14 ++- drivers/bus/vdev/vdev.c | 23 ++++- drivers/bus/vmbus/vmbus_common.c | 9 +- drivers/dma/idxd/idxd_bus.c | 9 +- drivers/raw/ifpga/ifpga_rawdev.c | 8 +- lib/eal/common/eal_common_bus.c | 2 +- lib/eal/common/eal_common_dev.c | 41 +++++++- lib/eal/common/hotplug_mp.c | 11 +- lib/eal/include/bus_driver.h | 24 ++++- lib/eal/include/rte_dev.h | 15 +++ lib/eal/linux/eal_dev.c | 10 +- lib/eal/version.map | 1 + 21 files changed, 305 insertions(+), 92 deletions(-)
Re: [PATCH v4] bus: fix inconsistent representation of PCI numbers
In reply to Shani Peretzapp/test/test_devargs.c test_invalid_devargs_parsing(void) · line 312
Quoted 5 lines · On Wed, 29 Jan 2025 10:54:16 +0200 Shani Peretz <[email protected]> wrote:
app/test/test_devargs.c +5
-0+create_pci_dev(const char *name) +{ +int port_id; +uint8_t slave_mac1[] = {0x00 ,0xFF ,0x00 ,0xFF ,0x00 ,0x00 }; +struct rte_ether_addr *mac_addr = (struct rte_ether_addr *)slave_mac1;
Use different initializer and you can avoid the need for cast here.
Quoted 4 lines
lib/eal/include/rte_dev.h +3
-0+/** +* General device name comparison. Will compare by using the specific bus +* compare function or by comparing the names directly.
lib/eal/include/rte_dev.h int rte_dev_is_probed(const struct rte_device *dev); · line 186
Quoted 10 lines
lib/eal/include/rte_dev.h +10
-0+* +* @param dev +* Device handle. +* @param name +* Name to compare against. +* @return +* 0 if the device matches the name. Nonzero otherwise. +*/ +__rte_internal +int rte_cmp_dev_name(const struct rte_device *dev, const void *name);
It would make more sense to me if name was a character not void pointer.
The design might be clearer if bus address was more of an typedef with a pointer and size together. Treat it more like an object.
RE: [PATCH v4] bus: fix inconsistent representation of PCI numbers
Quoted 53 lines
-----Original Message-----
From: Stephen Hemminger <[email protected]>
Sent: Wednesday, 29 January 2025 18:25
To: Shani Peretz <[email protected]>
Cc: [email protected]; NBU-Contact-Thomas Monjalon (EXTERNAL) <[email protected]>; Tyler Retzlaff <[email protected]>; Parav Pandit <[email protected]>; Xueming Li <[email protected]>; Nipun Gupta <[email protected]>; Nikhil Agarwal <[email protected]>; Hemant Agrawal <[email protected]>; Sachin Saxena <[email protected]>; Rosen Xu <[email protected]>; Chenbo Xia <[email protected]>; Tomasz Duszynski <[email protected]>; Chengwen Feng <[email protected]>; NBU-Contact-longli (EXTERNAL) <[email protected]>; Wei Hu <[email protected]>; Bruce Richardson <[email protected]>; Kevin Laatz <[email protected]>; Jan Blunck <[email protected]>
Subject: Re: [PATCH v4] bus: fix inconsistent representation of PCI numbersExternal email: Use caution opening links or attachments
app/test/test_devargs.c test_invalid_devargs_parsing(void)
Quoted 6 lines · On Wed, 29 Jan 2025 10:54:16 +0200 Shani Peretz <[email protected]> wrote:
app/test/test_devargs.c +6
-0+create_pci_dev(const char *name) +{ +int port_id; +uint8_t slave_mac1[] = {0x00 ,0xFF ,0x00 ,0xFF ,0x00 ,0x00 }; +struct rte_ether_addr *mac_addr = (struct rte_ether_addr +*)slave_mac1;Use different initializer and you can avoid the need for cast here.
Quoted 5 lines
lib/eal/include/rte_dev.h +4
-0+/** +* General device name comparison. Will compare by using the specific +bus +* compare function or by comparing the names directly. lib/eal/include/rte_dev.h int rte_dev_is_probed(const struct rte_device *dev); · line 186
Quoted 10 lines
lib/eal/include/rte_dev.h +10
-0+* +* @param dev +* Device handle. +* @param name +* Name to compare against. +* @return +* 0 if the device matches the name. Nonzero otherwise. +*/ +__rte_internal +int rte_cmp_dev_name(const struct rte_device *dev, const void *name);It would make more sense to me if name was a character not void pointer.
Quoted 2 lines
The design might be clearer if bus address was more of an typedef with a pointer and size together. Treat it more like an object.
Okay so just to understand,
this is the struct I am adding:
struct rte_bus_address {
const void *addr;
size_t size;
};This is how I pass it to find_device:
struct rte_bus_address dev_addr = {
.addr = da->name,
.size = RTE_DEV_NAME_MAX_LEN
};
dev = da->bus->find_device(NULL, rte_cmp_dev_name, &dev_addr);And this is how I use it in rte_cmp_dev_name:
rte_cmp_dev_name(const struct rte_device *dev1, const void *addr)
{
const struct rte_bus_address *dev2_addr = addr;
…
}Is that what you meant?
Also, I'm not sure if the size is really needed, because we check the size of the parsed name, which may be different than the size of the original name
Re: [PATCH v4] bus: fix inconsistent representation of PCI numbers
Quoted 73 lines · On Wed, 5 Feb 2025 16:36:11 +0000 Shani Peretz <[email protected]> wrote:
Quoted 51 lines
-----Original Message-----
From: Stephen Hemminger <[email protected]>
Sent: Wednesday, 29 January 2025 18:25
To: Shani Peretz <[email protected]>
Cc: [email protected]; NBU-Contact-Thomas Monjalon (EXTERNAL) <[email protected]>; Tyler Retzlaff <[email protected]>; Parav Pandit <[email protected]>; Xueming Li <[email protected]>; Nipun Gupta <[email protected]>; Nikhil Agarwal <[email protected]>; Hemant Agrawal <[email protected]>; Sachin Saxena <[email protected]>; Rosen Xu <[email protected]>; Chenbo Xia <[email protected]>; Tomasz Duszynski <[email protected]>; Chengwen Feng <[email protected]>; NBU-Contact-longli (EXTERNAL) <[email protected]>; Wei Hu <[email protected]>; Bruce Richardson <[email protected]>; Kevin Laatz <[email protected]>; Jan Blunck <[email protected]>
Subject: Re: [PATCH v4] bus: fix inconsistent representation of PCI numbersExternal email: Use caution opening links or attachments
app/test/test_devargs.c test_invalid_devargs_parsing(void)
Quoted 6 lines · On Wed, 29 Jan 2025 10:54:16 +0200 Shani Peretz <[email protected]> wrote:
app/test/test_devargs.c +6
-0+create_pci_dev(const char *name) +{ +int port_id; +uint8_t slave_mac1[] = {0x00 ,0xFF ,0x00 ,0xFF ,0x00 ,0x00 }; +struct rte_ether_addr *mac_addr = (struct rte_ether_addr +*)slave_mac1;Use different initializer and you can avoid the need for cast here.
Quoted 5 lines
lib/eal/include/rte_dev.h +4
-0+/** +* General device name comparison. Will compare by using the specific +bus +* compare function or by comparing the names directly. lib/eal/include/rte_dev.h int rte_dev_is_probed(const struct rte_device *dev); · line 186
Quoted 10 lines
lib/eal/include/rte_dev.h +10
-0+* +* @param dev +* Device handle. +* @param name +* Name to compare against. +* @return +* 0 if the device matches the name. Nonzero otherwise. +*/ +__rte_internal +int rte_cmp_dev_name(const struct rte_device *dev, const void *name);It would make more sense to me if name was a character not void pointer.
Quoted 2 lines
The design might be clearer if bus address was more of an typedef with a pointer and size together. Treat it more like an object.
Okay so just to understand,
this is the struct I am adding:struct rte_bus_address { const void *addr; size_t size; };This is how I pass it to
find_device:struct rte_bus_address dev_addr = { .addr = da->name, .size = RTE_DEV_NAME_MAX_LEN }; dev = da->bus->find_device(NULL, rte_cmp_dev_name, &dev_addr);And this is how I use it in
rte_cmp_dev_name:
Quoted 9 lines
rte_cmp_dev_name(const struct rte_device *dev1, const void *addr) { const struct rte_bus_address *dev2_addr = addr; … }Is that what you meant?
Also, I'm not sure if the size is really needed, because we check the size of the parsed name, which may be different than the size of the original name
It would be best to pass rte_bus_address to rte_cmp_dev_name rather than having implied cast. Not sure if that is possible without breaking API though.
RE: [PATCH v4] bus: fix inconsistent representation of PCI numbers
Quoted 114 lines
-----Original Message-----
From: Stephen Hemminger <[email protected]>
Sent: Wednesday, 5 February 2025 18:42
To: Shani Peretz <[email protected]>
Cc: [email protected]; NBU-Contact-Thomas Monjalon (EXTERNAL) <[email protected]>; Tyler Retzlaff <[email protected]>; Parav Pandit <[email protected]>; Xueming Li <[email protected]>; Nipun Gupta <[email protected]>; Nikhil Agarwal <[email protected]>; Hemant Agrawal <[email protected]>; Sachin Saxena <[email protected]>; Rosen Xu <[email protected]>; Chenbo Xia <[email protected]>; Tomasz Duszynski <[email protected]>; Chengwen Feng <[email protected]>; NBU-Contact-longli (EXTERNAL) <[email protected]>; Wei Hu <[email protected]>; Bruce Richardson <[email protected]>; Kevin Laatz <[email protected]>; Jan Blunck <[email protected]>
Subject: Re: [PATCH v4] bus: fix inconsistent representation of PCI numbersExternal email: Use caution opening links or attachments
Quoted 8 lines · On Wed, 5 Feb 2025 16:36:11 +0000 Shani Peretz <[email protected]> wrote:
Quoted 8 lines
-----Original Message-----
From: Stephen Hemminger <[email protected]>
Sent: Wednesday, 29 January 2025 18:25
To: Shani Peretz <[email protected]>
Cc: [email protected]; NBU-Contact-Thomas Monjalon (EXTERNAL) <[email protected]>; Tyler Retzlaff <[email protected]>; Parav Pandit <[email protected]>; Xueming Li <[email protected]>; Nipun GuptaQuoted 74 lines
Quoted 46 lines
Nikhil Agarwal <[email protected]>; Hemant Agrawal <[email protected]>; Sachin Saxena <[email protected]>; Rosen Xu <[email protected]>; Chenbo Xia <[email protected]>; Tomasz Duszynski <[email protected]>; Chengwen Feng <[email protected]>; NBU-Contact-longli
(EXTERNAL) <[email protected]>; Wei Hu <[email protected]>; Bruce Richardson <[email protected]>; Kevin Laatz <[email protected]>; Jan Blunck <[email protected]>
Subject: Re: [PATCH v4] bus: fix inconsistent representation of PCI numbersExternal email: Use caution opening links or attachments
app/test/test_devargs.c test_invalid_devargs_parsing(void)
Quoted 6 lines · On Wed, 29 Jan 2025 10:54:16 +0200 Shani Peretz <[email protected]> wrote:
app/test/test_devargs.c +6
-0+create_pci_dev(const char *name) +{ +int port_id; +uint8_t slave_mac1[] = {0x00 ,0xFF ,0x00 ,0xFF ,0x00 ,0x00 }; +struct rte_ether_addr *mac_addr = (struct rte_ether_addr +*)slave_mac1;Use different initializer and you can avoid the need for cast here.
Quoted 6 lines
lib/eal/include/rte_dev.h +5
-0+/** +* General device name comparison. Will compare by using the +specific bus +* compare function or by comparing the names directly. +* lib/eal/include/rte_dev.h int rte_dev_is_probed(const struct rte_device *dev);
Quoted 10 lines
lib/eal/include/rte_dev.h +10
-0+* @param dev +* Device handle. +* @param name +* Name to compare against. +* @return +* 0 if the device matches the name. Nonzero otherwise. +*/ +__rte_internal +int rte_cmp_dev_name(const struct rte_device *dev, const void +*name);It would make more sense to me if name was a character not void pointer.
Quoted 2 lines
The design might be clearer if bus address was more of an typedef with a pointer and size together. Treat it more like an object.
Okay so just to understand,
this is the struct I am adding:struct rte_bus_address { const void *addr; size_t size; };This is how I pass it to
find_device:struct rte_bus_address dev_addr = { .addr = da->name, .size = RTE_DEV_NAME_MAX_LEN }; dev = da->bus->find_device(NULL, rte_cmp_dev_name, &dev_addr);And this is how I use it in
rte_cmp_dev_name:rte_cmp_dev_name(const struct rte_device *dev1, const void *addr) { const struct rte_bus_address *dev2_addr = addr; … }Quoted 5 lines
Is that what you meant?
Also, I'm not sure if the size is really needed, because we check the size of the parsed name, which may be different than the size of the original name
Quoted 3 lines
It would be best to pass
rte_bus_addresstorte_cmp_dev_namerather than having implied cast.
Not sure if that is possible without breaking API though.
I think you are right, also it will require to change the signature of find_device which will make it even bigger change
Re: [PATCH v4] bus: fix inconsistent representation of PCI numbers
Quoted 112 lines · On Wed, 5 Feb 2025 17:37:54 +0000 Shani Peretz <[email protected]> wrote:
Quoted 112 lines
-----Original Message-----
From: Stephen Hemminger <[email protected]>
Sent: Wednesday, 5 February 2025 18:42
To: Shani Peretz <[email protected]>
Cc: [email protected]; NBU-Contact-Thomas Monjalon (EXTERNAL) <[email protected]>; Tyler Retzlaff <[email protected]>; Parav Pandit <[email protected]>; Xueming Li <[email protected]>; Nipun Gupta <[email protected]>; Nikhil Agarwal <[email protected]>; Hemant Agrawal <[email protected]>; Sachin Saxena <[email protected]>; Rosen Xu <[email protected]>; Chenbo Xia <[email protected]>; Tomasz Duszynski <[email protected]>; Chengwen Feng <[email protected]>; NBU-Contact-longli (EXTERNAL) <[email protected]>; Wei Hu <[email protected]>; Bruce Richardson <[email protected]>; Kevin Laatz <[email protected]>; Jan Blunck <[email protected]>
Subject: Re: [PATCH v4] bus: fix inconsistent representation of PCI numbersExternal email: Use caution opening links or attachments
Quoted 8 lines · On Wed, 5 Feb 2025 16:36:11 +0000 Shani Peretz <[email protected]> wrote:
Quoted 8 lines
-----Original Message-----
From: Stephen Hemminger <[email protected]>
Sent: Wednesday, 29 January 2025 18:25
To: Shani Peretz <[email protected]>
Cc: [email protected]; NBU-Contact-Thomas Monjalon (EXTERNAL) <[email protected]>; Tyler Retzlaff <[email protected]>; Parav Pandit <[email protected]>; Xueming Li <[email protected]>; Nipun GuptaQuoted 79 lines
Quoted 46 lines
Nikhil Agarwal <[email protected]>; Hemant Agrawal <[email protected]>; Sachin Saxena <[email protected]>; Rosen Xu <[email protected]>; Chenbo Xia <[email protected]>; Tomasz Duszynski <[email protected]>; Chengwen Feng <[email protected]>; NBU-Contact-longli
(EXTERNAL) <[email protected]>; Wei Hu <[email protected]>; Bruce Richardson <[email protected]>; Kevin Laatz <[email protected]>; Jan Blunck <[email protected]>
Subject: Re: [PATCH v4] bus: fix inconsistent representation of PCI numbersExternal email: Use caution opening links or attachments
app/test/test_devargs.c test_invalid_devargs_parsing(void)
Quoted 6 lines · On Wed, 29 Jan 2025 10:54:16 +0200 Shani Peretz <[email protected]> wrote:
app/test/test_devargs.c +6
-0+create_pci_dev(const char *name) +{ +int port_id; +uint8_t slave_mac1[] = {0x00 ,0xFF ,0x00 ,0xFF ,0x00 ,0x00 }; +struct rte_ether_addr *mac_addr = (struct rte_ether_addr +*)slave_mac1;Use different initializer and you can avoid the need for cast here.
Quoted 6 lines
lib/eal/include/rte_dev.h +5
-0+/** +* General device name comparison. Will compare by using the +specific bus +* compare function or by comparing the names directly. +* lib/eal/include/rte_dev.h int rte_dev_is_probed(const struct rte_device *dev);
Quoted 10 lines
lib/eal/include/rte_dev.h +10
-0+* @param dev +* Device handle. +* @param name +* Name to compare against. +* @return +* 0 if the device matches the name. Nonzero otherwise. +*/ +__rte_internal +int rte_cmp_dev_name(const struct rte_device *dev, const void +*name);It would make more sense to me if name was a character not void pointer.
Quoted 2 lines
The design might be clearer if bus address was more of an typedef with a pointer and size together. Treat it more like an object.
Okay so just to understand,
this is the struct I am adding:struct rte_bus_address { const void *addr; size_t size; };This is how I pass it to
find_device:struct rte_bus_address dev_addr = { .addr = da->name, .size = RTE_DEV_NAME_MAX_LEN }; dev = da->bus->find_device(NULL, rte_cmp_dev_name, &dev_addr);And this is how I use it in
rte_cmp_dev_name:rte_cmp_dev_name(const struct rte_device *dev1, const void *addr) { const struct rte_bus_address *dev2_addr = addr; … }Is that what you meant?
Also, I'm not sure if the size is really needed, because we check the size of the parsed name, which may be different than the size of the original name
Quoted 5 lines
Quoted 3 lines
It would be best to pass
rte_bus_addresstorte_cmp_dev_namerather than having implied cast.
Not sure if that is possible without breaking API though.I think you are right, also it will require to change the signature of
find_devicewhich will make it even bigger change
Could you post patch with something "good enough" that builds and passes tests?
RE: [PATCH v4] bus: fix inconsistent representation of PCI numbers
Quoted 145 lines
-----Original Message-----
From: Stephen Hemminger <[email protected]>
Sent: Wednesday, 5 February 2025 20:46
To: Shani Peretz <[email protected]>
Cc: [email protected]; NBU-Contact-Thomas Monjalon (EXTERNAL) <[email protected]>; Tyler Retzlaff <[email protected]>; Parav Pandit <[email protected]>; Xueming Li <[email protected]>; Nipun Gupta <[email protected]>; Nikhil Agarwal <[email protected]>; Hemant Agrawal <[email protected]>; Sachin Saxena <[email protected]>; Rosen Xu <[email protected]>; Chenbo Xia <[email protected]>; Tomasz Duszynski <[email protected]>; Chengwen Feng <[email protected]>; NBU-Contact-longli (EXTERNAL) <[email protected]>; Wei Hu <[email protected]>; Bruce Richardson <[email protected]>; Kevin Laatz <[email protected]>; Jan Blunck <[email protected]>
Subject: Re: [PATCH v4] bus: fix inconsistent representation of PCI numbersExternal email: Use caution opening links or attachments
Quoted 8 lines · On Wed, 5 Feb 2025 17:37:54 +0000 Shani Peretz <[email protected]> wrote:
Quoted 8 lines
-----Original Message-----
From: Stephen Hemminger <[email protected]>
Sent: Wednesday, 5 February 2025 18:42
To: Shani Peretz <[email protected]>
Cc: [email protected]; NBU-Contact-Thomas Monjalon (EXTERNAL) <[email protected]>; Tyler Retzlaff <[email protected]>; Parav Pandit <[email protected]>; Xueming Li <[email protected]>; Nipun GuptaQuoted 62 lines
Quoted 62 lines
Nikhil Agarwal <[email protected]>; Hemant Agrawal <[email protected]>; Sachin Saxena <[email protected]>; Rosen Xu <[email protected]>; Chenbo Xia <[email protected]>; Tomasz Duszynski <[email protected]>; Chengwen Feng <[email protected]>; NBU-Contact-longli
(EXTERNAL) <[email protected]>; Wei Hu <[email protected]>; Bruce Richardson <[email protected]>; Kevin Laatz <[email protected]>; Jan Blunck <[email protected]>
Subject: Re: [PATCH v4] bus: fix inconsistent representation of PCI numbersExternal email: Use caution opening links or attachments
Quoted 8 lines · On Wed, 5 Feb 2025 16:36:11 +0000 Shani Peretz <[email protected]> wrote:
Quoted 8 lines
-----Original Message-----
From: Stephen Hemminger <[email protected]>
Sent: Wednesday, 29 January 2025 18:25
To: Shani Peretz <[email protected]>
Cc: [email protected]; NBU-Contact-Thomas Monjalon (EXTERNAL) <[email protected]>; Tyler Retzlaff <[email protected]>; Parav Pandit <[email protected]>; Xueming Li <[email protected]>; Nipun GuptaQuoted 36 lines
Quoted 36 lines
Nikhil Agarwal <[email protected]>; Hemant Agrawal <[email protected]>; Sachin Saxena <[email protected]>; Rosen Xu <[email protected]>; Chenbo Xia <[email protected]>; Tomasz Duszynski <[email protected]>; Chengwen Feng <[email protected]>; NBU-Contact-longli (EXTERNAL) <[email protected]>; Wei Hu <[email protected]>; Bruce Richardson <[email protected]>; Kevin Laatz <[email protected]>; Jan Blunck <[email protected]>
Subject: Re: [PATCH v4] bus: fix inconsistent representation of PCI numbersExternal email: Use caution opening links or attachments
Review
Quoted 5 lines · On Wed, 29 Jan 2025 10:54:16 +0200 Shani Peretz <[email protected]> wrote:
(quoted diff) +5
-0+create_pci_dev(const char *name) { + int port_id; + uint8_t slave_mac1[] = {0x00, 0xFF, 0x00, 0xFF, 0x00, 0x00 }; + struct rte_ether_addr *mac_addr = (struct rte_ether_addr +*)slave_mac1;Use different initializer and you can avoid the need for cast here.
Quoted 10 lines
lib/eal/include/rte_dev.h +9
-0+/** +* General device name comparison. Will compare by using the +specific bus +* compare function or by comparing the names directly. +* +* @param dev +* Device handle. +* @param name +* Name to compare against. Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Review
Quoted 6 lines
+ * @return
+ * 0 if the device matches the name. Nonzero otherwise.
+ */(quoted diff) +3
-0+__rte_internal +int rte_cmp_dev_name(const struct rte_device *dev, const void +*name);It would make more sense to me if name was a character not void
pointer.
Quoted 40 lines
Quoted 39 lines
Quoted 30 lines
Quoted 3 lines
The design might be clearer if bus address was more of an typedef with a pointer and size together. Treat it more like an object.
Okay so just to understand,
this is the struct I am adding:struct rte_bus_address { const void *addr; size_t size; };This is how I pass it to
find_device:struct rte_bus_address dev_addr = { .addr = da->name, .size = RTE_DEV_NAME_MAX_LEN }; dev = da->bus->find_device(NULL, rte_cmp_dev_name,
&dev_addr);And this is how I use it in
rte_cmp_dev_name:rte_cmp_dev_name(const struct rte_device *dev1, const void *addr) { const struct rte_bus_address *dev2_addr = addr; … }Quoted 5 lines
Is that what you meant?
Also, I'm not sure if the size is really needed, because we check the size of the parsed name, which may be different than the size of the original nameIt would be best to pass
rte_bus_addresstorte_cmp_dev_namerather than having implied cast.
Not sure if that is possible without breaking API though.
Quoted 5 lines
Quoted 2 lines
I think you are right, also it will require to change the signature of
find_devicewhich will make it even bigger changeCould you post patch with something "good enough" that builds and passes tests?
You mean with the rte_bus_address change or without?
Without it it was tested and passed. With it I only ran few tests locally and they passed
Re: [PATCH v4] bus: fix inconsistent representation of PCI numbers
Quoted 143 lines · On Wed, 5 Feb 2025 20:16:48 +0000 Shani Peretz <[email protected]> wrote:
Quoted 143 lines
-----Original Message-----
From: Stephen Hemminger <[email protected]>
Sent: Wednesday, 5 February 2025 20:46
To: Shani Peretz <[email protected]>
Cc: [email protected]; NBU-Contact-Thomas Monjalon (EXTERNAL) <[email protected]>; Tyler Retzlaff <[email protected]>; Parav Pandit <[email protected]>; Xueming Li <[email protected]>; Nipun Gupta <[email protected]>; Nikhil Agarwal <[email protected]>; Hemant Agrawal <[email protected]>; Sachin Saxena <[email protected]>; Rosen Xu <[email protected]>; Chenbo Xia <[email protected]>; Tomasz Duszynski <[email protected]>; Chengwen Feng <[email protected]>; NBU-Contact-longli (EXTERNAL) <[email protected]>; Wei Hu <[email protected]>; Bruce Richardson <[email protected]>; Kevin Laatz <[email protected]>; Jan Blunck <[email protected]>
Subject: Re: [PATCH v4] bus: fix inconsistent representation of PCI numbersExternal email: Use caution opening links or attachments
Quoted 8 lines · On Wed, 5 Feb 2025 17:37:54 +0000 Shani Peretz <[email protected]> wrote:
Quoted 8 lines
-----Original Message-----
From: Stephen Hemminger <[email protected]>
Sent: Wednesday, 5 February 2025 18:42
To: Shani Peretz <[email protected]>
Cc: [email protected]; NBU-Contact-Thomas Monjalon (EXTERNAL) <[email protected]>; Tyler Retzlaff <[email protected]>; Parav Pandit <[email protected]>; Xueming Li <[email protected]>; Nipun GuptaQuoted 62 lines
Quoted 62 lines
Nikhil Agarwal <[email protected]>; Hemant Agrawal <[email protected]>; Sachin Saxena <[email protected]>; Rosen Xu <[email protected]>; Chenbo Xia <[email protected]>; Tomasz Duszynski <[email protected]>; Chengwen Feng <[email protected]>; NBU-Contact-longli
(EXTERNAL) <[email protected]>; Wei Hu <[email protected]>; Bruce Richardson <[email protected]>; Kevin Laatz <[email protected]>; Jan Blunck <[email protected]>
Subject: Re: [PATCH v4] bus: fix inconsistent representation of PCI numbersExternal email: Use caution opening links or attachments
Quoted 8 lines · On Wed, 5 Feb 2025 16:36:11 +0000 Shani Peretz <[email protected]> wrote:
Quoted 8 lines
-----Original Message-----
From: Stephen Hemminger <[email protected]>
Sent: Wednesday, 29 January 2025 18:25
To: Shani Peretz <[email protected]>
Cc: [email protected]; NBU-Contact-Thomas Monjalon (EXTERNAL) <[email protected]>; Tyler Retzlaff <[email protected]>; Parav Pandit <[email protected]>; Xueming Li <[email protected]>; Nipun GuptaQuoted 36 lines
Quoted 36 lines
Nikhil Agarwal <[email protected]>; Hemant Agrawal <[email protected]>; Sachin Saxena <[email protected]>; Rosen Xu <[email protected]>; Chenbo Xia <[email protected]>; Tomasz Duszynski <[email protected]>; Chengwen Feng <[email protected]>; NBU-Contact-longli (EXTERNAL) <[email protected]>; Wei Hu <[email protected]>; Bruce Richardson <[email protected]>; Kevin Laatz <[email protected]>; Jan Blunck <[email protected]>
Subject: Re: [PATCH v4] bus: fix inconsistent representation of PCI numbersExternal email: Use caution opening links or attachments
Review
Quoted 5 lines · On Wed, 29 Jan 2025 10:54:16 +0200 Shani Peretz <[email protected]> wrote:
(quoted diff) +5
-0+create_pci_dev(const char *name) { + int port_id; + uint8_t slave_mac1[] = {0x00, 0xFF, 0x00, 0xFF, 0x00, 0x00 }; + struct rte_ether_addr *mac_addr = (struct rte_ether_addr +*)slave_mac1;Use different initializer and you can avoid the need for cast here.
Quoted 10 lines
(quoted diff) +9
-0+/** + * General device name comparison. Will compare by using the +specific bus + * compare function or by comparing the names directly. + * + * @param dev + * Device handle. + * @param name + * Name to compare against.Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Review
Quoted 6 lines
+ * @return
+ * 0 if the device matches the name. Nonzero otherwise.
+ */(quoted diff) +3
-0+__rte_internal +int rte_cmp_dev_name(const struct rte_device *dev, const void +*name);It would make more sense to me if name was a character not void
pointer.
Quoted 40 lines
Quoted 39 lines
Quoted 30 lines
Quoted 3 lines
The design might be clearer if bus address was more of an typedef with a pointer and size together. Treat it more like an object.
Okay so just to understand,
this is the struct I am adding:struct rte_bus_address { const void *addr; size_t size; };This is how I pass it to
find_device:struct rte_bus_address dev_addr = { .addr = da->name, .size = RTE_DEV_NAME_MAX_LEN }; dev = da->bus->find_device(NULL, rte_cmp_dev_name,
&dev_addr);And this is how I use it in
rte_cmp_dev_name:rte_cmp_dev_name(const struct rte_device *dev1, const void *addr) { const struct rte_bus_address *dev2_addr = addr; … }Quoted 5 lines
Is that what you meant?
Also, I'm not sure if the size is really needed, because we check the size of the parsed name, which may be different than the size of the original nameIt would be best to pass
rte_bus_addresstorte_cmp_dev_namerather than having implied cast.
Not sure if that is possible without breaking API though.
Quoted 8 lines
Quoted 5 lines
Quoted 2 lines
I think you are right, also it will require to change the signature of
find_devicewhich will make it even bigger changeCould you post patch with something "good enough" that builds and passes tests?
You mean with the
rte_bus_addresschange or without?
Without it it was tested and passed. With it I only ran few tests locally and they passed
With the bus address change how much impact? Not sure it really matter much though both solutions are ok, it is more about dealing with other buses in future.
Re: [PATCH v4] bus: fix inconsistent representation of PCI numbers
In reply to Shani PeretzQuoted 32 lines · On Wed, 29 Jan 2025 10:54:16 +0200 Shani Peretz <[email protected]> wrote:
DPDK provides two formats for specifying PCI device numbers:
a full version ("0000:08:00.0") and a short version ("08:00.0"). Issues can occur when an application uses one format (e.g., short) while running testpmd, then attempts to use the other format (e.g., full) in a later command, resulting in a failure.The issue is that
find_devicegoes over the list of devices and compares the user-provided string to therte_devicestructure'sdevice->name(device->nameis just the string received from devargs (i.e "08:00.0" or "0000:08:00.0")).
Notice that there's another field that represents the device name, but this one is in therte_pci_busstruct. This name is actually the result of the PCI parse function ("0000:08:00.0").
If we want to accurately compare these names, we'll need to bring both sides to the same representation by invoking the parse function on the user input.To make the
cmp_dev_namefunction applicable to all buses—not just PCI— the proposed solution is to utilize the parse function implemented by each bus. When comparing names, we will call parse on the supplied string as well as on the device name itself and compare the results. This will allow consistent comparisons between different representations of same devices.Also, the
pci_common_setfunction has been modified to improve naming consistency for PCI buses.
Now, the name stored inrte_devicefor PCI buses will match the parsed name that is also stored inrte_pci_devicename,
rather than using the user-provided string from devargs.
As a result, when a new PCI device is registered, the name displayed in the device list will be the parsed version.
Quoted 4 lines
Added tests that compare and find devices in various forms of names under
test_devargs.Fixes a3ee360f4440 ("eal: add hotplug add/remove device")
Maybe just fix for now by normalizing the PCI device string when before storing and after parsing? That would allow for simple fix that can be backported. The more complex generalization of bus address is too much to go to stable branch.
Re: [PATCH v4] bus: fix inconsistent representation of PCI numbers
Quoted 35 lines · Stephen Hemminger
Quoted 32 lines · On Wed, 29 Jan 2025 10:54:16 +0200 Shani Peretz <[email protected]> wrote:
DPDK provides two formats for specifying PCI device numbers:
a full version ("0000:08:00.0") and a short version ("08:00.0"). Issues can occur when an application uses one format (e.g., short) while running testpmd, then attempts to use the other format (e.g., full) in a later command, resulting in a failure.The issue is that
find_devicegoes over the list of devices and compares the user-provided string to therte_devicestructure'sdevice->name(device->nameis just the string received from devargs (i.e "08:00.0" or "0000:08:00.0")).
Notice that there's another field that represents the device name, but this one is in therte_pci_busstruct. This name is actually the result of the PCI parse function ("0000:08:00.0").
If we want to accurately compare these names, we'll need to bring both sides to the same representation by invoking the parse function on the user input.To make the
cmp_dev_namefunction applicable to all buses—not just PCI— the proposed solution is to utilize the parse function implemented by each bus. When comparing names, we will call parse on the supplied string as well as on the device name itself and compare the results. This will allow consistent comparisons between different representations of same devices.Also, the
pci_common_setfunction has been modified to improve naming consistency for PCI buses.
Now, the name stored inrte_devicefor PCI buses will match the parsed name that is also stored inrte_pci_devicename,
rather than using the user-provided string from devargs.
As a result, when a new PCI device is registered, the name displayed in the device list will be the parsed version.
Quoted 8 lines
Quoted 4 lines
Added tests that compare and find devices in various forms of names under
test_devargs.Fixes a3ee360f4440 ("eal: add hotplug add/remove device")Maybe just fix for now by normalizing the PCI device string when before storing and after parsing? That would allow for simple fix that can be backported. The more complex generalization of bus address is too much to go to stable branch.
One idea for backport, perhaps?
https://patches.dpdk.org/project/dpdk/patch/[email protected]/
Re: [PATCH v4] bus: fix inconsistent representation of PCI numbers
Quoted 36 lines · Bruce Richardson
Quoted 35 lines · Stephen Hemminger
Quoted 32 lines · On Wed, 29 Jan 2025 10:54:16 +0200 Shani Peretz <[email protected]> wrote:
DPDK provides two formats for specifying PCI device numbers:
a full version ("0000:08:00.0") and a short version ("08:00.0"). Issues can occur when an application uses one format (e.g., short) while running testpmd, then attempts to use the other format (e.g., full) in a later command, resulting in a failure.The issue is that
find_devicegoes over the list of devices and compares the user-provided string to therte_devicestructure'sdevice->name(device->nameis just the string received from devargs (i.e "08:00.0" or "0000:08:00.0")).
Notice that there's another field that represents the device name, but this one is in therte_pci_busstruct. This name is actually the result of the PCI parse function ("0000:08:00.0").
If we want to accurately compare these names, we'll need to bring both sides to the same representation by invoking the parse function on the user input.To make the
cmp_dev_namefunction applicable to all buses—not just PCI— the proposed solution is to utilize the parse function implemented by each bus. When comparing names, we will call parse on the supplied string as well as on the device name itself and compare the results. This will allow consistent comparisons between different representations of same devices.Also, the
pci_common_setfunction has been modified to improve naming consistency for PCI buses.
Now, the name stored inrte_devicefor PCI buses will match the parsed name that is also stored inrte_pci_devicename,
rather than using the user-provided string from devargs.
As a result, when a new PCI device is registered, the name displayed in the device list will be the parsed version.
Quoted 8 lines
Quoted 8 lines
Quoted 4 lines
Added tests that compare and find devices in various forms of names under
test_devargs.Fixes a3ee360f4440 ("eal: add hotplug add/remove device")Maybe just fix for now by normalizing the PCI device string when before storing and after parsing? That would allow for simple fix that can be backported. The more complex generalization of bus address is too much to go to stable branch.
+1
Quoted 4 lines
One idea for backport, perhaps?
https://patches.dpdk.org/project/dpdk/patch/[email protected]/
ack
Quoted 1 line
v5 cover fix comparison between devices
In reply to Shani PeretzThis series fixes two issues:
1. saving PCI name as the parsed one instead of user-provided string when registering a new device
2. fixes rte_cmp_dev_name function that currently compares the names by compering 2 strings
Also added test to check the functionality of rte_cmp_dev_name.
Shani Peretz (4):
bus/pci: fix registration of PCI device
lib: fix comparison between devices app/test: add tests to find devices
lib: change find device and cmp dev name functions
app/test/test_devargs.c | 140 ++++++++++++++++++++++- app/test/test_vdev.c | 29 +++-- drivers/bus/auxiliary/auxiliary_common.c | 19 ++- drivers/bus/auxiliary/auxiliary_params.c | 10 +- drivers/bus/cdx/cdx.c | 25 ++-- drivers/bus/dpaa/dpaa_bus.c | 9 +- drivers/bus/fslmc/fslmc_bus.c | 11 +- drivers/bus/ifpga/ifpga_bus.c | 16 ++- drivers/bus/pci/pci_common.c | 23 ++-- drivers/bus/pci/pci_params.c | 10 +- drivers/bus/platform/platform.c | 18 ++- drivers/bus/platform/platform_params.c | 10 +- drivers/bus/uacce/uacce.c | 27 +++-- drivers/bus/vdev/vdev.c | 25 +++- drivers/bus/vdev/vdev_params.c | 10 +- drivers/bus/vdev/vdev_private.h | 2 +- drivers/bus/vmbus/vmbus_common.c | 11 +- drivers/dma/idxd/idxd_bus.c | 13 ++- drivers/net/bonding/rte_eth_bond_args.c | 15 +-- drivers/net/vdev_netvsc/vdev_netvsc.c | 8 +- drivers/raw/ifpga/ifpga_rawdev.c | 12 +- lib/eal/common/eal_common_bus.c | 12 +- lib/eal/common/eal_common_dev.c | 49 +++++++- lib/eal/common/hotplug_mp.c | 19 +-- lib/eal/include/bus_driver.h | 26 ++++- lib/eal/include/rte_dev.h | 22 +++- lib/eal/linux/eal_dev.c | 16 +-- lib/eal/version.map | 1 + 28 files changed, 444 insertions(+), 144 deletions(-)
Signature · 1 line
2.34.1
PATCH v5 1/4 bus/pci: fix registration of PCI device
When registering a new PCI device, the device->name field stored the user-provided string from devargs (e.g., "08:00.0" or "0000:08:00.0"). This approach led to inconsistencies when registering new devices.
This patch fix this issue by saving the parsed PCI in device->name, so when a new PCI device is registering the name displayed in the device list will be the parsed version.
--- drivers/bus/pci/pci_common.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-)
drivers/bus/pci/pci_common.c +2 -12
@@ -99,21 +99,11 @@ pci_common_set(struct rte_pci_device *dev)/* Each device has its internal, canonical name set. */ rte_pci_device_name (&dev->addr, dev->name,sizeof (dev->name)); + dev->device.name = dev->name; + devargs =pci_devargs_lookup (&dev->addr); dev->device.devargs = devargs; -/* When using a blocklist, only blocked devices will have -* an rte_devargs. Allowed devices won't have one. -*/ -if (devargs !=NULL ) -/* If an rte_devargs exists, the generic rte_device uses the -* given name as its name. -*/ - dev->device.name = dev->device.devargs->name; -else -/* Otherwise, it uses the internal, canonical form. */ - dev->device.name = dev->name; -if (dev->bus_info !=NULL ||asprintf (&dev->bus_info,"vendor_id=%" PRIx16", device_id=%" PRIx16, dev->id.vendor_id, dev->id.device_id) !=-1 )
Signature · 1 line
2.34.1
Re: [PATCH v5 1/4] bus/pci: fix registration of PCI device
06/02/2025 01:08, Shani Peretz:
Quoted 4 lines
When registering a new PCI device, the
device->namefield stored the user-provided string from devargs (e.g., "08:00.0" or "0000:08:00.0"). This approach led to inconsistencies when registering new devices.
Quoted 8 lines
This patch fix this issue by saving the parsed PCI in
device->name, so when a new PCI device is registering the name displayed in the device list will be the parsed version.Fixes 23eaa9059ec2 ("bus/pci: use given name as generic name")Signed-off-by Shani Peretz <[email protected]>
It's way simpler.
PATCH v5 2/4 lib: fix comparison between devices
In reply to Shani PeretzDPDK supports multiple formats for specifying buses, (such as "0000:08:00.0" and "08:00.0" for PCI). This flexibility can lead to inconsistencies when using one format while running testpmd, then attempts to use the other format in a later command, resulting in a failure.
The issue arises from the find_device function, which compares the user-provided string directly with the device->name in the rte_device structure.
If we want to accurately compare these names, we'll need to bring both sides to the same representation by invoking the parse function on the user input.
The proposed solution is to utilize the parse function implemented by each bus. When comparing names, we will call parse on the supplied string as well as on the device name itself and compare the results. As part of the change the parse function will now return the size of the parsed address.
This will allow consistent comparisons between different representations of same devices.
In addition, fixed vdev test to use the rte_cmp_dev_name function instead of the custom one.
--- app/test/test_vdev.c | 10 ++---- drivers/bus/auxiliary/auxiliary_common.c | 17 +++++++--- drivers/bus/cdx/cdx.c | 13 +++++--- drivers/bus/dpaa/dpaa_bus.c | 7 ++-- drivers/bus/fslmc/fslmc_bus.c | 9 ++++-- drivers/bus/ifpga/ifpga_bus.c | 14 +++++--- drivers/bus/pci/pci_common.c | 7 ++-- drivers/bus/platform/platform.c | 15 ++++++--- drivers/bus/uacce/uacce.c | 14 +++++--- drivers/bus/vdev/vdev.c | 23 +++++++++++-- drivers/bus/vmbus/vmbus_common.c | 9 ++++-- drivers/dma/idxd/idxd_bus.c | 9 ++++-- drivers/raw/ifpga/ifpga_rawdev.c | 8 +---- lib/eal/common/eal_common_bus.c | 2 +- lib/eal/common/eal_common_dev.c | 41 +++++++++++++++++++++--- lib/eal/common/hotplug_mp.c | 11 ++----- lib/eal/include/bus_driver.h | 24 +++++++++++++- lib/eal/include/rte_dev.h | 15 +++++++++ lib/eal/linux/eal_dev.c | 10 +----- lib/eal/version.map | 1 + 20 files changed, 180 insertions(+), 79 deletions(-)
app/test/test_vdev.c +2 -8
@@ -20,12 +20,6 @@ static const char * const valid_keys[] = { NULL, }; -static int -cmp_dev_name (const struct rte_device *dev,const void *name) -{ -return strcmp (rte_dev_name (dev), name); -} -static int cmp_dev_match (const struct rte_device *dev,const void *_kvlist) {
@@ -82,7 +76,7 @@ test_vdev_bus(void)printf ("Failed to create vdev net_null_test0\n" ); goto fail; } - dev0 = vdev_bus->find_device (NULL , cmp_dev_name,"net_null_test0" ); + dev0 = vdev_bus->find_device (NULL , rte_cmp_dev_name,"net_null_test0" );if (dev0 ==NULL ) {printf ("Cannot find net_null_test0 vdev\n" ); goto fail;
@@ -93,7 +87,7 @@ test_vdev_bus(void)printf ("Failed to create vdev net_null_test1\n" ); goto fail; } - dev1 = vdev_bus->find_device (NULL , cmp_dev_name,"net_null_test1" ); + dev1 = vdev_bus->find_device (NULL , rte_cmp_dev_name,"net_null_test1" );if (dev1 ==NULL ) {printf ("Cannot find net_null_test1 vdev\n" ); goto fail;
drivers/bus/auxiliary/auxiliary_common.c +12 -5
@@ -237,10 +237,9 @@ auxiliary_probe(void) }static int -auxiliary_parse (const char *name,void *addr) +auxiliary_parse (const char *name,void *addr,int *size) {struct rte_auxiliary_driver *drv =NULL ; -const char **out = addr;/* Allow empty device name "auxiliary:" to bypass entire bus scan. */ if (strlen (name) ==0 )
@@ -250,9 +249,17 @@ auxiliary_parse(const char *name, void *addr)if (drv->match (name))break ; } -if (drv !=NULL && addr !=NULL ) - *out = name; -return drv !=NULL ?0 :-1 ; + +if (drv ==NULL ) +return -1 ; + +if (size !=NULL ) + *size =strlen (name) +1 ; + +if (addr !=NULL ) +rte_strscpy (addr, name,strlen (name) +1 ); + +return 0 ; }/* Register a driver */
drivers/bus/cdx/cdx.c +9 -4
@@ -464,15 +464,20 @@ cdx_probe(void) }static int -cdx_parse (const char *name,void *addr) +cdx_parse (const char *name,void *addr,int *size) { -const char **out = addr;int ret; ret =strncmp (name,CDX_DEV_PREFIX ,strlen (CDX_DEV_PREFIX )); -if (ret ==0 && addr) - *out = name; +if (ret !=0 ) +return ret; + +if (size !=NULL ) + *size =strlen (name) +1 ; + +if (addr !=NULL ) +rte_strscpy (addr, name,strlen (name) +1 );return ret; }
drivers/bus/dpaa/dpaa_bus.c +5 -2
@@ -153,7 +153,7 @@ dpaa_devargs_lookup(struct rte_dpaa_device *dev)char dev_name[32 ]; RTE_EAL_DEVARGS_FOREACH("dpaa_bus", devargs) { - devargs->bus->parse (devargs->name, &dev_name); + devargs->bus->parse (devargs->name, &dev_name,NULL );if (strcmp (dev_name, dev->device.name) ==0 ) {DPAA_BUS_INFO ("**Devargs matched %s" , dev_name);return devargs;
@@ -447,7 +447,7 @@ dpaa_portal_finish(void *arg) }static int -rte_dpaa_bus_parse (const char *name,void *out) +rte_dpaa_bus_parse (const char *name,void *out,int *size) {unsigned int i, j;size_t delta, dev_delta;
@@ -494,6 +494,9 @@ rte_dpaa_bus_parse(const char *name, void *out) max_name_len =sizeof ("fm.-mac.." ) -1 ; } +if (size !=NULL ) + *size = max_name_len +1 ; +if (out !=NULL ) {char *out_name = out;
drivers/bus/fslmc/fslmc_bus.c +6 -3
@@ -103,7 +103,7 @@ fslmc_devargs_lookup(struct rte_dpaa2_device *dev)char dev_name[32 ]; RTE_EAL_DEVARGS_FOREACH("fslmc", devargs) { - devargs->bus->parse (devargs->name, &dev_name); + devargs->bus->parse (devargs->name, &dev_name,NULL );if (strcmp (dev_name, dev->device.name) ==0 ) {DPAA2_BUS_INFO ("**Devargs matched %s" , dev_name);return devargs;
@@ -235,7 +235,7 @@ scan_one_fslmc_device(char *dev_name) }static int -rte_fslmc_parse (const char *name,void *addr) +rte_fslmc_parse (const char *name,void *addr,int *size) {uint16_t dev_id;char *t_ptr;
@@ -298,7 +298,10 @@ rte_fslmc_parse(const char *name, void *addr) goto err_out; } -if (addr) +if (size !=NULL ) + *size =strlen (sep) +1 ; + +if (addr !=NULL )strcpy (addr, sep); ret =0 ;
drivers/bus/ifpga/ifpga_bus.c +9 -5
@@ -459,9 +459,8 @@ ifpga_find_device(const struct rte_device *start,return NULL ; }static int -ifpga_parse (const char *name,void *addr) +ifpga_parse (const char *name,void *addr,int *size) { -int *out = addr;struct rte_rawdev *rawdev =NULL ;char rawdev_name[RTE_RAWDEV_NAME_MAX_LEN ];char *c1 =NULL ;
@@ -491,9 +490,14 @@ ifpga_parse(const char *name, void *addr) rawdev =rte_rawdev_pmd_get_named_dev (rawdev_name);if ((port <IFPGA_BUS_DEV_PORT_MAX ) && - rawdev && - (addr !=NULL )) - *out = port; + rawdev) { +if (size !=NULL ) + *size =sizeof (port); + +if (addr !=NULL ) + *(int *)addr = port; + } +if ((port <IFPGA_BUS_DEV_PORT_MAX ) && rawdev)
drivers/bus/pci/pci_common.c +5 -2
@@ -84,7 +84,7 @@ pci_devargs_lookup(const struct rte_pci_addr *pci_addr)struct rte_pci_addr addr; RTE_EAL_DEVARGS_FOREACH("pci", devargs) { - devargs->bus->parse (devargs->name, &addr); + devargs->bus->parse (devargs->name, &addr,NULL );if (!rte_pci_addr_cmp (pci_addr, &addr))return devargs; }
@@ -487,12 +487,15 @@ rte_pci_dump(FILE *f) }static int -pci_parse (const char *name,void *addr) +pci_parse (const char *name,void *addr,int *size) {struct rte_pci_addr *out = addr;struct rte_pci_addr pci_addr;bool parse; +if (size !=NULL ) + *size =sizeof (struct rte_pci_addr ); + parse = (rte_pci_addr_parse (name, &pci_addr) ==0 );if (parse && addr !=NULL ) *out = pci_addr;
drivers/bus/platform/platform.c +10 -5
@@ -542,11 +542,10 @@ platform_bus_unplug(struct rte_device *dev) }static int -platform_bus_parse (const char *name,void *addr) +platform_bus_parse (const char *name,void *addr,int *size) {struct rte_platform_device pdev = { };struct rte_platform_driver *pdrv; -const char **out = addr;rte_strscpy (pdev.name, name,sizeof (pdev.name));
@@ -555,10 +554,16 @@ platform_bus_parse(const char *name, void *addr)break ; } -if (pdrv !=NULL && addr !=NULL ) - *out = name; +if (pdrv ==NULL ) +return -ENODEV ; + +if (size !=NULL ) + *size =strlen (name) +1 ; -return pdrv !=NULL ?0 : -ENODEV ; +if (addr !=NULL ) +rte_strscpy (addr, name,strlen (name) +1 ); + +return 0 ; } static int
drivers/bus/uacce/uacce.c +10 -4
@@ -20,6 +20,7 @@#include <rte_errno.h> #include <rte_log.h> #include <rte_kvargs.h> +#include <rte_string_fns.h> #include <bus_driver.h> #include "bus_uacce_driver.h"
@@ -529,15 +530,20 @@ uacce_find_device(const struct rte_device *start, rte_dev_cmp_t cmp, const void }static int -uacce_parse (const char *name,void *addr) +uacce_parse (const char *name,void *addr,int *size) { -const char **out = addr;int ret; ret =strncmp (name,UACCE_DEV_PREFIX ,strlen (UACCE_DEV_PREFIX )); -if (ret ==0 && addr) - *out = name; +if (ret !=0 ) +return ret; + +if (size !=NULL ) + *size =strlen (name) +1 ; + +if (addr !=NULL ) +rte_strscpy (addr, name,strlen (name) +1 );return ret; }
drivers/bus/vdev/vdev.c +20 -3
@@ -113,7 +113,7 @@ rte_vdev_remove_custom_scan(rte_vdev_scan_callback callback, void *user_arg) }static int -vdev_parse (const char *name,void *addr) +vdev_find_driver (const char *name,void *addr) {struct rte_vdev_driver **out = addr;struct rte_vdev_driver *driver =NULL ;
@@ -197,7 +197,7 @@ vdev_probe_all_drivers(struct rte_vdev_device *dev) name =rte_vdev_device_name (dev);VDEV_LOG (DEBUG ,"Search driver to probe device %s" , name); -if (vdev_parse (name, &driver)) +if (vdev_find_driver (name, &driver))return -1 ; iova_mode =rte_eal_iova_mode ();
@@ -232,6 +232,23 @@ find_vdev(const char *name)return NULL ; } +static int +vdev_parse (const char *name,void *addr,int *size) +{ +struct rte_vdev_driver *driver; + +if (vdev_find_driver (name, &driver)) +return 1 ; + +if (size !=NULL ) + *size =strlen (name) +1 ; + +if (addr !=NULL ) +rte_strscpy (addr, name,strlen (name) +1 ); + +return 0 ; +} +static struct rte_devargs *alloc_devargs (const char *name,const char *args) {
@@ -647,7 +664,7 @@ vdev_get_iommu_class(void) TAILQ_FOREACH(dev, &vdev_device_list, next) { name =rte_vdev_device_name (dev); -if (vdev_parse (name, &driver)) +if (vdev_find_driver (name, &driver))continue ;if (driver->drv_flags &RTE_VDEV_DRV_NEED_IOVA_AS_VA )
drivers/bus/vmbus/vmbus_common.c +6 -3
@@ -245,13 +245,16 @@ rte_vmbus_cleanup(void) }static int -vmbus_parse (const char *name,void *addr) +vmbus_parse (const char *name,void *addr,int *size) {rte_uuid_t guid;int ret; +if (size !=NULL ) + *size =sizeof (guid); + ret =rte_uuid_parse (name, guid); -if (ret ==0 && addr) +if (ret ==0 && addr !=NULL )memcpy (addr, &guid,sizeof (guid));return ret;
@@ -269,7 +272,7 @@ vmbus_devargs_lookup(struct rte_vmbus_device *dev)rte_uuid_t addr; RTE_EAL_DEVARGS_FOREACH("vmbus", devargs) { -vmbus_parse (devargs->name, &addr); +vmbus_parse (devargs->name, &addr,NULL );if (rte_uuid_compare (dev->device_id, addr) ==0 )return devargs;
drivers/dma/idxd/idxd_bus.c +6 -3
@@ -47,7 +47,7 @@ static int dsa_probe(void);static struct rte_device *dsa_find_device (const struct rte_device *start,rte_dev_cmp_t cmp,const void *data);static enum rte_iova_mode dsa_get_iommu_class (void ); -static int dsa_addr_parse (const char *name,void *addr); +static int dsa_addr_parse (const char *name,void *addr,int *size);/** List of devices */ TAILQ_HEAD (dsa_device_list, rte_dsa_device);
@@ -345,7 +345,7 @@ dsa_scan(void)closedir (dev_dir);return -ENOMEM ; } -if (dsa_addr_parse (wq->d_name, &dev->addr) <0 ) { +if (dsa_addr_parse (wq->d_name, &dev->addr,NULL ) <0 ) {IDXD_PMD_ERR ("Error parsing WQ name: %s" , wq->d_name);free (dev);continue ;
@@ -391,11 +391,14 @@ dsa_get_iommu_class(void) }static int -dsa_addr_parse (const char *name,void *addr) +dsa_addr_parse (const char *name,void *addr,int *size) {struct dsa_wq_addr *wq = addr;unsigned int device_id, wq_id; +if (size !=NULL ) + *size =sizeof (struct dsa_wq_addr ); +if (sscanf (name,"wq%u.%u" , &device_id, &wq_id) !=2 ) {IDXD_PMD_DEBUG ("Parsing WQ name failed: %s" , name);return -1 ;
drivers/raw/ifpga/ifpga_rawdev.c +1 -7
@@ -1833,12 +1833,6 @@ ifpga_cfg_probe(struct rte_vdev_device *vdev)return ret; } -static int cmp_dev_name (const struct rte_device *dev,const void *_name) -{ -const char *name = _name; -return strcmp (dev->name, name); -} -static int ifpga_cfg_remove (struct rte_vdev_device *vdev) {
@@ -1874,7 +1868,7 @@ ifpga_cfg_remove(struct rte_vdev_device *vdev) args.port, args.bdf); bus =rte_bus_find_by_name (RTE_STR (IFPGA_BUS_NAME ));if (bus) { -if (bus->find_device (NULL , cmp_dev_name, dev_name)) { +if (bus->find_device (NULL , rte_cmp_dev_name, dev_name)) { ret =rte_eal_hotplug_remove (RTE_STR (IFPGA_BUS_NAME ), dev_name); }
lib/eal/common/eal_common_bus.c +1 -1
@@ -200,7 +200,7 @@ bus_can_parse(const struct rte_bus *bus, const void *_name) {const char *name = _name; -return !(bus->parse && bus->parse (name,NULL ) ==0 ); +return !(bus->parse && bus->parse (name,NULL ,NULL ) ==0 ); } struct rte_bus *
lib/eal/common/eal_common_dev.c +36 -5
61 lines not on this page · raw message
lib/eal/common/hotplug_mp.c +2 -9
@@ -21,13 +21,6 @@ struct mp_reply_bundle {void *peer; }; -static int cmp_dev_name (const struct rte_device *dev,const void *_name) -{ -const char *name = _name; - -return strcmp (dev->name, name); -} -/** * Secondary to primary request. * start from function eal_dev_hotplug_request_to_primary.
@@ -135,7 +128,7 @@ __handle_secondary_request(void *param) goto finish; } - dev = bus->find_device (NULL , cmp_dev_name, da.name); + dev = bus->find_device (NULL , rte_cmp_dev_name, da.name);if (dev ==NULL ) {EAL_LOG (ERR ,"Cannot find plugged device (%s)" , da.name); ret = -ENOENT ;
@@ -262,7 +255,7 @@ static void __handle_primary_request(void *param) goto quit; } - dev = bus->find_device (NULL , cmp_dev_name, da->name); + dev = bus->find_device (NULL , rte_cmp_dev_name, da->name);if (dev ==NULL ) {EAL_LOG (ERR ,"Cannot find plugged device (%s)" , da->name); ret = -ENOENT ;
lib/eal/include/bus_driver.h +23 -1
@@ -112,11 +112,32 @@ typedef int (*rte_bus_unplug_t)(struct rte_device *dev);* should be written. If NULL, nothing should be written, which * is not an error. * +* @param[out] size +* device information size. If NULL, nothing should +* be written, which is not an error. +* * @return * 0 if parsing was successful. * !0 for any error. */ -typedef int (*rte_bus_parse_t )(const char *name,void *addr); +typedef int (*rte_bus_parse_t )(const char *name,void *addr,int *size); + +/** +* Bus specific device name comparison function. +* +* This type of function is used to compare a bus name with an arbitrary +* name. +* +* @param dev +* Device handle. +* +* @param name +* Name to compare against. +* +* @return +* 0 if the device matches the name. Nonzero otherwise. +*/ +typedef int (*rte_bus_cmp_name_t )(const struct rte_device *dev,const void *name);/** * Parse bus part of the device arguments.
@@ -258,6 +279,7 @@ struct rte_bus {rte_bus_plug_t plug;/**< Probe single device for drivers */ rte_bus_unplug_t unplug;/**< Remove single device from driver */ rte_bus_parse_t parse;/**< Parse a device name */ +rte_bus_cmp_name_t cmp_name;/**< Compare device name */ rte_bus_devargs_parse_t devargs_parse;/**< Parse bus devargs */ rte_dev_dma_map_t dma_map;/**< DMA map for device in the bus */ rte_dev_dma_unmap_t dma_unmap;/**< DMA unmap for device in the bus */
lib/eal/include/rte_dev.h +15 -0
@@ -17,6 +17,7 @@#include <rte_config.h> #include <rte_common.h> +#include <rte_compat.h> #include <rte_log.h> #ifdef __cplusplus
@@ -170,6 +171,20 @@ int rte_dev_is_probed(const struct rte_device *dev);int rte_eal_hotplug_add (const char *busname,const char *devname,const char *drvargs); +/** +* General device name comparison. Will compare by using the specific bus +* compare function or by comparing the names directly. +* +* @param dev +* Device handle. +* @param name +* Name to compare against. +* @return +* 0 if the device matches the name. Nonzero otherwise. +*/ +__rte_internal +int rte_cmp_dev_name(const struct rte_device *dev, const void *name); +/** * Add matching devices. *
lib/eal/linux/eal_dev.c +1 -9
@@ -91,14 +91,6 @@ static void sigbus_handler(int signum, siginfo_t *info,EAL_LOG (DEBUG ,"Success to handle SIGBUS for hot-unplug!" ); } -static int cmp_dev_name (const struct rte_device *dev, -const void *_name) -{ -const char *name = _name; - -return strcmp (dev->name, name); -} -static int dev_uev_socket_fd_create (void ) {
@@ -280,7 +272,7 @@ dev_uev_handler(__rte_unused void *param) goto failure_handle_err; } - dev = bus->find_device (NULL , cmp_dev_name, + dev = bus->find_device (NULL , rte_cmp_dev_name, uevent.devname);if (dev ==NULL ) { EAL_LOG(ERR, "Cannot find device (%s) on "
lib/eal/version.map +1 -0
@@ -448,4 +448,5 @@ INTERNAL { rte_mem_unmap; rte_thread_create_internal_control; rte_thread_set_prefixed_name; + rte_cmp_dev_name; };
Signature · 1 line
2.34.1
Re: [PATCH v5 2/4] lib: fix comparison between devices
Quoted 207 lines · Shani Peretz
DPDK supports multiple formats for specifying buses, (such as "0000:08:00.0" and "08:00.0" for PCI). This flexibility can lead to inconsistencies when using one format while running testpmd, then attempts to use the other format in a later command, resulting in a failure.
The issue arises from the
find_devicefunction, which compares the user-provided string directly with thedevice->namein therte_devicestructure.
If we want to accurately compare these names, we'll need to bring both sides to the same representation by invoking the parse function on the user input.The proposed solution is to utilize the parse function implemented by each bus. When comparing names, we will call parse on the supplied string as well as on the device name itself and compare the results. As part of the change the parse function will now return the size of the parsed address.
This will allow consistent comparisons between different representations of same devices.
In addition, fixed vdev test to use the
rte_cmp_dev_namefunction instead of the custom one.Fixes a3ee360f4440 ("eal: add hotplug add/remove device")Signed-off-by Shani Peretz <[email protected]>--- app/test/test_vdev.c | 10 ++---- drivers/bus/auxiliary/auxiliary_common.c | 17 +++++++--- drivers/bus/cdx/cdx.c | 13 +++++--- drivers/bus/dpaa/dpaa_bus.c | 7 ++-- drivers/bus/fslmc/fslmc_bus.c | 9 ++++-- drivers/bus/ifpga/ifpga_bus.c | 14 +++++--- drivers/bus/pci/pci_common.c | 7 ++-- drivers/bus/platform/platform.c | 15 ++++++--- drivers/bus/uacce/uacce.c | 14 +++++--- drivers/bus/vdev/vdev.c | 23 +++++++++++-- drivers/bus/vmbus/vmbus_common.c | 9 ++++-- drivers/dma/idxd/idxd_bus.c | 9 ++++-- drivers/raw/ifpga/ifpga_rawdev.c | 8 +---- lib/eal/common/eal_common_bus.c | 2 +- lib/eal/common/eal_common_dev.c | 41 +++++++++++++++++++++--- lib/eal/common/hotplug_mp.c | 11 ++----- lib/eal/include/bus_driver.h | 24 +++++++++++++- lib/eal/include/rte_dev.h | 15 +++++++++ lib/eal/linux/eal_dev.c | 10 +----- lib/eal/version.map | 1 + 20 files changed, 180 insertions(+), 79 deletions(-)app/test/test_vdev.c +2
-8@@ -20,12 +20,6 @@ static const char * const valid_keys[] = { NULL, }; -static int -cmp_dev_name (const struct rte_device *dev,const void *name) -{ -return strcmp (rte_dev_name (dev), name); -} -static int cmp_dev_match (const struct rte_device *dev,const void *_kvlist) {@@ -82,7 +76,7 @@ test_vdev_bus(void)printf ("Failed to create vdev net_null_test0\n" ); goto fail; } - dev0 = vdev_bus->find_device (NULL , cmp_dev_name,"net_null_test0" ); + dev0 = vdev_bus->find_device (NULL , rte_cmp_dev_name,"net_null_test0" );if (dev0 ==NULL ) {printf ("Cannot find net_null_test0 vdev\n" ); goto fail;@@ -93,7 +87,7 @@ test_vdev_bus(void)printf ("Failed to create vdev net_null_test1\n" ); goto fail; } - dev1 = vdev_bus->find_device (NULL , cmp_dev_name,"net_null_test1" ); + dev1 = vdev_bus->find_device (NULL , rte_cmp_dev_name,"net_null_test1" );if (dev1 ==NULL ) {printf ("Cannot find net_null_test1 vdev\n" ); goto fail;drivers/bus/auxiliary/auxiliary_common.c +12
-5@@ -237,10 +237,9 @@ auxiliary_probe(void) }static int -auxiliary_parse (const char *name,void *addr) +auxiliary_parse (const char *name,void *addr,int *size) {struct rte_auxiliary_driver *drv =NULL ; -const char **out = addr;/* Allow empty device name "auxiliary:" to bypass entire bus scan. */ if (strlen (name) ==0 )@@ -250,9 +249,17 @@ auxiliary_parse(const char *name, void *addr)if (drv->match (name))break ; } -if (drv !=NULL && addr !=NULL ) - *out = name; -return drv !=NULL ?0 :-1 ; + +if (drv ==NULL ) +return -1 ; + +if (size !=NULL ) + *size =strlen (name) +1 ; + +if (addr !=NULL ) +rte_strscpy (addr, name,strlen (name) +1 ); + +return 0 ; }/* Register a driver */ drivers/bus/cdx/cdx.c +9
-4@@ -464,15 +464,20 @@ cdx_probe(void) }static int -cdx_parse (const char *name,void *addr) +cdx_parse (const char *name,void *addr,int *size) { -const char **out = addr;int ret; ret =strncmp (name,CDX_DEV_PREFIX ,strlen (CDX_DEV_PREFIX )); -if (ret ==0 && addr) - *out = name; +if (ret !=0 ) +return ret; + +if (size !=NULL ) + *size =strlen (name) +1 ; + +if (addr !=NULL ) +rte_strscpy (addr, name,strlen (name) +1 );return ret; }drivers/bus/dpaa/dpaa_bus.c +5
-2@@ -153,7 +153,7 @@ dpaa_devargs_lookup(struct rte_dpaa_device *dev)char dev_name[32 ]; RTE_EAL_DEVARGS_FOREACH("dpaa_bus", devargs) { - devargs->bus->parse (devargs->name, &dev_name); + devargs->bus->parse (devargs->name, &dev_name,NULL );if (strcmp (dev_name, dev->device.name) ==0 ) {DPAA_BUS_INFO ("**Devargs matched %s" , dev_name);return devargs;@@ -447,7 +447,7 @@ dpaa_portal_finish(void *arg) }static int -rte_dpaa_bus_parse (const char *name,void *out) +rte_dpaa_bus_parse (const char *name,void *out,int *size) {unsigned int i, j;size_t delta, dev_delta;@@ -494,6 +494,9 @@ rte_dpaa_bus_parse(const char *name, void *out) max_name_len =sizeof ("fm.-mac.." ) -1 ; } +if (size !=NULL ) + *size = max_name_len +1 ; +if (out !=NULL ) {char *out_name = out;drivers/bus/fslmc/fslmc_bus.c +2
-2@@ -103,7 +103,7 @@ fslmc_devargs_lookup(struct rte_dpaa2_device *dev)char dev_name[32 ]; RTE_EAL_DEVARGS_FOREACH("fslmc", devargs) { - devargs->bus->parse (devargs->name, &dev_name); + devargs->bus->parse (devargs->name, &dev_name,NULL );if (strcmp (dev_name, dev->device.name) ==0 ) {DPAA2_BUS_INFO ("**Devargs matched %s" , dev_name);return devargs;@@ -235,7 +235,7 @@ scan_one_fslmc_device(char *dev_name) }static int -rte_fslmc_parse (const char *name,void *addr) +rte_fslmc_parse (const char *name,void *addr,int *size) {uint16_t dev_id;char *t_ptr;
drivers/bus/fslmc/fslmc_bus.c rte_fslmc_parse(const char *name, void *addr) · line 306
Quoted 10 lines
drivers/bus/fslmc/fslmc_bus.c +4
-1@@ -298,7 +298,10 @@ rte_fslmc_parse(const char *name, void *addr) goto err_out; } -if (addr) +if (size !=NULL ) + *size =strlen (sep) +1 ; + +if (addr !=NULL )strcpy (addr, sep); };
for DPAA/FSLMC:
Re: [PATCH v5 2/4] lib: fix comparison between devices
In reply to Shani Peretz06/02/2025 01:08, Shani Peretz:
Quoted 22 lines
DPDK supports multiple formats for specifying buses, (such as "0000:08:00.0" and "08:00.0" for PCI). This flexibility can lead to inconsistencies when using one format while running testpmd, then attempts to use the other format in a later command, resulting in a failure.
The issue arises from the
find_devicefunction, which compares the user-provided string directly with thedevice->namein therte_devicestructure.
If we want to accurately compare these names, we'll need to bring both sides to the same representation by invoking the parse function on the user input.The proposed solution is to utilize the parse function implemented by each bus. When comparing names, we will call parse on the supplied string as well as on the device name itself and compare the results. As part of the change the parse function will now return the size of the parsed address.
This will allow consistent comparisons between different representations of same devices.
Quoted 6 lines
In addition, fixed vdev test to use the
rte_cmp_dev_namefunction instead of the custom one.Fixes a3ee360f4440 ("eal: add hotplug add/remove device")Signed-off-by Shani Peretz <[email protected]>
I like how it looks safer.
RE: [PATCH v5 2/4] lib: fix comparison between devices
In reply to Shani PeretzHi,
Quoted 38 lines
-----Original Message-----
From: Shani Peretz <[email protected]>
Sent: Thursday, February 6, 2025 8:09 AM
To: [email protected]
Cc: [email protected]; Shani Peretz <[email protected]>; Parav Pandit <[email protected]>; Xueming Li <[email protected]>; Nipun Gupta <[email protected]>; Nikhil Agarwal <[email protected]>; Hemant Agrawal <[email protected]>; Sachin Saxena <[email protected]>; Xu, Rosen <[email protected]>; Chenbo Xia <[email protected]>; Tomasz Duszynski <[email protected]>; Chengwen Feng <[email protected]>; Long Li <[email protected]>; Wei Hu <[email protected]>; Richardson, Bruce <[email protected]>; Laatz, Kevin <[email protected]>; Tyler Retzlaff <[email protected]>; Jan Blunck <[email protected]>
Subject: [PATCH v5 2/4] lib: fix comparison between devicesDPDK supports multiple formats for specifying buses, (such as "0000:08:00.0" and "08:00.0" for PCI).
This flexibility can lead to inconsistencies when using one format while running testpmd, then attempts to use the other format in a later command, resulting in a failure.The issue arises from the
find_devicefunction, which compares the user- provided string directly with thedevice->namein therte_devicestructure. If we want to accurately compare these names, we'll need to bring both sides to the same representation by invoking the parse function on the user input.The proposed solution is to utilize the parse function implemented by each bus. When comparing names, we will call parse on the supplied string as well as on the device name itself and compare the results.
As part of the change the parse function will now return the size of the parsed address.This will allow consistent comparisons between different representations of same devices.
Quoted 6 lines
In addition, fixed vdev test to use the
rte_cmp_dev_namefunction instead of the custom one.Fixes a3ee360f4440 ("eal: add hotplug add/remove device")Signed-off-by Shani Peretz <[email protected]>
Re: [PATCH v5 2/4] lib: fix comparison between devices
In reply to Shani PeretzQuoted 9 lines · On Thu, 6 Feb 2025 02:08:36 +0200 Shani Peretz <[email protected]> wrote:
static int
drivers/bus/cdx/cdx.c +1
-2-cdx_parse(const char *name, void *addr) +cdx_parse(const char *name, void *addr, int *size) { - const char **out = addr; int ret; ret =strncmp (name,CDX_DEV_PREFIX ,strlen (CDX_DEV_PREFIX ));
drivers/bus/cdx/cdx.c cdx_probe(void) · line 480
Quoted 10 lines
drivers/bus/cdx/cdx.c +8
-2-if (ret ==0 && addr) - *out = name; +if (ret !=0 ) +return ret; + +if (size !=NULL ) + *size =strlen (name) +1 ; + +if (addr !=NULL ) +rte_strscpy (addr, name,strlen (name) +1 );
Why use rte_strscpy() here?
The intention of strscpy() is to handle case where the resulting
buffer is limited in size. By using the input string length you aren't really doing anything different than strcpy(). Still unsafe if output (addr) is not big enough.
Re: [PATCH v5 2/4] lib: fix comparison between devices
Quoted 25 lines · Stephen Hemminger
Quoted 9 lines · On Thu, 6 Feb 2025 02:08:36 +0200 Shani Peretz <[email protected]> wrote:
static int
drivers/bus/cdx/cdx.c +1
-2-cdx_parse(const char *name, void *addr) +cdx_parse(const char *name, void *addr, int *size) { - const char **out = addr; int ret; ret =strncmp (name,CDX_DEV_PREFIX ,strlen (CDX_DEV_PREFIX ));drivers/bus/cdx/cdx.c cdx_probe(void) · line 480
Quoted 10 lines
drivers/bus/cdx/cdx.c +8
-2-if (ret ==0 && addr) - *out = name; +if (ret !=0 ) +return ret; + +if (size !=NULL ) + *size =strlen (name) +1 ; + +if (addr !=NULL ) +rte_strscpy (addr, name,strlen (name) +1 );Why use
rte_strscpy()here?
Quoted 3 lines
The intention of
strscpy()is to handle case where the resulting
buffer is limited in size. By using the input string length you aren't really doing anything different thanstrcpy(). Still unsafe if output (addr) is not big enough.
And using strlcpy is probably fine too, without having to use dpdk-specific string functions.
/Bruce
Re: [PATCH v5 2/4] lib: fix comparison between devices
Quoted 26 lines · On Tue, 11 Feb 2025 17:54:26 +0000 Bruce Richardson…
Quoted 25 lines · Stephen Hemminger
Quoted 9 lines · On Thu, 6 Feb 2025 02:08:36 +0200 Shani Peretz <[email protected]> wrote:
static int
drivers/bus/cdx/cdx.c +1
-2-cdx_parse(const char *name, void *addr) +cdx_parse(const char *name, void *addr, int *size) { - const char **out = addr; int ret; ret =strncmp (name,CDX_DEV_PREFIX ,strlen (CDX_DEV_PREFIX ));drivers/bus/cdx/cdx.c cdx_probe(void) · line 480
Quoted 10 lines
drivers/bus/cdx/cdx.c +8
-2-if (ret ==0 && addr) - *out = name; +if (ret !=0 ) +return ret; + +if (size !=NULL ) + *size =strlen (name) +1 ; + +if (addr !=NULL ) +rte_strscpy (addr, name,strlen (name) +1 );Why use
rte_strscpy()here?
Quoted 8 lines
Quoted 3 lines
The intention of
strscpy()is to handle case where the resulting
buffer is limited in size. By using the input string length you aren't really doing anything different thanstrcpy(). Still unsafe if output (addr) is not big enough.And using strlcpy is probably fine too, without having to use dpdk-specific string functions.
/Bruce
The issue is that any length argument needs to come from caller based on the size of the target buffer. Not from length of source string.
If you want to make parse code string safe, then either size needs to be always present and in/out parameter or need to have a src_size and resulting size as separate params.
RE: [PATCH v5 2/4] lib: fix comparison between devices
Hey,
Sorry for my late response, I sent a fix (v7):
https://patches.dpdk.org/project/dpdk/patch/[email protected]/
I added another parameter to the parse function - the size of the memory pointed by addr. so the function signature now is:
int XXX_parse(const char *name, void *addr, int addr_size, int *out_size) So I now use it in rte_strscpy.
In addition, should I replace the call to rte_strscpy with strlcpy?
Quoted 64 lines
-----Original Message-----
From: Stephen Hemminger <[email protected]>
Sent: Tuesday, 11 February 2025 20:05
To: Bruce Richardson <[email protected]>
Cc: Shani Peretz <[email protected]>; [email protected]; Parav Pandit <[email protected]>; Xueming Li <[email protected]>; Nipun Gupta <[email protected]>; Nikhil Agarwal <[email protected]>; Hemant Agrawal <[email protected]>; Sachin Saxena <[email protected]>; Rosen Xu <[email protected]>; Chenbo Xia <[email protected]>; Tomasz Duszynski <[email protected]>; Chengwen Feng <[email protected]>; NBU-Contact-longli (EXTERNAL) <[email protected]>; Wei Hu <[email protected]>; Kevin Laatz <[email protected]>; Tyler Retzlaff <[email protected]>; Jan Blunck <[email protected]>
Subject: Re: [PATCH v5 2/4] lib: fix comparison between devicesExternal email: Use caution opening links or attachments
Quoted 26 lines · On Tue, 11 Feb 2025 17:54:26 +0000 Bruce Richardson…
Quoted 25 lines · Stephen Hemminger
Quoted 9 lines · On Thu, 6 Feb 2025 02:08:36 +0200 Shani Peretz <[email protected]> wrote:
static int
drivers/bus/cdx/cdx.c +1
-2-cdx_parse(const char *name, void *addr) +cdx_parse(const char *name, void *addr, int *size) { - const char **out = addr; int ret; ret =strncmp (name,CDX_DEV_PREFIX ,strlen (CDX_DEV_PREFIX ));drivers/bus/cdx/cdx.c cdx_probe(void) · line 480
Quoted 10 lines
drivers/bus/cdx/cdx.c +8
-2-if (ret ==0 && addr) - *out = name; +if (ret !=0 ) +return ret; + +if (size !=NULL ) + *size =strlen (name) +1 ; + +if (addr !=NULL ) +rte_strscpy (addr, name,strlen (name) +1 );Why use
rte_strscpy()here?Quoted 3 lines
Quoted 3 lines
The intention of
strscpy()is to handle case where the resulting buffer is limited in size. By using the input string length you aren't really doing anything different thanstrcpy(). Still unsafe if output(addr) is not big enough.
Quoted 5 lines
And using strlcpy is probably fine too, without having to use dpdk-specific string functions.
/Bruce
The issue is that any length argument needs to come from caller based on the size of the target buffer. Not from length of source string.
If you want to make parse code string safe, then either size needs to be always present and in/out parameter or need to have a
src_sizeand resulting size as separate params.
PATCH v5 3/4 app/test: add tests to find devices
In reply to Shani PeretzAdded tests to PCI and vdev bus that compare and find devices in various forms of names under test_devargs.
The tests check the functionality of the rte_cmp_dev_name function by calling it with different variations of names, like short and full, full and full, etc.
--- app/test/test_devargs.c | 125 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 124 insertions(+), 1 deletion(-)
app/test/test_devargs.c +124 -1
@@ -12,7 +12,9 @@#include <rte_kvargs.h> #include <bus_driver.h> #include <rte_class.h> +#include <rte_bus_vdev.h> +#include "virtual_pmd.h" #include "test.h" /* Check layer arguments. */
@@ -171,7 +173,7 @@ test_valid_devargs(void)int ret; ret =test_valid_devargs_cases (list,RTE_DIM (list)); -if (vdev_bus !=NULL && vdev_bus->parse ("net_ring0" ,NULL ) ==0 ) +if (vdev_bus !=NULL && vdev_bus->parse ("net_ring0" ,NULL ,NULL ) ==0 )/* Ring vdev driver enabled. */ ret |=test_valid_devargs_cases (legacy_ring_list,RTE_DIM (legacy_ring_list));
@@ -302,6 +304,121 @@ test_invalid_devargs_parsing(void)return fail; } +static struct rte_device * +create_pci_dev (const char *name) +{ +int port_id; +struct rte_ether_addr mac_addr = { + .addr_bytes = { +0x00 ,0xFF ,0x00 ,0xFF ,0x00 ,0x00 + } + }; + +char pmd_name[RTE_ETH_NAME_MAX_LEN ]; +strlcpy (pmd_name, name,RTE_ETH_NAME_MAX_LEN ); + + port_id =virtual_ethdev_create (pmd_name, + &mac_addr,rte_socket_id (),1 ); + +if (port_id <0 ) +return NULL ; + +return (&rte_eth_devices[port_id])->device; +} + +static int +test_pci (struct rte_bus *pci_bus,const char *dev_name,const char *name2) +{ +struct rte_device *pci_dev =create_pci_dev (dev_name); + +if (pci_dev ==NULL ) +return -1 ; + + pci_dev->bus = pci_bus; + +if (rte_cmp_dev_name (pci_dev, name2) !=0 ) { +printf ("rte_cmp_dev_name(%s, %s) device name (%s) not expected (%s)\n" , + pci_dev->name, name2, pci_dev->name, name2); +return -1 ; + } +return 0 ; +} + +static int +test_vdev (struct rte_bus *vdev_bus,const char *dev_name,const char *name2) +{ +/* create vdev */ +if (rte_vdev_init (dev_name,"" ) <0 ) { +printf ("Failed to create vdev %s\n" , dev_name); +return -1 ; + } + +struct rte_device *vdev_dev = vdev_bus->find_device (NULL , rte_cmp_dev_name, dev_name); +if (vdev_dev ==NULL ) { +printf ("Cannot find %s vdev\n" , dev_name); +rte_vdev_uninit (dev_name); +return -1 ; + } +int ret =rte_cmp_dev_name (vdev_dev, name2); +if (ret !=0 ) { +printf ("rte_cmp_dev_name(%s, %s) device name (%s) not expected (%s)\n" , + vdev_dev->name, name2, vdev_dev->name, name2); +return -1 ; + } + +if (vdev_dev != vdev_bus->find_device (NULL , rte_cmp_dev_name, name2)) { +printf ("rte_cmp_dev_name(%s, %s) device name (%s) not expected (%s)\n" , + vdev_dev->name, name2, vdev_dev->name, name2); +return -1 ; + } + +rte_vdev_uninit (dev_name); +return 0 ; +} + +static int +test_valid_cmp_dev_name (void ) +{ +struct rte_bus *pci_bus =rte_bus_find_by_name ("pci" ); +struct rte_bus *vdev_bus =rte_bus_find_by_name ("vdev" ); + +if (pci_bus) { +if ((test_pci (pci_bus,"0000:08:11.0" ,"08:11.0" ) !=0 ) || + (test_pci (pci_bus,"08:12.0" ,"0000:08:12.0" ) !=0 ) || + (test_pci (pci_bus,"08:13.0" ,"08:13.0" ) !=0 ) || + (test_pci (pci_bus,"0000:08:14.0" ,"0000:08:14.0" ) !=0 )) +return -1 ; + } + +if (vdev_bus) { +if (test_vdev (vdev_bus,"net_null_test0" ,"net_null_test0" ) !=0 ) +return -1 ; + } +return 0 ; +} + +static int +test_invalid_cmp_dev_name (void ) +{ +struct rte_bus *pci_bus =rte_bus_find_by_name ("pci" ); +struct rte_bus *vdev_bus =rte_bus_find_by_name ("vdev" ); + +if (pci_bus) { +if ((test_pci (pci_bus,"0000:08:15.0" ,"08:00.0" ) ==0 ) || + (test_pci (pci_bus,"08:16.0" ,"0000:08:15.0" ) ==0 ) || + (test_pci (pci_bus,"08:17.0" ,"08:13.0" ) ==0 ) || + (test_pci (pci_bus,"0000:08:18.0" ,"0000:08:14.0" ) ==0 )) +return -1 ; + } + +if (vdev_bus) { +if ((test_vdev (vdev_bus,"net_null_test0" ,"net_null_test" ) ==0 ) || + (test_vdev (vdev_bus,"net_null_test1" ,"net_null_test2" ) ==0 )) +return -1 ; + } +return 0 ; +} +static int test_devargs (void ) {
@@ -317,6 +434,12 @@ test_devargs(void)printf ("== test devargs parsing invalid case ==\n" );if (test_invalid_devargs_parsing () <0 )return -1 ; +printf ("== test find device valid case ==\n" ); +if (test_valid_cmp_dev_name () <0 ) +return -1 ; +printf ("== test find device invalid case ==\n" ); +if (test_invalid_cmp_dev_name () <0 ) +return -1 ;return 0 ; }
Signature · 1 line
2.34.1
Re: [PATCH v5 3/4] app/test: add tests to find devices
app/test/test_devargs.c test_invalid_devargs_parsing(void) · line 317
Quoted 11 lines · On Thu, 6 Feb 2025 02:08:37 +0200 Shani Peretz <[email protected]> wrote:
app/test/test_devargs.c +11
-0+static struct rte_device * +create_pci_dev (const char *name) +{ +int port_id; +struct rte_ether_addr mac_addr = { + .addr_bytes = { +0x00 ,0xFF ,0x00 ,0xFF ,0x00 ,0x00 + } + }; + +char pmd_name[RTE_ETH_NAME_MAX_LEN ];
Why hardcode a MAC address, which could lead to future issues. Instead use rte_eth_random_addr().
PATCH v5 4/4 lib: change find device and cmp dev name functions
In reply to Shani PeretzChange find_device and rte_cmp_dev_name to accept a struct with pointer and size instead of a void* pointer.
--- app/test/test_devargs.c | 23 +++++++++++++++++++---- app/test/test_vdev.c | 23 ++++++++++++++++++----- drivers/bus/auxiliary/auxiliary_common.c | 2 +- drivers/bus/auxiliary/auxiliary_params.c | 10 +++++++--- drivers/bus/cdx/cdx.c | 12 ++++++++---- drivers/bus/dpaa/dpaa_bus.c | 2 +- drivers/bus/fslmc/fslmc_bus.c | 2 +- drivers/bus/ifpga/ifpga_bus.c | 2 +- drivers/bus/pci/pci_common.c | 2 +- drivers/bus/pci/pci_params.c | 10 +++++++--- drivers/bus/platform/platform.c | 3 ++- drivers/bus/platform/platform_params.c | 10 +++++++--- drivers/bus/uacce/uacce.c | 13 +++++++++---- drivers/bus/vdev/vdev.c | 2 +- drivers/bus/vdev/vdev_params.c | 10 +++++++--- drivers/bus/vdev/vdev_private.h | 2 +- drivers/bus/vmbus/vmbus_common.c | 2 +- drivers/dma/idxd/idxd_bus.c | 4 ++-- drivers/net/bonding/rte_eth_bond_args.c | 15 +++++---------- drivers/net/vdev_netvsc/vdev_netvsc.c | 8 ++++++-- drivers/raw/ifpga/ifpga_rawdev.c | 6 +++++- lib/eal/common/eal_common_bus.c | 10 +++++++--- lib/eal/common/eal_common_dev.c | 18 +++++++++++++----- lib/eal/common/hotplug_mp.c | 12 ++++++++++-- lib/eal/include/bus_driver.h | 2 +- lib/eal/include/rte_dev.h | 15 ++++++++++----- lib/eal/linux/eal_dev.c | 6 +++++- 27 files changed, 156 insertions(+), 70 deletions(-)
app/test/test_devargs.c +19 -4
@@ -336,7 +336,12 @@ test_pci(struct rte_bus *pci_bus, const char *dev_name, const char *name2) pci_dev->bus = pci_bus; -if (rte_cmp_dev_name (pci_dev, name2) !=0 ) { +struct rte_bus_address addr = { + .addr = name2, + .size =strlen (name2) + }; + +if (rte_cmp_dev_name (pci_dev, &addr) !=0 ) {printf ("rte_cmp_dev_name(%s, %s) device name (%s) not expected (%s)\n" , pci_dev->name, name2, pci_dev->name, name2);return -1 ;
@@ -353,20 +358,30 @@ test_vdev(struct rte_bus *vdev_bus, const char *dev_name, const char *name2)return -1 ; } -struct rte_device *vdev_dev = vdev_bus->find_device (NULL , rte_cmp_dev_name, dev_name); +struct rte_bus_address dev_addr = { + .addr = dev_name, + .size =strlen (dev_name) + }; + +struct rte_device *vdev_dev = vdev_bus->find_device (NULL , rte_cmp_dev_name, &dev_addr);if (vdev_dev ==NULL ) {printf ("Cannot find %s vdev\n" , dev_name);rte_vdev_uninit (dev_name);return -1 ; } -int ret =rte_cmp_dev_name (vdev_dev, name2); + +struct rte_bus_address dev_addr2 = { + .addr = name2, + .size =strlen (name2) + }; +int ret =rte_cmp_dev_name (vdev_dev, &dev_addr2);if (ret !=0 ) {printf ("rte_cmp_dev_name(%s, %s) device name (%s) not expected (%s)\n" , vdev_dev->name, name2, vdev_dev->name, name2);return -1 ; } -if (vdev_dev != vdev_bus->find_device (NULL , rte_cmp_dev_name, name2)) { +if (vdev_dev != vdev_bus->find_device (NULL , rte_cmp_dev_name, &dev_addr2)) {printf ("rte_cmp_dev_name(%s, %s) device name (%s) not expected (%s)\n" , vdev_dev->name, name2, vdev_dev->name, name2);return -1 ;
app/test/test_vdev.c +18 -5
@@ -21,9 +21,9 @@ static const char * const valid_keys[] = { };static int -cmp_dev_match (const struct rte_device *dev,const void *_kvlist) +cmp_dev_match (const struct rte_device *dev,const struct rte_bus_address *_kvlist) { -const struct rte_kvargs *kvlist = _kvlist; +const struct rte_kvargs *kvlist = _kvlist->addr;const char *key =TEST_VDEV_KEY_NAME ;const char *name;
@@ -54,7 +54,11 @@ get_matching_vdev(const char *match_str) } } - dev = vdev_bus->find_device (NULL , cmp_dev_match, kvargs); +struct rte_bus_address dev_addr = { + .addr = kvargs, + .size =sizeof (struct rte_kvargs ), + }; + dev = vdev_bus->find_device (NULL , cmp_dev_match, &dev_addr);rte_kvargs_free (kvargs);return dev;
@@ -76,7 +80,12 @@ test_vdev_bus(void)printf ("Failed to create vdev net_null_test0\n" ); goto fail; } - dev0 = vdev_bus->find_device (NULL , rte_cmp_dev_name,"net_null_test0" ); + +struct rte_bus_address dev0_addr = { + .addr ="net_null_test0" , + .size =strlen ("net_null_test0" ) + }; + dev0 = vdev_bus->find_device (NULL , rte_cmp_dev_name, &dev0_addr);if (dev0 ==NULL ) {printf ("Cannot find net_null_test0 vdev\n" ); goto fail;
@@ -87,7 +96,11 @@ test_vdev_bus(void)printf ("Failed to create vdev net_null_test1\n" ); goto fail; } - dev1 = vdev_bus->find_device (NULL , rte_cmp_dev_name,"net_null_test1" ); +struct rte_bus_address dev1_addr = { + .addr ="net_null_test1" , + .size =strlen ("net_null_test1" ) + }; + dev1 = vdev_bus->find_device (NULL , rte_cmp_dev_name, &dev1_addr);if (dev1 ==NULL ) {printf ("Cannot find net_null_test1 vdev\n" ); goto fail;
drivers/bus/auxiliary/auxiliary_common.c +1 -1
@@ -300,7 +300,7 @@ rte_auxiliary_remove_device(struct rte_auxiliary_device *auxiliary_dev)static struct rte_device *auxiliary_find_device (const struct rte_device *start,rte_dev_cmp_t cmp, -const void *data) +const struct rte_bus_address *data) {const struct rte_auxiliary_device *pstart;struct rte_auxiliary_device *adev;
drivers/bus/auxiliary/auxiliary_params.c +7 -3
@@ -22,9 +22,9 @@ static const char * const auxiliary_params_keys[] = {static int auxiliary_dev_match (const struct rte_device *dev, -const void *_kvlist) +const struct rte_bus_address *_kvlist) { -const struct rte_kvargs *kvlist = _kvlist; +const struct rte_kvargs *kvlist = _kvlist->addr;const char *key = auxiliary_params_keys[RTE_AUXILIARY_PARAM_NAME ];const char *name;
@@ -59,7 +59,11 @@ auxiliary_dev_iterate(const void *start, } } find_device = auxiliary_bus.bus.find_device; - dev =find_device (start, auxiliary_dev_match, kvargs); +struct rte_bus_address dev_addr = { + .addr = kvargs, + .size =sizeof (struct rte_kvargs ), + }; + dev =find_device (start, auxiliary_dev_match, &dev_addr);rte_kvargs_free (kvargs);return dev; }
drivers/bus/cdx/cdx.c +8 -4
@@ -500,7 +500,7 @@ rte_cdx_unregister(struct rte_cdx_driver *driver)static struct rte_device *cdx_find_device (const struct rte_device *start,rte_dev_cmp_t cmp, -const void *data) +const struct rte_bus_address *data) {const struct rte_cdx_device *cdx_start;struct rte_cdx_device *cdx_dev;
@@ -613,9 +613,9 @@ cdx_get_iommu_class(void)static int cdx_dev_match (const struct rte_device *dev, -const void *_kvlist) +const struct rte_bus_address *_kvlist) { -const struct rte_kvargs *kvlist = _kvlist; +const struct rte_kvargs *kvlist = _kvlist->addr;const char *key = cdx_params_keys[RTE_CDX_PARAM_NAME ];const char *name;
@@ -649,7 +649,11 @@ cdx_dev_iterate(const void *start, } } find_device = rte_cdx_bus.bus.find_device; - dev =find_device (start, cdx_dev_match, kvargs); +struct rte_bus_address dev_addr = { + .addr = kvargs, + .size =sizeof (struct rte_kvargs ), + }; + dev =find_device (start, cdx_dev_match, &dev_addr);rte_kvargs_free (kvargs);return dev; }
drivers/bus/dpaa/dpaa_bus.c +1 -1
@@ -745,7 +745,7 @@ rte_dpaa_bus_probe(void)static struct rte_device *rte_dpaa_find_device (const struct rte_device *start,rte_dev_cmp_t cmp, -const void *data) +const struct rte_bus_address *data) {struct rte_dpaa_device *dev;const struct rte_dpaa_device *dstart;
drivers/bus/fslmc/fslmc_bus.c +1 -1
@@ -497,7 +497,7 @@ rte_fslmc_probe(void)static struct rte_device *rte_fslmc_find_device (const struct rte_device *start,rte_dev_cmp_t cmp, -const void *data) +const struct rte_bus_address *data) {const struct rte_dpaa2_device *dstart;struct rte_dpaa2_device *dev;
drivers/bus/ifpga/ifpga_bus.c +1 -1
@@ -443,7 +443,7 @@ ifpga_unplug(struct rte_device *dev)static struct rte_device *ifpga_find_device (const struct rte_device *start, -rte_dev_cmp_t cmp,const void *data) +rte_dev_cmp_t cmp,const struct rte_bus_address *data) {struct rte_afu_device *afu_dev;
drivers/bus/pci/pci_common.c +1 -1
@@ -540,7 +540,7 @@ rte_pci_remove_device(struct rte_pci_device *pci_dev)static struct rte_device *pci_find_device (const struct rte_device *start,rte_dev_cmp_t cmp, -const void *data) +const struct rte_bus_address *data) {const struct rte_pci_device *pstart;struct rte_pci_device *pdev;
drivers/bus/pci/pci_params.c +7 -3
@@ -41,9 +41,9 @@ pci_addr_kv_cmp(const char *key __rte_unused,static int pci_dev_match (const struct rte_device *dev, -const void *_kvlist) +const struct rte_bus_address *_kvlist) { -const struct rte_kvargs *kvlist = _kvlist; +const struct rte_kvargs *kvlist = _kvlist->addr;const struct rte_pci_device *pdev;if (kvlist ==NULL )
@@ -76,7 +76,11 @@ rte_pci_dev_iterate(const void *start, } } find_device = rte_pci_bus.bus.find_device; - dev =find_device (start, pci_dev_match, kvargs); +struct rte_bus_address dev_addr = { + .addr = kvargs, + .size =sizeof (struct rte_kvargs ), + }; + dev =find_device (start, pci_dev_match, &dev_addr);rte_kvargs_free (kvargs);return dev; }
drivers/bus/platform/platform.c +2 -1
@@ -473,7 +473,8 @@ platform_bus_probe(void) }static struct rte_device * -platform_bus_find_device (const struct rte_device *start,rte_dev_cmp_t cmp,const void *data) +platform_bus_find_device (const struct rte_device *start,rte_dev_cmp_t cmp, +const struct rte_bus_address *data) {struct rte_platform_device *pdev;
drivers/bus/platform/platform_params.c +7 -3
@@ -27,10 +27,10 @@ static const char * const platform_params_keys[] = { };static int -platform_dev_match (const struct rte_device *dev,const void *_kvlist) +platform_dev_match (const struct rte_device *dev,const struct rte_bus_address *_kvlist) {const char *key = platform_params_keys[RTE_PLATFORM_PARAM_NAME ]; -const struct rte_kvargs *kvlist = _kvlist; +const struct rte_kvargs *kvlist = _kvlist->addr;const char *name;/* no kvlist arg, all devices match */
@@ -68,7 +68,11 @@ platform_bus_dev_iterate(const void *start, const char *str,return NULL ; } - dev = platform_bus.bus.find_device (start, platform_dev_match, kvargs); +struct rte_bus_address dev_addr = { + .addr = kvargs, + .size =sizeof (struct rte_kvargs ), + }; + dev = platform_bus.bus.find_device (start, platform_dev_match, &dev_addr);rte_kvargs_free (kvargs);return dev;
drivers/bus/uacce/uacce.c +9 -4
@@ -508,7 +508,8 @@ uacce_unplug(struct rte_device *dev) }static struct rte_device * -uacce_find_device (const struct rte_device *start,rte_dev_cmp_t cmp,const void *data) +uacce_find_device (const struct rte_device *start,rte_dev_cmp_t cmp, +const struct rte_bus_address *data) {const struct rte_uacce_device *uacce_start;struct rte_uacce_device *uacce_dev;
@@ -549,10 +550,10 @@ uacce_parse(const char *name, void *addr, int *size) }static int -uacce_dev_match (const struct rte_device *dev,const void *_kvlist) +uacce_dev_match (const struct rte_device *dev,const struct rte_bus_address *_kvlist) {const char *key = uacce_params_keys[RTE_UACCE_PARAM_NAME ]; -const struct rte_kvargs *kvlist = _kvlist; +const struct rte_kvargs *kvlist = _kvlist->addr;const char *name;/* no kvlist arg, all devices match. */
@@ -583,7 +584,11 @@ uacce_dev_iterate(const void *start, const char *str, } } find_device = uacce_bus.bus.find_device; - dev =find_device (start, uacce_dev_match, kvargs); +struct rte_bus_address dev_addr = { + .addr = kvargs, + .size =sizeof (struct rte_kvargs ), + }; + dev =find_device (start, uacce_dev_match, &dev_addr);rte_kvargs_free (kvargs);return dev; }
drivers/bus/vdev/vdev.c +1 -1
@@ -621,7 +621,7 @@ vdev_cleanup(void)struct rte_device *rte_vdev_find_device (const struct rte_device *start,rte_dev_cmp_t cmp, -const void *data) +const struct rte_bus_address *data) {const struct rte_vdev_device *vstart;struct rte_vdev_device *dev;
drivers/bus/vdev/vdev_params.c +7 -3
@@ -24,9 +24,9 @@ static const char * const vdev_params_keys[] = {static int vdev_dev_match (const struct rte_device *dev, -const void *_kvlist) +const struct rte_bus_address *_kvlist) { -const struct rte_kvargs *kvlist = _kvlist; +const struct rte_kvargs *kvlist = _kvlist->addr;const char *key = vdev_params_keys[RTE_VDEV_PARAM_NAME ];const char *name;
@@ -58,7 +58,11 @@ rte_vdev_dev_iterate(const void *start,return NULL ; } } - dev =rte_vdev_find_device (start, vdev_dev_match, kvargs); +struct rte_bus_address dev_addr = { + .addr = kvargs, + .size =sizeof (struct rte_kvargs ), + }; + dev =rte_vdev_find_device (start, vdev_dev_match, &dev_addr);rte_kvargs_free (kvargs);return dev; }
drivers/bus/vdev/vdev_private.h +1 -1
@@ -14,7 +14,7 @@ extern "C" {struct rte_device *rte_vdev_find_device (const struct rte_device *start,rte_dev_cmp_t cmp, -const void *data); +const struct rte_bus_address *data);void * rte_vdev_dev_iterate(const void *start,
drivers/bus/vmbus/vmbus_common.c +1 -1
@@ -323,7 +323,7 @@ vmbus_remove_device(struct rte_vmbus_device *vmbus_dev)/* VMBUS doesn't support hotplug */ static struct rte_device *vmbus_find_device (const struct rte_device *start,rte_dev_cmp_t cmp, -const void *data) +const struct rte_bus_address *data) {struct rte_vmbus_device *dev;
drivers/dma/idxd/idxd_bus.c +2 -2
@@ -45,7 +45,7 @@ struct dsa_bus;static int dsa_scan (void );static int dsa_probe (void );static struct rte_device *dsa_find_device (const struct rte_device *start, -rte_dev_cmp_t cmp,const void *data); +rte_dev_cmp_t cmp,const struct rte_bus_address *data);static enum rte_iova_mode dsa_get_iommu_class (void );static int dsa_addr_parse (const char *name,void *addr,int *size);
@@ -366,7 +366,7 @@ dsa_scan(void)static struct rte_device *dsa_find_device (const struct rte_device *start,rte_dev_cmp_t cmp, -const void *data) +const struct rte_bus_address *data) {struct rte_dsa_device *dev =TAILQ_FIRST (&dsa_bus.device_list);
drivers/net/bonding/rte_eth_bond_args.c +5 -10
@@ -23,15 +23,6 @@ const char *pmd_bond_init_valid_arguments[] = { NULL }; -static inline int -bond_pci_addr_cmp (const struct rte_device *dev,const void *_pci_addr) -{ -const struct rte_pci_device *pdev =RTE_DEV_TO_PCI_CONST (dev); -const struct rte_pci_addr *paddr = _pci_addr; - -return rte_pci_addr_cmp (&pdev->addr, paddr); -} -static inline int find_port_id_by_pci_addr (const struct rte_pci_addr *pci_addr) {
@@ -45,7 +36,11 @@ find_port_id_by_pci_addr(const struct rte_pci_addr *pci_addr)return -1 ; } - dev = pci_bus->find_device (NULL , bond_pci_addr_cmp, pci_addr); +struct rte_bus_address dev_addr = { + .addr = pci_addr, + .size =PCI_PRI_STR_SIZE + }; + dev = pci_bus->find_device (NULL , rte_cmp_dev_name, &dev_addr);if (dev ==NULL ) {RTE_BOND_LOG (ERR ,"unable to find PCI device" );return -1 ;
drivers/net/vdev_netvsc/vdev_netvsc.c +6 -2
@@ -771,7 +771,7 @@ RTE_PMD_REGISTER_PARAM_STRING(net_vdev_netvsc,/** Compare function for vdev find device operation. */ static int vdev_netvsc_cmp_rte_device (const struct rte_device *dev1, - __rte_unused const void *_dev2) + __rte_unused const struct rte_bus_address *_dev2) {return strncmp (dev1->devargs->name,VDEV_NETVSC_DRIVER_NAME ,VDEV_NETVSC_DRIVER_NAME_LEN );
@@ -794,8 +794,12 @@ vdev_netvsc_scan_callback(__rte_unused void *arg) VDEV_NETVSC_DRIVER_NAME_LEN))return ; +struct rte_bus_address dev_addr = { + .addr =VDEV_NETVSC_DRIVER_NAME , + .size =VDEV_NETVSC_DRIVER_NAME_LEN , + }; dev = vbus->find_device (NULL , vdev_netvsc_cmp_rte_device, -VDEV_NETVSC_DRIVER_NAME ); + &dev_addr);if (dev)return ;if (rte_devargs_add (RTE_DEVTYPE_VIRTUAL ,VDEV_NETVSC_DRIVER_NAME ))
drivers/raw/ifpga/ifpga_rawdev.c +5 -1
@@ -1868,7 +1868,11 @@ ifpga_cfg_remove(struct rte_vdev_device *vdev) args.port, args.bdf); bus =rte_bus_find_by_name (RTE_STR (IFPGA_BUS_NAME ));if (bus) { -if (bus->find_device (NULL , rte_cmp_dev_name, dev_name)) { +struct rte_bus_address dev_addr = { + .addr = dev_name, + .size =RTE_RAWDEV_NAME_MAX_LEN + }; +if (bus->find_device (NULL , rte_cmp_dev_name, &dev_addr)) { ret =rte_eal_hotplug_remove (RTE_STR (IFPGA_BUS_NAME ), dev_name); }
lib/eal/common/eal_common_bus.c +7 -3
@@ -159,9 +159,9 @@ rte_bus_find(const struct rte_bus *start, rte_bus_cmp_t cmp, }static int -cmp_rte_device (const struct rte_device *dev1,const void *_dev2) +cmp_rte_device (const struct rte_device *dev1,const struct rte_bus_address *_dev2) { -const struct rte_device *dev2 = _dev2; +const struct rte_device *dev2 = _dev2->addr;return dev1 != dev2; }
@@ -171,7 +171,11 @@ bus_find_device(const struct rte_bus *bus, const void *_dev) {struct rte_device *dev; - dev = bus->find_device (NULL , cmp_rte_device, _dev); +struct rte_bus_address dev_addr = { + .addr = _dev, + .size =0 , + }; + dev = bus->find_device (NULL , cmp_rte_device, &dev_addr);return dev ==NULL ; }
lib/eal/common/eal_common_dev.c +13 -5
@@ -108,7 +108,7 @@ struct dev_next_ctx { (((struct dev_next_ctx *)(intptr_t)ptr)->cls_str)int -rte_cmp_dev_name (const struct rte_device *dev1,const void *name2) +rte_cmp_dev_name (const struct rte_device *dev1,const struct rte_bus_address *dev2_addr) {void *parsed_name1;void *parsed_name2;
@@ -117,7 +117,7 @@ rte_cmp_dev_name(const struct rte_device *dev1, const void *name2)int ret;if (dev1->bus->parse (dev1->name,NULL , &size1) !=0 || - dev1->bus->parse (name2,NULL , &size2) !=0 ) + dev1->bus->parse (dev2_addr->addr,NULL , &size2) !=0 )return 1 ;if (size1 != size2)
@@ -137,7 +137,7 @@ rte_cmp_dev_name(const struct rte_device *dev1, const void *name2)memset (parsed_name2,0 , size2); dev1->bus->parse (dev1->name, parsed_name1,NULL ); - dev1->bus->parse (name2, parsed_name2,NULL ); + dev1->bus->parse (dev2_addr->addr, parsed_name2,NULL ); ret =memcmp (parsed_name1, parsed_name2, size1);free (parsed_name1);
@@ -228,7 +228,11 @@ local_dev_probe(const char *devargs, struct rte_device **new_dev)if (ret) goto err_devarg; - dev = da->bus->find_device (NULL , rte_cmp_dev_name, da->name); +struct rte_bus_address dev_addr = { + .addr = da->name, + .size =RTE_DEV_NAME_MAX_LEN + }; + dev = da->bus->find_device (NULL , rte_cmp_dev_name, &dev_addr);if (dev ==NULL ) {EAL_LOG (ERR ,"Cannot find device (%s)" , da->name);
@@ -366,7 +370,11 @@ rte_eal_hotplug_remove(const char *busname, const char *devname)return -ENOENT ; } - dev = bus->find_device (NULL , rte_cmp_dev_name, devname); +struct rte_bus_address dev_addr = { + .addr = devname, + .size =strlen (devname) + }; + dev = bus->find_device (NULL , rte_cmp_dev_name, &dev_addr);if (dev ==NULL ) {EAL_LOG (ERR ,"Cannot find plugged device (%s)" , devname);return -EINVAL ;
lib/eal/common/hotplug_mp.c +10 -2
@@ -128,7 +128,11 @@ __handle_secondary_request(void *param) goto finish; } - dev = bus->find_device (NULL , rte_cmp_dev_name, da.name); +struct rte_bus_address dev_addr = { + .addr = da.name, + .size =RTE_DEV_NAME_MAX_LEN + }; + dev = bus->find_device (NULL , rte_cmp_dev_name, &dev_addr);if (dev ==NULL ) {EAL_LOG (ERR ,"Cannot find plugged device (%s)" , da.name); ret = -ENOENT ;
@@ -255,7 +259,11 @@ static void __handle_primary_request(void *param) goto quit; } - dev = bus->find_device (NULL , rte_cmp_dev_name, da->name); +struct rte_bus_address dev_addr = { + .addr = da->name, + .size =RTE_DEV_NAME_MAX_LEN + }; + dev = bus->find_device (NULL , rte_cmp_dev_name, &dev_addr);if (dev ==NULL ) {EAL_LOG (ERR ,"Cannot find plugged device (%s)" , da->name); ret = -ENOENT ;
lib/eal/include/bus_driver.h +1 -1
@@ -70,7 +70,7 @@ typedef int (*rte_bus_probe_t)(void);*/ typedef struct rte_device * (*rte_bus_find_device_t )(const struct rte_device *start,rte_dev_cmp_t cmp, -const void *data); +const struct rte_bus_address *data);/** * Implementation specific probe function which is responsible for linking
lib/eal/include/rte_dev.h +10 -5
@@ -171,19 +171,24 @@ int rte_dev_is_probed(const struct rte_device *dev);int rte_eal_hotplug_add (const char *busname,const char *devname,const char *drvargs); +struct rte_bus_address { +const void *addr; +size_t size; +}; +/** * General device name comparison. Will compare by using the specific bus * compare function or by comparing the names directly. * * @param dev * Device handle. -* @param name -* Name to compare against. +* @param addr +* Address to compare against. * @return -* 0 if the device matches the name. Nonzero otherwise. +* 0 if the device matches the address. Nonzero otherwise. */ __rte_internal -int rte_cmp_dev_name(const struct rte_device *dev, const void *name); +int rte_cmp_dev_name(const struct rte_device *dev, const struct rte_bus_address *addr);/** * Add matching devices.
@@ -245,7 +250,7 @@ int rte_dev_remove(struct rte_device *dev);* <0 if ordering is possible and the device is lower than the data. * >0 if ordering is possible and the device is greater than the data. */ -typedef int (*rte_dev_cmp_t )(const struct rte_device *dev,const void *data); +typedef int (*rte_dev_cmp_t )(const struct rte_device *dev,const struct rte_bus_address *data);#define RTE_PMD_EXPORT_NAME_ARRAY (n, idx) n##idx[]
lib/eal/linux/eal_dev.c +5 -1
@@ -272,8 +272,12 @@ dev_uev_handler(__rte_unused void *param) goto failure_handle_err; } +const struct rte_bus_address dev_addr = { + .addr = uevent.devname, + .size =strlen (uevent.devname) + }; dev = bus->find_device (NULL , rte_cmp_dev_name, - uevent.devname); + &dev_addr);if (dev ==NULL ) {EAL_LOG (ERR ,"Cannot find device (%s) on " "bus (%s)" , uevent.devname, busname);
Signature · 1 line
2.34.1
PATCH v6 1/4 bus/pci: fix registration of PCI device
When registering a new PCI device, the device->name field stored the user-provided string from devargs (e.g., "08:00.0" or "0000:08:00.0"). This approach led to inconsistencies when registering new devices.
This patch fix this issue by saving the parsed PCI in device->name, so when a new PCI device is registering the name displayed in the device list will be the parsed version.
--- drivers/bus/pci/pci_common.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-)
drivers/bus/pci/pci_common.c +2 -12
@@ -99,21 +99,11 @@ pci_common_set(struct rte_pci_device *dev)/* Each device has its internal, canonical name set. */ rte_pci_device_name (&dev->addr, dev->name,sizeof (dev->name)); + dev->device.name = dev->name; + devargs =pci_devargs_lookup (&dev->addr); dev->device.devargs = devargs; -/* When using a blocklist, only blocked devices will have -* an rte_devargs. Allowed devices won't have one. -*/ -if (devargs !=NULL ) -/* If an rte_devargs exists, the generic rte_device uses the -* given name as its name. -*/ - dev->device.name = dev->device.devargs->name; -else -/* Otherwise, it uses the internal, canonical form. */ - dev->device.name = dev->name; -if (dev->bus_info !=NULL ||asprintf (&dev->bus_info,"vendor_id=%" PRIx16", device_id=%" PRIx16, dev->id.vendor_id, dev->id.device_id) !=-1 )
Signature · 1 line
2.34.1
PATCH v6 2/4 lib: fix comparison between devices
DPDK supports multiple formats for specifying buses, (such as "0000:08:00.0" and "08:00.0" for PCI). This flexibility can lead to inconsistencies when using one format while running testpmd, then attempts to use the other format in a later command, resulting in a failure.
The issue arises from the find_device function, which compares the user-provided string directly with the device->name in the rte_device structure.
If we want to accurately compare these names, we'll need to bring both sides to the same representation by invoking the parse function on the user input.
The proposed solution is to utilize the parse function implemented by each bus. When comparing names, we will call parse on the supplied string as well as on the device name itself and compare the results. As part of the change the parse function will now return the size of the parsed address.
This will allow consistent comparisons between different representations of same devices.
In addition, fixed vdev test to use the rte_cmp_dev_name function instead of the custom one.
--- app/test/test_vdev.c | 10 ++---- drivers/bus/auxiliary/auxiliary_common.c | 17 +++++++--- drivers/bus/cdx/cdx.c | 13 +++++--- drivers/bus/dpaa/dpaa_bus.c | 7 ++-- drivers/bus/fslmc/fslmc_bus.c | 9 ++++-- drivers/bus/ifpga/ifpga_bus.c | 14 +++++--- drivers/bus/pci/pci_common.c | 7 ++-- drivers/bus/platform/platform.c | 15 ++++++--- drivers/bus/uacce/uacce.c | 14 +++++--- drivers/bus/vdev/vdev.c | 23 +++++++++++-- drivers/bus/vmbus/vmbus_common.c | 9 ++++-- drivers/dma/idxd/idxd_bus.c | 9 ++++-- drivers/raw/ifpga/ifpga_rawdev.c | 8 +---- lib/eal/common/eal_common_bus.c | 2 +- lib/eal/common/eal_common_dev.c | 41 +++++++++++++++++++++--- lib/eal/common/hotplug_mp.c | 11 ++----- lib/eal/include/bus_driver.h | 24 +++++++++++++- lib/eal/include/rte_dev.h | 15 +++++++++ lib/eal/linux/eal_dev.c | 10 +----- lib/eal/version.map | 1 + 20 files changed, 180 insertions(+), 79 deletions(-)
app/test/test_vdev.c +2 -8
@@ -20,12 +20,6 @@ static const char * const valid_keys[] = { NULL, }; -static int -cmp_dev_name (const struct rte_device *dev,const void *name) -{ -return strcmp (rte_dev_name (dev), name); -} -static int cmp_dev_match (const struct rte_device *dev,const void *_kvlist) {
@@ -82,7 +76,7 @@ test_vdev_bus(void)printf ("Failed to create vdev net_null_test0\n" ); goto fail; } - dev0 = vdev_bus->find_device (NULL , cmp_dev_name,"net_null_test0" ); + dev0 = vdev_bus->find_device (NULL , rte_cmp_dev_name,"net_null_test0" );if (dev0 ==NULL ) {printf ("Cannot find net_null_test0 vdev\n" ); goto fail;
@@ -93,7 +87,7 @@ test_vdev_bus(void)printf ("Failed to create vdev net_null_test1\n" ); goto fail; } - dev1 = vdev_bus->find_device (NULL , cmp_dev_name,"net_null_test1" ); + dev1 = vdev_bus->find_device (NULL , rte_cmp_dev_name,"net_null_test1" );if (dev1 ==NULL ) {printf ("Cannot find net_null_test1 vdev\n" ); goto fail;
drivers/bus/auxiliary/auxiliary_common.c +12 -5
@@ -237,10 +237,9 @@ auxiliary_probe(void) }static int -auxiliary_parse (const char *name,void *addr) +auxiliary_parse (const char *name,void *addr,int *size) {struct rte_auxiliary_driver *drv =NULL ; -const char **out = addr;/* Allow empty device name "auxiliary:" to bypass entire bus scan. */ if (strlen (name) ==0 )
@@ -250,9 +249,17 @@ auxiliary_parse(const char *name, void *addr)if (drv->match (name))break ; } -if (drv !=NULL && addr !=NULL ) - *out = name; -return drv !=NULL ?0 :-1 ; + +if (drv ==NULL ) +return -1 ; + +if (size !=NULL ) + *size =strlen (name) +1 ; + +if (addr !=NULL ) +rte_strscpy (addr, name,strlen (name) +1 ); + +return 0 ; }/* Register a driver */
drivers/bus/cdx/cdx.c +9 -4
@@ -464,15 +464,20 @@ cdx_probe(void) }static int -cdx_parse (const char *name,void *addr) +cdx_parse (const char *name,void *addr,int *size) { -const char **out = addr;int ret; ret =strncmp (name,CDX_DEV_PREFIX ,strlen (CDX_DEV_PREFIX )); -if (ret ==0 && addr) - *out = name; +if (ret !=0 ) +return ret; + +if (size !=NULL ) + *size =strlen (name) +1 ; + +if (addr !=NULL ) +rte_strscpy (addr, name,strlen (name) +1 );return ret; }
drivers/bus/dpaa/dpaa_bus.c +5 -2
@@ -153,7 +153,7 @@ dpaa_devargs_lookup(struct rte_dpaa_device *dev)char dev_name[32 ]; RTE_EAL_DEVARGS_FOREACH("dpaa_bus", devargs) { - devargs->bus->parse (devargs->name, &dev_name); + devargs->bus->parse (devargs->name, &dev_name,NULL );if (strcmp (dev_name, dev->device.name) ==0 ) {DPAA_BUS_INFO ("**Devargs matched %s" , dev_name);return devargs;
@@ -447,7 +447,7 @@ dpaa_portal_finish(void *arg) }static int -rte_dpaa_bus_parse (const char *name,void *out) +rte_dpaa_bus_parse (const char *name,void *out,int *size) {unsigned int i, j;size_t delta, dev_delta;
@@ -494,6 +494,9 @@ rte_dpaa_bus_parse(const char *name, void *out) max_name_len =sizeof ("fm.-mac.." ) -1 ; } +if (size !=NULL ) + *size = max_name_len +1 ; +if (out !=NULL ) {char *out_name = out;
drivers/bus/fslmc/fslmc_bus.c +6 -3
@@ -103,7 +103,7 @@ fslmc_devargs_lookup(struct rte_dpaa2_device *dev)char dev_name[32 ]; RTE_EAL_DEVARGS_FOREACH("fslmc", devargs) { - devargs->bus->parse (devargs->name, &dev_name); + devargs->bus->parse (devargs->name, &dev_name,NULL );if (strcmp (dev_name, dev->device.name) ==0 ) {DPAA2_BUS_INFO ("**Devargs matched %s" , dev_name);return devargs;
@@ -235,7 +235,7 @@ scan_one_fslmc_device(char *dev_name) }static int -rte_fslmc_parse (const char *name,void *addr) +rte_fslmc_parse (const char *name,void *addr,int *size) {uint16_t dev_id;char *t_ptr;
@@ -298,7 +298,10 @@ rte_fslmc_parse(const char *name, void *addr) goto err_out; } -if (addr) +if (size !=NULL ) + *size =strlen (sep) +1 ; + +if (addr !=NULL )strcpy (addr, sep); ret =0 ;
drivers/bus/ifpga/ifpga_bus.c +9 -5
@@ -459,9 +459,8 @@ ifpga_find_device(const struct rte_device *start,return NULL ; }static int -ifpga_parse (const char *name,void *addr) +ifpga_parse (const char *name,void *addr,int *size) { -int *out = addr;struct rte_rawdev *rawdev =NULL ;char rawdev_name[RTE_RAWDEV_NAME_MAX_LEN ];char *c1 =NULL ;
@@ -491,9 +490,14 @@ ifpga_parse(const char *name, void *addr) rawdev =rte_rawdev_pmd_get_named_dev (rawdev_name);if ((port <IFPGA_BUS_DEV_PORT_MAX ) && - rawdev && - (addr !=NULL )) - *out = port; + rawdev) { +if (size !=NULL ) + *size =sizeof (port); + +if (addr !=NULL ) + *(int *)addr = port; + } +if ((port <IFPGA_BUS_DEV_PORT_MAX ) && rawdev)
drivers/bus/pci/pci_common.c +5 -2
@@ -84,7 +84,7 @@ pci_devargs_lookup(const struct rte_pci_addr *pci_addr)struct rte_pci_addr addr; RTE_EAL_DEVARGS_FOREACH("pci", devargs) { - devargs->bus->parse (devargs->name, &addr); + devargs->bus->parse (devargs->name, &addr,NULL );if (!rte_pci_addr_cmp (pci_addr, &addr))return devargs; }
@@ -487,12 +487,15 @@ rte_pci_dump(FILE *f) }static int -pci_parse (const char *name,void *addr) +pci_parse (const char *name,void *addr,int *size) {struct rte_pci_addr *out = addr;struct rte_pci_addr pci_addr;bool parse; +if (size !=NULL ) + *size =sizeof (struct rte_pci_addr ); + parse = (rte_pci_addr_parse (name, &pci_addr) ==0 );if (parse && addr !=NULL ) *out = pci_addr;
drivers/bus/platform/platform.c +10 -5
@@ -542,11 +542,10 @@ platform_bus_unplug(struct rte_device *dev) }static int -platform_bus_parse (const char *name,void *addr) +platform_bus_parse (const char *name,void *addr,int *size) {struct rte_platform_device pdev = { };struct rte_platform_driver *pdrv; -const char **out = addr;rte_strscpy (pdev.name, name,sizeof (pdev.name));
@@ -555,10 +554,16 @@ platform_bus_parse(const char *name, void *addr)break ; } -if (pdrv !=NULL && addr !=NULL ) - *out = name; +if (pdrv ==NULL ) +return -ENODEV ; + +if (size !=NULL ) + *size =strlen (name) +1 ; -return pdrv !=NULL ?0 : -ENODEV ; +if (addr !=NULL ) +rte_strscpy (addr, name,strlen (name) +1 ); + +return 0 ; } static int
drivers/bus/uacce/uacce.c +10 -4
@@ -20,6 +20,7 @@#include <rte_errno.h> #include <rte_log.h> #include <rte_kvargs.h> +#include <rte_string_fns.h> #include <bus_driver.h> #include "bus_uacce_driver.h"
@@ -529,15 +530,20 @@ uacce_find_device(const struct rte_device *start, rte_dev_cmp_t cmp, const void }static int -uacce_parse (const char *name,void *addr) +uacce_parse (const char *name,void *addr,int *size) { -const char **out = addr;int ret; ret =strncmp (name,UACCE_DEV_PREFIX ,strlen (UACCE_DEV_PREFIX )); -if (ret ==0 && addr) - *out = name; +if (ret !=0 ) +return ret; + +if (size !=NULL ) + *size =strlen (name) +1 ; + +if (addr !=NULL ) +rte_strscpy (addr, name,strlen (name) +1 );return ret; }
drivers/bus/vdev/vdev.c +20 -3
@@ -113,7 +113,7 @@ rte_vdev_remove_custom_scan(rte_vdev_scan_callback callback, void *user_arg) }static int -vdev_parse (const char *name,void *addr) +vdev_find_driver (const char *name,void *addr) {struct rte_vdev_driver **out = addr;struct rte_vdev_driver *driver =NULL ;
@@ -197,7 +197,7 @@ vdev_probe_all_drivers(struct rte_vdev_device *dev) name =rte_vdev_device_name (dev);VDEV_LOG (DEBUG ,"Search driver to probe device %s" , name); -if (vdev_parse (name, &driver)) +if (vdev_find_driver (name, &driver))return -1 ; iova_mode =rte_eal_iova_mode ();
@@ -232,6 +232,23 @@ find_vdev(const char *name)return NULL ; } +static int +vdev_parse (const char *name,void *addr,int *size) +{ +struct rte_vdev_driver *driver; + +if (vdev_find_driver (name, &driver)) +return 1 ; + +if (size !=NULL ) + *size =strlen (name) +1 ; + +if (addr !=NULL ) +rte_strscpy (addr, name,strlen (name) +1 ); + +return 0 ; +} +static struct rte_devargs *alloc_devargs (const char *name,const char *args) {
@@ -647,7 +664,7 @@ vdev_get_iommu_class(void) TAILQ_FOREACH(dev, &vdev_device_list, next) { name =rte_vdev_device_name (dev); -if (vdev_parse (name, &driver)) +if (vdev_find_driver (name, &driver))continue ;if (driver->drv_flags &RTE_VDEV_DRV_NEED_IOVA_AS_VA )
drivers/bus/vmbus/vmbus_common.c +6 -3
@@ -245,13 +245,16 @@ rte_vmbus_cleanup(void) }static int -vmbus_parse (const char *name,void *addr) +vmbus_parse (const char *name,void *addr,int *size) {rte_uuid_t guid;int ret; +if (size !=NULL ) + *size =sizeof (guid); + ret =rte_uuid_parse (name, guid); -if (ret ==0 && addr) +if (ret ==0 && addr !=NULL )memcpy (addr, &guid,sizeof (guid));return ret;
@@ -269,7 +272,7 @@ vmbus_devargs_lookup(struct rte_vmbus_device *dev)rte_uuid_t addr; RTE_EAL_DEVARGS_FOREACH("vmbus", devargs) { -vmbus_parse (devargs->name, &addr); +vmbus_parse (devargs->name, &addr,NULL );if (rte_uuid_compare (dev->device_id, addr) ==0 )return devargs;
drivers/dma/idxd/idxd_bus.c +6 -3
@@ -47,7 +47,7 @@ static int dsa_probe(void);static struct rte_device *dsa_find_device (const struct rte_device *start,rte_dev_cmp_t cmp,const void *data);static enum rte_iova_mode dsa_get_iommu_class (void ); -static int dsa_addr_parse (const char *name,void *addr); +static int dsa_addr_parse (const char *name,void *addr,int *size);/** List of devices */ TAILQ_HEAD (dsa_device_list, rte_dsa_device);
@@ -345,7 +345,7 @@ dsa_scan(void)closedir (dev_dir);return -ENOMEM ; } -if (dsa_addr_parse (wq->d_name, &dev->addr) <0 ) { +if (dsa_addr_parse (wq->d_name, &dev->addr,NULL ) <0 ) {IDXD_PMD_ERR ("Error parsing WQ name: %s" , wq->d_name);free (dev);continue ;
@@ -391,11 +391,14 @@ dsa_get_iommu_class(void) }static int -dsa_addr_parse (const char *name,void *addr) +dsa_addr_parse (const char *name,void *addr,int *size) {struct dsa_wq_addr *wq = addr;unsigned int device_id, wq_id; +if (size !=NULL ) + *size =sizeof (struct dsa_wq_addr ); +if (sscanf (name,"wq%u.%u" , &device_id, &wq_id) !=2 ) {IDXD_PMD_DEBUG ("Parsing WQ name failed: %s" , name);return -1 ;
drivers/raw/ifpga/ifpga_rawdev.c +1 -7
@@ -1833,12 +1833,6 @@ ifpga_cfg_probe(struct rte_vdev_device *vdev)return ret; } -static int cmp_dev_name (const struct rte_device *dev,const void *_name) -{ -const char *name = _name; -return strcmp (dev->name, name); -} -static int ifpga_cfg_remove (struct rte_vdev_device *vdev) {
@@ -1874,7 +1868,7 @@ ifpga_cfg_remove(struct rte_vdev_device *vdev) args.port, args.bdf); bus =rte_bus_find_by_name (RTE_STR (IFPGA_BUS_NAME ));if (bus) { -if (bus->find_device (NULL , cmp_dev_name, dev_name)) { +if (bus->find_device (NULL , rte_cmp_dev_name, dev_name)) { ret =rte_eal_hotplug_remove (RTE_STR (IFPGA_BUS_NAME ), dev_name); }
lib/eal/common/eal_common_bus.c +1 -1
@@ -200,7 +200,7 @@ bus_can_parse(const struct rte_bus *bus, const void *_name) {const char *name = _name; -return !(bus->parse && bus->parse (name,NULL ) ==0 ); +return !(bus->parse && bus->parse (name,NULL ,NULL ) ==0 ); } struct rte_bus *
lib/eal/common/eal_common_dev.c +36 -5
61 lines not on this page · raw message
lib/eal/common/hotplug_mp.c +2 -9
@@ -21,13 +21,6 @@ struct mp_reply_bundle {void *peer; }; -static int cmp_dev_name (const struct rte_device *dev,const void *_name) -{ -const char *name = _name; - -return strcmp (dev->name, name); -} -/** * Secondary to primary request. * start from function eal_dev_hotplug_request_to_primary.
@@ -135,7 +128,7 @@ __handle_secondary_request(void *param) goto finish; } - dev = bus->find_device (NULL , cmp_dev_name, da.name); + dev = bus->find_device (NULL , rte_cmp_dev_name, da.name);if (dev ==NULL ) {EAL_LOG (ERR ,"Cannot find plugged device (%s)" , da.name); ret = -ENOENT ;
@@ -262,7 +255,7 @@ static void __handle_primary_request(void *param) goto quit; } - dev = bus->find_device (NULL , cmp_dev_name, da->name); + dev = bus->find_device (NULL , rte_cmp_dev_name, da->name);if (dev ==NULL ) {EAL_LOG (ERR ,"Cannot find plugged device (%s)" , da->name); ret = -ENOENT ;
lib/eal/include/bus_driver.h +23 -1
@@ -112,11 +112,32 @@ typedef int (*rte_bus_unplug_t)(struct rte_device *dev);* should be written. If NULL, nothing should be written, which * is not an error. * +* @param[out] size +* device information size. If NULL, nothing should +* be written, which is not an error. +* * @return * 0 if parsing was successful. * !0 for any error. */ -typedef int (*rte_bus_parse_t )(const char *name,void *addr); +typedef int (*rte_bus_parse_t )(const char *name,void *addr,int *size); + +/** +* Bus specific device name comparison function. +* +* This type of function is used to compare a bus name with an arbitrary +* name. +* +* @param dev +* Device handle. +* +* @param name +* Name to compare against. +* +* @return +* 0 if the device matches the name. Nonzero otherwise. +*/ +typedef int (*rte_bus_cmp_name_t )(const struct rte_device *dev,const void *name);/** * Parse bus part of the device arguments.
@@ -258,6 +279,7 @@ struct rte_bus {rte_bus_plug_t plug;/**< Probe single device for drivers */ rte_bus_unplug_t unplug;/**< Remove single device from driver */ rte_bus_parse_t parse;/**< Parse a device name */ +rte_bus_cmp_name_t cmp_name;/**< Compare device name */ rte_bus_devargs_parse_t devargs_parse;/**< Parse bus devargs */ rte_dev_dma_map_t dma_map;/**< DMA map for device in the bus */ rte_dev_dma_unmap_t dma_unmap;/**< DMA unmap for device in the bus */
lib/eal/include/rte_dev.h +15 -0
@@ -17,6 +17,7 @@#include <rte_config.h> #include <rte_common.h> +#include <rte_compat.h> #include <rte_log.h> #ifdef __cplusplus
@@ -170,6 +171,20 @@ int rte_dev_is_probed(const struct rte_device *dev);int rte_eal_hotplug_add (const char *busname,const char *devname,const char *drvargs); +/** +* General device name comparison. Will compare by using the specific bus +* compare function or by comparing the names directly. +* +* @param dev +* Device handle. +* @param name +* Name to compare against. +* @return +* 0 if the device matches the name. Nonzero otherwise. +*/ +__rte_internal +int rte_cmp_dev_name(const struct rte_device *dev, const void *name); +/** * Add matching devices. *
lib/eal/linux/eal_dev.c +1 -9
@@ -91,14 +91,6 @@ static void sigbus_handler(int signum, siginfo_t *info,EAL_LOG (DEBUG ,"Success to handle SIGBUS for hot-unplug!" ); } -static int cmp_dev_name (const struct rte_device *dev, -const void *_name) -{ -const char *name = _name; - -return strcmp (dev->name, name); -} -static int dev_uev_socket_fd_create (void ) {
@@ -280,7 +272,7 @@ dev_uev_handler(__rte_unused void *param) goto failure_handle_err; } - dev = bus->find_device (NULL , cmp_dev_name, + dev = bus->find_device (NULL , rte_cmp_dev_name, uevent.devname);if (dev ==NULL ) { EAL_LOG(ERR, "Cannot find device (%s) on "
lib/eal/version.map +1 -0
@@ -448,4 +448,5 @@ INTERNAL { rte_mem_unmap; rte_thread_create_internal_control; rte_thread_set_prefixed_name; + rte_cmp_dev_name; };
Signature · 1 line
2.34.1
PATCH v6 3/4 app/test: add tests to find devices
In reply to Shani PeretzAdded tests to PCI and vdev bus that compare and find devices in various forms of names under test_devargs.
The tests check the functionality of the rte_cmp_dev_name function by calling it with different variations of names, like short and full, full and full, etc.
--- app/test/test_devargs.c | 122 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 121 insertions(+), 1 deletion(-)
app/test/test_devargs.c +121 -1
@@ -12,7 +12,9 @@#include <rte_kvargs.h> #include <bus_driver.h> #include <rte_class.h> +#include <rte_bus_vdev.h> +#include "virtual_pmd.h" #include "test.h" /* Check layer arguments. */
@@ -171,7 +173,7 @@ test_valid_devargs(void)int ret; ret =test_valid_devargs_cases (list,RTE_DIM (list)); -if (vdev_bus !=NULL && vdev_bus->parse ("net_ring0" ,NULL ) ==0 ) +if (vdev_bus !=NULL && vdev_bus->parse ("net_ring0" ,NULL ,NULL ) ==0 )/* Ring vdev driver enabled. */ ret |=test_valid_devargs_cases (legacy_ring_list,RTE_DIM (legacy_ring_list));
@@ -302,6 +304,118 @@ test_invalid_devargs_parsing(void)return fail; } +static struct rte_device * +create_pci_dev (const char *name) +{ +int port_id; +struct rte_ether_addr rand_ea = {0 }; +rte_eth_random_addr (rand_ea.addr_bytes); + +char pmd_name[RTE_ETH_NAME_MAX_LEN ]; +strlcpy (pmd_name, name,RTE_ETH_NAME_MAX_LEN ); + + port_id =virtual_ethdev_create (pmd_name, + &rand_ea,rte_socket_id (),1 ); + +if (port_id <0 ) +return NULL ; + +return (&rte_eth_devices[port_id])->device; +} + +static int +test_pci (struct rte_bus *pci_bus,const char *dev_name,const char *name2) +{ +struct rte_device *pci_dev =create_pci_dev (dev_name); + +if (pci_dev ==NULL ) +return -1 ; + + pci_dev->bus = pci_bus; + +if (rte_cmp_dev_name (pci_dev, name2) !=0 ) { +printf ("rte_cmp_dev_name(%s, %s) device name (%s) not expected (%s)\n" , + pci_dev->name, name2, pci_dev->name, name2); +return -1 ; + } +return 0 ; +} + +static int +test_vdev (struct rte_bus *vdev_bus,const char *dev_name,const char *name2) +{ +/* create vdev */ +if (rte_vdev_init (dev_name,"" ) <0 ) { +printf ("Failed to create vdev %s\n" , dev_name); +return -1 ; + } + +struct rte_device *vdev_dev = vdev_bus->find_device (NULL , rte_cmp_dev_name, dev_name); +if (vdev_dev ==NULL ) { +printf ("Cannot find %s vdev\n" , dev_name); +rte_vdev_uninit (dev_name); +return -1 ; + } +int ret =rte_cmp_dev_name (vdev_dev, name2); +if (ret !=0 ) { +printf ("rte_cmp_dev_name(%s, %s) device name (%s) not expected (%s)\n" , + vdev_dev->name, name2, vdev_dev->name, name2); +return -1 ; + } + +if (vdev_dev != vdev_bus->find_device (NULL , rte_cmp_dev_name, name2)) { +printf ("rte_cmp_dev_name(%s, %s) device name (%s) not expected (%s)\n" , + vdev_dev->name, name2, vdev_dev->name, name2); +return -1 ; + } + +rte_vdev_uninit (dev_name); +return 0 ; +} + +static int +test_valid_cmp_dev_name (void ) +{ +struct rte_bus *pci_bus =rte_bus_find_by_name ("pci" ); +struct rte_bus *vdev_bus =rte_bus_find_by_name ("vdev" ); + +if (pci_bus) { +if ((test_pci (pci_bus,"0000:08:11.0" ,"08:11.0" ) !=0 ) || + (test_pci (pci_bus,"08:12.0" ,"0000:08:12.0" ) !=0 ) || + (test_pci (pci_bus,"08:13.0" ,"08:13.0" ) !=0 ) || + (test_pci (pci_bus,"0000:08:14.0" ,"0000:08:14.0" ) !=0 )) +return -1 ; + } + +if (vdev_bus) { +if (test_vdev (vdev_bus,"net_null_test0" ,"net_null_test0" ) !=0 ) +return -1 ; + } +return 0 ; +} + +static int +test_invalid_cmp_dev_name (void ) +{ +struct rte_bus *pci_bus =rte_bus_find_by_name ("pci" ); +struct rte_bus *vdev_bus =rte_bus_find_by_name ("vdev" ); + +if (pci_bus) { +if ((test_pci (pci_bus,"0000:08:15.0" ,"08:00.0" ) ==0 ) || + (test_pci (pci_bus,"08:16.0" ,"0000:08:15.0" ) ==0 ) || + (test_pci (pci_bus,"08:17.0" ,"08:13.0" ) ==0 ) || + (test_pci (pci_bus,"0000:08:18.0" ,"0000:08:14.0" ) ==0 )) +return -1 ; + } + +if (vdev_bus) { +if ((test_vdev (vdev_bus,"net_null_test0" ,"net_null_test" ) ==0 ) || + (test_vdev (vdev_bus,"net_null_test1" ,"net_null_test2" ) ==0 )) +return -1 ; + } +return 0 ; +} +static int test_devargs (void ) {
@@ -317,6 +431,12 @@ test_devargs(void)printf ("== test devargs parsing invalid case ==\n" );if (test_invalid_devargs_parsing () <0 )return -1 ; +printf ("== test find device valid case ==\n" ); +if (test_valid_cmp_dev_name () <0 ) +return -1 ; +printf ("== test find device invalid case ==\n" ); +if (test_invalid_cmp_dev_name () <0 ) +return -1 ;return 0 ; }
Signature · 1 line
2.34.1
PATCH v6 4/4 lib: change find device and cmp dev name functions
In reply to Shani PeretzChange find_device and rte_cmp_dev_name to accept a struct with pointer and size instead of a void* pointer.
--- app/test/test_devargs.c | 23 +++++++++++++++++++---- app/test/test_vdev.c | 23 ++++++++++++++++++----- drivers/bus/auxiliary/auxiliary_common.c | 2 +- drivers/bus/auxiliary/auxiliary_params.c | 10 +++++++--- drivers/bus/cdx/cdx.c | 12 ++++++++---- drivers/bus/dpaa/dpaa_bus.c | 2 +- drivers/bus/fslmc/fslmc_bus.c | 2 +- drivers/bus/ifpga/ifpga_bus.c | 2 +- drivers/bus/pci/pci_common.c | 2 +- drivers/bus/pci/pci_params.c | 10 +++++++--- drivers/bus/platform/platform.c | 3 ++- drivers/bus/platform/platform_params.c | 10 +++++++--- drivers/bus/uacce/uacce.c | 13 +++++++++---- drivers/bus/vdev/vdev.c | 2 +- drivers/bus/vdev/vdev_params.c | 10 +++++++--- drivers/bus/vdev/vdev_private.h | 2 +- drivers/bus/vmbus/vmbus_common.c | 2 +- drivers/dma/idxd/idxd_bus.c | 4 ++-- drivers/net/bonding/rte_eth_bond_args.c | 15 +++++---------- drivers/net/vdev_netvsc/vdev_netvsc.c | 8 ++++++-- drivers/raw/ifpga/ifpga_rawdev.c | 6 +++++- lib/eal/common/eal_common_bus.c | 10 +++++++--- lib/eal/common/eal_common_dev.c | 18 +++++++++++++----- lib/eal/common/hotplug_mp.c | 12 ++++++++++-- lib/eal/include/bus_driver.h | 2 +- lib/eal/include/rte_dev.h | 15 ++++++++++----- lib/eal/linux/eal_dev.c | 6 +++++- 27 files changed, 156 insertions(+), 70 deletions(-)
app/test/test_devargs.c +19 -4
@@ -333,7 +333,12 @@ test_pci(struct rte_bus *pci_bus, const char *dev_name, const char *name2) pci_dev->bus = pci_bus; -if (rte_cmp_dev_name (pci_dev, name2) !=0 ) { +struct rte_bus_address addr = { + .addr = name2, + .size =strlen (name2) + }; + +if (rte_cmp_dev_name (pci_dev, &addr) !=0 ) {printf ("rte_cmp_dev_name(%s, %s) device name (%s) not expected (%s)\n" , pci_dev->name, name2, pci_dev->name, name2);return -1 ;
@@ -350,20 +355,30 @@ test_vdev(struct rte_bus *vdev_bus, const char *dev_name, const char *name2)return -1 ; } -struct rte_device *vdev_dev = vdev_bus->find_device (NULL , rte_cmp_dev_name, dev_name); +struct rte_bus_address dev_addr = { + .addr = dev_name, + .size =strlen (dev_name) + }; + +struct rte_device *vdev_dev = vdev_bus->find_device (NULL , rte_cmp_dev_name, &dev_addr);if (vdev_dev ==NULL ) {printf ("Cannot find %s vdev\n" , dev_name);rte_vdev_uninit (dev_name);return -1 ; } -int ret =rte_cmp_dev_name (vdev_dev, name2); + +struct rte_bus_address dev_addr2 = { + .addr = name2, + .size =strlen (name2) + }; +int ret =rte_cmp_dev_name (vdev_dev, &dev_addr2);if (ret !=0 ) {printf ("rte_cmp_dev_name(%s, %s) device name (%s) not expected (%s)\n" , vdev_dev->name, name2, vdev_dev->name, name2);return -1 ; } -if (vdev_dev != vdev_bus->find_device (NULL , rte_cmp_dev_name, name2)) { +if (vdev_dev != vdev_bus->find_device (NULL , rte_cmp_dev_name, &dev_addr2)) {printf ("rte_cmp_dev_name(%s, %s) device name (%s) not expected (%s)\n" , vdev_dev->name, name2, vdev_dev->name, name2);return -1 ;
app/test/test_vdev.c +18 -5
@@ -21,9 +21,9 @@ static const char * const valid_keys[] = { };static int -cmp_dev_match (const struct rte_device *dev,const void *_kvlist) +cmp_dev_match (const struct rte_device *dev,const struct rte_bus_address *_kvlist) { -const struct rte_kvargs *kvlist = _kvlist; +const struct rte_kvargs *kvlist = _kvlist->addr;const char *key =TEST_VDEV_KEY_NAME ;const char *name;
@@ -54,7 +54,11 @@ get_matching_vdev(const char *match_str) } } - dev = vdev_bus->find_device (NULL , cmp_dev_match, kvargs); +struct rte_bus_address dev_addr = { + .addr = kvargs, + .size =sizeof (struct rte_kvargs ), + }; + dev = vdev_bus->find_device (NULL , cmp_dev_match, &dev_addr);rte_kvargs_free (kvargs);return dev;
@@ -76,7 +80,12 @@ test_vdev_bus(void)printf ("Failed to create vdev net_null_test0\n" ); goto fail; } - dev0 = vdev_bus->find_device (NULL , rte_cmp_dev_name,"net_null_test0" ); + +struct rte_bus_address dev0_addr = { + .addr ="net_null_test0" , + .size =strlen ("net_null_test0" ) + }; + dev0 = vdev_bus->find_device (NULL , rte_cmp_dev_name, &dev0_addr);if (dev0 ==NULL ) {printf ("Cannot find net_null_test0 vdev\n" ); goto fail;
@@ -87,7 +96,11 @@ test_vdev_bus(void)printf ("Failed to create vdev net_null_test1\n" ); goto fail; } - dev1 = vdev_bus->find_device (NULL , rte_cmp_dev_name,"net_null_test1" ); +struct rte_bus_address dev1_addr = { + .addr ="net_null_test1" , + .size =strlen ("net_null_test1" ) + }; + dev1 = vdev_bus->find_device (NULL , rte_cmp_dev_name, &dev1_addr);if (dev1 ==NULL ) {printf ("Cannot find net_null_test1 vdev\n" ); goto fail;
drivers/bus/auxiliary/auxiliary_common.c +1 -1
@@ -300,7 +300,7 @@ rte_auxiliary_remove_device(struct rte_auxiliary_device *auxiliary_dev)static struct rte_device *auxiliary_find_device (const struct rte_device *start,rte_dev_cmp_t cmp, -const void *data) +const struct rte_bus_address *data) {const struct rte_auxiliary_device *pstart;struct rte_auxiliary_device *adev;
drivers/bus/auxiliary/auxiliary_params.c +7 -3
@@ -22,9 +22,9 @@ static const char * const auxiliary_params_keys[] = {static int auxiliary_dev_match (const struct rte_device *dev, -const void *_kvlist) +const struct rte_bus_address *_kvlist) { -const struct rte_kvargs *kvlist = _kvlist; +const struct rte_kvargs *kvlist = _kvlist->addr;const char *key = auxiliary_params_keys[RTE_AUXILIARY_PARAM_NAME ];const char *name;
@@ -59,7 +59,11 @@ auxiliary_dev_iterate(const void *start, } } find_device = auxiliary_bus.bus.find_device; - dev =find_device (start, auxiliary_dev_match, kvargs); +struct rte_bus_address dev_addr = { + .addr = kvargs, + .size =sizeof (struct rte_kvargs ), + }; + dev =find_device (start, auxiliary_dev_match, &dev_addr);rte_kvargs_free (kvargs);return dev; }
drivers/bus/cdx/cdx.c +8 -4
@@ -500,7 +500,7 @@ rte_cdx_unregister(struct rte_cdx_driver *driver)static struct rte_device *cdx_find_device (const struct rte_device *start,rte_dev_cmp_t cmp, -const void *data) +const struct rte_bus_address *data) {const struct rte_cdx_device *cdx_start;struct rte_cdx_device *cdx_dev;
@@ -613,9 +613,9 @@ cdx_get_iommu_class(void)static int cdx_dev_match (const struct rte_device *dev, -const void *_kvlist) +const struct rte_bus_address *_kvlist) { -const struct rte_kvargs *kvlist = _kvlist; +const struct rte_kvargs *kvlist = _kvlist->addr;const char *key = cdx_params_keys[RTE_CDX_PARAM_NAME ];const char *name;
@@ -649,7 +649,11 @@ cdx_dev_iterate(const void *start, } } find_device = rte_cdx_bus.bus.find_device; - dev =find_device (start, cdx_dev_match, kvargs); +struct rte_bus_address dev_addr = { + .addr = kvargs, + .size =sizeof (struct rte_kvargs ), + }; + dev =find_device (start, cdx_dev_match, &dev_addr);rte_kvargs_free (kvargs);return dev; }
drivers/bus/dpaa/dpaa_bus.c +1 -1
@@ -745,7 +745,7 @@ rte_dpaa_bus_probe(void)static struct rte_device *rte_dpaa_find_device (const struct rte_device *start,rte_dev_cmp_t cmp, -const void *data) +const struct rte_bus_address *data) {struct rte_dpaa_device *dev;const struct rte_dpaa_device *dstart;
drivers/bus/fslmc/fslmc_bus.c +1 -1
@@ -497,7 +497,7 @@ rte_fslmc_probe(void)static struct rte_device *rte_fslmc_find_device (const struct rte_device *start,rte_dev_cmp_t cmp, -const void *data) +const struct rte_bus_address *data) {const struct rte_dpaa2_device *dstart;struct rte_dpaa2_device *dev;
drivers/bus/ifpga/ifpga_bus.c +1 -1
@@ -443,7 +443,7 @@ ifpga_unplug(struct rte_device *dev)static struct rte_device *ifpga_find_device (const struct rte_device *start, -rte_dev_cmp_t cmp,const void *data) +rte_dev_cmp_t cmp,const struct rte_bus_address *data) {struct rte_afu_device *afu_dev;
drivers/bus/pci/pci_common.c +1 -1
@@ -540,7 +540,7 @@ rte_pci_remove_device(struct rte_pci_device *pci_dev)static struct rte_device *pci_find_device (const struct rte_device *start,rte_dev_cmp_t cmp, -const void *data) +const struct rte_bus_address *data) {const struct rte_pci_device *pstart;struct rte_pci_device *pdev;
drivers/bus/pci/pci_params.c +7 -3
@@ -41,9 +41,9 @@ pci_addr_kv_cmp(const char *key __rte_unused,static int pci_dev_match (const struct rte_device *dev, -const void *_kvlist) +const struct rte_bus_address *_kvlist) { -const struct rte_kvargs *kvlist = _kvlist; +const struct rte_kvargs *kvlist = _kvlist->addr;const struct rte_pci_device *pdev;if (kvlist ==NULL )
@@ -76,7 +76,11 @@ rte_pci_dev_iterate(const void *start, } } find_device = rte_pci_bus.bus.find_device; - dev =find_device (start, pci_dev_match, kvargs); +struct rte_bus_address dev_addr = { + .addr = kvargs, + .size =sizeof (struct rte_kvargs ), + }; + dev =find_device (start, pci_dev_match, &dev_addr);rte_kvargs_free (kvargs);return dev; }
drivers/bus/platform/platform.c +2 -1
@@ -473,7 +473,8 @@ platform_bus_probe(void) }static struct rte_device * -platform_bus_find_device (const struct rte_device *start,rte_dev_cmp_t cmp,const void *data) +platform_bus_find_device (const struct rte_device *start,rte_dev_cmp_t cmp, +const struct rte_bus_address *data) {struct rte_platform_device *pdev;
drivers/bus/platform/platform_params.c +7 -3
@@ -27,10 +27,10 @@ static const char * const platform_params_keys[] = { };static int -platform_dev_match (const struct rte_device *dev,const void *_kvlist) +platform_dev_match (const struct rte_device *dev,const struct rte_bus_address *_kvlist) {const char *key = platform_params_keys[RTE_PLATFORM_PARAM_NAME ]; -const struct rte_kvargs *kvlist = _kvlist; +const struct rte_kvargs *kvlist = _kvlist->addr;const char *name;/* no kvlist arg, all devices match */
@@ -68,7 +68,11 @@ platform_bus_dev_iterate(const void *start, const char *str,return NULL ; } - dev = platform_bus.bus.find_device (start, platform_dev_match, kvargs); +struct rte_bus_address dev_addr = { + .addr = kvargs, + .size =sizeof (struct rte_kvargs ), + }; + dev = platform_bus.bus.find_device (start, platform_dev_match, &dev_addr);rte_kvargs_free (kvargs);return dev;
drivers/bus/uacce/uacce.c +9 -4
@@ -508,7 +508,8 @@ uacce_unplug(struct rte_device *dev) }static struct rte_device * -uacce_find_device (const struct rte_device *start,rte_dev_cmp_t cmp,const void *data) +uacce_find_device (const struct rte_device *start,rte_dev_cmp_t cmp, +const struct rte_bus_address *data) {const struct rte_uacce_device *uacce_start;struct rte_uacce_device *uacce_dev;
@@ -549,10 +550,10 @@ uacce_parse(const char *name, void *addr, int *size) }static int -uacce_dev_match (const struct rte_device *dev,const void *_kvlist) +uacce_dev_match (const struct rte_device *dev,const struct rte_bus_address *_kvlist) {const char *key = uacce_params_keys[RTE_UACCE_PARAM_NAME ]; -const struct rte_kvargs *kvlist = _kvlist; +const struct rte_kvargs *kvlist = _kvlist->addr;const char *name;/* no kvlist arg, all devices match. */
@@ -583,7 +584,11 @@ uacce_dev_iterate(const void *start, const char *str, } } find_device = uacce_bus.bus.find_device; - dev =find_device (start, uacce_dev_match, kvargs); +struct rte_bus_address dev_addr = { + .addr = kvargs, + .size =sizeof (struct rte_kvargs ), + }; + dev =find_device (start, uacce_dev_match, &dev_addr);rte_kvargs_free (kvargs);return dev; }
drivers/bus/vdev/vdev.c +1 -1
@@ -621,7 +621,7 @@ vdev_cleanup(void)struct rte_device *rte_vdev_find_device (const struct rte_device *start,rte_dev_cmp_t cmp, -const void *data) +const struct rte_bus_address *data) {const struct rte_vdev_device *vstart;struct rte_vdev_device *dev;
drivers/bus/vdev/vdev_params.c +7 -3
@@ -24,9 +24,9 @@ static const char * const vdev_params_keys[] = {static int vdev_dev_match (const struct rte_device *dev, -const void *_kvlist) +const struct rte_bus_address *_kvlist) { -const struct rte_kvargs *kvlist = _kvlist; +const struct rte_kvargs *kvlist = _kvlist->addr;const char *key = vdev_params_keys[RTE_VDEV_PARAM_NAME ];const char *name;
@@ -58,7 +58,11 @@ rte_vdev_dev_iterate(const void *start,return NULL ; } } - dev =rte_vdev_find_device (start, vdev_dev_match, kvargs); +struct rte_bus_address dev_addr = { + .addr = kvargs, + .size =sizeof (struct rte_kvargs ), + }; + dev =rte_vdev_find_device (start, vdev_dev_match, &dev_addr);rte_kvargs_free (kvargs);return dev; }
drivers/bus/vdev/vdev_private.h +1 -1
@@ -14,7 +14,7 @@ extern "C" {struct rte_device *rte_vdev_find_device (const struct rte_device *start,rte_dev_cmp_t cmp, -const void *data); +const struct rte_bus_address *data);void * rte_vdev_dev_iterate(const void *start,
drivers/bus/vmbus/vmbus_common.c +1 -1
@@ -323,7 +323,7 @@ vmbus_remove_device(struct rte_vmbus_device *vmbus_dev)/* VMBUS doesn't support hotplug */ static struct rte_device *vmbus_find_device (const struct rte_device *start,rte_dev_cmp_t cmp, -const void *data) +const struct rte_bus_address *data) {struct rte_vmbus_device *dev;
drivers/dma/idxd/idxd_bus.c +2 -2
@@ -45,7 +45,7 @@ struct dsa_bus;static int dsa_scan (void );static int dsa_probe (void );static struct rte_device *dsa_find_device (const struct rte_device *start, -rte_dev_cmp_t cmp,const void *data); +rte_dev_cmp_t cmp,const struct rte_bus_address *data);static enum rte_iova_mode dsa_get_iommu_class (void );static int dsa_addr_parse (const char *name,void *addr,int *size);
@@ -366,7 +366,7 @@ dsa_scan(void)static struct rte_device *dsa_find_device (const struct rte_device *start,rte_dev_cmp_t cmp, -const void *data) +const struct rte_bus_address *data) {struct rte_dsa_device *dev =TAILQ_FIRST (&dsa_bus.device_list);
drivers/net/bonding/rte_eth_bond_args.c +5 -10
@@ -23,15 +23,6 @@ const char *pmd_bond_init_valid_arguments[] = { NULL }; -static inline int -bond_pci_addr_cmp (const struct rte_device *dev,const void *_pci_addr) -{ -const struct rte_pci_device *pdev =RTE_DEV_TO_PCI_CONST (dev); -const struct rte_pci_addr *paddr = _pci_addr; - -return rte_pci_addr_cmp (&pdev->addr, paddr); -} -static inline int find_port_id_by_pci_addr (const struct rte_pci_addr *pci_addr) {
@@ -45,7 +36,11 @@ find_port_id_by_pci_addr(const struct rte_pci_addr *pci_addr)return -1 ; } - dev = pci_bus->find_device (NULL , bond_pci_addr_cmp, pci_addr); +struct rte_bus_address dev_addr = { + .addr = pci_addr, + .size =PCI_PRI_STR_SIZE + }; + dev = pci_bus->find_device (NULL , rte_cmp_dev_name, &dev_addr);if (dev ==NULL ) {RTE_BOND_LOG (ERR ,"unable to find PCI device" );return -1 ;
drivers/net/vdev_netvsc/vdev_netvsc.c +6 -2
@@ -771,7 +771,7 @@ RTE_PMD_REGISTER_PARAM_STRING(net_vdev_netvsc,/** Compare function for vdev find device operation. */ static int vdev_netvsc_cmp_rte_device (const struct rte_device *dev1, - __rte_unused const void *_dev2) + __rte_unused const struct rte_bus_address *_dev2) {return strncmp (dev1->devargs->name,VDEV_NETVSC_DRIVER_NAME ,VDEV_NETVSC_DRIVER_NAME_LEN );
@@ -794,8 +794,12 @@ vdev_netvsc_scan_callback(__rte_unused void *arg) VDEV_NETVSC_DRIVER_NAME_LEN))return ; +struct rte_bus_address dev_addr = { + .addr =VDEV_NETVSC_DRIVER_NAME , + .size =VDEV_NETVSC_DRIVER_NAME_LEN , + }; dev = vbus->find_device (NULL , vdev_netvsc_cmp_rte_device, -VDEV_NETVSC_DRIVER_NAME ); + &dev_addr);if (dev)return ;if (rte_devargs_add (RTE_DEVTYPE_VIRTUAL ,VDEV_NETVSC_DRIVER_NAME ))
drivers/raw/ifpga/ifpga_rawdev.c +5 -1
@@ -1868,7 +1868,11 @@ ifpga_cfg_remove(struct rte_vdev_device *vdev) args.port, args.bdf); bus =rte_bus_find_by_name (RTE_STR (IFPGA_BUS_NAME ));if (bus) { -if (bus->find_device (NULL , rte_cmp_dev_name, dev_name)) { +struct rte_bus_address dev_addr = { + .addr = dev_name, + .size =RTE_RAWDEV_NAME_MAX_LEN + }; +if (bus->find_device (NULL , rte_cmp_dev_name, &dev_addr)) { ret =rte_eal_hotplug_remove (RTE_STR (IFPGA_BUS_NAME ), dev_name); }
lib/eal/common/eal_common_bus.c +7 -3
@@ -159,9 +159,9 @@ rte_bus_find(const struct rte_bus *start, rte_bus_cmp_t cmp, }static int -cmp_rte_device (const struct rte_device *dev1,const void *_dev2) +cmp_rte_device (const struct rte_device *dev1,const struct rte_bus_address *_dev2) { -const struct rte_device *dev2 = _dev2; +const struct rte_device *dev2 = _dev2->addr;return dev1 != dev2; }
@@ -171,7 +171,11 @@ bus_find_device(const struct rte_bus *bus, const void *_dev) {struct rte_device *dev; - dev = bus->find_device (NULL , cmp_rte_device, _dev); +struct rte_bus_address dev_addr = { + .addr = _dev, + .size =0 , + }; + dev = bus->find_device (NULL , cmp_rte_device, &dev_addr);return dev ==NULL ; }
lib/eal/common/eal_common_dev.c +13 -5
@@ -108,7 +108,7 @@ struct dev_next_ctx { (((struct dev_next_ctx *)(intptr_t)ptr)->cls_str)int -rte_cmp_dev_name (const struct rte_device *dev1,const void *name2) +rte_cmp_dev_name (const struct rte_device *dev1,const struct rte_bus_address *dev2_addr) {void *parsed_name1;void *parsed_name2;
@@ -117,7 +117,7 @@ rte_cmp_dev_name(const struct rte_device *dev1, const void *name2)int ret;if (dev1->bus->parse (dev1->name,NULL , &size1) !=0 || - dev1->bus->parse (name2,NULL , &size2) !=0 ) + dev1->bus->parse (dev2_addr->addr,NULL , &size2) !=0 )return 1 ;if (size1 != size2)
@@ -137,7 +137,7 @@ rte_cmp_dev_name(const struct rte_device *dev1, const void *name2)memset (parsed_name2,0 , size2); dev1->bus->parse (dev1->name, parsed_name1,NULL ); - dev1->bus->parse (name2, parsed_name2,NULL ); + dev1->bus->parse (dev2_addr->addr, parsed_name2,NULL ); ret =memcmp (parsed_name1, parsed_name2, size1);free (parsed_name1);
@@ -228,7 +228,11 @@ local_dev_probe(const char *devargs, struct rte_device **new_dev)if (ret) goto err_devarg; - dev = da->bus->find_device (NULL , rte_cmp_dev_name, da->name); +struct rte_bus_address dev_addr = { + .addr = da->name, + .size =RTE_DEV_NAME_MAX_LEN + }; + dev = da->bus->find_device (NULL , rte_cmp_dev_name, &dev_addr);if (dev ==NULL ) {EAL_LOG (ERR ,"Cannot find device (%s)" , da->name);
@@ -366,7 +370,11 @@ rte_eal_hotplug_remove(const char *busname, const char *devname)return -ENOENT ; } - dev = bus->find_device (NULL , rte_cmp_dev_name, devname); +struct rte_bus_address dev_addr = { + .addr = devname, + .size =strlen (devname) + }; + dev = bus->find_device (NULL , rte_cmp_dev_name, &dev_addr);if (dev ==NULL ) {EAL_LOG (ERR ,"Cannot find plugged device (%s)" , devname);return -EINVAL ;
lib/eal/common/hotplug_mp.c +10 -2
@@ -128,7 +128,11 @@ __handle_secondary_request(void *param) goto finish; } - dev = bus->find_device (NULL , rte_cmp_dev_name, da.name); +struct rte_bus_address dev_addr = { + .addr = da.name, + .size =RTE_DEV_NAME_MAX_LEN + }; + dev = bus->find_device (NULL , rte_cmp_dev_name, &dev_addr);if (dev ==NULL ) {EAL_LOG (ERR ,"Cannot find plugged device (%s)" , da.name); ret = -ENOENT ;
@@ -255,7 +259,11 @@ static void __handle_primary_request(void *param) goto quit; } - dev = bus->find_device (NULL , rte_cmp_dev_name, da->name); +struct rte_bus_address dev_addr = { + .addr = da->name, + .size =RTE_DEV_NAME_MAX_LEN + }; + dev = bus->find_device (NULL , rte_cmp_dev_name, &dev_addr);if (dev ==NULL ) {EAL_LOG (ERR ,"Cannot find plugged device (%s)" , da->name); ret = -ENOENT ;
lib/eal/include/bus_driver.h +1 -1
@@ -70,7 +70,7 @@ typedef int (*rte_bus_probe_t)(void);*/ typedef struct rte_device * (*rte_bus_find_device_t )(const struct rte_device *start,rte_dev_cmp_t cmp, -const void *data); +const struct rte_bus_address *data);/** * Implementation specific probe function which is responsible for linking
lib/eal/include/rte_dev.h +10 -5
@@ -171,19 +171,24 @@ int rte_dev_is_probed(const struct rte_device *dev);int rte_eal_hotplug_add (const char *busname,const char *devname,const char *drvargs); +struct rte_bus_address { +const void *addr; +size_t size; +}; +/** * General device name comparison. Will compare by using the specific bus * compare function or by comparing the names directly. * * @param dev * Device handle. -* @param name -* Name to compare against. +* @param addr +* Address to compare against. * @return -* 0 if the device matches the name. Nonzero otherwise. +* 0 if the device matches the address. Nonzero otherwise. */ __rte_internal -int rte_cmp_dev_name(const struct rte_device *dev, const void *name); +int rte_cmp_dev_name(const struct rte_device *dev, const struct rte_bus_address *addr);/** * Add matching devices.
@@ -245,7 +250,7 @@ int rte_dev_remove(struct rte_device *dev);* <0 if ordering is possible and the device is lower than the data. * >0 if ordering is possible and the device is greater than the data. */ -typedef int (*rte_dev_cmp_t )(const struct rte_device *dev,const void *data); +typedef int (*rte_dev_cmp_t )(const struct rte_device *dev,const struct rte_bus_address *data);#define RTE_PMD_EXPORT_NAME_ARRAY (n, idx) n##idx[]
lib/eal/linux/eal_dev.c +5 -1
@@ -272,8 +272,12 @@ dev_uev_handler(__rte_unused void *param) goto failure_handle_err; } +const struct rte_bus_address dev_addr = { + .addr = uevent.devname, + .size =strlen (uevent.devname) + }; dev = bus->find_device (NULL , rte_cmp_dev_name, - uevent.devname); + &dev_addr);if (dev ==NULL ) {EAL_LOG (ERR ,"Cannot find device (%s) on " "bus (%s)" , uevent.devname, busname);
Signature · 1 line
2.34.1
Re: [PATCH v6 1/4] bus/pci: fix registration of PCI device
In reply to Shani PeretzQuoted 8 lines · Shani Peretz
When registering a new PCI device, the
device->namefield stored the user-provided string from devargs (e.g., "08:00.0" or "0000:08:00.0"). This approach led to inconsistencies when registering new devices.This patch fix this issue by saving the parsed PCI in
device->name, so when a new PCI device is registering the name displayed in the device list will be the parsed version.
Quoted 8 lines
Fixes 23eaa9059ec2 ("bus/pci: use given name as generic name")Signed-off-by Shani Peretz <[email protected]>--- drivers/bus/pci/pci_common.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-)
Tested with running testpmd using -a 27:00.0 -a 27:00.1 and then using dpdk-proc-info with the same ports prefixed with 0000:. Without this patch, that gave an error. With this patch, output was the same with and without the extra prefix.
Also tested the reverse case, running testpmd with the domain prefix, and proc-info without, that too worked in testing.
/Bruce
Re: [PATCH v6 1/4] bus/pci: fix registration of PCI device
In reply to Shani PeretzQuoted 4 lines · On Thu, 6 Feb 2025 12:54:24 +0200 Shani Peretz <[email protected]> wrote:
When registering a new PCI device, the
device->namefield stored the user-provided string from devargs (e.g., "08:00.0" or "0000:08:00.0"). This approach led to inconsistencies when registering new devices.
Quoted 8 lines
This patch fix this issue by saving the parsed PCI in
device->name, so when a new PCI device is registering the name displayed in the device list will be the parsed version.Fixes 23eaa9059ec2 ("bus/pci: use given name as generic name")Signed-off-by Shani Peretz <[email protected]>
This part looks good, second part needs work.
PATCH v7 1/4 bus/pci: fix registration of PCI device
In reply to Shani PeretzWhen registering a new PCI device, the device->name field stored the user-provided string from devargs (e.g., "08:00.0" or "0000:08:00.0"). This approach led to inconsistencies when registering new devices.
This patch fix this issue by saving the parsed PCI in device->name, so when a new PCI device is registering the name displayed in the device list will be the parsed version.
--- drivers/bus/pci/pci_common.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-)
drivers/bus/pci/pci_common.c +2 -12
@@ -99,21 +99,11 @@ pci_common_set(struct rte_pci_device *dev)/* Each device has its internal, canonical name set. */ rte_pci_device_name (&dev->addr, dev->name,sizeof (dev->name)); + dev->device.name = dev->name; + devargs =pci_devargs_lookup (&dev->addr); dev->device.devargs = devargs; -/* When using a blocklist, only blocked devices will have -* an rte_devargs. Allowed devices won't have one. -*/ -if (devargs !=NULL ) -/* If an rte_devargs exists, the generic rte_device uses the -* given name as its name. -*/ - dev->device.name = dev->device.devargs->name; -else -/* Otherwise, it uses the internal, canonical form. */ - dev->device.name = dev->name; -if (dev->bus_info !=NULL ||asprintf (&dev->bus_info,"vendor_id=%" PRIx16", device_id=%" PRIx16, dev->id.vendor_id, dev->id.device_id) !=-1 )
Signature · 1 line
2.34.1
PATCH v7 2/4 lib: fix comparison between devices
DPDK supports multiple formats for specifying buses, (such as "0000:08:00.0" and "08:00.0" for PCI). This flexibility can lead to inconsistencies when using one format while running testpmd, then attempts to use the other format in a later command, resulting in a failure.
The issue arises from the find_device function, which compares the user-provided string directly with the device->name in the rte_device structure.
If we want to accurately compare these names, we'll need to bring both sides to the same representation by invoking the parse function on the user input.
The proposed solution is to utilize the parse function implemented by each bus. When comparing names, we will call parse on the supplied string as well as on the device name itself and compare the results. As part of the change the parse function will now recive the address to write to and the size of the pointer, in addition it will return the size of the parsed address.
This will allow consistent comparisons between different representations of same devices.
In addition, fixed vdev test to use the rte_cmp_dev_name function instead of the custom one.
--- app/test/test_devargs.c | 2 +- app/test/test_vdev.c | 10 ++---- drivers/bus/auxiliary/auxiliary_common.c | 17 +++++++--- drivers/bus/cdx/cdx.c | 13 +++++--- drivers/bus/dpaa/dpaa_bus.c | 9 ++++-- drivers/bus/fslmc/fslmc_bus.c | 11 ++++--- drivers/bus/ifpga/ifpga_bus.c | 14 +++++--- drivers/bus/pci/pci_common.c | 7 ++-- drivers/bus/platform/platform.c | 15 ++++++--- drivers/bus/uacce/uacce.c | 14 +++++--- drivers/bus/vdev/vdev.c | 23 +++++++++++-- drivers/bus/vmbus/vmbus_common.c | 11 ++++--- drivers/dma/idxd/idxd_bus.c | 9 ++++-- drivers/raw/ifpga/ifpga_rawdev.c | 8 +---- lib/eal/common/eal_common_bus.c | 2 +- lib/eal/common/eal_common_dev.c | 41 +++++++++++++++++++++--- lib/eal/common/hotplug_mp.c | 11 ++----- lib/eal/include/bus_driver.h | 27 +++++++++++++++- lib/eal/include/rte_dev.h | 15 +++++++++ lib/eal/linux/eal_dev.c | 10 +----- lib/eal/version.map | 1 + 21 files changed, 187 insertions(+), 83 deletions(-)
app/test/test_devargs.c +1 -1
@@ -171,7 +171,7 @@ test_valid_devargs(void)int ret; ret =test_valid_devargs_cases (list,RTE_DIM (list)); -if (vdev_bus !=NULL && vdev_bus->parse ("net_ring0" ,NULL ) ==0 ) +if (vdev_bus !=NULL && vdev_bus->parse ("net_ring0" ,NULL ,0 ,NULL ) ==0 )/* Ring vdev driver enabled. */ ret |=test_valid_devargs_cases (legacy_ring_list,RTE_DIM (legacy_ring_list));
app/test/test_vdev.c +2 -8
@@ -20,12 +20,6 @@ static const char * const valid_keys[] = { NULL, }; -static int -cmp_dev_name (const struct rte_device *dev,const void *name) -{ -return strcmp (rte_dev_name (dev), name); -} -static int cmp_dev_match (const struct rte_device *dev,const void *_kvlist) {
@@ -82,7 +76,7 @@ test_vdev_bus(void)printf ("Failed to create vdev net_null_test0\n" ); goto fail; } - dev0 = vdev_bus->find_device (NULL , cmp_dev_name,"net_null_test0" ); + dev0 = vdev_bus->find_device (NULL , rte_cmp_dev_name,"net_null_test0" );if (dev0 ==NULL ) {printf ("Cannot find net_null_test0 vdev\n" ); goto fail;
@@ -93,7 +87,7 @@ test_vdev_bus(void)printf ("Failed to create vdev net_null_test1\n" ); goto fail; } - dev1 = vdev_bus->find_device (NULL , cmp_dev_name,"net_null_test1" ); + dev1 = vdev_bus->find_device (NULL , rte_cmp_dev_name,"net_null_test1" );if (dev1 ==NULL ) {printf ("Cannot find net_null_test1 vdev\n" ); goto fail;
drivers/bus/auxiliary/auxiliary_common.c +12 -5
@@ -237,10 +237,9 @@ auxiliary_probe(void) }static int -auxiliary_parse (const char *name,void *addr) +auxiliary_parse (const char *name,void *addr,int addr_size,int *out_size) {struct rte_auxiliary_driver *drv =NULL ; -const char **out = addr;/* Allow empty device name "auxiliary:" to bypass entire bus scan. */ if (strlen (name) ==0 )
@@ -250,9 +249,17 @@ auxiliary_parse(const char *name, void *addr)if (drv->match (name))break ; } -if (drv !=NULL && addr !=NULL ) - *out = name; -return drv !=NULL ?0 :-1 ; + +if (drv ==NULL ) +return -1 ; + +if (out_size !=NULL ) + *out_size =strlen (name) +1 ; + +if (addr !=NULL ) +rte_strscpy (addr, name, addr_size); + +return 0 ; }/* Register a driver */
drivers/bus/cdx/cdx.c +9 -4
@@ -464,15 +464,20 @@ cdx_probe(void) }static int -cdx_parse (const char *name,void *addr) +cdx_parse (const char *name,void *addr,int addr_size,int *out_size) { -const char **out = addr;int ret; ret =strncmp (name,CDX_DEV_PREFIX ,strlen (CDX_DEV_PREFIX )); -if (ret ==0 && addr) - *out = name; +if (ret !=0 ) +return ret; + +if (out_size !=NULL ) + *out_size =strlen (name) +1 ; + +if (addr !=NULL ) +rte_strscpy (addr, name, addr_size);return ret; }
drivers/bus/dpaa/dpaa_bus.c +6 -3
@@ -153,7 +153,7 @@ dpaa_devargs_lookup(struct rte_dpaa_device *dev)char dev_name[32 ]; RTE_EAL_DEVARGS_FOREACH("dpaa_bus", devargs) { - devargs->bus->parse (devargs->name, &dev_name); + devargs->bus->parse (devargs->name, &dev_name,sizeof (dev_name),NULL );if (strcmp (dev_name, dev->device.name) ==0 ) {DPAA_BUS_INFO ("**Devargs matched %s" , dev_name);return devargs;
@@ -447,7 +447,7 @@ dpaa_portal_finish(void *arg) }static int -rte_dpaa_bus_parse (const char *name,void *out) +rte_dpaa_bus_parse (const char *name,void *out,int addr_size,int *out_size) {unsigned int i, j;size_t delta, dev_delta;
@@ -494,6 +494,9 @@ rte_dpaa_bus_parse(const char *name, void *out) max_name_len =sizeof ("fm.-mac.." ) -1 ; } +if (out_size !=NULL ) + *out_size = max_name_len +1 ; +if (out !=NULL ) {char *out_name = out;
@@ -502,7 +505,7 @@ rte_dpaa_bus_parse(const char *name, void *out)* will be a ',' instead. Not copying past this comma is not an * error. */ -strlcpy (out_name, &name[delta], max_name_len +1 ); +strlcpy (out_name, &name[delta], addr_size);/* Second digit of mac%u could instead be ','. */ if ((strlen(out_name) == max_name_len) &&
drivers/bus/fslmc/fslmc_bus.c +7 -4
@@ -103,7 +103,7 @@ fslmc_devargs_lookup(struct rte_dpaa2_device *dev)char dev_name[32 ]; RTE_EAL_DEVARGS_FOREACH("fslmc", devargs) { - devargs->bus->parse (devargs->name, &dev_name); + devargs->bus->parse (devargs->name, &dev_name,sizeof (dev_name),NULL );if (strcmp (dev_name, dev->device.name) ==0 ) {DPAA2_BUS_INFO ("**Devargs matched %s" , dev_name);return devargs;
@@ -235,7 +235,7 @@ scan_one_fslmc_device(char *dev_name) }static int -rte_fslmc_parse (const char *name,void *addr) +rte_fslmc_parse (const char *name,void *addr,int addr_size,int *out_size) {uint16_t dev_id;char *t_ptr;
@@ -298,8 +298,11 @@ rte_fslmc_parse(const char *name, void *addr) goto err_out; } -if (addr) -strcpy (addr, sep); +if (out_size !=NULL ) + *out_size =strlen (sep) +1 ; + +if (addr !=NULL ) +rte_strscpy (addr, sep, addr_size); ret =0 ; err_out:
drivers/bus/ifpga/ifpga_bus.c +9 -5
@@ -459,9 +459,8 @@ ifpga_find_device(const struct rte_device *start,return NULL ; }static int -ifpga_parse (const char *name,void *addr) +ifpga_parse(const char *name, void *addr, int addr_size __rte_unused, int *out_size) { -int *out = addr;struct rte_rawdev *rawdev =NULL ;char rawdev_name[RTE_RAWDEV_NAME_MAX_LEN ];char *c1 =NULL ;
@@ -491,9 +490,14 @@ ifpga_parse(const char *name, void *addr) rawdev =rte_rawdev_pmd_get_named_dev (rawdev_name);if ((port <IFPGA_BUS_DEV_PORT_MAX ) && - rawdev && - (addr !=NULL )) - *out = port; + rawdev) { +if (out_size !=NULL ) + *out_size =sizeof (port); + +if (addr !=NULL ) + *(int *)addr = port; + } +if ((port <IFPGA_BUS_DEV_PORT_MAX ) && rawdev)
drivers/bus/pci/pci_common.c +5 -2
@@ -84,7 +84,7 @@ pci_devargs_lookup(const struct rte_pci_addr *pci_addr)struct rte_pci_addr addr; RTE_EAL_DEVARGS_FOREACH("pci", devargs) { - devargs->bus->parse (devargs->name, &addr); + devargs->bus->parse (devargs->name, &addr,sizeof (struct rte_pci_addr ),NULL );if (!rte_pci_addr_cmp (pci_addr, &addr))return devargs; }
@@ -487,12 +487,15 @@ rte_pci_dump(FILE *f) }static int -pci_parse (const char *name,void *addr) +pci_parse(const char *name, void *addr, __rte_unused int addr_size, int *size) {struct rte_pci_addr *out = addr;struct rte_pci_addr pci_addr;bool parse; +if (size !=NULL ) + *size =sizeof (struct rte_pci_addr ); + parse = (rte_pci_addr_parse (name, &pci_addr) ==0 );if (parse && addr !=NULL ) *out = pci_addr;
drivers/bus/platform/platform.c +10 -5
@@ -542,11 +542,10 @@ platform_bus_unplug(struct rte_device *dev) }static int -platform_bus_parse (const char *name,void *addr) +platform_bus_parse (const char *name,void *addr,int addr_size,int *out_size) {struct rte_platform_device pdev = { };struct rte_platform_driver *pdrv; -const char **out = addr;rte_strscpy (pdev.name, name,sizeof (pdev.name));
@@ -555,10 +554,16 @@ platform_bus_parse(const char *name, void *addr)break ; } -if (pdrv !=NULL && addr !=NULL ) - *out = name; +if (pdrv ==NULL ) +return -ENODEV ; + +if (out_size !=NULL ) + *out_size =strlen (name) +1 ; -return pdrv !=NULL ?0 : -ENODEV ; +if (addr !=NULL ) +rte_strscpy (addr, name, addr_size); + +return 0 ; } static int
drivers/bus/uacce/uacce.c +10 -4
@@ -20,6 +20,7 @@#include <rte_errno.h> #include <rte_log.h> #include <rte_kvargs.h> +#include <rte_string_fns.h> #include <bus_driver.h> #include "bus_uacce_driver.h"
@@ -529,15 +530,20 @@ uacce_find_device(const struct rte_device *start, rte_dev_cmp_t cmp, const void }static int -uacce_parse (const char *name,void *addr) +uacce_parse (const char *name,void *addr,int addr_size,int *out_size) { -const char **out = addr;int ret; ret =strncmp (name,UACCE_DEV_PREFIX ,strlen (UACCE_DEV_PREFIX )); -if (ret ==0 && addr) - *out = name; +if (ret !=0 ) +return ret; + +if (out_size !=NULL ) + *out_size =strlen (name) +1 ; + +if (addr !=NULL ) +rte_strscpy (addr, name, addr_size);return ret; }
drivers/bus/vdev/vdev.c +20 -3
@@ -113,7 +113,7 @@ rte_vdev_remove_custom_scan(rte_vdev_scan_callback callback, void *user_arg) }static int -vdev_parse (const char *name,void *addr) +vdev_find_driver (const char *name,void *addr) {struct rte_vdev_driver **out = addr;struct rte_vdev_driver *driver =NULL ;
@@ -197,7 +197,7 @@ vdev_probe_all_drivers(struct rte_vdev_device *dev) name =rte_vdev_device_name (dev);VDEV_LOG (DEBUG ,"Search driver to probe device %s" , name); -if (vdev_parse (name, &driver)) +if (vdev_find_driver (name, &driver))return -1 ; iova_mode =rte_eal_iova_mode ();
@@ -232,6 +232,23 @@ find_vdev(const char *name)return NULL ; } +static int +vdev_parse (const char *name,void *addr,int addr_size,int *out_size) +{ +struct rte_vdev_driver *driver; + +if (vdev_find_driver (name, &driver)) +return 1 ; + +if (out_size !=NULL ) + *out_size =strlen (name) +1 ; + +if (addr !=NULL ) +rte_strscpy (addr, name, addr_size); + +return 0 ; +} +static struct rte_devargs *alloc_devargs (const char *name,const char *args) {
@@ -647,7 +664,7 @@ vdev_get_iommu_class(void) TAILQ_FOREACH(dev, &vdev_device_list, next) { name =rte_vdev_device_name (dev); -if (vdev_parse (name, &driver)) +if (vdev_find_driver (name, &driver))continue ;if (driver->drv_flags &RTE_VDEV_DRV_NEED_IOVA_AS_VA )
drivers/bus/vmbus/vmbus_common.c +7 -4
@@ -245,14 +245,17 @@ rte_vmbus_cleanup(void) }static int -vmbus_parse (const char *name,void *addr) +vmbus_parse (const char *name,void *addr,int addr_size,int *out_size) {rte_uuid_t guid;int ret; +if (out_size !=NULL ) + *out_size =sizeof (guid); + ret =rte_uuid_parse (name, guid); -if (ret ==0 && addr) -memcpy (addr, &guid,sizeof (guid)); +if (ret ==0 && addr !=NULL ) +memcpy (addr, &guid, addr_size);return ret; }
@@ -269,7 +272,7 @@ vmbus_devargs_lookup(struct rte_vmbus_device *dev)rte_uuid_t addr; RTE_EAL_DEVARGS_FOREACH("vmbus", devargs) { -vmbus_parse (devargs->name, &addr); +vmbus_parse (devargs->name, &addr,sizeof (rte_uuid_t),NULL );if (rte_uuid_compare (dev->device_id, addr) ==0 )return devargs;
drivers/dma/idxd/idxd_bus.c +6 -3
@@ -47,7 +47,7 @@ static int dsa_probe(void);static struct rte_device *dsa_find_device (const struct rte_device *start,rte_dev_cmp_t cmp,const void *data);static enum rte_iova_mode dsa_get_iommu_class (void ); -static int dsa_addr_parse (const char *name,void *addr); +static int dsa_addr_parse (const char *name,void *addr,int addr_size,int *out_size);/** List of devices */ TAILQ_HEAD (dsa_device_list, rte_dsa_device);
@@ -345,7 +345,7 @@ dsa_scan(void)closedir (dev_dir);return -ENOMEM ; } -if (dsa_addr_parse (wq->d_name, &dev->addr) <0 ) { +if (dsa_addr_parse (wq->d_name, &dev->addr,sizeof (dev->addr),NULL ) <0 ) {IDXD_PMD_ERR ("Error parsing WQ name: %s" , wq->d_name);free (dev);continue ;
@@ -391,11 +391,14 @@ dsa_get_iommu_class(void) }static int -dsa_addr_parse (const char *name,void *addr) +dsa_addr_parse(const char *name, void *addr, int addr_size __rte_unused, int *out_size) {struct dsa_wq_addr *wq = addr;unsigned int device_id, wq_id; +if (out_size !=NULL ) + *out_size =sizeof (struct dsa_wq_addr ); +if (sscanf (name,"wq%u.%u" , &device_id, &wq_id) !=2 ) {IDXD_PMD_DEBUG ("Parsing WQ name failed: %s" , name);return -1 ;
drivers/raw/ifpga/ifpga_rawdev.c +1 -7
@@ -1833,12 +1833,6 @@ ifpga_cfg_probe(struct rte_vdev_device *vdev)return ret; } -static int cmp_dev_name (const struct rte_device *dev,const void *_name) -{ -const char *name = _name; -return strcmp (dev->name, name); -} -static int ifpga_cfg_remove (struct rte_vdev_device *vdev) {
@@ -1874,7 +1868,7 @@ ifpga_cfg_remove(struct rte_vdev_device *vdev) args.port, args.bdf); bus =rte_bus_find_by_name (RTE_STR (IFPGA_BUS_NAME ));if (bus) { -if (bus->find_device (NULL , cmp_dev_name, dev_name)) { +if (bus->find_device (NULL , rte_cmp_dev_name, dev_name)) { ret =rte_eal_hotplug_remove (RTE_STR (IFPGA_BUS_NAME ), dev_name); }
lib/eal/common/eal_common_bus.c +1 -1
@@ -200,7 +200,7 @@ bus_can_parse(const struct rte_bus *bus, const void *_name) {const char *name = _name; -return !(bus->parse && bus->parse (name,NULL ) ==0 ); +return !(bus->parse && bus->parse (name,NULL ,0 ,NULL ) ==0 ); } struct rte_bus *
lib/eal/common/eal_common_dev.c +36 -5
61 lines not on this page · raw message
lib/eal/common/hotplug_mp.c +2 -9
@@ -21,13 +21,6 @@ struct mp_reply_bundle {void *peer; }; -static int cmp_dev_name (const struct rte_device *dev,const void *_name) -{ -const char *name = _name; - -return strcmp (dev->name, name); -} -/** * Secondary to primary request. * start from function eal_dev_hotplug_request_to_primary.
@@ -135,7 +128,7 @@ __handle_secondary_request(void *param) goto finish; } - dev = bus->find_device (NULL , cmp_dev_name, da.name); + dev = bus->find_device (NULL , rte_cmp_dev_name, da.name);if (dev ==NULL ) {EAL_LOG (ERR ,"Cannot find plugged device (%s)" , da.name); ret = -ENOENT ;
@@ -262,7 +255,7 @@ static void __handle_primary_request(void *param) goto quit; } - dev = bus->find_device (NULL , cmp_dev_name, da->name); + dev = bus->find_device (NULL , rte_cmp_dev_name, da->name);if (dev ==NULL ) {EAL_LOG (ERR ,"Cannot find plugged device (%s)" , da->name); ret = -ENOENT ;
lib/eal/include/bus_driver.h +26 -1
@@ -112,11 +112,35 @@ typedef int (*rte_bus_unplug_t)(struct rte_device *dev);* should be written. If NULL, nothing should be written, which * is not an error. * +* @param[in] addr_size +* size of addr. +* +* @param[out] out_size +* device information size. If NULL, nothing should +* be written, which is not an error. +* * @return * 0 if parsing was successful. * !0 for any error. */ -typedef int (*rte_bus_parse_t )(const char *name,void *addr); +typedef int (*rte_bus_parse_t )(const char *name,void *addr,int addr_size,int *out_size); + +/** +* Bus specific device name comparison function. +* +* This type of function is used to compare a bus name with an arbitrary +* name. +* +* @param dev +* Device handle. +* +* @param name +* Name to compare against. +* +* @return +* 0 if the device matches the name. Nonzero otherwise. +*/ +typedef int (*rte_bus_cmp_name_t )(const struct rte_device *dev,const void *name);/** * Parse bus part of the device arguments.
@@ -258,6 +282,7 @@ struct rte_bus {rte_bus_plug_t plug;/**< Probe single device for drivers */ rte_bus_unplug_t unplug;/**< Remove single device from driver */ rte_bus_parse_t parse;/**< Parse a device name */ +rte_bus_cmp_name_t cmp_name;/**< Compare device name */ rte_bus_devargs_parse_t devargs_parse;/**< Parse bus devargs */ rte_dev_dma_map_t dma_map;/**< DMA map for device in the bus */ rte_dev_dma_unmap_t dma_unmap;/**< DMA unmap for device in the bus */
lib/eal/include/rte_dev.h +15 -0
@@ -17,6 +17,7 @@#include <rte_config.h> #include <rte_common.h> +#include <rte_compat.h> #include <rte_log.h> #ifdef __cplusplus
@@ -170,6 +171,20 @@ int rte_dev_is_probed(const struct rte_device *dev);int rte_eal_hotplug_add (const char *busname,const char *devname,const char *drvargs); +/** +* General device name comparison. Will compare by using the specific bus +* compare function or by comparing the names directly. +* +* @param dev +* Device handle. +* @param name +* Name to compare against. +* @return +* 0 if the device matches the name. Nonzero otherwise. +*/ +__rte_internal +int rte_cmp_dev_name(const struct rte_device *dev, const void *name); +/** * Add matching devices. *
lib/eal/linux/eal_dev.c +1 -9
@@ -91,14 +91,6 @@ static void sigbus_handler(int signum, siginfo_t *info,EAL_LOG (DEBUG ,"Success to handle SIGBUS for hot-unplug!" ); } -static int cmp_dev_name (const struct rte_device *dev, -const void *_name) -{ -const char *name = _name; - -return strcmp (dev->name, name); -} -static int dev_uev_socket_fd_create (void ) {
@@ -280,7 +272,7 @@ dev_uev_handler(__rte_unused void *param) goto failure_handle_err; } - dev = bus->find_device (NULL , cmp_dev_name, + dev = bus->find_device (NULL , rte_cmp_dev_name, uevent.devname);if (dev ==NULL ) { EAL_LOG(ERR, "Cannot find device (%s) on "
lib/eal/version.map +1 -0
@@ -448,4 +448,5 @@ INTERNAL { rte_mem_unmap; rte_thread_create_internal_control; rte_thread_set_prefixed_name; + rte_cmp_dev_name; };
Signature · 1 line
2.34.1
Re: [PATCH v7 2/4] lib: fix comparison between devices
Quoted 23 lines · On Wed, 12 Feb 2025 18:38:33 +0200 Shani Peretz <[email protected]> wrote:
DPDK supports multiple formats for specifying buses, (such as "0000:08:00.0" and "08:00.0" for PCI). This flexibility can lead to inconsistencies when using one format while running testpmd, then attempts to use the other format in a later command, resulting in a failure.
The issue arises from the
find_devicefunction, which compares the user-provided string directly with thedevice->namein therte_devicestructure.
If we want to accurately compare these names, we'll need to bring both sides to the same representation by invoking the parse function on the user input.The proposed solution is to utilize the parse function implemented by each bus. When comparing names, we will call parse on the supplied string as well as on the device name itself and compare the results. As part of the change the parse function will now recive the address to write to and the size of the pointer, in addition it will return the size of the parsed address.
This will allow consistent comparisons between different representations of same devices.
Quoted 6 lines
In addition, fixed vdev test to use the
rte_cmp_dev_namefunction instead of the custom one.Fixes a3ee360f4440 ("eal: add hotplug add/remove device")Signed-off-by Shani Peretz <[email protected]>
This patch set seems to transform the device name from a null terminated string to a an array of bytes with a length. Not sure if this is completely needed. Understand that C null terminated strings are a bug magnet, but not sure how the PCI changes force this.
Re: [PATCH v7 2/4] lib: fix comparison between devices
In reply to Shani PeretzQuoted 6 lines · On Wed, 12 Feb 2025 18:38:33 +0200 Shani Peretz <[email protected]> wrote:
DPDK supports multiple formats for specifying buses, (such as "0000:08:00.0" and "08:00.0" for PCI). This flexibility can lead to inconsistencies when using one format while running testpmd, then attempts to use the other format in a later command, resulting in a failure.
Quoted 6 lines
The issue arises from the
find_devicefunction, which compares the user-provided string directly with thedevice->namein therte_devicestructure.
If we want to accurately compare these names, we'll need to bring both sides to the same representation by invoking the parse function on the user input.
Could you give an example where this happens please? Shouldn't find_device string always be changed into canonical form in find_device handler?
Quoted 6 lines
The proposed solution is to utilize the parse function implemented by each bus. When comparing names, we will call parse on the supplied string as well as on the device name itself and compare the results. As part of the change the parse function will now recive the address to write to and the size of the pointer, in addition it will return the size of the parsed address.
This leads to more complexity than needed, the layering here is a bit of a mess already. Way too complex as it is.
There is complex nesting between generic bus code, pci bus code, kvargs processing and drivers.
Why does the PCI code need to be calling generic code for parse.
Quoted 2 lines
This will allow consistent comparisons between different representations of same devices.
Not a fan of how wide this change ends up being. Would like to keep it just to PCI.
RE: [PATCH v7 2/4] lib: fix comparison between devices
Quoted 36 lines
-----Original Message-----
From: Stephen Hemminger <[email protected]>
Sent: Thursday, 20 February 2025 20:33
To: Shani Peretz <[email protected]>
Cc: [email protected]; Tyler Retzlaff <[email protected]>; Parav Pandit <[email protected]>; Xueming Li <[email protected]>; Nipun Gupta <[email protected]>; Nikhil Agarwal <[email protected]>; Hemant Agrawal <[email protected]>; Sachin Saxena <[email protected]>; Rosen Xu <[email protected]>; Chenbo Xia <[email protected]>; Tomasz Duszynski <[email protected]>; Chengwen Feng <[email protected]>; NBU-Contact-longli (EXTERNAL) <[email protected]>; Wei Hu <[email protected]>; Bruce Richardson <[email protected]>; Kevin Laatz <[email protected]>; Jan Blunck <[email protected]>
Subject: Re: [PATCH v7 2/4] lib: fix comparison between devicesExternal email: Use caution opening links or attachments
Quoted 6 lines · On Wed, 12 Feb 2025 18:38:33 +0200 Shani Peretz <[email protected]> wrote:
DPDK supports multiple formats for specifying buses, (such as "0000:08:00.0" and "08:00.0" for PCI).
This flexibility can lead to inconsistencies when using one format while running testpmd, then attempts to use the other format in a later command, resulting in a failure.Quoted 6 lines
The issue arises from the
find_devicefunction, which compares the user-provided string directly with thedevice->namein therte_devicestructure.
If we want to accurately compare these names, we'll need to bring both sides to the same representation by invoking the parse function on the user input.
Quoted 3 lines
Could you give an example where this happens please? Shouldn't
find_devicestring always be changed into canonical form infind_devicehandler?
The flow I was dealing with was attach_port -> rte_dev_probe - > local_dev_probe -> find_device. The string passed to attach_port was the short version, directly from the user.
So, to clarify - you're saying that find_device simply need to accept the string in its canonical form? Which means we'll only need to fix local_dev_probe to bring it to the canonical form before calling find_device?
I tried it but then I noticed that there's no function that gets the user-provided string and returns it's string canonical form. The closest to this is parse, but what it eventually returns is not necessarily a string - it can be anything - for instance pci_parse will give you back a struct rte_pci_addr.
Quoted 13 lines
Quoted 7 lines
The proposed solution is to utilize the parse function implemented by each bus. When comparing names, we will call parse on the supplied string as well as on the device name itself and compare the results. As part of the change the parse function will now recive the address to write to and the size of the pointer, in addition it will return the size of the parsed address.
This leads to more complexity than needed, the layering here is a bit of a mess already. Way too complex as it is.
There is complex nesting between generic bus code, pci bus code, kvargs processing and drivers.
Quoted 8 lines
Why does the PCI code need to be calling generic code for parse.
Quoted 2 lines
This will allow consistent comparisons between different representations of same devices.
Not a fan of how wide this change ends up being. Would like to keep it just to PCI.
I agree it became too wide.
As I see it we have 3 options:
1. Add a function that returns the canonical form string of a device and call it before find_device is called (in local_dev_probe for example)
2. Add a comparison function, pci bus will call this specific comparison (something like what I did in here https://patches.dpdk.org/project/dpdk/patch/[email protected]/)
3. The current proposal
What do you think?
Thanks for your help, and sorry for the late response
Re: [PATCH v7 2/4] lib: fix comparison between devices
Quoted 39 lines · On Thu, 6 Mar 2025 16:26:50 +0000 Shani Peretz <[email protected]> wrote:
Quoted 35 lines
-----Original Message-----
From: Stephen Hemminger <[email protected]>
Sent: Thursday, 20 February 2025 20:33
To: Shani Peretz <[email protected]>
Cc: [email protected]; Tyler Retzlaff <[email protected]>; Parav Pandit <[email protected]>; Xueming Li <[email protected]>; Nipun Gupta <[email protected]>; Nikhil Agarwal <[email protected]>; Hemant Agrawal <[email protected]>; Sachin Saxena <[email protected]>; Rosen Xu <[email protected]>; Chenbo Xia <[email protected]>; Tomasz Duszynski <[email protected]>; Chengwen Feng <[email protected]>; NBU-Contact-longli (EXTERNAL) <[email protected]>; Wei Hu <[email protected]>; Bruce Richardson <[email protected]>; Kevin Laatz <[email protected]>; Jan Blunck <[email protected]>
Subject: Re: [PATCH v7 2/4] lib: fix comparison between devicesExternal email: Use caution opening links or attachments
Quoted 6 lines · On Wed, 12 Feb 2025 18:38:33 +0200 Shani Peretz <[email protected]> wrote:
DPDK supports multiple formats for specifying buses, (such as "0000:08:00.0" and "08:00.0" for PCI).
This flexibility can lead to inconsistencies when using one format while running testpmd, then attempts to use the other format in a later command, resulting in a failure.Quoted 6 lines
The issue arises from the
find_devicefunction, which compares the user-provided string directly with thedevice->namein therte_devicestructure.
If we want to accurately compare these names, we'll need to bring both sides to the same representation by invoking the parse function on the user input.Quoted 3 lines
Could you give an example where this happens please? Shouldn't
find_devicestring always be changed into canonical form infind_devicehandler?
Quoted 5 lines
The flow I was dealing with was
attach_port->rte_dev_probe- >local_dev_probe->find_device. The string passed toattach_portwas the short version, directly from the user.So, to clarify - you're saying that
find_devicesimply need to accept the string in its canonical form? Which means we'll only need to fixlocal_dev_probeto bring it to the canonical form before callingfind_device?
I tried it but then I noticed that there's no function that gets the user-provided string and returns it's string canonical form. The closest to this is parse, but what it eventually returns is not necessarily a string - it can be anything - for instancepci_parsewill give you back a structrte_pci_addr.
Not sure at this point. There are two options. One would be fixup in attach_port the other would be allowing short form in PCI part of find_device. Since the strings from command line are put in canonical form for devargs, it seems logical to do it in attach_port path.
RE: [PATCH v7 2/4] lib: fix comparison between devices
Hey Stephan,
Apologize for the delayed response and appreciate your assistance.
I prepared a document outlining the bug and its flow, along with the two solutions we discussed. I hope this document provides a comprehensive overview. Can you take a look?
Thank you!
https://docs.google.com/document/d/1LmMlJ31P1G77K0TGkBfXWz0DEj6zdprP0bG5p_wu77w/edit?usp=sharing
Quoted 78 lines
-----Original Message-----
From: Stephen Hemminger <[email protected]>
Sent: Monday, 17 March 2025 16:11
To: Shani Peretz <[email protected]>
Cc: [email protected]; Tyler Retzlaff <[email protected]>; Parav Pandit <[email protected]>; Xueming Li <[email protected]>; Nipun Gupta <[email protected]>; Nikhil Agarwal <[email protected]>; Hemant Agrawal <[email protected]>; Sachin Saxena <[email protected]>; Rosen Xu <[email protected]>; Chenbo Xia <[email protected]>; Tomasz Duszynski <[email protected]>; Chengwen Feng <[email protected]>; NBU-Contact-longli (EXTERNAL) <[email protected]>; Wei Hu <[email protected]>; Bruce Richardson <[email protected]>; Kevin Laatz <[email protected]>; Jan Blunck <[email protected]>
Subject: Re: [PATCH v7 2/4] lib: fix comparison between devicesExternal email: Use caution opening links or attachments
Quoted 36 lines · On Thu, 6 Mar 2025 16:26:50 +0000 Shani Peretz <[email protected]> wrote:
Quoted 36 lines
-----Original Message-----
From: Stephen Hemminger <[email protected]>
Sent: Thursday, 20 February 2025 20:33
To: Shani Peretz <[email protected]>
Cc: [email protected]; Tyler Retzlaff <[email protected]>; Parav Pandit <[email protected]>; Xueming Li <[email protected]>; Nipun Gupta <[email protected]>; Nikhil Agarwal <[email protected]>; Hemant Agrawal <[email protected]>; Sachin Saxena <[email protected]>; Rosen Xu <[email protected]>; Chenbo Xia <[email protected]>; Tomasz Duszynski <[email protected]>; Chengwen Feng <[email protected]>; NBU-Contact-longli
(EXTERNAL) <[email protected]>; Wei Hu <[email protected]>; Bruce Richardson <[email protected]>; Kevin Laatz <[email protected]>; Jan Blunck <[email protected]>
Subject: Re: [PATCH v7 2/4] lib: fix comparison between devicesExternal email: Use caution opening links or attachments
Quoted 12 lines · On Wed, 12 Feb 2025 18:38:33 +0200 Shani Peretz <[email protected]> wrote:
DPDK supports multiple formats for specifying buses, (such as "0000:08:00.0" and "08:00.0" for PCI).
This flexibility can lead to inconsistencies when using one format while running testpmd, then attempts to use the other format in a later command, resulting in a failure.The issue arises from the
find_devicefunction, which compares the user-provided string directly with thedevice->namein therte_devicestructure.
If we want to accurately compare these names, we'll need to bring both sides to the same representation by invoking the parse function on the user input.Quoted 5 lines
Quoted 3 lines
Could you give an example where this happens please? Shouldn't
find_devicestring always be changed into canonical form infind_devicehandler?The flow I was dealing with was
attach_port->rte_dev_probe- >
local_dev_probe->find_device.Quoted 3 lines
The string passed to
attach_portwas the short version, directly from the user.So, to clarify - you're saying that
find_devicesimply need to accept the stringin its canonical form? Which means we'll only need to fix
local_dev_probeto bring it to the canonical form before callingfind_device?Quoted 1 line
I tried it but then I noticed that there's no function that gets the user-
provided string and returns it's string canonical form. The closest to this is parse, but what it eventually returns is not necessarily a string - it can be anything - for instance
pci_parsewill give you back a structrte_pci_addr.Not sure at this point. There are two options. One would be fixup in
attach_portthe other would be allowing short form in PCI part offind_device. Since the strings from command line are put in canonical form for devargs, it seems logical to do it inattach_portpath.
Re: [PATCH v7 2/4] lib: fix comparison between devices
Quoted 5 lines · On Wed, 30 Apr 2025 11:12:51 +0000 Shani Peretz <[email protected]> wrote:
Hey Stephan,
Apologize for the delayed response and appreciate your assistance.
I prepared a document outlining the bug and its flow, along with the two solutions we discussed. I hope this document provides a comprehensive overview. Can you take a look?
Quoted 83 lines
Thank you!
https://docs.google.com/document/d/1LmMlJ31P1G77K0TGkBfXWz0DEj6zdprP0bG5p_wu77w/edit?usp=sharing
Quoted 78 lines
-----Original Message-----
From: Stephen Hemminger <[email protected]>
Sent: Monday, 17 March 2025 16:11
To: Shani Peretz <[email protected]>
Cc: [email protected]; Tyler Retzlaff <[email protected]>; Parav Pandit <[email protected]>; Xueming Li <[email protected]>; Nipun Gupta <[email protected]>; Nikhil Agarwal <[email protected]>; Hemant Agrawal <[email protected]>; Sachin Saxena <[email protected]>; Rosen Xu <[email protected]>; Chenbo Xia <[email protected]>; Tomasz Duszynski <[email protected]>; Chengwen Feng <[email protected]>; NBU-Contact-longli (EXTERNAL) <[email protected]>; Wei Hu <[email protected]>; Bruce Richardson <[email protected]>; Kevin Laatz <[email protected]>; Jan Blunck <[email protected]>
Subject: Re: [PATCH v7 2/4] lib: fix comparison between devicesExternal email: Use caution opening links or attachments
Quoted 36 lines · On Thu, 6 Mar 2025 16:26:50 +0000 Shani Peretz <[email protected]> wrote:
Quoted 36 lines
-----Original Message-----
From: Stephen Hemminger <[email protected]>
Sent: Thursday, 20 February 2025 20:33
To: Shani Peretz <[email protected]>
Cc: [email protected]; Tyler Retzlaff <[email protected]>; Parav Pandit <[email protected]>; Xueming Li <[email protected]>; Nipun Gupta <[email protected]>; Nikhil Agarwal <[email protected]>; Hemant Agrawal <[email protected]>; Sachin Saxena <[email protected]>; Rosen Xu <[email protected]>; Chenbo Xia <[email protected]>; Tomasz Duszynski <[email protected]>; Chengwen Feng <[email protected]>; NBU-Contact-longli
(EXTERNAL) <[email protected]>; Wei Hu <[email protected]>; Bruce Richardson <[email protected]>; Kevin Laatz <[email protected]>; Jan Blunck <[email protected]>
Subject: Re: [PATCH v7 2/4] lib: fix comparison between devicesExternal email: Use caution opening links or attachments
Quoted 12 lines · On Wed, 12 Feb 2025 18:38:33 +0200 Shani Peretz <[email protected]> wrote:
DPDK supports multiple formats for specifying buses, (such as "0000:08:00.0" and "08:00.0" for PCI).
This flexibility can lead to inconsistencies when using one format while running testpmd, then attempts to use the other format in a later command, resulting in a failure.The issue arises from the
find_devicefunction, which compares the user-provided string directly with thedevice->namein therte_devicestructure.
If we want to accurately compare these names, we'll need to bring both sides to the same representation by invoking the parse function on the user input.Quoted 5 lines
Quoted 3 lines
Could you give an example where this happens please? Shouldn't
find_devicestring always be changed into canonical form infind_devicehandler?The flow I was dealing with was
attach_port->rte_dev_probe- >
local_dev_probe->find_device.Quoted 3 lines
The string passed to
attach_portwas the short version, directly from the user.So, to clarify - you're saying that
find_devicesimply need to accept the stringin its canonical form? Which means we'll only need to fix
local_dev_probeto bring it to the canonical form before callingfind_device?Quoted 1 line
I tried it but then I noticed that there's no function that gets the user-
provided string and returns it's string canonical form. The closest to this is parse, but what it eventually returns is not necessarily a string - it can be anything - for instance
pci_parsewill give you back a structrte_pci_addr.Not sure at this point. There are two options. One would be fixup in
attach_portthe other would be allowing short form in PCI part offind_device. Since the strings from command line are put in canonical form for devargs, it seems logical to do it inattach_portpath.
What about if testpmd just did it first?
app/test-pmd/testpmd.c +6 -5
@@ -3413,17 +3413,18 @@ void attach_port(char *identifier) {portid_t pi; +struct rte_devargs devargs = {0 };struct rte_dev_iterator iterator;printf ("Attaching a new port...\n" ); -if (identifier ==NULL ) { +if (rte_devargs_parse (&devargs, identifier) !=0 ) {fprintf (stderr,"Invalid parameters are specified\n" );return ; } -if (rte_dev_probe (identifier) <0 ) { -TESTPMD_LOG (ERR ,"Failed to attach port %s\n" , identifier); +if (rte_dev_probe (devargs.name) <0 ) { +TESTPMD_LOG (ERR ,"Failed to attach port %s\n" , devargs.name);return ; }
@@ -3435,14 +3436,14 @@ attach_port(char *identifier) }/* second attach mode: iterator */ - RTE_ETH_FOREACH_MATCHING_DEV(pi, identifier, &iterator) { + RTE_ETH_FOREACH_MATCHING_DEV(pi, devargs.name, &iterator) {/* setup ports matching the devargs used for probing */ if (port_is_forwarding (pi))continue ;/* port was already attached before */ setup_attached_port ((void *)(intptr_t )pi); } out: -printf ("Port %s is attached.\n" , identifier); +printf ("Port %s is attached.\n" , devargs.name);printf ("Done\n" ); }
RE: [PATCH v7 2/4] lib: fix comparison between devices
Hey Stephan thanks for the quick reply,
I checked the code and also tested and it seems that it won't work because rte_devargs_parse() saves the user provided name in devargs.name without changing it to canonical form. so in the end find_device still receives the short name.
We could save it in devargs.name but then we will still need another function that converts the short name to its canonical form.
Quoted 167 lines
-----Original Message-----
From: Stephen Hemminger <[email protected]>
Sent: Wednesday, 30 April 2025 19:00
To: Shani Peretz <[email protected]>
Cc: [email protected]; Tyler Retzlaff <[email protected]>; Parav Pandit <[email protected]>; Xueming Li <[email protected]>; Nipun Gupta <[email protected]>; Nikhil Agarwal <[email protected]>; Hemant Agrawal <[email protected]>; Sachin Saxena <[email protected]>; Rosen Xu <[email protected]>; Chenbo Xia <[email protected]>; Tomasz Duszynski <[email protected]>; Chengwen Feng <[email protected]>; NBU-Contact-longli (EXTERNAL) <[email protected]>; Wei Hu <[email protected]>; Bruce Richardson <[email protected]>; Kevin Laatz <[email protected]>; Jan Blunck <[email protected]>
Subject: Re: [PATCH v7 2/4] lib: fix comparison between devicesExternal email: Use caution opening links or attachments
Quoted 3 lines · On Wed, 30 Apr 2025 11:12:51 +0000 Shani Peretz <[email protected]> wrote:
Hey Stephan,
Apologize for the delayed response and appreciate your assistance. I prepared a document outlining the bug and its flow, along with the twosolutions we discussed.
Quoted 1 line
I hope this document provides a comprehensive overview. Can you take a
look?
Quoted 4 lines
Thank you!
https://docs.google.com/document/d/1LmMlJ31P1G77K0TGkBfXWz0DEj6zdprP
0bQuoted 69 lines
G5p_wu77w/edit?usp=sharing
Quoted 66 lines
-----Original Message-----
From: Stephen Hemminger <[email protected]>
Sent: Monday, 17 March 2025 16:11
To: Shani Peretz <[email protected]>
Cc: [email protected]; Tyler Retzlaff <[email protected]>; Parav Pandit <[email protected]>; Xueming Li <[email protected]>; Nipun Gupta <[email protected]>; Nikhil Agarwal <[email protected]>; Hemant Agrawal <[email protected]>; Sachin Saxena <[email protected]>; Rosen Xu <[email protected]>; Chenbo Xia <[email protected]>; Tomasz Duszynski <[email protected]>; Chengwen Feng <[email protected]>; NBU-Contact-longli
(EXTERNAL) <[email protected]>; Wei Hu <[email protected]>; Bruce Richardson <[email protected]>; Kevin Laatz <[email protected]>; Jan Blunck <[email protected]>
Subject: Re: [PATCH v7 2/4] lib: fix comparison between devicesExternal email: Use caution opening links or attachments
Quoted 36 lines · On Thu, 6 Mar 2025 16:26:50 +0000 Shani Peretz <[email protected]> wrote:
Quoted 36 lines
-----Original Message-----
From: Stephen Hemminger <[email protected]>
Sent: Thursday, 20 February 2025 20:33
To: Shani Peretz <[email protected]>
Cc: [email protected]; Tyler Retzlaff <[email protected]>; Parav Pandit <[email protected]>; Xueming Li <[email protected]>; Nipun Gupta <[email protected]>; Nikhil Agarwal <[email protected]>; Hemant Agrawal <[email protected]>; Sachin Saxena <[email protected]>; Rosen Xu <[email protected]>; Chenbo Xia <[email protected]>; Tomasz Duszynski <[email protected]>; Chengwen Feng <[email protected]>; NBU-Contact-longli (EXTERNAL) <[email protected]>; Wei Hu <[email protected]>; Bruce Richardson <[email protected]>; Kevin Laatz <[email protected]>; Jan Blunck <[email protected]>
Subject: Re: [PATCH v7 2/4] lib: fix comparison between devicesExternal email: Use caution opening links or attachments
Quoted 12 lines · On Wed, 12 Feb 2025 18:38:33 +0200 Shani Peretz <[email protected]> wrote:
DPDK supports multiple formats for specifying buses, (such as "0000:08:00.0" and "08:00.0" for PCI).
This flexibility can lead to inconsistencies when using one format while running testpmd, then attempts to use the other format in a later command, resulting in a failure.The issue arises from the
find_devicefunction, which compares the user-provided string directly with thedevice->namein therte_devicestructure.
If we want to accurately compare these names, we'll need to bring both sides to the same representation by invoking the parse function on the user input.Quoted 5 lines
Quoted 3 lines
Could you give an example where this happens please? Shouldn't
find_devicestring always be changed into canonical form infind_devicehandler?The flow I was dealing with was
attach_port->rte_dev_probe- >
local_dev_probe->find_device.Quoted 1 line
The string passed to
attach_portwas the short version, directly from theuser.
Quoted 10 lines
Quoted 10 lines
Quoted 3 lines
So, to clarify - you're saying that
find_devicesimply need to accept the stringin its canonical form? Which means we'll only need to fix
local_dev_probeto bring it to the canonical form before callingfind_device?Quoted 2 lines
I tried it but then I noticed that there's no function that gets the user-
provided string and returns it's string canonical form. The closest to this is parse, but what it eventually returns is not necessarily a string - it can be anything - for instance
pci_parsewill give you back astruct
rte_pci_addr.Quoted 5 lines
Quoted 5 lines
Not sure at this point. There are two options. One would be fixup in
attach_portthe other would be allowing short form in PCI part offind_device. Since the strings from command line are put in canonical form for devargs, it seems logical to do it inattach_portpath.What about if testpmd just did it first?
app/test-pmd/testpmd.c index renamed from app/test-pmd/testpmd.c +0
-0
b5f0c02261..a324225e26100644app/test-pmd/testpmd.c +7
-5@@ -3413,17 +3413,18 @@ void attach_port(char *identifier) {portid_t pi; +struct rte_devargs devargs = {0 };struct rte_dev_iterator iterator;printf ("Attaching a new port...\n" ); -if (identifier ==NULL ) { +if (rte_devargs_parse (&devargs, identifier) !=0 ) {fprintf (stderr,"Invalid parameters are specified\n" );return ; } -if (rte_dev_probe (identifier) <0 ) { -TESTPMD_LOG (ERR ,"Failed to attach port %s\n" , identifier); +if (rte_dev_probe (devargs.name) <0 ) { +TESTPMD_LOG (ERR ,"Failed to attach port %s\n" , + devargs.name);return ; }@@ -3435,14 +3436,14 @@ attach_port(char *identifier) }/* second attach mode: iterator */ - RTE_ETH_FOREACH_MATCHING_DEV(pi, identifier, &iterator) { + RTE_ETH_FOREACH_MATCHING_DEV(pi, devargs.name, &iterator) {/* setup ports matching the devargs used for probing */ if (port_is_forwarding (pi))continue ;/* port was already attached before */ setup_attached_port ((void *)(intptr_t )pi); } out: -printf ("Port %s is attached.\n" , identifier); +printf ("Port %s is attached.\n" , devargs.name);printf ("Done\n" ); }
v8 cover fix inconsistent representation of PCI device name
In reply to Shani Peretzv8:
Keep cmp_dev_name as string comparison and create a function within testpmd that converts the PCI name to its long format before passing it to the find_device function.
v1-v7:
The fix focuses on improving cmp_dev_name to perform a smarter comparison instead of a direct string match to find the device.
Shani Peretz (1):
app/testpmd: canonicalize short PCI name format
app/test-pmd/testpmd.c | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-)
Signature · 1 line
2.34.1
PATCH v8 1/1 app/testpmd: canonicalize short PCI name format
when providing short format PCI device names in devargs (e.g. "08:00:0") it is converted and stored as long format. however when attach_port is called from testpmd, the user might provide a short format, which will be passed to find_device with a comparison function that simply compare stings, which will cause find_device not to find any device.
This fix canonicalize the user provided string before it is being passed to find_device.
--- app/test-pmd/testpmd.c | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-)
app/test-pmd/testpmd.c +30 -1
@@ -47,6 +47,7 @@#include <rte_ethdev.h> #include <rte_dev.h> #include <rte_string_fns.h> +#include <rte_pci.h> #ifdef RTE_NET_IXGBE #include <rte_pmd_ixgbe.h> #endif
@@ -3407,12 +3408,35 @@ reset_port(portid_t pid)printf ("Done\n" ); } +static char * +convert_pci_address_format (const char *identifier,char *pci_buffer,size_t buf_size) +{ +struct rte_devargs da; +struct rte_pci_addr pci_addr; + +if (rte_devargs_parse (&da, identifier) !=0 ) +return NULL ; + +if (da.bus ==NULL ) +return NULL ; + +if (strcmp (rte_bus_name (da.bus),"pci" ) !=0 ) +return NULL ; + +if (rte_pci_addr_parse (da.name, &pci_addr) !=0 ) +return NULL ; + +rte_pci_device_name (&pci_addr, pci_buffer, buf_size); +return pci_buffer; +} +void attach_port (char *identifier) {portid_t pi;struct rte_dev_iterator iterator; - +char *long_identifier; +char long_format[PCI_PRI_STR_SIZE ];printf ("Attaching a new port...\n" );if (identifier ==NULL ) {
@@ -3420,6 +3444,11 @@ attach_port(char *identifier)return ; } +/* For PCI device convert to canonical format */ + long_identifier =convert_pci_address_format (identifier, long_format,sizeof (long_format)); +if (long_identifier !=NULL ) + identifier = long_identifier; +if (rte_dev_probe (identifier) <0 ) {TESTPMD_LOG (ERR ,"Failed to attach port %s\n" , identifier);return ;
Signature · 1 line
2.34.1
Re: [PATCH v8 1/1] app/testpmd: canonicalize short PCI name format
Quoted 11 lines · On Tue, 8 Jul 2025 11:37:40 +0300 Shani Peretz <[email protected]> wrote:
when providing short format PCI device names in devargs (e.g. "08:00:0") it is converted and stored as long format. however when
attach_portis called from testpmd, the user might provide a short format, which will be passed tofind_devicewith a comparison function that simply compare stings, which will causefind_devicenot to find any device.This fix canonicalize the user provided string before it is being passed to
find_device.Signed-off-by Shani Peretz <[email protected]>
Looks good, but builds are failing and there is a typo s/stings/strings/
Please resubmit
v9 cover fix inconsistent representation of PCI device name
In reply to Shani Peretzv9:
added pci dependency to the testpmd meson file
fixed typo in commit message
v8:
Keep cmp_dev_name as string comparison and create a function within testpmd that converts the PCI name to its long format before passing it to the find_device function.
v1-v7:
The fix focuses on improving cmp_dev_name to perform a smarter comparison instead of a direct string match to find the device.
Shani Peretz (1):
app/testpmd: canonicalize short PCI name format
app/test-pmd/meson.build | 2 +- app/test-pmd/testpmd.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-)
Signature · 1 line
2.34.1
PATCH v9 1/1 app/testpmd: canonicalize short PCI name format
when providing short format PCI device names in devargs (e.g. "08:00:0") it is converted and stored as long format. however when attach_port is called from testpmd, the user might provide a short format, which will be passed to find_device with a comparison function that simply compare strings, which will cause find_device not to find any device.
This fix canonicalize the user provided string before it is being passed to find_device.
--- app/test-pmd/meson.build | 2 +- app/test-pmd/testpmd.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-)
app/test-pmd/meson.build +1 -1
@@ -34,7 +34,7 @@ if dpdk_conf.has('RTE_HAS_JANSSON') ext_deps += jansson_dep endif -deps += ['ethdev', 'cmdline'] +deps += ['ethdev', 'cmdline', 'pci'] if dpdk_conf.has('RTE_CRYPTO_SCHEDULER') deps += 'crypto_scheduler' endif
app/test-pmd/testpmd.c +30 -0
@@ -47,6 +47,7 @@#include <rte_ethdev.h> #include <rte_dev.h> #include <rte_string_fns.h> +#include <rte_pci.h> #ifdef RTE_NET_IXGBE #include <rte_pmd_ixgbe.h> #endif
@@ -3407,11 +3408,35 @@ reset_port(portid_t pid)printf ("Done\n" ); } +static char * +convert_pci_address_format (const char *identifier,char *pci_buffer,size_t buf_size) +{ +struct rte_devargs da; +struct rte_pci_addr pci_addr; + +if (rte_devargs_parse (&da, identifier) !=0 ) +return NULL ; + +if (da.bus ==NULL ) +return NULL ; + +if (strcmp (rte_bus_name (da.bus),"pci" ) !=0 ) +return NULL ; + +if (rte_pci_addr_parse (da.name, &pci_addr) !=0 ) +return NULL ; + +rte_pci_device_name (&pci_addr, pci_buffer, buf_size); +return pci_buffer; +} +void attach_port (char *identifier) {portid_t pi;struct rte_dev_iterator iterator; +char *long_identifier; +char long_format[PCI_PRI_STR_SIZE ];printf ("Attaching a new port...\n" );
@@ -3420,6 +3445,11 @@ attach_port(char *identifier)return ; } +/* For PCI device convert to canonical format */ + long_identifier =convert_pci_address_format (identifier, long_format,sizeof (long_format)); +if (long_identifier !=NULL ) + identifier = long_identifier; +if (rte_dev_probe (identifier) <0 ) {TESTPMD_LOG (ERR ,"Failed to attach port %s\n" , identifier);return ;
Signature · 1 line
2.34.1
Stephen Hemminger
AppliedRe: [PATCH v9 1/1] app/testpmd: canonicalize short PCI name format
Quoted 7 lines · On Sun, 13 Jul 2025 09:34:17 +0300 Shani Peretz <[email protected]> wrote:
when providing short format PCI device names in devargs (e.g. "08:00:0") it is converted and stored as long format. however when
attach_portis called from testpmd, the user might provide a short format, which will be passed tofind_devicewith a comparison function that simply compare strings, which will causefind_devicenot to find any device.
Quoted 5 lines
This fix canonicalize the user provided string before it is being passed to
find_device.Signed-off-by Shani Peretz <[email protected]>---
Queued to next-net for 25.11
PATCH v7 3/4 app/test: add tests to find devices
In reply to Shani PeretzAdded tests to PCI and vdev bus that compare and find devices in various forms of names under test_devargs.
The tests check the functionality of the rte_cmp_dev_name function by calling it with different variations of names, like short and full, full and full, etc.
--- app/test/test_devargs.c | 120 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 120 insertions(+)
app/test/test_devargs.c +120 -0
@@ -12,7 +12,9 @@#include <rte_kvargs.h> #include <bus_driver.h> #include <rte_class.h> +#include <rte_bus_vdev.h> +#include "virtual_pmd.h" #include "test.h" /* Check layer arguments. */
@@ -302,6 +304,118 @@ test_invalid_devargs_parsing(void)return fail; } +static struct rte_device * +create_pci_dev (const char *name) +{ +int port_id; +struct rte_ether_addr rand_ea = {0 }; +rte_eth_random_addr (rand_ea.addr_bytes); + +char pmd_name[RTE_ETH_NAME_MAX_LEN ]; +strlcpy (pmd_name, name,RTE_ETH_NAME_MAX_LEN ); + + port_id =virtual_ethdev_create (pmd_name, + &rand_ea,rte_socket_id (),1 ); + +if (port_id <0 ) +return NULL ; + +return (&rte_eth_devices[port_id])->device; +} + +static int +test_pci (struct rte_bus *pci_bus,const char *dev_name,const char *name2) +{ +struct rte_device *pci_dev =create_pci_dev (dev_name); + +if (pci_dev ==NULL ) +return -1 ; + + pci_dev->bus = pci_bus; + +if (rte_cmp_dev_name (pci_dev, name2) !=0 ) { +printf ("rte_cmp_dev_name(%s, %s) device name (%s) not expected (%s)\n" , + pci_dev->name, name2, pci_dev->name, name2); +return -1 ; + } +return 0 ; +} + +static int +test_vdev (struct rte_bus *vdev_bus,const char *dev_name,const char *name2) +{ +/* create vdev */ +if (rte_vdev_init (dev_name,"" ) <0 ) { +printf ("Failed to create vdev %s\n" , dev_name); +return -1 ; + } + +struct rte_device *vdev_dev = vdev_bus->find_device (NULL , rte_cmp_dev_name, dev_name); +if (vdev_dev ==NULL ) { +printf ("Cannot find %s vdev\n" , dev_name); +rte_vdev_uninit (dev_name); +return -1 ; + } +int ret =rte_cmp_dev_name (vdev_dev, name2); +if (ret !=0 ) { +printf ("rte_cmp_dev_name(%s, %s) device name (%s) not expected (%s)\n" , + vdev_dev->name, name2, vdev_dev->name, name2); +return -1 ; + } + +if (vdev_dev != vdev_bus->find_device (NULL , rte_cmp_dev_name, name2)) { +printf ("rte_cmp_dev_name(%s, %s) device name (%s) not expected (%s)\n" , + vdev_dev->name, name2, vdev_dev->name, name2); +return -1 ; + } + +rte_vdev_uninit (dev_name); +return 0 ; +} + +static int +test_valid_cmp_dev_name (void ) +{ +struct rte_bus *pci_bus =rte_bus_find_by_name ("pci" ); +struct rte_bus *vdev_bus =rte_bus_find_by_name ("vdev" ); + +if (pci_bus) { +if ((test_pci (pci_bus,"0000:08:11.0" ,"08:11.0" ) !=0 ) || + (test_pci (pci_bus,"08:12.0" ,"0000:08:12.0" ) !=0 ) || + (test_pci (pci_bus,"08:13.0" ,"08:13.0" ) !=0 ) || + (test_pci (pci_bus,"0000:08:14.0" ,"0000:08:14.0" ) !=0 )) +return -1 ; + } + +if (vdev_bus) { +if (test_vdev (vdev_bus,"net_null_test0" ,"net_null_test0" ) !=0 ) +return -1 ; + } +return 0 ; +} + +static int +test_invalid_cmp_dev_name (void ) +{ +struct rte_bus *pci_bus =rte_bus_find_by_name ("pci" ); +struct rte_bus *vdev_bus =rte_bus_find_by_name ("vdev" ); + +if (pci_bus) { +if ((test_pci (pci_bus,"0000:08:15.0" ,"08:00.0" ) ==0 ) || + (test_pci (pci_bus,"08:16.0" ,"0000:08:15.0" ) ==0 ) || + (test_pci (pci_bus,"08:17.0" ,"08:13.0" ) ==0 ) || + (test_pci (pci_bus,"0000:08:18.0" ,"0000:08:14.0" ) ==0 )) +return -1 ; + } + +if (vdev_bus) { +if ((test_vdev (vdev_bus,"net_null_test0" ,"net_null_test" ) ==0 ) || + (test_vdev (vdev_bus,"net_null_test1" ,"net_null_test2" ) ==0 )) +return -1 ; + } +return 0 ; +} +static int test_devargs (void ) {
@@ -317,6 +431,12 @@ test_devargs(void)printf ("== test devargs parsing invalid case ==\n" );if (test_invalid_devargs_parsing () <0 )return -1 ; +printf ("== test find device valid case ==\n" ); +if (test_valid_cmp_dev_name () <0 ) +return -1 ; +printf ("== test find device invalid case ==\n" ); +if (test_invalid_cmp_dev_name () <0 ) +return -1 ;return 0 ; }
Signature · 1 line
2.34.1
Re: [PATCH v7 3/4] app/test: add tests to find devices
app/test/test_devargs.c test_invalid_devargs_parsing(void) · line 312
Quoted 6 lines · On Wed, 12 Feb 2025 18:38:34 +0200 Shani Peretz <[email protected]> wrote:
app/test/test_devargs.c +6
-0+static struct rte_device * +create_pci_dev (const char *name) +{ +int port_id; +struct rte_ether_addr rand_ea = {0 }; +rte_eth_random_addr (rand_ea.addr_bytes);
Minor nit, no need to initialize address then call random. Random always writes the value.
Re: [PATCH v7 3/4] app/test: add tests to find devices
In reply to Shani Peretzapp/test/test_devargs.c test_devargs(void) · line 440
Quoted 11 lines · On Wed, 12 Feb 2025 18:38:34 +0200 Shani Peretz <[email protected]> wrote:
app/test/test_devargs.c +6
-0@@ -317,6 +431,12 @@ test_devargs(void)printf ("== test devargs parsing invalid case ==\n" );if (test_invalid_devargs_parsing () <0 )return -1 ; +printf ("== test find device valid case ==\n" ); +if (test_valid_cmp_dev_name () <0 ) +return -1 ; +printf ("== test find device invalid case ==\n" ); +if (test_invalid_cmp_dev_name () <0 ) +return -1 ;
The tests should be converted to use unit_test_suit_runnner() API. But that can be done as a follow on patch.
PATCH v7 4/4 lib: change find device and cmp dev name functions
In reply to Shani PeretzChange find_device and rte_cmp_dev_name to accept a struct with pointer and size instead of a void* pointer.
--- app/test/test_devargs.c | 23 +++++++++++++++++++---- app/test/test_vdev.c | 23 ++++++++++++++++++----- drivers/bus/auxiliary/auxiliary_common.c | 2 +- drivers/bus/auxiliary/auxiliary_params.c | 10 +++++++--- drivers/bus/cdx/cdx.c | 12 ++++++++---- drivers/bus/dpaa/dpaa_bus.c | 2 +- drivers/bus/fslmc/fslmc_bus.c | 2 +- drivers/bus/ifpga/ifpga_bus.c | 2 +- drivers/bus/pci/pci_common.c | 2 +- drivers/bus/pci/pci_params.c | 10 +++++++--- drivers/bus/platform/platform.c | 3 ++- drivers/bus/platform/platform_params.c | 10 +++++++--- drivers/bus/uacce/uacce.c | 13 +++++++++---- drivers/bus/vdev/vdev.c | 2 +- drivers/bus/vdev/vdev_params.c | 10 +++++++--- drivers/bus/vdev/vdev_private.h | 2 +- drivers/bus/vmbus/vmbus_common.c | 2 +- drivers/dma/idxd/idxd_bus.c | 4 ++-- drivers/net/bonding/rte_eth_bond_args.c | 15 +++++---------- drivers/net/vdev_netvsc/vdev_netvsc.c | 8 ++++++-- drivers/raw/ifpga/ifpga_rawdev.c | 6 +++++- lib/eal/common/eal_common_bus.c | 10 +++++++--- lib/eal/common/eal_common_dev.c | 18 +++++++++++++----- lib/eal/common/hotplug_mp.c | 12 ++++++++++-- lib/eal/include/bus_driver.h | 2 +- lib/eal/include/rte_dev.h | 15 ++++++++++----- lib/eal/linux/eal_dev.c | 6 +++++- 27 files changed, 156 insertions(+), 70 deletions(-)
app/test/test_devargs.c +19 -4
@@ -333,7 +333,12 @@ test_pci(struct rte_bus *pci_bus, const char *dev_name, const char *name2) pci_dev->bus = pci_bus; -if (rte_cmp_dev_name (pci_dev, name2) !=0 ) { +struct rte_bus_address addr = { + .addr = name2, + .size =strlen (name2) + }; + +if (rte_cmp_dev_name (pci_dev, &addr) !=0 ) {printf ("rte_cmp_dev_name(%s, %s) device name (%s) not expected (%s)\n" , pci_dev->name, name2, pci_dev->name, name2);return -1 ;
@@ -350,20 +355,30 @@ test_vdev(struct rte_bus *vdev_bus, const char *dev_name, const char *name2)return -1 ; } -struct rte_device *vdev_dev = vdev_bus->find_device (NULL , rte_cmp_dev_name, dev_name); +struct rte_bus_address dev_addr = { + .addr = dev_name, + .size =strlen (dev_name) + }; + +struct rte_device *vdev_dev = vdev_bus->find_device (NULL , rte_cmp_dev_name, &dev_addr);if (vdev_dev ==NULL ) {printf ("Cannot find %s vdev\n" , dev_name);rte_vdev_uninit (dev_name);return -1 ; } -int ret =rte_cmp_dev_name (vdev_dev, name2); + +struct rte_bus_address dev_addr2 = { + .addr = name2, + .size =strlen (name2) + }; +int ret =rte_cmp_dev_name (vdev_dev, &dev_addr2);if (ret !=0 ) {printf ("rte_cmp_dev_name(%s, %s) device name (%s) not expected (%s)\n" , vdev_dev->name, name2, vdev_dev->name, name2);return -1 ; } -if (vdev_dev != vdev_bus->find_device (NULL , rte_cmp_dev_name, name2)) { +if (vdev_dev != vdev_bus->find_device (NULL , rte_cmp_dev_name, &dev_addr2)) {printf ("rte_cmp_dev_name(%s, %s) device name (%s) not expected (%s)\n" , vdev_dev->name, name2, vdev_dev->name, name2);return -1 ;
app/test/test_vdev.c +18 -5
@@ -21,9 +21,9 @@ static const char * const valid_keys[] = { };static int -cmp_dev_match (const struct rte_device *dev,const void *_kvlist) +cmp_dev_match (const struct rte_device *dev,const struct rte_bus_address *_kvlist) { -const struct rte_kvargs *kvlist = _kvlist; +const struct rte_kvargs *kvlist = _kvlist->addr;const char *key =TEST_VDEV_KEY_NAME ;const char *name;
@@ -54,7 +54,11 @@ get_matching_vdev(const char *match_str) } } - dev = vdev_bus->find_device (NULL , cmp_dev_match, kvargs); +struct rte_bus_address dev_addr = { + .addr = kvargs, + .size =sizeof (struct rte_kvargs ), + }; + dev = vdev_bus->find_device (NULL , cmp_dev_match, &dev_addr);rte_kvargs_free (kvargs);return dev;
@@ -76,7 +80,12 @@ test_vdev_bus(void)printf ("Failed to create vdev net_null_test0\n" ); goto fail; } - dev0 = vdev_bus->find_device (NULL , rte_cmp_dev_name,"net_null_test0" ); + +struct rte_bus_address dev0_addr = { + .addr ="net_null_test0" , + .size =strlen ("net_null_test0" ) + }; + dev0 = vdev_bus->find_device (NULL , rte_cmp_dev_name, &dev0_addr);if (dev0 ==NULL ) {printf ("Cannot find net_null_test0 vdev\n" ); goto fail;
@@ -87,7 +96,11 @@ test_vdev_bus(void)printf ("Failed to create vdev net_null_test1\n" ); goto fail; } - dev1 = vdev_bus->find_device (NULL , rte_cmp_dev_name,"net_null_test1" ); +struct rte_bus_address dev1_addr = { + .addr ="net_null_test1" , + .size =strlen ("net_null_test1" ) + }; + dev1 = vdev_bus->find_device (NULL , rte_cmp_dev_name, &dev1_addr);if (dev1 ==NULL ) {printf ("Cannot find net_null_test1 vdev\n" ); goto fail;
drivers/bus/auxiliary/auxiliary_common.c +1 -1
@@ -300,7 +300,7 @@ rte_auxiliary_remove_device(struct rte_auxiliary_device *auxiliary_dev)static struct rte_device *auxiliary_find_device (const struct rte_device *start,rte_dev_cmp_t cmp, -const void *data) +const struct rte_bus_address *data) {const struct rte_auxiliary_device *pstart;struct rte_auxiliary_device *adev;
drivers/bus/auxiliary/auxiliary_params.c +7 -3
@@ -22,9 +22,9 @@ static const char * const auxiliary_params_keys[] = {static int auxiliary_dev_match (const struct rte_device *dev, -const void *_kvlist) +const struct rte_bus_address *_kvlist) { -const struct rte_kvargs *kvlist = _kvlist; +const struct rte_kvargs *kvlist = _kvlist->addr;const char *key = auxiliary_params_keys[RTE_AUXILIARY_PARAM_NAME ];const char *name;
@@ -59,7 +59,11 @@ auxiliary_dev_iterate(const void *start, } } find_device = auxiliary_bus.bus.find_device; - dev =find_device (start, auxiliary_dev_match, kvargs); +struct rte_bus_address dev_addr = { + .addr = kvargs, + .size =sizeof (struct rte_kvargs ), + }; + dev =find_device (start, auxiliary_dev_match, &dev_addr);rte_kvargs_free (kvargs);return dev; }
drivers/bus/cdx/cdx.c +8 -4
@@ -500,7 +500,7 @@ rte_cdx_unregister(struct rte_cdx_driver *driver)static struct rte_device *cdx_find_device (const struct rte_device *start,rte_dev_cmp_t cmp, -const void *data) +const struct rte_bus_address *data) {const struct rte_cdx_device *cdx_start;struct rte_cdx_device *cdx_dev;
@@ -613,9 +613,9 @@ cdx_get_iommu_class(void)static int cdx_dev_match (const struct rte_device *dev, -const void *_kvlist) +const struct rte_bus_address *_kvlist) { -const struct rte_kvargs *kvlist = _kvlist; +const struct rte_kvargs *kvlist = _kvlist->addr;const char *key = cdx_params_keys[RTE_CDX_PARAM_NAME ];const char *name;
@@ -649,7 +649,11 @@ cdx_dev_iterate(const void *start, } } find_device = rte_cdx_bus.bus.find_device; - dev =find_device (start, cdx_dev_match, kvargs); +struct rte_bus_address dev_addr = { + .addr = kvargs, + .size =sizeof (struct rte_kvargs ), + }; + dev =find_device (start, cdx_dev_match, &dev_addr);rte_kvargs_free (kvargs);return dev; }
drivers/bus/dpaa/dpaa_bus.c +1 -1
@@ -745,7 +745,7 @@ rte_dpaa_bus_probe(void)static struct rte_device *rte_dpaa_find_device (const struct rte_device *start,rte_dev_cmp_t cmp, -const void *data) +const struct rte_bus_address *data) {struct rte_dpaa_device *dev;const struct rte_dpaa_device *dstart;
drivers/bus/fslmc/fslmc_bus.c +1 -1
@@ -497,7 +497,7 @@ rte_fslmc_probe(void)static struct rte_device *rte_fslmc_find_device (const struct rte_device *start,rte_dev_cmp_t cmp, -const void *data) +const struct rte_bus_address *data) {const struct rte_dpaa2_device *dstart;struct rte_dpaa2_device *dev;
drivers/bus/ifpga/ifpga_bus.c +1 -1
@@ -443,7 +443,7 @@ ifpga_unplug(struct rte_device *dev)static struct rte_device *ifpga_find_device (const struct rte_device *start, -rte_dev_cmp_t cmp,const void *data) +rte_dev_cmp_t cmp,const struct rte_bus_address *data) {struct rte_afu_device *afu_dev;
drivers/bus/pci/pci_common.c +1 -1
@@ -540,7 +540,7 @@ rte_pci_remove_device(struct rte_pci_device *pci_dev)static struct rte_device *pci_find_device (const struct rte_device *start,rte_dev_cmp_t cmp, -const void *data) +const struct rte_bus_address *data) {const struct rte_pci_device *pstart;struct rte_pci_device *pdev;
drivers/bus/pci/pci_params.c +7 -3
@@ -41,9 +41,9 @@ pci_addr_kv_cmp(const char *key __rte_unused,static int pci_dev_match (const struct rte_device *dev, -const void *_kvlist) +const struct rte_bus_address *_kvlist) { -const struct rte_kvargs *kvlist = _kvlist; +const struct rte_kvargs *kvlist = _kvlist->addr;const struct rte_pci_device *pdev;if (kvlist ==NULL )
@@ -76,7 +76,11 @@ rte_pci_dev_iterate(const void *start, } } find_device = rte_pci_bus.bus.find_device; - dev =find_device (start, pci_dev_match, kvargs); +struct rte_bus_address dev_addr = { + .addr = kvargs, + .size =sizeof (struct rte_kvargs ), + }; + dev =find_device (start, pci_dev_match, &dev_addr);rte_kvargs_free (kvargs);return dev; }
drivers/bus/platform/platform.c +2 -1
@@ -473,7 +473,8 @@ platform_bus_probe(void) }static struct rte_device * -platform_bus_find_device (const struct rte_device *start,rte_dev_cmp_t cmp,const void *data) +platform_bus_find_device (const struct rte_device *start,rte_dev_cmp_t cmp, +const struct rte_bus_address *data) {struct rte_platform_device *pdev;
drivers/bus/platform/platform_params.c +7 -3
@@ -27,10 +27,10 @@ static const char * const platform_params_keys[] = { };static int -platform_dev_match (const struct rte_device *dev,const void *_kvlist) +platform_dev_match (const struct rte_device *dev,const struct rte_bus_address *_kvlist) {const char *key = platform_params_keys[RTE_PLATFORM_PARAM_NAME ]; -const struct rte_kvargs *kvlist = _kvlist; +const struct rte_kvargs *kvlist = _kvlist->addr;const char *name;/* no kvlist arg, all devices match */
@@ -68,7 +68,11 @@ platform_bus_dev_iterate(const void *start, const char *str,return NULL ; } - dev = platform_bus.bus.find_device (start, platform_dev_match, kvargs); +struct rte_bus_address dev_addr = { + .addr = kvargs, + .size =sizeof (struct rte_kvargs ), + }; + dev = platform_bus.bus.find_device (start, platform_dev_match, &dev_addr);rte_kvargs_free (kvargs);return dev;
drivers/bus/uacce/uacce.c +9 -4
@@ -508,7 +508,8 @@ uacce_unplug(struct rte_device *dev) }static struct rte_device * -uacce_find_device (const struct rte_device *start,rte_dev_cmp_t cmp,const void *data) +uacce_find_device (const struct rte_device *start,rte_dev_cmp_t cmp, +const struct rte_bus_address *data) {const struct rte_uacce_device *uacce_start;struct rte_uacce_device *uacce_dev;
@@ -549,10 +550,10 @@ uacce_parse(const char *name, void *addr, int addr_size, int *out_size) }static int -uacce_dev_match (const struct rte_device *dev,const void *_kvlist) +uacce_dev_match (const struct rte_device *dev,const struct rte_bus_address *_kvlist) {const char *key = uacce_params_keys[RTE_UACCE_PARAM_NAME ]; -const struct rte_kvargs *kvlist = _kvlist; +const struct rte_kvargs *kvlist = _kvlist->addr;const char *name;/* no kvlist arg, all devices match. */
@@ -583,7 +584,11 @@ uacce_dev_iterate(const void *start, const char *str, } } find_device = uacce_bus.bus.find_device; - dev =find_device (start, uacce_dev_match, kvargs); +struct rte_bus_address dev_addr = { + .addr = kvargs, + .size =sizeof (struct rte_kvargs ), + }; + dev =find_device (start, uacce_dev_match, &dev_addr);rte_kvargs_free (kvargs);return dev; }
drivers/bus/vdev/vdev.c +1 -1
@@ -621,7 +621,7 @@ vdev_cleanup(void)struct rte_device *rte_vdev_find_device (const struct rte_device *start,rte_dev_cmp_t cmp, -const void *data) +const struct rte_bus_address *data) {const struct rte_vdev_device *vstart;struct rte_vdev_device *dev;
drivers/bus/vdev/vdev_params.c +7 -3
@@ -24,9 +24,9 @@ static const char * const vdev_params_keys[] = {static int vdev_dev_match (const struct rte_device *dev, -const void *_kvlist) +const struct rte_bus_address *_kvlist) { -const struct rte_kvargs *kvlist = _kvlist; +const struct rte_kvargs *kvlist = _kvlist->addr;const char *key = vdev_params_keys[RTE_VDEV_PARAM_NAME ];const char *name;
@@ -58,7 +58,11 @@ rte_vdev_dev_iterate(const void *start,return NULL ; } } - dev =rte_vdev_find_device (start, vdev_dev_match, kvargs); +struct rte_bus_address dev_addr = { + .addr = kvargs, + .size =sizeof (struct rte_kvargs ), + }; + dev =rte_vdev_find_device (start, vdev_dev_match, &dev_addr);rte_kvargs_free (kvargs);return dev; }
drivers/bus/vdev/vdev_private.h +1 -1
@@ -14,7 +14,7 @@ extern "C" {struct rte_device *rte_vdev_find_device (const struct rte_device *start,rte_dev_cmp_t cmp, -const void *data); +const struct rte_bus_address *data);void * rte_vdev_dev_iterate(const void *start,
drivers/bus/vmbus/vmbus_common.c +1 -1
@@ -323,7 +323,7 @@ vmbus_remove_device(struct rte_vmbus_device *vmbus_dev)/* VMBUS doesn't support hotplug */ static struct rte_device *vmbus_find_device (const struct rte_device *start,rte_dev_cmp_t cmp, -const void *data) +const struct rte_bus_address *data) {struct rte_vmbus_device *dev;
drivers/dma/idxd/idxd_bus.c +2 -2
@@ -45,7 +45,7 @@ struct dsa_bus;static int dsa_scan (void );static int dsa_probe (void );static struct rte_device *dsa_find_device (const struct rte_device *start, -rte_dev_cmp_t cmp,const void *data); +rte_dev_cmp_t cmp,const struct rte_bus_address *data);static enum rte_iova_mode dsa_get_iommu_class (void );static int dsa_addr_parse (const char *name,void *addr,int addr_size,int *out_size);
@@ -366,7 +366,7 @@ dsa_scan(void)static struct rte_device *dsa_find_device (const struct rte_device *start,rte_dev_cmp_t cmp, -const void *data) +const struct rte_bus_address *data) {struct rte_dsa_device *dev =TAILQ_FIRST (&dsa_bus.device_list);
drivers/net/bonding/rte_eth_bond_args.c +5 -10
@@ -23,15 +23,6 @@ const char *pmd_bond_init_valid_arguments[] = { NULL }; -static inline int -bond_pci_addr_cmp (const struct rte_device *dev,const void *_pci_addr) -{ -const struct rte_pci_device *pdev =RTE_DEV_TO_PCI_CONST (dev); -const struct rte_pci_addr *paddr = _pci_addr; - -return rte_pci_addr_cmp (&pdev->addr, paddr); -} -static inline int find_port_id_by_pci_addr (const struct rte_pci_addr *pci_addr) {
@@ -45,7 +36,11 @@ find_port_id_by_pci_addr(const struct rte_pci_addr *pci_addr)return -1 ; } - dev = pci_bus->find_device (NULL , bond_pci_addr_cmp, pci_addr); +struct rte_bus_address dev_addr = { + .addr = pci_addr, + .size =PCI_PRI_STR_SIZE + }; + dev = pci_bus->find_device (NULL , rte_cmp_dev_name, &dev_addr);if (dev ==NULL ) {RTE_BOND_LOG (ERR ,"unable to find PCI device" );return -1 ;
drivers/net/vdev_netvsc/vdev_netvsc.c +6 -2
@@ -771,7 +771,7 @@ RTE_PMD_REGISTER_PARAM_STRING(net_vdev_netvsc,/** Compare function for vdev find device operation. */ static int vdev_netvsc_cmp_rte_device (const struct rte_device *dev1, - __rte_unused const void *_dev2) + __rte_unused const struct rte_bus_address *_dev2) {return strncmp (dev1->devargs->name,VDEV_NETVSC_DRIVER_NAME ,VDEV_NETVSC_DRIVER_NAME_LEN );
@@ -794,8 +794,12 @@ vdev_netvsc_scan_callback(__rte_unused void *arg) VDEV_NETVSC_DRIVER_NAME_LEN))return ; +struct rte_bus_address dev_addr = { + .addr =VDEV_NETVSC_DRIVER_NAME , + .size =VDEV_NETVSC_DRIVER_NAME_LEN , + }; dev = vbus->find_device (NULL , vdev_netvsc_cmp_rte_device, -VDEV_NETVSC_DRIVER_NAME ); + &dev_addr);if (dev)return ;if (rte_devargs_add (RTE_DEVTYPE_VIRTUAL ,VDEV_NETVSC_DRIVER_NAME ))
drivers/raw/ifpga/ifpga_rawdev.c +5 -1
@@ -1868,7 +1868,11 @@ ifpga_cfg_remove(struct rte_vdev_device *vdev) args.port, args.bdf); bus =rte_bus_find_by_name (RTE_STR (IFPGA_BUS_NAME ));if (bus) { -if (bus->find_device (NULL , rte_cmp_dev_name, dev_name)) { +struct rte_bus_address dev_addr = { + .addr = dev_name, + .size =RTE_RAWDEV_NAME_MAX_LEN + }; +if (bus->find_device (NULL , rte_cmp_dev_name, &dev_addr)) { ret =rte_eal_hotplug_remove (RTE_STR (IFPGA_BUS_NAME ), dev_name); }
lib/eal/common/eal_common_bus.c +7 -3
@@ -159,9 +159,9 @@ rte_bus_find(const struct rte_bus *start, rte_bus_cmp_t cmp, }static int -cmp_rte_device (const struct rte_device *dev1,const void *_dev2) +cmp_rte_device (const struct rte_device *dev1,const struct rte_bus_address *_dev2) { -const struct rte_device *dev2 = _dev2; +const struct rte_device *dev2 = _dev2->addr;return dev1 != dev2; }
@@ -171,7 +171,11 @@ bus_find_device(const struct rte_bus *bus, const void *_dev) {struct rte_device *dev; - dev = bus->find_device (NULL , cmp_rte_device, _dev); +struct rte_bus_address dev_addr = { + .addr = _dev, + .size =0 , + }; + dev = bus->find_device (NULL , cmp_rte_device, &dev_addr);return dev ==NULL ; }
lib/eal/common/eal_common_dev.c +13 -5
@@ -108,7 +108,7 @@ struct dev_next_ctx { (((struct dev_next_ctx *)(intptr_t)ptr)->cls_str)int -rte_cmp_dev_name (const struct rte_device *dev1,const void *name2) +rte_cmp_dev_name (const struct rte_device *dev1,const struct rte_bus_address *dev2_addr) {void *parsed_name1;void *parsed_name2;
@@ -117,7 +117,7 @@ rte_cmp_dev_name(const struct rte_device *dev1, const void *name2)int ret;if (dev1->bus->parse (dev1->name,NULL ,0 , &size1) !=0 || - dev1->bus->parse (name2,NULL ,0 , &size2) !=0 ) + dev1->bus->parse (dev2_addr->addr,NULL ,0 , &size2) !=0 )return 1 ;if (size1 != size2)
@@ -137,7 +137,7 @@ rte_cmp_dev_name(const struct rte_device *dev1, const void *name2)memset (parsed_name2,0 , size2); dev1->bus->parse (dev1->name, parsed_name1, size1,NULL ); - dev1->bus->parse (name2, parsed_name2, size2,NULL ); + dev1->bus->parse (dev2_addr->addr, parsed_name2, size2,NULL ); ret =memcmp (parsed_name1, parsed_name2, size1);free (parsed_name1);
@@ -228,7 +228,11 @@ local_dev_probe(const char *devargs, struct rte_device **new_dev)if (ret) goto err_devarg; - dev = da->bus->find_device (NULL , rte_cmp_dev_name, da->name); +struct rte_bus_address dev_addr = { + .addr = da->name, + .size =RTE_DEV_NAME_MAX_LEN + }; + dev = da->bus->find_device (NULL , rte_cmp_dev_name, &dev_addr);if (dev ==NULL ) {EAL_LOG (ERR ,"Cannot find device (%s)" , da->name);
@@ -366,7 +370,11 @@ rte_eal_hotplug_remove(const char *busname, const char *devname)return -ENOENT ; } - dev = bus->find_device (NULL , rte_cmp_dev_name, devname); +struct rte_bus_address dev_addr = { + .addr = devname, + .size =strlen (devname) + }; + dev = bus->find_device (NULL , rte_cmp_dev_name, &dev_addr);if (dev ==NULL ) {EAL_LOG (ERR ,"Cannot find plugged device (%s)" , devname);return -EINVAL ;
lib/eal/common/hotplug_mp.c +10 -2
@@ -128,7 +128,11 @@ __handle_secondary_request(void *param) goto finish; } - dev = bus->find_device (NULL , rte_cmp_dev_name, da.name); +struct rte_bus_address dev_addr = { + .addr = da.name, + .size =RTE_DEV_NAME_MAX_LEN + }; + dev = bus->find_device (NULL , rte_cmp_dev_name, &dev_addr);if (dev ==NULL ) {EAL_LOG (ERR ,"Cannot find plugged device (%s)" , da.name); ret = -ENOENT ;
@@ -255,7 +259,11 @@ static void __handle_primary_request(void *param) goto quit; } - dev = bus->find_device (NULL , rte_cmp_dev_name, da->name); +struct rte_bus_address dev_addr = { + .addr = da->name, + .size =RTE_DEV_NAME_MAX_LEN + }; + dev = bus->find_device (NULL , rte_cmp_dev_name, &dev_addr);if (dev ==NULL ) {EAL_LOG (ERR ,"Cannot find plugged device (%s)" , da->name); ret = -ENOENT ;
lib/eal/include/bus_driver.h +1 -1
@@ -70,7 +70,7 @@ typedef int (*rte_bus_probe_t)(void);*/ typedef struct rte_device * (*rte_bus_find_device_t )(const struct rte_device *start,rte_dev_cmp_t cmp, -const void *data); +const struct rte_bus_address *data);/** * Implementation specific probe function which is responsible for linking
lib/eal/include/rte_dev.h +10 -5
@@ -171,19 +171,24 @@ int rte_dev_is_probed(const struct rte_device *dev);int rte_eal_hotplug_add (const char *busname,const char *devname,const char *drvargs); +struct rte_bus_address { +const void *addr; +size_t size; +}; +/** * General device name comparison. Will compare by using the specific bus * compare function or by comparing the names directly. * * @param dev * Device handle. -* @param name -* Name to compare against. +* @param addr +* Address to compare against. * @return -* 0 if the device matches the name. Nonzero otherwise. +* 0 if the device matches the address. Nonzero otherwise. */ __rte_internal -int rte_cmp_dev_name(const struct rte_device *dev, const void *name); +int rte_cmp_dev_name(const struct rte_device *dev, const struct rte_bus_address *addr);/** * Add matching devices.
@@ -245,7 +250,7 @@ int rte_dev_remove(struct rte_device *dev);* <0 if ordering is possible and the device is lower than the data. * >0 if ordering is possible and the device is greater than the data. */ -typedef int (*rte_dev_cmp_t )(const struct rte_device *dev,const void *data); +typedef int (*rte_dev_cmp_t )(const struct rte_device *dev,const struct rte_bus_address *data);#define RTE_PMD_EXPORT_NAME_ARRAY (n, idx) n##idx[]
lib/eal/linux/eal_dev.c +5 -1
@@ -272,8 +272,12 @@ dev_uev_handler(__rte_unused void *param) goto failure_handle_err; } +const struct rte_bus_address dev_addr = { + .addr = uevent.devname, + .size =strlen (uevent.devname) + }; dev = bus->find_device (NULL , rte_cmp_dev_name, - uevent.devname); + &dev_addr);if (dev ==NULL ) {EAL_LOG (ERR ,"Cannot find device (%s) on " "bus (%s)" , uevent.devname, busname);
Signature · 1 line
2.34.1
Re: [PATCH v7 1/4] bus/pci: fix registration of PCI device
In reply to Shani PeretzQuoted 4 lines · On Wed, 12 Feb 2025 18:38:32 +0200 Shani Peretz <[email protected]> wrote:
When registering a new PCI device, the
device->namefield stored the user-provided string from devargs (e.g., "08:00.0" or "0000:08:00.0"). This approach led to inconsistencies when registering new devices.
Quoted 8 lines
This patch fix this issue by saving the parsed PCI in
device->name, so when a new PCI device is registering the name displayed in the device list will be the parsed version.Fixes 23eaa9059ec2 ("bus/pci: use given name as generic name")Signed-off-by Shani Peretz <[email protected]>
Re: [PATCH v7 1/4] bus/pci: fix registration of PCI device
In reply to Shani PeretzQuoted 4 lines · On Wed, 12 Feb 2025 18:38:32 +0200 Shani Peretz <[email protected]> wrote:
When registering a new PCI device, the
device->namefield stored the user-provided string from devargs (e.g., "08:00.0" or "0000:08:00.0"). This approach led to inconsistencies when registering new devices.
Quoted 8 lines
This patch fix this issue by saving the parsed PCI in
device->name, so when a new PCI device is registering the name displayed in the device list will be the parsed version.Fixes 23eaa9059ec2 ("bus/pci: use given name as generic name")Signed-off-by Shani Peretz <[email protected]>
Re: [PATCH v7 1/4] bus/pci: fix registration of PCI device
In reply to Shani PeretzQuoted 4 lines · On Wed, 12 Feb 2025 18:38:32 +0200 Shani Peretz <[email protected]> wrote:
When registering a new PCI device, the
device->namefield stored the user-provided string from devargs (e.g., "08:00.0" or "0000:08:00.0"). This approach led to inconsistencies when registering new devices.
Quoted 8 lines
This patch fix this issue by saving the parsed PCI in
device->name, so when a new PCI device is registering the name displayed in the device list will be the parsed version.Fixes 23eaa9059ec2 ("bus/pci: use given name as generic name")Signed-off-by Shani Peretz <[email protected]>
Is there a bugzilla entry for this?
Would like to be able to see what exactly was broken.
The PCI name thing goes back to 17.01 release where this was added. Did something regress? If so why is there no test for this?
commit 23eaa9059ec24e95e32361f333ed0686f82bea74
Author: Gaetan Rivet <[email protected]> Date: Sat Jul 15 19:56:39 2017 +0200
bus/pci: use given name as generic name
When an application requests the use of a PCI device, it can currently interchangeably use either the longform DomBDF format (0000:00:00.0) or the shorter BDF format (00:00.0).
When a device is inserted via the hotplug API, it must first be scanned and then will be identified by its name using find_device. The name of the device must match the name given by the user to be found and then probed.
A new function sets the expected name for a scanned PCI device. It was previously generated from parsing the PCI address. This canonical name is superseded when an rte_devargs exists describing the device. In such case, the device takes the given name found within the rte_devargs.
As the rte_devargs is linked to the rte_pci_device during scanning, it can be avoided during the probe. Additionally, this fixes the issue of the rte_devargs lookup not being done within rte_pci_probe_one.
Quoted 4 lines · On Mon, 1 Jul 2024 23:01:17 +0300 Shani Peretz <[email protected]> wrote:
lib/eal/include/rte_dev.h +4
-0+/** +* General device name comparison. Will compare by using the specific bus +* compare function or by comparing the names directly. +*
lib/eal/include/rte_dev.h int rte_dev_is_probed(const struct rte_device *dev); · line 187
Quoted 10 lines
lib/eal/include/rte_dev.h +10
-0+* @param dev +* Device handle. +* @param name +* Name to compare against. +* @return +* 0 if the device matches the name. Nonzero otherwise. +*/ +__rte_experimental +int +rte_cmp_dev_name (const struct rte_device *dev,const void *name);
Why is this not rte_internal instead of experimental? Why is the name arguement void * instead of char *?
And there are other questions in the mail thread.
That is why it has not gotten accepted.