I have checked and tested it, no issue found. Thanks, Yunjian
> -----Original Message----- > From: Thomas Monjalon [mailto:tho...@monjalon.net] > Sent: Tuesday, September 29, 2020 7:14 AM > To: dev@dpdk.org > Cc: ferruh.yi...@intel.com; arybche...@solarflare.com; wangyunjian > <wangyunj...@huawei.com>; Keith Wiles <keith.wi...@intel.com>; Anatoly > Burakov <anatoly.bura...@intel.com> > Subject: [PATCH v3 20/29] net/tap: release port upon close > > From: Yunjian Wang <wangyunj...@huawei.com> > > The flag RTE_ETH_DEV_CLOSE_REMOVE is set so all port resources can be > freed by rte_eth_dev_close(). > > Freeing of private port resources is moved from the ".remove(device)" to the > ".dev_close(port)" operation. > > Signed-off-by: Yunjian Wang <wangyunj...@huawei.com> > Signed-off-by: Thomas Monjalon <tho...@monjalon.net> > --- > drivers/net/tap/rte_eth_tap.c | 51 +++++++++++++++++++---------------- > 1 file changed, 28 insertions(+), 23 deletions(-) > > diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c > index > 2d1e4e365a..0d217f1486 100644 > --- a/drivers/net/tap/rte_eth_tap.c > +++ b/drivers/net/tap/rte_eth_tap.c > @@ -72,6 +72,10 @@ > > static int tap_devices_count; > > +static const char *tuntap_types[ETH_TUNTAP_TYPE_MAX] = { > + "UNKNOWN", "TUN", "TAP" > +}; > + > static const char *valid_arguments[] = { > ETH_TAP_IFACE_ARG, > ETH_TAP_REMOTE_ARG, > @@ -1075,6 +1079,11 @@ tap_dev_close(struct rte_eth_dev *dev) > struct pmd_process_private *process_private = dev->process_private; > struct rx_queue *rxq; > > + if (rte_eal_process_type() != RTE_PROC_PRIMARY) { > + rte_free(dev->process_private); > + return 0; > + } > + > tap_link_set_down(dev); > if (internals->nlsk_fd != -1) { > tap_flow_flush(dev, NULL); > @@ -1112,6 +1121,23 @@ tap_dev_close(struct rte_eth_dev *dev) > close(internals->ka_fd); > internals->ka_fd = -1; > } > + > + /* mac_addrs must not be freed alone because part of dev_private */ > + dev->data->mac_addrs = NULL; > + > + internals = dev->data->dev_private; > + TAP_LOG(DEBUG, "Closing %s Ethernet device on numa %u", > + tuntap_types[internals->type], rte_socket_id()); > + > + if (internals->ioctl_sock != -1) { > + close(internals->ioctl_sock); > + internals->ioctl_sock = -1; > + } > + rte_free(dev->process_private); > + dev->process_private = NULL; > + if (tap_devices_count == 1) > + rte_mp_action_unregister(TAP_MP_KEY); > + tap_devices_count--; > /* > * Since TUN device has no more opened file descriptors > * it will be removed from kernel > @@ -1845,10 +1871,6 @@ static const struct eth_dev_ops ops = { > .filter_ctrl = tap_dev_filter_ctrl, > }; > > -static const char *tuntap_types[ETH_TUNTAP_TYPE_MAX] = { > - "UNKNOWN", "TUN", "TAP" > -}; > - > static int > eth_dev_tap_create(struct rte_vdev_device *vdev, const char *tap_name, > char *remote_iface, struct rte_ether_addr *mac_addr, @@ > -1900,7 +1922,7 @@ eth_dev_tap_create(struct rte_vdev_device *vdev, const > char *tap_name, > /* Setup some default values */ > data = dev->data; > data->dev_private = pmd; > - data->dev_flags = RTE_ETH_DEV_INTR_LSC; > + data->dev_flags = RTE_ETH_DEV_INTR_LSC | > RTE_ETH_DEV_CLOSE_REMOVE; > data->numa_node = numa_node; > > data->dev_link = pmd_link; > @@ -2492,30 +2514,13 @@ static int > rte_pmd_tap_remove(struct rte_vdev_device *dev) { > struct rte_eth_dev *eth_dev = NULL; > - struct pmd_internals *internals; > > /* find the ethdev entry */ > eth_dev = rte_eth_dev_allocated(rte_vdev_device_name(dev)); > if (!eth_dev) > - return -ENODEV; > - > - /* 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) > - return rte_eth_dev_release_port(eth_dev); > + return 0; > > tap_dev_close(eth_dev); > - > - internals = eth_dev->data->dev_private; > - TAP_LOG(DEBUG, "Closing %s Ethernet device on numa %u", > - tuntap_types[internals->type], rte_socket_id()); > - > - close(internals->ioctl_sock); > - rte_free(eth_dev->process_private); > - if (tap_devices_count == 1) > - rte_mp_action_unregister(TAP_MP_KEY); > - tap_devices_count--; > rte_eth_dev_release_port(eth_dev); > > return 0; > -- > 2.28.0
