Skip to contentSkip to conversation

net/bnx2x: enhance old ethdev close behavior

PATCH In review Rasesh Mody 2 participants 5 messages Sep 25, 2020 – Sep 26, 2020 Network drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net/bnx2x: enhance old ethdev close behavior

Set RTE_ETH_DEV_CLOSE_REMOVE upon probe so all the private resources for the port can be freed by rte_eth_dev_close(). With this change the private port resources are released in the .dev_close callback.

---
 drivers/net/bnx2x/bnx2x_ethdev.c | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)
drivers/net/bnx2x/bnx2x_ethdev.c +18 -2
index b2ea5fafa..00d76b9f8 100644
@@ -295,6 +295,9 @@ bnx2x_dev_close(struct rte_eth_dev *dev)
 
 	/* free ilt */
 	bnx2x_free_ilt_mem(sc);
+
+	/* mac_addrs must not be freed alone because part of dev_private */
+	dev->data->mac_addrs = NULL;
 }
 
 static int
@@ -726,6 +729,11 @@ bnx2x_common_dev_init(struct rte_eth_dev *eth_dev, int is_vf)
 			goto out;
 	}
 
+	/* Pass the information to the rte_eth_dev_close() that it should also
+	 * release the private port resources.
+	 */
+	eth_dev->data->dev_flags |= RTE_ETH_DEV_CLOSE_REMOVE;
+
 	return 0;
 
 out:
@@ -753,8 +761,16 @@ eth_bnx2xvf_dev_init(struct rte_eth_dev *eth_dev)
 
 static int eth_bnx2x_dev_uninit(struct rte_eth_dev *eth_dev)
 {
-	/* mac_addrs must not be freed alone because part of dev_private */
-	eth_dev->data->mac_addrs = NULL;
+	struct bnx2x_softc *sc = eth_dev->data->dev_private;
+
+	PMD_INIT_FUNC_TRACE(sc);
+
+	/* only uninitialize in the primary process */
+	if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+		return 0;
+
+	bnx2x_dev_close(eth_dev);
+
 	return 0;
 }
 
Signature · 1 line
2.18.1
#1 lore raw

PATCH 1/1 net/qede: enhance old ethdev close behavior

Set RTE_ETH_DEV_CLOSE_REMOVE upon probe so all the private resources for the port can be freed by rte_eth_dev_close(). With this change the private port resources are released in the .dev_close callback.

---
 drivers/net/qede/qede_ethdev.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/net/qede/qede_ethdev.c +9 -4
index 59f1746ee..86a0ea26f 100644
@@ -1586,6 +1586,10 @@ static void qede_dev_close(struct rte_eth_dev *eth_dev)
 
 	if (ECORE_IS_CMT(edev))
 		rte_eal_alarm_cancel(qede_poll_sp_sb_cb, (void *)eth_dev);
+
+	eth_dev->dev_ops = NULL;
+	eth_dev->rx_pkt_burst = NULL;
+	eth_dev->tx_pkt_burst = NULL;
 }
 
 static int
@@ -2701,6 +2705,11 @@ static int qede_common_dev_init(struct rte_eth_dev *eth_dev, bool is_vf)
 		adapter->ipgre.enable = false;
 	}
 
+	/* Pass the information to the rte_eth_dev_close() that it should also
+	 * release the private port resources.
+	 */
+	eth_dev->data->dev_flags |= RTE_ETH_DEV_CLOSE_REMOVE;
+
 	DP_INFO(edev, "MAC address : %02x:%02x:%02x:%02x:%02x:%02x\n",
 		adapter->primary_mac.addr_bytes[0],
 		adapter->primary_mac.addr_bytes[1],
@@ -2745,10 +2754,6 @@ static int qede_dev_common_uninit(struct rte_eth_dev *eth_dev)
 	/* safe to close dev here */
 	qede_dev_close(eth_dev);
 
-	eth_dev->dev_ops = NULL;
-	eth_dev->rx_pkt_burst = NULL;
-	eth_dev->tx_pkt_burst = NULL;
-
 	return 0;
 }
 
Signature · 1 line
2.18.1
#2 lore raw
In reply to Rasesh Mody

25/09/2020 06:17, Rasesh Mody:

Quoted 9 lines

Set RTE_ETH_DEV_CLOSE_REMOVE upon probe so all the private resources for the port can be freed by rte_eth_dev_close(). With this change the private port resources are released in the .dev_close callback.

---
static int eth_bnx2x_dev_uninit(struct rte_eth_dev *eth_dev) {

drivers/net/bnx2x/bnx2x_ethdev.c +0 -1
-	/* mac_addrs must not be freed alone because part of dev_private */

drivers/net/bnx2x/bnx2x_ethdev.c eth_bnx2xvf_dev_init(struct rte_eth_dev *eth_dev) · line 772

Quoted 10 lines
drivers/net/bnx2x/bnx2x_ethdev.c +9 -1
-	eth_dev->data->mac_addrs = NULL;
+	struct bnx2x_softc *sc = eth_dev->data->dev_private;
+
+	PMD_INIT_FUNC_TRACE(sc);
+
+	/* only uninitialize in the primary process */
+	if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+		return 0;
+
+	bnx2x_dev_close(eth_dev);

The check for primary process should be in the close function.

About the title, I would suggest net/bnx2x: release port upon close

#3 lore raw

Hi Thomas,

Quoted 8 lines

From: Thomas Monjalon <[email protected]>
Sent: Friday, September 25, 2020 12:11 AM

25/09/2020 06:17, Rasesh Mody:

Quoted 4 lines

Set RTE_ETH_DEV_CLOSE_REMOVE upon probe so all the private resources for the port can be freed by rte_eth_dev_close(). With this change the private port resources are released in the .dev_close callback.

Quoted 17 lines
Quoted 4 lines

---
static int eth_bnx2x_dev_uninit(struct rte_eth_dev *eth_dev) {

drivers/net/bnx2x/bnx2x_ethdev.c +0 -1
-	/* mac_addrs must not be freed alone because part of dev_private */

drivers/net/bnx2x/bnx2x_ethdev.c eth_bnx2xvf_dev_init(struct rte_eth_dev *eth_dev) · line 772

Quoted 10 lines
drivers/net/bnx2x/bnx2x_ethdev.c +9 -1
-	eth_dev->data->mac_addrs = NULL;
+	struct bnx2x_softc *sc = eth_dev->data->dev_private;
+
+	PMD_INIT_FUNC_TRACE(sc);
+
+	/* only uninitialize in the primary process */
+	if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+		return 0;
+
+	bnx2x_dev_close(eth_dev);

The check for primary process should be in the close function.

PMDs check for primary process as part of PCI probe, hence it was put in as part of PCI remove. I also observed other PMDs implementing a similar scheme. If it needs to be part of close function, I can move it there.

Quoted 2 lines

About the title, I would suggest net/bnx2x: release port upon close

I'll change the title and resubmit.

Thanks!
-Rasesh

#4 lore raw

25/09/2020 21:24, Rasesh Mody:

Quoted 27 lines

Hi Thomas,

Quoted 8 lines

From: Thomas Monjalon <[email protected]>
Sent: Friday, September 25, 2020 12:11 AM

25/09/2020 06:17, Rasesh Mody:

Quoted 4 lines

Set RTE_ETH_DEV_CLOSE_REMOVE upon probe so all the private resources for the port can be freed by rte_eth_dev_close(). With this change the private port resources are released in the .dev_close callback.

Quoted 17 lines
Quoted 4 lines

---
static int eth_bnx2x_dev_uninit(struct rte_eth_dev *eth_dev) {

drivers/net/bnx2x/bnx2x_ethdev.c +0 -1
-	/* mac_addrs must not be freed alone because part of dev_private */

drivers/net/bnx2x/bnx2x_ethdev.c eth_bnx2xvf_dev_init(struct rte_eth_dev *eth_dev) · line 772

Quoted 10 lines
drivers/net/bnx2x/bnx2x_ethdev.c +9 -1
-	eth_dev->data->mac_addrs = NULL;
+	struct bnx2x_softc *sc = eth_dev->data->dev_private;
+
+	PMD_INIT_FUNC_TRACE(sc);
+
+	/* only uninitialize in the primary process */
+	if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+		return 0;
+
+	bnx2x_dev_close(eth_dev);

The check for primary process should be in the close function.

Quoted 1 line

PMDs check for primary process as part of PCI probe, hence it was put in as part of PCI remove. I also observed other PMDs implementing a similar scheme.

Yes I am reviewing other PMDs to fix the same.

Quoted 1 line

If it needs to be part of close function, I can move it there.

Yes please.

Quoted 3 lines
Quoted 2 lines

About the title, I would suggest net/bnx2x: release port upon close

I'll change the title and resubmit.

Thanks