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

net/af_xdp: remove resources when port is closed

Browse Source 
Since 18.11, it is suggested that driver should release all its private
resources at the dev_close routine. So all resources previously released
in remove routine are now released at the dev_close routine, and the
dev_close routine will be called in driver remove routine in order to
support removing a device without closing its ports.

Above behavior changes are supported by setting RTE_ETH_DEV_CLOSE_REMOVE
flag during probe stage.

Also as af_xdp pmd doesn't allocate MAC addresses dynamically, it needs
to be set as NULL, so it won't be released by rte_eth_dev_release_port()
otherwise, there would be "EAL: Error: Invalid memory" error.

Signed-off-by: Xiaolong Ye <xiaolong.ye@intel.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
This commit is contained in:
Xiaolong Ye 2019-04-30 16:39:46 +08:00 committed by Ferruh Yigit
parent 0b083fe41c
commit f0ce7af0e1
1 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
drivers/net/af_xdp/rte_eth_af_xdp.c
View File

@ -426,6 +426,19 @@ remove_xdp_program(struct pmd_internals *internals)
XDP_FLAGS_UPDATE_IF_NOEXIST);
}
static void
xdp_umem_destroy(struct xsk_umem_info *umem)
{
rte_memzone_free(umem->mz);
umem->mz = NULL;
rte_ring_free(umem->buf_ring);
umem->buf_ring = NULL;
rte_free(umem);
umem = NULL;
}
static void
eth_dev_close(struct rte_eth_dev *dev)
{
@ -444,6 +457,15 @@ eth_dev_close(struct rte_eth_dev *dev)
}
(void)xsk_umem__delete(internals->umem->umem);
/*
* MAC is not allocated dynamically, setting it to NULL would prevent
* from releasing it in rte_eth_dev_release_port.
*/
dev->data->mac_addrs = NULL;
xdp_umem_destroy(internals->umem);
remove_xdp_program(internals);
}
@ -459,19 +481,6 @@ eth_link_update(struct rte_eth_dev *dev __rte_unused,
return 0;
}
static void
xdp_umem_destroy(struct xsk_umem_info *umem)
{
rte_memzone_free(umem->mz);
umem->mz = NULL;
rte_ring_free(umem->buf_ring);
umem->buf_ring = NULL;
rte_free(umem);
umem = NULL;
}
static struct
xsk_umem_info *xdp_umem_configure(struct pmd_internals *internals)
{
@ -856,6 +865,8 @@ init_internals(struct rte_vdev_device *dev,
eth_dev->dev_ops = &ops;
eth_dev->rx_pkt_burst = eth_af_xdp_rx;
eth_dev->tx_pkt_burst = eth_af_xdp_tx;
/* Let rte_eth_dev_close() release the port resources. */
eth_dev->data->dev_flags |= RTE_ETH_DEV_CLOSE_REMOVE;
return eth_dev;
@ -923,7 +934,6 @@ static int
rte_pmd_af_xdp_remove(struct rte_vdev_device *dev)
{
struct rte_eth_dev *eth_dev = NULL;
struct pmd_internals *internals;
AF_XDP_LOG(INFO, "Removing AF_XDP ethdev on numa socket %u\n",
rte_socket_id());
@ -936,12 +946,7 @@ rte_pmd_af_xdp_remove(struct rte_vdev_device *dev)
if (eth_dev == NULL)
return -1;
internals = eth_dev->data->dev_private;
rte_ring_free(internals->umem->buf_ring);
rte_memzone_free(internals->umem->mz);
rte_free(internals->umem);
eth_dev_close(eth_dev);
rte_eth_dev_release_port(eth_dev);