Send updated port_id in vdev_init functions
PATCH v3 1/1 Send updated port_id in vdev_init functions
Instead of executing following functions before and after vdev_init
Quoted 2 lines
rte_eth_dev_saveandrte_eth_dev_get_changed_port
update following functions to return allocated port_id.
Quoted 2 lines
rte_eal_vdev_initrte_eal_probe_one
Ravi Kerur (1):
Change rte_eal_vdev_init to update port_id
lib/librte_ether/rte_ethdev.c | 116 +++++++++++++++++++++++------------------- 1 file changed, 63 insertions(+), 53 deletions(-)
Signature · 1 line
1.9.1
PATCH v3 1/1 Change rte_eal_vdev_init to update port_id
v3:
Quoted 1 line
Isolate changes within
rte_ethercomponent.
v2:
Quoted 3 lines
Remove tilegx changes
Userte_eal_compare_pci_addrfor address comparison Use dpdk_2.2 in version map file for new functions
v1:
Changes include
Quoted 2 lines
Modify
rte_eal_vdev_initto return allocatedport_idModifyrte_eal_probe_oneto return allocatedport_id
2. Removed following functions
Quoted 2 lines
rte_eth_dev_saveandrte_eth_dev_get_changed_port
3. Added 2 new functions
Quoted 2 lines
rte_eth_dev_get_port_by_namerte_eth_dev_get_port_by_addr
4. Fix return error(ENOMEM) in function rte_pmd_mpipe_devinit
Compiled on Linux for following targets
Quoted 3 lines
x86_64-native-linuxapp-gcc
x86_64-native-linuxapp-clang
x86_x32-native-linuxapp-gcc
Compiled on FreeBSD for following targets
Quoted 2 lines
x86_64-native-bsdapp-clang
x86_64-native-bsdapp-gcc
Tested on Linux/FreeBSD:
Quoted 10 lines
port attach
eth_null
port start all
port stop all
port close all
port detach 0
port attacheth_null
port start all
port stop all
port close all
port detach 0
Successful run of checkpatch.pl on the diffs
Successful validate_abi on Linux for following targets
Quoted 2 lines
x86_64-native-linuxapp-gcc
x86_64-native-linuxapp-clang
--- lib/librte_ether/rte_ethdev.c | 116 +++++++++++++++++++++++------------------- 1 file changed, 63 insertions(+), 53 deletions(-)
lib/librte_ether/rte_ethdev.c +63 -53
@@ -442,32 +442,6 @@ rte_eth_dev_get_device_type(uint8_t port_id) }static int -rte_eth_dev_save (struct rte_eth_dev *devs,size_t size) -{ -if ((devs ==NULL ) || - (size !=sizeof (struct rte_eth_dev ) *RTE_MAX_ETHPORTS )) -return -EINVAL ; - -/* save current rte_eth_devices */ -memcpy (devs, rte_eth_devices, size); -return 0 ; -} - -static int -rte_eth_dev_get_changed_port (struct rte_eth_dev *devs,uint8_t *port_id) -{ -if ((devs ==NULL ) || (port_id ==NULL )) -return -EINVAL ; - -/* check which port was attached or detached */ -for (*port_id =0 ; *port_id <RTE_MAX_ETHPORTS ; (*port_id)++, devs++) { -if (rte_eth_devices[*port_id].attached ^ devs->attached) -return 0 ; - } -return -ENODEV ; -} - -static int rte_eth_dev_get_addr_by_port (uint8_t port_id,struct rte_pci_addr *addr) {VALID_PORTID_OR_ERR_RET (port_id, -EINVAL );
@@ -501,6 +475,59 @@ rte_eth_dev_get_name_by_port(uint8_t port_id, char *name) }static int +rte_eth_dev_get_port_by_name (const char *name,uint8_t *port_id) +{ +int i; + +if (name ==NULL ) { +PMD_DEBUG_TRACE ("Null pointer is specified\n" ); +return -EINVAL ; + } + + *port_id =RTE_MAX_ETHPORTS ; + +for (i =0 ; i <RTE_MAX_ETHPORTS ; i++) { + +if (!strncmp (name, + rte_eth_dev_data[i].name,strlen (name))) { + + *port_id = i; + +return 0 ; + } + } +return -ENODEV ; +} + +static int +rte_eth_dev_get_port_by_addr (const struct rte_pci_addr *addr,uint8_t *port_id) +{ +int i; +struct rte_pci_device *pci_dev =NULL ; + +if (addr ==NULL ) { +PMD_DEBUG_TRACE ("Null pointer is specified\n" ); +return -EINVAL ; + } + + *port_id =RTE_MAX_ETHPORTS ; + +for (i =0 ; i <RTE_MAX_ETHPORTS ; i++) { + + pci_dev = rte_eth_devices[i].pci_dev; + +if (pci_dev && + !rte_eal_compare_pci_addr (&pci_dev->addr, addr)) { + + *port_id = i; + +return 0 ; + } + } +return -ENODEV ; +} + +static int rte_eth_dev_is_detachable (uint8_t port_id) {uint32_t drv_flags;
@@ -530,30 +557,19 @@ rte_eth_dev_is_detachable(uint8_t port_id)static int rte_eth_dev_attach_pdev (struct rte_pci_addr *addr,uint8_t *port_id) { -uint8_t new_port_id; -struct rte_eth_dev devs[RTE_MAX_ETHPORTS ]; -if ((addr ==NULL ) || (port_id ==NULL )) goto err; -/* save current port status */ -if (rte_eth_dev_save (devs,sizeof (devs))) - goto err;/* re-construct pci_device_list */ if (rte_eal_pci_scan ()) goto err; -/* invoke probe func of the driver can handle the new device. -* TODO: -* rte_eal_pci_probe_one() should return port_id. -* And rte_eth_dev_save() and rte_eth_dev_get_changed_port() -* should be removed. */ +/* Invoke probe func of the driver can handle the new device. */ if (rte_eal_pci_probe_one (addr)) goto err; -/* get port_id enabled by above procedures */ -if (rte_eth_dev_get_changed_port (devs, &new_port_id)) + +if (rte_eth_dev_get_port_by_addr (addr, port_id)) goto err; - *port_id = new_port_id;return 0 ; err:RTE_LOG (ERR ,EAL ,"Driver, cannot attach the device\n" );
@@ -600,8 +616,6 @@ static int rte_eth_dev_attach_vdev(const char *vdevargs, uint8_t *port_id) { char *name = NULL, *args = NULL; -uint8_t new_port_id; -struct rte_eth_dev devs[RTE_MAX_ETHPORTS ];int ret =-1 ;if ((vdevargs ==NULL ) || (port_id ==NULL ))
@@ -611,22 +625,18 @@ rte_eth_dev_attach_vdev(const char *vdevargs, uint8_t *port_id)if (rte_eal_parse_devargs_str (vdevargs, &name, &args)) goto end; -/* save current port status */ -if (rte_eth_dev_save (devs,sizeof (devs))) - goto end;/* walk around dev_driver_list to find the driver of the device, -* then invoke probe function o the driver. -* TODO: -* rte_eal_vdev_init() should return port_id, -* And rte_eth_dev_save() and rte_eth_dev_get_changed_port() -* should be removed. */ +* then invoke probe function of the driver. +* rte_eal_vdev_init() updates port_id allocated after +* initialization. +*/ if (rte_eal_vdev_init (name, args)) goto end; -/* get port_id enabled by above procedures */ -if (rte_eth_dev_get_changed_port (devs, &new_port_id)) + +if (rte_eth_dev_get_port_by_name (name, port_id)) goto end; + ret =0 ; - *port_id = new_port_id; end:if (name)free (name);
Signature · 1 line
1.9.1
Re: [PATCH v3] Change rte_eal_vdev_init to update port_id
Quoted 216 lines · Ravi Kerur
v3:
Quoted 1 line
Isolate changes within
rte_ethercomponent.v2:
Quoted 3 lines
Remove tilegx changes
Userte_eal_compare_pci_addrfor address comparison Use dpdk_2.2 in version map file for new functionsv1:
Changes includeQuoted 2 lines
Modify
rte_eal_vdev_initto return allocatedport_idModifyrte_eal_probe_oneto return allocatedport_id2. Removed following functions
Quoted 2 lines
rte_eth_dev_saveandrte_eth_dev_get_changed_port3. Added 2 new functions
Quoted 2 lines
rte_eth_dev_get_port_by_namerte_eth_dev_get_port_by_addr4. Fix return error(ENOMEM) in function
rte_pmd_mpipe_devinitCompiled on Linux for following targets
Quoted 3 lines
x86_64-native-linuxapp-gcc
x86_64-native-linuxapp-clang
x86_x32-native-linuxapp-gccCompiled on FreeBSD for following targets
Quoted 2 lines
x86_64-native-bsdapp-clang
x86_64-native-bsdapp-gccTested on Linux/FreeBSD:
Quoted 10 lines
port attach
eth_null
port start all
port stop all
port close all
port detach 0
port attacheth_null
port start all
port stop all
port close all
port detach 0Successful run of checkpatch.pl on the diffs
Successful
validate_abion Linux for following targetsQuoted 2 lines
x86_64-native-linuxapp-gcc
x86_64-native-linuxapp-clangSigned-off-by Ravi Kerur <[email protected]>--- lib/librte_ether/rte_ethdev.c | 116 +++++++++++++++++++++++------------------- 1 file changed, 63 insertions(+), 53 deletions(-)lib/librte_ether/rte_ethdev.c +60
-51@@ -442,32 +442,6 @@ rte_eth_dev_get_device_type(uint8_t port_id) }static int -rte_eth_dev_save (struct rte_eth_dev *devs,size_t size) -{ -if ((devs ==NULL ) || - (size !=sizeof (struct rte_eth_dev ) *RTE_MAX_ETHPORTS )) -return -EINVAL ; - -/* save current rte_eth_devices */ -memcpy (devs, rte_eth_devices, size); -return 0 ; -} - -static int -rte_eth_dev_get_changed_port (struct rte_eth_dev *devs,uint8_t *port_id) -{ -if ((devs ==NULL ) || (port_id ==NULL )) -return -EINVAL ; - -/* check which port was attached or detached */ -for (*port_id =0 ; *port_id <RTE_MAX_ETHPORTS ; (*port_id)++, devs++) { -if (rte_eth_devices[*port_id].attached ^ devs->attached) -return 0 ; - } -return -ENODEV ; -} - -static int rte_eth_dev_get_addr_by_port (uint8_t port_id,struct rte_pci_addr *addr) {VALID_PORTID_OR_ERR_RET (port_id, -EINVAL );@@ -501,6 +475,59 @@ rte_eth_dev_get_name_by_port(uint8_t port_id, char *name) }static int +rte_eth_dev_get_port_by_name (const char *name,uint8_t *port_id) +{ +int i; + +if (name ==NULL ) { +PMD_DEBUG_TRACE ("Null pointer is specified\n" ); +return -EINVAL ; + } + + *port_id =RTE_MAX_ETHPORTS ; + +for (i =0 ; i <RTE_MAX_ETHPORTS ; i++) { + +if (!strncmp (name, + rte_eth_dev_data[i].name,strlen (name))) { + + *port_id = i; + +return 0 ; + } + } +return -ENODEV ; +} + +static int +rte_eth_dev_get_port_by_addr (const struct rte_pci_addr *addr,uint8_t *port_id) +{ +int i; +struct rte_pci_device *pci_dev =NULL ; + +if (addr ==NULL ) { +PMD_DEBUG_TRACE ("Null pointer is specified\n" ); +return -EINVAL ; + } + + *port_id =RTE_MAX_ETHPORTS ; + +for (i =0 ; i <RTE_MAX_ETHPORTS ; i++) { + + pci_dev = rte_eth_devices[i].pci_dev; + +if (pci_dev && + !rte_eal_compare_pci_addr (&pci_dev->addr, addr)) { + + *port_id = i; + +return 0 ; + } + } +return -ENODEV ; +} + +static int rte_eth_dev_is_detachable (uint8_t port_id) {uint32_t drv_flags;@@ -530,30 +557,19 @@ rte_eth_dev_is_detachable(uint8_t port_id)static int rte_eth_dev_attach_pdev (struct rte_pci_addr *addr,uint8_t *port_id) { -uint8_t new_port_id; -struct rte_eth_dev devs[RTE_MAX_ETHPORTS ]; -if ((addr ==NULL ) || (port_id ==NULL )) goto err; -/* save current port status */ -if (rte_eth_dev_save (devs,sizeof (devs))) - goto err;/* re-construct pci_device_list */ if (rte_eal_pci_scan ()) goto err; -/* invoke probe func of the driver can handle the new device. -* TODO: -* rte_eal_pci_probe_one() should return port_id. -* And rte_eth_dev_save() and rte_eth_dev_get_changed_port() -* should be removed. */ +/* Invoke probe func of the driver can handle the new device. */ if (rte_eal_pci_probe_one (addr)) goto err; -/* get port_id enabled by above procedures */ -if (rte_eth_dev_get_changed_port (devs, &new_port_id)) + +if (rte_eth_dev_get_port_by_addr (addr, port_id)) goto err; - *port_id = new_port_id;return 0 ; err:RTE_LOG (ERR ,EAL ,"Driver, cannot attach the device\n" );@@ -600,8 +616,6 @@ static int rte_eth_dev_attach_vdev(const char *vdevargs, uint8_t *port_id) { char *name = NULL, *args = NULL; -uint8_t new_port_id; -struct rte_eth_dev devs[RTE_MAX_ETHPORTS ];int ret =-1 ;if ((vdevargs ==NULL ) || (port_id ==NULL ))@@ -611,22 +625,18 @@ rte_eth_dev_attach_vdev(const char *vdevargs, uint8_t *port_id)if (rte_eal_parse_devargs_str (vdevargs, &name, &args)) goto end; -/* save current port status */ -if (rte_eth_dev_save (devs,sizeof (devs))) - goto end;/* walk around dev_driver_list to find the driver of the device, -* then invoke probe function o the driver. -* TODO: -* rte_eal_vdev_init() should return port_id, -* And rte_eth_dev_save() and rte_eth_dev_get_changed_port() -* should be removed. */ +* then invoke probe function of the driver. +* rte_eal_vdev_init() updates port_id allocated after +* initialization. +*/ if (rte_eal_vdev_init (name, args)) goto end; -/* get port_id enabled by above procedures */
lib/librte_ether/rte_ethdev.c rte_eth_dev_attach_vdev(const char *vdevargs, uint8_t *port_id) · line 642
Quoted 10 lines
lib/librte_ether/rte_ethdev.c +3
-2-if (rte_eth_dev_get_changed_port (devs, &new_port_id)) + +if (rte_eth_dev_get_port_by_name (name, port_id)) goto end; + ret =0 ; - *port_id = new_port_id; end:if (name)free (name);
Thomas Monjalon
AppliedRe: [PATCH v3] Change rte_eal_vdev_init to update port_id
Quoted 3 lines
Quoted 1 line
Signed-off-by Ravi Kerur <[email protected]>Acked-by Tetsuya Mukawa <[email protected]>
Applied, thanks