patch 'net/bnxt: fix crash when representor is re-attached' has been queued to stable release 24.11.2
Kevin Traynor
ktraynor at redhat.com
Thu Feb 13 10:58:33 CET 2025
Hi,
FYI, your patch has been queued to stable release 24.11.2
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/17/25. So please
shout if anyone has objections.
Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.
Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable
This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/6eaaefeecea9eaf0ef2069e676e804e2e7fec63a
Thanks.
Kevin
---
>From 6eaaefeecea9eaf0ef2069e676e804e2e7fec63a Mon Sep 17 00:00:00 2001
From: Sangtani Parag Satishbhai <parag-satishbhai.sangtani at broadcom.com>
Date: Thu, 19 Dec 2024 17:31:13 -0800
Subject: [PATCH] net/bnxt: fix crash when representor is re-attached
[ upstream commit fca6cf68bbcf9b84e4388239031fb168a6624375 ]
When the PCI port is detached using the testpmd command,
as part of cleanup testpmd removes resources of parent
port and all the children's ports and calls the driver specific
pci_remove API with the parent rte ethdev to clean-up ethdevs.
For the bnxt driver, a condition to check type of ethdev is added
in bnxt_pci_remove and based on the condition relevant
ethdev is removed (VF/PF or VFR). As the RTE layer always
calls PCI remove with the parent ethdev, the bnxt_pci_remove
never frees children (VFRs) ethdev. As, these ethdevs were not
freed it gives spurious status in re-allocation check(when pci
port attach command is executed) and when RTE layers tries to
access interrupt specific info from the ethdev due to uninitialized
members it access NULL pointer which results in seg fault. The fix
is made in bnxt_pci_remove to clean ethdev for parent (PF/VF) along
with children (VFRs).
Fixes: 322bd6e70272 ("net/bnxt: add port representor infrastructure")
Signed-off-by: Sangtani Parag Satishbhai <parag-satishbhai.sangtani at broadcom.com>
Reviewed-by: Somnath Kotur <somnath.kotur at broadcom.com>
Reviewed-by: Kalesh AP <kalesh-anakkur.purayil at broadcom.com>
Reviewed-by: Ajit Khaparde <ajit.khaparde at broadcom.com>
---
drivers/net/bnxt/bnxt_ethdev.c | 22 +++++++++++++++-------
1 file changed, 15 insertions(+), 7 deletions(-)
diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index ef8a928c91..a63a9af91e 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -7015,4 +7015,6 @@ static int bnxt_pci_remove(struct rte_pci_device *pci_dev)
{
struct rte_eth_dev *eth_dev;
+ uint16_t port_id;
+ int rc = 0;
eth_dev = rte_eth_dev_allocated(pci_dev->device.name);
@@ -7024,12 +7026,18 @@ static int bnxt_pci_remove(struct rte_pci_device *pci_dev)
*/
- PMD_DRV_LOG_LINE(DEBUG, "BNXT Port:%d pci remove", eth_dev->data->port_id);
if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
- if (rte_eth_dev_is_repr(eth_dev))
- return rte_eth_dev_destroy(eth_dev,
- bnxt_representor_uninit);
- else
- return rte_eth_dev_destroy(eth_dev,
- bnxt_dev_uninit);
+ RTE_ETH_FOREACH_DEV_OF(port_id, &pci_dev->device) {
+ PMD_DRV_LOG_LINE(DEBUG, "BNXT Port:%d pci remove", port_id);
+ eth_dev = &rte_eth_devices[port_id];
+ if (eth_dev->data->dev_flags & RTE_ETH_DEV_REPRESENTOR)
+ rc = rte_eth_dev_destroy(eth_dev,
+ bnxt_representor_uninit);
+ else
+ rc = rte_eth_dev_destroy(eth_dev,
+ bnxt_dev_uninit);
+ if (rc != 0)
+ return rc;
+ }
+ return rc;
} else {
return rte_eth_dev_pci_generic_remove(pci_dev, NULL);
--
2.48.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2025-02-12 17:29:41.525461709 +0000
+++ 0066-net-bnxt-fix-crash-when-representor-is-re-attached.patch 2025-02-12 17:29:34.404946252 +0000
@@ -1 +1 @@
-From fca6cf68bbcf9b84e4388239031fb168a6624375 Mon Sep 17 00:00:00 2001
+From 6eaaefeecea9eaf0ef2069e676e804e2e7fec63a Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit fca6cf68bbcf9b84e4388239031fb168a6624375 ]
+
@@ -23 +24,0 @@
-Cc: stable at dpdk.org
@@ -34 +35 @@
-index b18247feb2..144d4377bd 100644
+index ef8a928c91..a63a9af91e 100644
@@ -37 +38 @@
-@@ -6994,4 +6994,6 @@ static int bnxt_pci_remove(struct rte_pci_device *pci_dev)
+@@ -7015,4 +7015,6 @@ static int bnxt_pci_remove(struct rte_pci_device *pci_dev)
@@ -44 +45 @@
-@@ -7003,12 +7005,18 @@ static int bnxt_pci_remove(struct rte_pci_device *pci_dev)
+@@ -7024,12 +7026,18 @@ static int bnxt_pci_remove(struct rte_pci_device *pci_dev)
More information about the stable
mailing list