From: Martin Spinler <[email protected]> Internal handles are initialized in eth_dev_init, so the cleanup should be done in eth_dev_uninit.
Signed-off-by: Martin Spinler <[email protected]> --- drivers/net/nfb/nfb_ethdev.c | 76 ++++++++++++++++++++---------------- 1 file changed, 43 insertions(+), 33 deletions(-) diff --git a/drivers/net/nfb/nfb_ethdev.c b/drivers/net/nfb/nfb_ethdev.c index 4dcf6bde01..2f8a3813f7 100644 --- a/drivers/net/nfb/nfb_ethdev.c +++ b/drivers/net/nfb/nfb_ethdev.c @@ -18,6 +18,8 @@ #include "nfb_rxmode.h" #include "nfb.h" +static int nfb_eth_dev_uninit(struct rte_eth_dev *dev); + /** * Default MAC addr */ @@ -160,8 +162,6 @@ nfb_eth_dev_stop(struct rte_eth_dev *dev) uint16_t nb_rx = dev->data->nb_rx_queues; uint16_t nb_tx = dev->data->nb_tx_queues; - dev->data->dev_started = 0; - for (i = 0; i < nb_tx; i++) nfb_eth_tx_queue_stop(dev, i); @@ -181,10 +181,9 @@ nfb_eth_dev_stop(struct rte_eth_dev *dev) * 0 on success, a negative errno value otherwise. */ static int -nfb_eth_dev_configure(struct rte_eth_dev *dev __rte_unused) +nfb_eth_dev_configure(struct rte_eth_dev *dev) { int ret; - struct pmd_internals *internals = dev->process_private; struct rte_eth_conf *dev_conf = &dev->data->dev_conf; if (dev_conf->rxmode.offloads & RTE_ETH_RX_OFFLOAD_TIMESTAMP) { @@ -193,12 +192,16 @@ nfb_eth_dev_configure(struct rte_eth_dev *dev __rte_unused) &nfb_timestamp_rx_dynflag); if (ret != 0) { NFB_LOG(ERR, "Cannot register Rx timestamp field/flag %d", ret); - nfb_close(internals->nfb); - return -rte_errno; + ret = -ENOMEM; + goto err_ts_register; } } return 0; + +err_ts_register: + nfb_eth_dev_uninit(dev); + return ret; } static uint32_t @@ -262,32 +265,28 @@ nfb_eth_dev_info(struct rte_eth_dev *dev, static int nfb_eth_dev_close(struct rte_eth_dev *dev) { - struct pmd_internals *internals = dev->process_private; uint16_t i; uint16_t nb_rx = dev->data->nb_rx_queues; uint16_t nb_tx = dev->data->nb_tx_queues; - int ret; - nfb_nc_rxmac_deinit(internals->rxmac, internals->max_rxmac); - nfb_nc_txmac_deinit(internals->txmac, internals->max_txmac); - - if (rte_eal_process_type() != RTE_PROC_PRIMARY) - return 0; - - ret = nfb_eth_dev_stop(dev); - - for (i = 0; i < nb_rx; i++) { - nfb_eth_rx_queue_release(dev, i); - dev->data->rx_queues[i] = NULL; - } - dev->data->nb_rx_queues = 0; - for (i = 0; i < nb_tx; i++) { - nfb_eth_tx_queue_release(dev, i); - dev->data->tx_queues[i] = NULL; + if (rte_eal_process_type() == RTE_PROC_PRIMARY) { + for (i = 0; i < nb_rx; i++) { + if (dev->data->rx_queues[i]) { + nfb_eth_rx_queue_release(dev, i); + dev->data->rx_queues[i] = NULL; + } + } + for (i = 0; i < nb_tx; i++) { + if (dev->data->tx_queues[i]) { + nfb_eth_tx_queue_release(dev, i); + dev->data->tx_queues[i] = NULL; + } + } } - dev->data->nb_tx_queues = 0; - return ret; + nfb_eth_dev_uninit(dev); + + return 0; } /** @@ -528,7 +527,7 @@ nfb_eth_dev_init(struct rte_eth_dev *dev) dev->device->numa_node); if (internals == NULL) { ret = -ENOMEM; - return ret; + goto err_alloc_internals; } dev->process_private = internals; @@ -546,8 +545,8 @@ nfb_eth_dev_init(struct rte_eth_dev *dev) internals->nfb = nfb_open(nfb_dev); if (internals->nfb == NULL) { NFB_LOG(ERR, "nfb_open(): failed to open %s", nfb_dev); - rte_free(internals); - return -EINVAL; + ret = -EINVAL; + goto err_nfb_open; } priv->max_rx_queues = ndp_get_rx_queue_available_count(internals->nfb); priv->max_tx_queues = ndp_get_tx_queue_available_count(internals->nfb); @@ -579,9 +578,8 @@ nfb_eth_dev_init(struct rte_eth_dev *dev) sizeof(struct rte_ether_addr) * mac_count, RTE_CACHE_LINE_SIZE); if (data->mac_addrs == NULL) { NFB_LOG(ERR, "Could not alloc space for MAC address"); - nfb_close(internals->nfb); - rte_free(internals); - return -EINVAL; + ret = -ENOMEM; + goto err_malloc_mac_addrs; } rte_eth_random_addr(eth_addr_init.addr_bytes); @@ -603,6 +601,16 @@ nfb_eth_dev_init(struct rte_eth_dev *dev) pci_addr->function); return 0; + +err_malloc_mac_addrs: + nfb_nc_rxmac_deinit(internals->rxmac, internals->max_rxmac); + nfb_nc_txmac_deinit(internals->txmac, internals->max_txmac); + nfb_close(internals->nfb); + +err_nfb_open: + rte_free(internals); +err_alloc_internals: + return ret; } /** @@ -621,7 +629,9 @@ nfb_eth_dev_uninit(struct rte_eth_dev *dev) struct rte_pci_addr *pci_addr = &pci_dev->addr; struct pmd_internals *internals = dev->process_private; - nfb_eth_dev_close(dev); + nfb_nc_rxmac_deinit(internals->rxmac, internals->max_rxmac); + nfb_nc_txmac_deinit(internals->txmac, internals->max_txmac); + nfb_close(internals->nfb); rte_free(internals); -- 2.52.0
