From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 82D2846211 for ; Thu, 13 Feb 2025 11:02:21 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7E63642F04; Thu, 13 Feb 2025 11:02:21 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id A616D42EE7 for ; Thu, 13 Feb 2025 11:02:19 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739440939; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9QjXP5y2lLIQZZWVhUldUd05dMGPVQZdYqHQG0h+ebY=; b=XmzNopQDcFfTbS34CnNtZnPvSCGgRT7ruEHF2k2rjC9zq06pTJwAkrhz9ZDw5hR2Vq1etp 1jNfG8RSqhBS4t9s/kj8ZL5q9QRBP1CE6CvzfD7GTxLSbOqTRorKDfs3MhS/uiYW8VEmoI 0Bt7NlvNam7v0uJZBkq1E57EO1WW+J4= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-553-b0dAtudsM0-xD5wBPnJ3sg-1; Thu, 13 Feb 2025 05:02:17 -0500 X-MC-Unique: b0dAtudsM0-xD5wBPnJ3sg-1 X-Mimecast-MFC-AGG-ID: b0dAtudsM0-xD5wBPnJ3sg Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 898B61800360; Thu, 13 Feb 2025 10:02:16 +0000 (UTC) Received: from rh.Home (unknown [10.45.224.21]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 5EA171800360; Thu, 13 Feb 2025 10:02:14 +0000 (UTC) From: Kevin Traynor To: Sangtani Parag Satishbhai Cc: Somnath Kotur , Kalesh AP , Ajit Khaparde , dpdk stable Subject: patch 'net/bnxt: fix crash when representor is re-attached' has been queued to stable release 24.11.2 Date: Thu, 13 Feb 2025 09:58:33 +0000 Message-ID: <20250213095933.362078-66-ktraynor@redhat.com> In-Reply-To: <20250213095933.362078-1-ktraynor@redhat.com> References: <20250213095933.362078-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: Y9g3Y925U0nnVUtY0B_RI8fWyNJjboqR1Y01lsW5Erw_1739440936 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org 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 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 Reviewed-by: Somnath Kotur Reviewed-by: Kalesh AP Reviewed-by: Ajit Khaparde --- 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@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)