d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ethdev: remove release function for secondary process

Browse Source 
After previous changes, the function rte_eth_dev_release_port()
can be used for primary or secondary process as well.
The only difference with rte_eth_dev_release_port_secondary()
is the shared lock used in rte_eth_dev_release_port().

The function rte_eth_dev_release_port_secondary() was recently
added in 18.11 cycle.

Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
Reviewed-by: Andrew Rybchenko <arybchenko@solarflare.com>
This commit is contained in:
Thomas Monjalon 2018-10-19 04:07:56 +02:00 committed by Ferruh Yigit
parent e16adf08e5
commit 662dbc322d
12 changed files with 15 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/af_packet/rte_eth_af_packet.c
View File

@ -990,7 +990,7 @@ rte_pmd_af_packet_remove(struct rte_vdev_device *dev)
eth_dev->data->mac_addrs = NULL;
if (rte_eal_process_type() != RTE_PROC_PRIMARY)
return rte_eth_dev_release_port_secondary(eth_dev);
return rte_eth_dev_release_port(eth_dev);
internals = eth_dev->data->dev_private;
for (q = 0; q < internals->nb_queues; q++) {

2
drivers/net/bonding/rte_eth_bond_pmd.c
View File

@ -3267,7 +3267,7 @@ bond_remove(struct rte_vdev_device *dev)
return -ENODEV;
if (rte_eal_process_type() != RTE_PROC_PRIMARY)
return rte_eth_dev_release_port_secondary(eth_dev);
return rte_eth_dev_release_port(eth_dev);
RTE_ASSERT(eth_dev->device == &dev->device);

2
drivers/net/kni/rte_eth_kni.c
View File

@ -467,7 +467,7 @@ eth_kni_remove(struct rte_vdev_device *vdev)
eth_dev->data->mac_addrs = NULL;
if (rte_eal_process_type() != RTE_PROC_PRIMARY)
return rte_eth_dev_release_port_secondary(eth_dev);
return rte_eth_dev_release_port(eth_dev);
eth_kni_dev_stop(eth_dev);

7
drivers/net/null/rte_eth_null.c
View File

@ -679,11 +679,10 @@ rte_pmd_null_remove(struct rte_vdev_device *dev)
if (eth_dev == NULL)
return -1;
if (rte_eal_process_type() != RTE_PROC_PRIMARY)
return rte_eth_dev_release_port_secondary(eth_dev);
if (rte_eal_process_type() == RTE_PROC_PRIMARY)
/* mac_addrs must not be freed alone because part of dev_private */
eth_dev->data->mac_addrs = NULL;
/* mac_addrs must not be freed alone because part of dev_private */
eth_dev->data->mac_addrs = NULL;
rte_eth_dev_release_port(eth_dev);
return 0;

2
drivers/net/octeontx/octeontx_ethdev.c
View File

@ -1129,7 +1129,7 @@ octeontx_remove(struct rte_vdev_device *dev)
return -ENODEV;
if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
rte_eth_dev_release_port_secondary(eth_dev);
rte_eth_dev_release_port(eth_dev);
continue;
}

12
drivers/net/pcap/rte_eth_pcap.c
View File

@ -1228,13 +1228,13 @@ pmd_pcap_remove(struct rte_vdev_device *dev)
if (eth_dev == NULL)
return -1;
if (rte_eal_process_type() != RTE_PROC_PRIMARY)
return rte_eth_dev_release_port_secondary(eth_dev);
if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
internals = eth_dev->data->dev_private;
if (internals != NULL && internals->phy_mac == 0)
/* not dynamically allocated, must not be freed */
eth_dev->data->mac_addrs = NULL;
}
internals = eth_dev->data->dev_private;
if (internals != NULL && internals->phy_mac == 0)
/* not dynamically allocated, must not be freed */
eth_dev->data->mac_addrs = NULL;
rte_eth_dev_release_port(eth_dev);
return 0;

2
drivers/net/tap/rte_eth_tap.c
View File

@ -2265,7 +2265,7 @@ rte_pmd_tap_remove(struct rte_vdev_device *dev)
eth_dev->data->mac_addrs = NULL;
if (rte_eal_process_type() != RTE_PROC_PRIMARY)
return rte_eth_dev_release_port_secondary(eth_dev);
return rte_eth_dev_release_port(eth_dev);
internals = eth_dev->data->dev_private;
process_private = eth_dev->process_private;

2
drivers/net/vhost/rte_eth_vhost.c
View File

@ -1446,7 +1446,7 @@ rte_pmd_vhost_remove(struct rte_vdev_device *dev)
return -ENODEV;
if (rte_eal_process_type() != RTE_PROC_PRIMARY)
return rte_eth_dev_release_port_secondary(eth_dev);
return rte_eth_dev_release_port(eth_dev);
eth_dev_close(eth_dev);

15
lib/librte_ethdev/rte_ethdev.c
View File

@ -362,18 +362,6 @@ rte_eth_dev_attach_secondary(const char *name)
return eth_dev;
}
int
rte_eth_dev_release_port_secondary(struct rte_eth_dev *eth_dev)
{
if (eth_dev == NULL)
return -EINVAL;
_rte_eth_dev_callback_process(eth_dev, RTE_ETH_EVENT_DESTROY, NULL);
eth_dev->state = RTE_ETH_DEV_UNUSED;
return 0;
}
int
rte_eth_dev_release_port(struct rte_eth_dev *eth_dev)
{
@ -3591,9 +3579,6 @@ rte_eth_dev_destroy(struct rte_eth_dev *ethdev,
return ret;
}
if (rte_eal_process_type() != RTE_PROC_PRIMARY)
return rte_eth_dev_release_port_secondary(ethdev);
return rte_eth_dev_release_port(ethdev);
}

14
lib/librte_ethdev/rte_ethdev_driver.h
View File

@ -74,20 +74,6 @@ struct rte_eth_dev *rte_eth_dev_attach_secondary(const char *name);
*/
int rte_eth_dev_release_port(struct rte_eth_dev *eth_dev);
/**
* @internal
* Release the specified ethdev port in the local process.
* Only set ethdev state to unused, but not reset shared data since
* it assume other processes is still using it. typically it is
* called by a secondary process.
*
* @param eth_dev
* Device to be detached.
* @return
* - 0 on success, negative on error
*/
int rte_eth_dev_release_port_secondary(struct rte_eth_dev *eth_dev);
/**
* @internal
* Release device queues and clear its configuration to force the user

7
lib/librte_ethdev/rte_ethdev_pci.h
View File

@ -135,13 +135,6 @@ rte_eth_dev_pci_allocate(struct rte_pci_device *dev, size_t private_data_size)
static inline void
rte_eth_dev_pci_release(struct rte_eth_dev *eth_dev)
{
if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
eth_dev->device = NULL;
eth_dev->intr_handle = NULL;
rte_eth_dev_release_port_secondary(eth_dev);
return;
}
eth_dev->device = NULL;
eth_dev->intr_handle = NULL;

7
lib/librte_ethdev/rte_ethdev_version.map
View File

@ -220,13 +220,6 @@ DPDK_18.08 {
} DPDK_18.05;
DPDK_18.11 {
global:
rte_eth_dev_release_port_secondary;
} DPDK_18.08;
EXPERIMENTAL {
global: