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 0E9AA4624E for ; Mon, 17 Feb 2025 18:06:27 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 04A3A402D3; Mon, 17 Feb 2025 18:06:27 +0100 (CET) Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by mails.dpdk.org (Postfix) with ESMTP id 2F542400D6 for ; Mon, 17 Feb 2025 18:06:26 +0100 (CET) Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-4395f66a639so27684385e9.0 for ; Mon, 17 Feb 2025 09:06:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739811986; x=1740416786; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=R45rg1zbzbcYE5WCVHumfFXZpdSSysYmG5+LEePafGs=; b=EDnMpJ9h68uSimVeDbBXUSQE7QNvmKxtjB/pi61Urb+WeXfqKJMO1mQ3SXC+WtNq/p T3/9CmEnoLs6NlEhAt/7qlMUP610hCDMk7fSM0wTWmNsFGUpeDyBIOHZeJIFMVYU6ENJ YYPv6+zmBRVj4FHFpQ47px+4mgvJFV0bC6hKMn6BT0gnYC5mcrqKyFBLzIxPVQBWGpUJ pyNxsD//fo67LHgNdL2ufAmbV34nTsRK+zbB8OFec5lb0IqNy5Gbt7HjLeJ60OWqQ9/i 8SfpC2c2/jvlNpZl0kJMCeNWfV05O1Iw1e1JtiHb3vZ2pHJUTDT1/cU5OiLoyII653gj hPUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739811986; x=1740416786; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=R45rg1zbzbcYE5WCVHumfFXZpdSSysYmG5+LEePafGs=; b=Ev4RLdywd0ToWo6lZodLn/6oX/lW/CgOvwezBkvdm7QD1tJjcZwa14+f6fBaDeS8yS IkRIN5J4OLn4550ZwFHM/LV3gSyCYkSMWMvytTOe4/4/T0Niy5ApbwjjwP5WmDp2Y5N7 l/iYYcAFU0ENq/U8OTd4wdcnhy+XlagsT4ziY3dkQpGaNzRzisXnxFKhDu3SipmXzIZI wr3PERT7n+dSlsfRbXhs4q0EFsumU9JlkFVcSbRgk/6d18z2J8vItWivY1IAtB3ZYu6j uV0uyKjq8ZaxS+5fx7D8gKNqxaxU9AHEr84ib/rVwzG+Q1zdo7dq/p72dZf6d14nLtSp 01XQ== X-Forwarded-Encrypted: i=1; AJvYcCXYlbozVxBeTSIJRx+5xdcuYWnbky96/phnPlMwr16sbPcUXmNyFFy22V9/OTMBCGS5wS6OY4Y=@dpdk.org X-Gm-Message-State: AOJu0YxXoKxUDySWLbjz/8E7V1nEybldjCDMtiS/2B5t2iditdDabcwU oHoQccQ9xA3ArP0LL3AG8fWU8YvrbZ2O8LjixZkPMQkkLwQq9bqPITBLa+9KsQN9QQ== X-Gm-Gg: ASbGncvOmIY1OTpvp0gzEVl29wE0IFiBhn+uc1UUNgK+uQk/FPXbNrEy6G2dTUD8iGB j2zvF6AQrj4a85mbWKpbPkLNv9zDH/JwNiEkKwrdGOgh1/ztvq8qvhuT7MiCw8XAyIKp4XRCtwQ /5vRGBcCH6YdApZHCULKWTf6gp0QXZTlmklqwGXyDsD2u5bFAF/IyIPxJoSJDvmVBzIBhAz0NI8 npFp2u2Y+VI/FWPk6L7KzIL1kvFfREQMhFCYECbFm5NfBzMOU2A0r6dUtqStegkxFRZEsyPG2kX vNrgokm9EKmrEKjzfqbMYg== X-Google-Smtp-Source: AGHT+IE3MPSYE7XHYE9aHvpIpejZuYPOmW4gOiPaZDKBHBIpNLxzHUqFdKo4My0GAv5b//4gTfbXjw== X-Received: by 2002:a5d:598b:0:b0:38f:4e6e:22 with SMTP id ffacd0b85a97d-38f4e6e01a3mr2080182f8f.48.1739811985583; Mon, 17 Feb 2025 09:06:25 -0800 (PST) Received: from localhost ([2a01:4b00:d036:ae00:f83c:95e7:29fd:a997]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-38f258b4423sm12992180f8f.11.2025.02.17.09.06.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Feb 2025 09:06:24 -0800 (PST) From: luca.boccassi@gmail.com 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 22.11.8 Date: Mon, 17 Feb 2025 17:04:02 +0000 Message-ID: <20250217170456.1068278-29-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250217170456.1068278-1-luca.boccassi@gmail.com> References: <20250217170456.1068278-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 22.11.8 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/19/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/fc55d68d544f753961b7bcfdab85f2d0ce0e3b9d Thanks. Luca Boccassi --- >From fc55d68d544f753961b7bcfdab85f2d0ce0e3b9d 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 e44fa4405c..93dcfb7e01 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -6340,6 +6340,8 @@ static int bnxt_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, 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); if (!eth_dev) @@ -6349,14 +6351,20 @@ static int bnxt_pci_remove(struct rte_pci_device *pci_dev) * +ve value will at least help in proper cleanup */ - PMD_DRV_LOG(DEBUG, "BNXT Port:%d pci remove\n", eth_dev->data->port_id); if (rte_eal_process_type() == RTE_PROC_PRIMARY) { - if (eth_dev->data->dev_flags & RTE_ETH_DEV_REPRESENTOR) - 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(DEBUG, "BNXT Port:%d pci remove\n", 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.47.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-17 16:13:17.887818640 +0000 +++ 0029-net-bnxt-fix-crash-when-representor-is-re-attached.patch 2025-02-17 16:13:16.814441593 +0000 @@ -1 +1 @@ -From fca6cf68bbcf9b84e4388239031fb168a6624375 Mon Sep 17 00:00:00 2001 +From fc55d68d544f753961b7bcfdab85f2d0ce0e3b9d 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 e44fa4405c..93dcfb7e01 100644 @@ -37 +38 @@ -@@ -6993,6 +6993,8 @@ static int bnxt_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, +@@ -6340,6 +6340,8 @@ static int bnxt_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, @@ -46 +47 @@ -@@ -7002,14 +7004,20 @@ static int bnxt_pci_remove(struct rte_pci_device *pci_dev) +@@ -6349,14 +6351,20 @@ static int bnxt_pci_remove(struct rte_pci_device *pci_dev) @@ -50 +51 @@ -- PMD_DRV_LOG_LINE(DEBUG, "BNXT Port:%d pci remove", eth_dev->data->port_id); +- PMD_DRV_LOG(DEBUG, "BNXT Port:%d pci remove\n", eth_dev->data->port_id); @@ -52 +53 @@ -- if (rte_eth_dev_is_repr(eth_dev)) +- if (eth_dev->data->dev_flags & RTE_ETH_DEV_REPRESENTOR) @@ -59 +60 @@ -+ PMD_DRV_LOG_LINE(DEBUG, "BNXT Port:%d pci remove", port_id); ++ PMD_DRV_LOG(DEBUG, "BNXT Port:%d pci remove\n", port_id);