net/kni: remove resources when port is closed

Add .dev_close to clean resources on device close,
also set RTE_ETH_DEV_CLOSE_REMOVE device flag to cause all ethdev
resources removed on 'rte_eth_dev_close()' call.

Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
This commit is contained in:
Ferruh Yigit 2019-07-26 17:33:04 +01:00
parent 282b72cd72
commit 696fbc7bb4

View File

@ -194,6 +194,24 @@ eth_kni_dev_stop(struct rte_eth_dev *dev)
dev->data->dev_link.link_status = 0;
}
static void
eth_kni_close(struct rte_eth_dev *eth_dev)
{
struct pmd_internals *internals;
int ret;
eth_kni_dev_stop(eth_dev);
/* mac_addrs must not be freed alone because part of dev_private */
eth_dev->data->mac_addrs = NULL;
internals = eth_dev->data->dev_private;
ret = rte_kni_release(internals->kni);
if (ret)
PMD_LOG(WARNING, "Not able to release kni for %s",
eth_dev->data->name);
}
static int
eth_kni_dev_configure(struct rte_eth_dev *dev __rte_unused)
{
@ -322,6 +340,7 @@ eth_kni_stats_reset(struct rte_eth_dev *dev)
static const struct eth_dev_ops eth_kni_ops = {
.dev_start = eth_kni_dev_start,
.dev_stop = eth_kni_dev_stop,
.dev_close = eth_kni_close,
.dev_configure = eth_kni_dev_configure,
.dev_infos_get = eth_kni_dev_info,
.rx_queue_setup = eth_kni_rx_queue_setup,
@ -357,6 +376,8 @@ eth_kni_create(struct rte_vdev_device *vdev,
data->dev_link = pmd_link;
data->mac_addrs = &internals->eth_addr;
data->dev_flags |= RTE_ETH_DEV_CLOSE_REMOVE;
rte_eth_random_addr(internals->eth_addr.addr_bytes);
eth_dev->dev_ops = &eth_kni_ops;
@ -451,9 +472,7 @@ static int
eth_kni_remove(struct rte_vdev_device *vdev)
{
struct rte_eth_dev *eth_dev;
struct pmd_internals *internals;
const char *name;
int ret;
name = rte_vdev_device_name(vdev);
PMD_LOG(INFO, "Un-Initializing eth_kni for %s", name);
@ -463,19 +482,12 @@ eth_kni_remove(struct rte_vdev_device *vdev)
if (eth_dev == NULL)
return -1;
/* mac_addrs must not be freed alone because part of dev_private */
eth_dev->data->mac_addrs = NULL;
if (rte_eal_process_type() != RTE_PROC_PRIMARY)
if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
eth_kni_dev_stop(eth_dev);
return rte_eth_dev_release_port(eth_dev);
}
eth_kni_dev_stop(eth_dev);
internals = eth_dev->data->dev_private;
ret = rte_kni_release(internals->kni);
if (ret)
PMD_LOG(WARNING, "Not able to release kni for %s", name);
eth_kni_close(eth_dev);
rte_eth_dev_release_port(eth_dev);
is_kni_initialized--;