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 F40F24625C for ; Tue, 18 Feb 2025 13:38:38 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EAAF5402A0; Tue, 18 Feb 2025 13:38:38 +0100 (CET) Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam02on2055.outbound.protection.outlook.com [40.107.212.55]) by mails.dpdk.org (Postfix) with ESMTP id 393CB402D8 for ; Tue, 18 Feb 2025 13:38:37 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ZRJcBrLOmyRsU4cTsUmQjd3C5KjD98VuvEUYhunZ54BcZjcQsUU+BtpaaUgdiEHMdnYKjHbBTSbJeZkuUU/nRtv3aLixk+O/ZAm5mesOlbRONkukjF5fcf5DStTEXJSs7wbunv4KWAmlc3KfNHFErxYN7rX/RWaYNT4DYQANtXWhqjOkypUc/ZYj4wdZPjRG1ssn46lJez+gSPperF+/zuMDGU9wiuFcs5C6I79pIFwfWEH5mDFbTEgRBNhMjE4/LjD9H3KMFAvpgED0pebsSU/YG1F8ZdRNrcwIrQvDJq73vwuD/qw0RJqOldtFbDleKBXSG0KIhNes7e5+RkA8zw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=arkyHd/jG+Nbew+sUBovepIQlkWIWmbX4TzxNLZDZK4=; b=fBnyf2U+WoQ2j13AqUec8kf3FRUI6rukk2aZjWXsoW6K7HG94DKZRITXieS7/PIzzLfeOQ8thm6LjvZARs+YX6v4WpFQoHVaFVefoXIL8Ucd9clM7Nfkba6QQDOPrKAYZ8O9LhwI15SiXgMDUQgj7S+X9bntqGCXUXViGNxcQMYumJotoaa1IAz948LkygXebDcHNkKlnHRt4R3chhfZgGENO7ckqdR03nl3GBuTaUJIIMKYJog3UK9+6uLD62QpbxVlCWZEb7Z2YXxXNp/irmd/DDrOMsfe+6OZ6pemJeuoEC1RNnbhVooEhuXoF3cE8wNTN+jnX30vRIGZzaB8dw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=corigine.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=arkyHd/jG+Nbew+sUBovepIQlkWIWmbX4TzxNLZDZK4=; b=BGC7Eb3vTZntxAWCk5AYI9k5eVaCS2KjOVP9p2hPm8BNSuRI4GJb6j3rGO+3znoqzBAUCJ0Vx/T9nZbHN9H3Kw+/ugbbqqDlr5rRtTE9YnJ/3fGiYEEQ33FUveEtRZ12vEEoIUezQaLf+0fOJS9oHMYixA7MH0N37iEV2xqjFaXzFKDoOYVvkoyqFVKrAFU7/FFbmzjflhVDs+ks08pMFIHBqkHLEpHLjKrclA44lZtv9Rm95N4yUm8yyReifGBAxXH6G50BmL3w6atgcg/McE3IZu2LfgxZStNBLJBZwpF1xEEYztmd5hgtlrVmY3mYKEJ7GnLQs5k4YheSUpc/2A== Received: from BY1P220CA0008.NAMP220.PROD.OUTLOOK.COM (2603:10b6:a03:59d::16) by MN0PR12MB5908.namprd12.prod.outlook.com (2603:10b6:208:37c::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.18; Tue, 18 Feb 2025 12:38:33 +0000 Received: from MWH0EPF000989E7.namprd02.prod.outlook.com (2603:10b6:a03:59d:cafe::2c) by BY1P220CA0008.outlook.office365.com (2603:10b6:a03:59d::16) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8466.14 via Frontend Transport; Tue, 18 Feb 2025 12:38:32 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by MWH0EPF000989E7.mail.protection.outlook.com (10.167.241.134) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.11 via Frontend Transport; Tue, 18 Feb 2025 12:38:32 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Tue, 18 Feb 2025 04:38:20 -0800 Received: from nvidia.com (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Tue, 18 Feb 2025 04:38:18 -0800 From: Xueming Li To: Zerun Fu CC: , Chaoyong He , Long Wu , Peng Zhang , dpdk stable Subject: patch 'net/nfp: fix multiple PFs check from NSP' has been queued to stable release 23.11.4 Date: Tue, 18 Feb 2025 20:34:21 +0800 Message-ID: <20250218123523.36836-27-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250218123523.36836-1-xuemingl@nvidia.com> References: <20250218123523.36836-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MWH0EPF000989E7:EE_|MN0PR12MB5908:EE_ X-MS-Office365-Filtering-Correlation-Id: d677ede8-3bac-4215-631f-08dd501927a0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|82310400026|376014|1800799024|36860700013|13003099007|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?RCojfdcvNWLLD0uBpPAeNYe1oorqt85DOmJI0mjexaOnVIKedPC0zcF+2aWs?= =?us-ascii?Q?Mxc67aiyZwIa1kApehYQFh2mghLT8hB8uzX152gdmC//CsS0ktanPdamXX+I?= =?us-ascii?Q?hhK5o5mbpnxb258Tv6tQengGHBOdKoBmxTJlt7Ei66cJi58iWo8pTKw23owY?= =?us-ascii?Q?G6FtQYlw1oDDN69/3f7R85gLLWHmwyzRz5iNakybk9qcH/g9OjRsjmhl4BjA?= =?us-ascii?Q?1uAJg5Pjjxet9itCH58AGw45BA5oMdqekfPkfdtPBMT7dSqWwPk9WxAqf/ST?= =?us-ascii?Q?XTEZsWjTiQscHYPYz0sV88TRJ8H/huhDJMM5TdZVfd3ChZJ/sy7gogwputtA?= =?us-ascii?Q?nEn04sxUYySP/Zk5NwRfjOkDsjh89ZE0LuFFTawxIX2UPz1vKzlcNlDHGyIj?= =?us-ascii?Q?XX/9duj1p46NLu5lk6PiSI8xI1hCjRylemCpYDv/BBxKvImpC5//kBnfAdo6?= =?us-ascii?Q?2WmXTXuh8f52RQA8YBpRMnxygq038WEg+mkCw3XCFgJcXicXXksGycp/g+NF?= =?us-ascii?Q?R/kIsc0+MlTv6Lrm0f6LBdwnNRIkFA+ZNgVXExP0+5WuF384vikGoWAAn9Lf?= =?us-ascii?Q?VydHJGjeubYiWN7NjEtQB9llPKjuIHFXlwEKIIlGje+DPnGb6T+Z9YR+tPuP?= =?us-ascii?Q?UCG76AxYudNckoHCqU2jUZvy48uaOo097j9d/gzNOoMCXTwtV6RUAo6o9ca2?= =?us-ascii?Q?tnINWT/9YvkL20JT3jHq4h3LODCPPPTK1AjsdtGhOur5BvknWwUm16gYrjO/?= =?us-ascii?Q?ExgO4ZbZ8cv/OKAY41JBbY+Yr7967otqkUJzfH83Pc/RQTq86QbUYSN9QWfD?= =?us-ascii?Q?pM0giAu46qGq0cir874Ts79gkLecDf6Va5BO5UhJMj+e9R8jdPx7P4iiyDT0?= =?us-ascii?Q?91oa7+cxarV4wMwVQeUloWRcmKP1eg9qj0X2CweBbEvqHy51ZYV+iSe6WJwK?= =?us-ascii?Q?fFpnxrCjHatQOqizlXXp8hPtbjDVrF19SnqHm2R/80UT/aqX66pKpMpHiZN5?= =?us-ascii?Q?YuDMDgTit88pFE4dpoOEoJXpW6jOTYXYmBya5T6ygEVeRb8/PJHCUIQzFOqc?= =?us-ascii?Q?lgXKZaKPxn7lXszrbup7X6CDCANCZ1T410U2lbpqDXuYbfDg3bGlesV6LfwJ?= =?us-ascii?Q?yuiauRaWcKhwTgdby89Gcows3sCqu8NpV6JpmXm+LOgVONfeCqnWoCJMvKws?= =?us-ascii?Q?pDUYkUzjhSpdTgbuviOGDxDYkpk0AStirDuRWRSoWexp+yMYB+JMnaFLHAXd?= =?us-ascii?Q?RGmbpb5+k0nNSc3e0nTAuLClvJAkBP7Uj8o70GPuhOUZTDnN+DrenJ3zMByJ?= =?us-ascii?Q?QFw15ycmaPeF/biVWzmCGX3pz5c65vvHIHOlDlThuML+Xhy/56XceHRWSrVz?= =?us-ascii?Q?r9+gmvOy7QLak2Y8OG3VeaxmZ0tViIW2KR5Zb14sO2BsaQiovuq+Xcfphl2+?= =?us-ascii?Q?D2r6zYOs/LLaq3Ejfrd4pJ7BCth9mejD2+53fqmp9pntYC2iHK+XDSLYt2xL?= =?us-ascii?Q?o6z6RQInS5JON48=3D?= X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230040)(82310400026)(376014)(1800799024)(36860700013)(13003099007)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Feb 2025 12:38:32.4767 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d677ede8-3bac-4215-631f-08dd501927a0 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: MWH0EPF000989E7.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR12MB5908 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 23.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. 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://git.dpdk.org/dpdk-stable/log/?h=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=b96c0c90f65f490a52bdeec9ecfb9ac67375e03f Thanks. Xueming Li --- >From b96c0c90f65f490a52bdeec9ecfb9ac67375e03f Mon Sep 17 00:00:00 2001 From: Zerun Fu Date: Wed, 22 Jan 2025 09:28:15 +0800 Subject: [PATCH] net/nfp: fix multiple PFs check from NSP Cc: Xueming Li [ upstream commit c19d389f5b553b0a9dddbb22882750c17a6fa577 ] Fix multiple PFs check from NSP problem in the logic of PF initialization. Fixes: 8ad2cc8fec37 ("net/nfp: add flag for multiple PFs support") Signed-off-by: Zerun Fu Reviewed-by: Chaoyong He Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- drivers/net/nfp/nfp_ethdev.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c index e704c90dc5..b27324c0b4 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -985,24 +985,25 @@ nfp_check_multi_pf_from_fw(uint32_t total_vnics) return false; } -static inline bool +static inline int nfp_check_multi_pf_from_nsp(struct rte_pci_device *pci_dev, - struct nfp_cpp *cpp) + struct nfp_cpp *cpp, + bool *flag) { - bool flag; struct nfp_nsp *nsp; nsp = nfp_nsp_open(cpp); if (nsp == NULL) { PMD_DRV_LOG(ERR, "NFP error when obtaining NSP handle"); - return false; + return -EIO; } - flag = (nfp_nsp_get_abi_ver_major(nsp) > 0) && + *flag = (nfp_nsp_get_abi_ver_major(nsp) > 0) && (pci_dev->id.device_id == PCI_DEVICE_ID_NFP3800_PF_NIC); nfp_nsp_close(nsp); - return flag; + + return 0; } static int @@ -1294,7 +1295,12 @@ nfp_pf_init(struct rte_pci_device *pci_dev) goto hwinfo_cleanup; } - pf_dev->multi_pf.enabled = nfp_check_multi_pf_from_nsp(pci_dev, cpp); + ret = nfp_check_multi_pf_from_nsp(pci_dev, cpp, &pf_dev->multi_pf.enabled); + if (ret != 0) { + PMD_INIT_LOG(ERR, "Failed to check multi pf from NSP."); + goto eth_table_cleanup; + } + pf_dev->multi_pf.function_id = function_id; ret = nfp_net_force_port_down(pf_dev, nfp_eth_table, cpp); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-18 19:39:01.660983970 +0800 +++ 0026-net-nfp-fix-multiple-PFs-check-from-NSP.patch 2025-02-18 19:39:00.488244072 +0800 @@ -1 +1 @@ -From c19d389f5b553b0a9dddbb22882750c17a6fa577 Mon Sep 17 00:00:00 2001 +From b96c0c90f65f490a52bdeec9ecfb9ac67375e03f Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit c19d389f5b553b0a9dddbb22882750c17a6fa577 ] @@ -9 +11,0 @@ -Cc: stable@dpdk.org @@ -20 +22 @@ -index df5482f74a..58a5b1d94e 100644 +index e704c90dc5..b27324c0b4 100644 @@ -23 +25 @@ -@@ -1751,24 +1751,25 @@ nfp_check_multi_pf_from_fw(uint32_t total_vnics) +@@ -985,24 +985,25 @@ nfp_check_multi_pf_from_fw(uint32_t total_vnics) @@ -39 +41 @@ - PMD_DRV_LOG(ERR, "NFP error when obtaining NSP handle."); + PMD_DRV_LOG(ERR, "NFP error when obtaining NSP handle"); @@ -55,2 +57,2 @@ -@@ -2434,8 +2435,13 @@ nfp_pf_init(struct rte_pci_device *pci_dev) - goto eth_table_cleanup; +@@ -1294,7 +1295,12 @@ nfp_pf_init(struct rte_pci_device *pci_dev) + goto hwinfo_cleanup; @@ -58,0 +61 @@ +- pf_dev->multi_pf.enabled = nfp_check_multi_pf_from_nsp(pci_dev, cpp); @@ -65,2 +67,0 @@ - pf_dev->nfp_eth_table = nfp_eth_table; -- pf_dev->multi_pf.enabled = nfp_check_multi_pf_from_nsp(pci_dev, cpp); @@ -68 +68,0 @@ - pf_dev->total_phyports = nfp_net_get_phyports_from_nsp(pf_dev); @@ -69,0 +70 @@ + ret = nfp_net_force_port_down(pf_dev, nfp_eth_table, cpp);