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 28E234625C for ; Tue, 18 Feb 2025 13:38:41 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 22D00402A0; Tue, 18 Feb 2025 13:38:41 +0100 (CET) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2071.outbound.protection.outlook.com [40.107.236.71]) by mails.dpdk.org (Postfix) with ESMTP id 43F25402E1 for ; Tue, 18 Feb 2025 13:38:39 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Srw3ZVXEdjb4XuzHFVmzUiMiaPLF+0NF0Vb9jS0x2+U5bZPcSkAj5vGqmCVYIa/+FlaLUAWmgp/P8g4AtN9GQ16VTbUddg6cyuMObdcQ/QQjhsEAyOTphbXze2OJFG1QVphfvcKnCbfyz5Y2cZjQc7luh2GXewsVglF4wZKbqfGuBMlko3qJ0DmnNqufsXFt+6BAOwvNHQU7to+diAXcyR3888CpDUtJtY7lmxDDaPzNXBuKKqst/1JaLPI8NH41h0Top27arrJh5MOhHKVgQIYMHLyuhINyziRX773XwA7F0vSHlzNFkizmTP4RNryQMwONBpgr/2p+F32JHbRWCg== 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=DplP7f+Q9TgobIkA1/rd1oFjuyh/bIUwbpn0Xw2js50=; b=mUg8IGR/yTrBw5NkGm+QUaqHdyq/UHRHvWfYIh0BCE0sUKU+OsjlM6KayKNGIwo/z/PlTeM17CAO2X0tAnaGs0UwHAulREDxR7GD4ckJJNXElJFVdyJUzpzgq2P+ZjBSxfF2fpaYHcUVUp653fVwl6f56JFAycu3+X5W2IlAweie5dncknf+T7GLjjGavEK44Q2oTvALfPiTYBsLRkZphyPWBeAZAtW5n2XA02oT11TK7igWUAAuAVnJJ0p+o8rj5+jSL/46i8GP6ZuXpELNWfRtxVCJ80YnBeNDWO0E7PGI3obc7Dz5dtlyEBliZ1zwasK4GRnVfDjva6ScXuJE/w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) 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=DplP7f+Q9TgobIkA1/rd1oFjuyh/bIUwbpn0Xw2js50=; b=iOH5ER3avJ5gFJ04DzLscr4N6gfRWADIP3VixV5fWka4PfuOzEu7f+88l+hMEFozquXmlbDNPsbpDdXIO7mbmO9oyn6e2QOF7XtlLtGs/xXNmtVSvm68F51+zAgfxksg/wjuuo85u5sx0QsGCWNBDlcqyNF10eUtVdRgJ39aOaneSTry6NFGPgrPj88vlgTNmkZ7yScFbMklbBhgCCoB4hpdP3XTx18VdkkJsp0rFqzK6VYQiAhGhoGp++t3aIzFcFrwToJfPnv8STQLSYcdV1UJYHFpJjTBHbGzUkwE9HYSJcJUihUmCAvzYfF65FmfBmy3bjV7wdqWeRqSLR9nbg== Received: from BN1PR12CA0023.namprd12.prod.outlook.com (2603:10b6:408:e1::28) by CY5PR12MB6573.namprd12.prod.outlook.com (2603:10b6:930:43::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.20; Tue, 18 Feb 2025 12:38:35 +0000 Received: from BN3PEPF0000B06D.namprd21.prod.outlook.com (2603:10b6:408:e1:cafe::70) by BN1PR12CA0023.outlook.office365.com (2603:10b6:408:e1::28) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8445.19 via Frontend Transport; Tue, 18 Feb 2025 12:38:35 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by BN3PEPF0000B06D.mail.protection.outlook.com (10.167.243.72) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8489.2 via Frontend Transport; Tue, 18 Feb 2025 12:38:34 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) 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:23 -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:21 -0800 From: Xueming Li To: Zerun Fu CC: , Chaoyong He , Long Wu , Peng Zhang , dpdk stable Subject: patch 'net/nfp: fix misuse of function return values' has been queued to stable release 23.11.4 Date: Tue, 18 Feb 2025 20:34:22 +0800 Message-ID: <20250218123523.36836-28-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: BN3PEPF0000B06D:EE_|CY5PR12MB6573:EE_ X-MS-Office365-Filtering-Correlation-Id: 3201f921-8c85-4be2-2a98-08dd5019290a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|376014|36860700013|82310400026|7053199007|13003099007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?BGWq5wf7dkG7yVaTJpMcf/l+U2d9bALRp+7n1ECUKwE5GRvxlcruk3IvSsuX?= =?us-ascii?Q?b4vEgMfrgCPxvKnxbozUZxPo73N45SUwYb0rtAwBAtn4t1Sa1aFKMMJRQKRj?= =?us-ascii?Q?6vtvYgzULMIWygnyJrmtCmVHazFiw0QZJG4CU+jRDtI+H/vowuev0x8sOyBh?= =?us-ascii?Q?2zYxS8ueZMM7tRJf28y1PmQEJ0rF7aqZfOVVDVOgsWLhxdZkreb8IwO0TboD?= =?us-ascii?Q?0c1G3cNn848k/ZbacYqVtCEIUUONp71Wp78+mPQ10QgqN9+sJ4wMKu6jDIb3?= =?us-ascii?Q?6Ahvgjpd3pUDCM9M267kdxrOw+nHoSdo9j94e78eI7KKIaTXirA7dcjYsQru?= =?us-ascii?Q?+n0ok+WcPGj6aNA0CqV27lPWr8WSOPwffedzIiy75OzvO7JJ6n/HKfuN5aya?= =?us-ascii?Q?Wir6e85neGMF9BOrnqedbJvAsR9tdCWbzCCvb/feSd44v2bHM7sTlTXt8PKI?= =?us-ascii?Q?AW8zr+6jL0KBYH1FDqogvQeE/AqH3AzEtKnna1UzzBInukUwckB0tCw+naDG?= =?us-ascii?Q?eNT/WySy/URwW9uKFnUwg8ELhocBGG8ASzNY3ppc7g143Mz9suelGjx8/bvs?= =?us-ascii?Q?G+cVNAUluHkm1tkXpckq8djahL34VFEeLWDyHZpSL1ERge96Q8wVROj1P1Nu?= =?us-ascii?Q?H2TvbZTUdRlJB1jMIrF9/img9acf9Fq+TzqNCItPKVyT/lPYWMZjv9iz2PE3?= =?us-ascii?Q?g2gEJ55LmTnU3YlIVwGUZk+B+Bz2FCF4AVOJQgdyX6ak0muuS/bRyDOKLezW?= =?us-ascii?Q?PQ+E61CJX2A/NHEyHyChA8H2qGlGtTIoOqQ0tMoJs1aBMA1hTI74VwR+LxmP?= =?us-ascii?Q?91OFNwpDLFXk3aXapOlo5PlPaw4ZIJeplwNdLOTHyD9a0QVu0AAwoOmpnRUY?= =?us-ascii?Q?PTVbguiaJNPkWHAsLuIpZnEO+Pd5p9VEjoByQclKADdDu7LqAWIiseoJJyHN?= =?us-ascii?Q?D//86YlfY2vMzdfT40zwmNNFcGWE315Gox2OhOXtiXnoPCq1f3Hx028uF7NJ?= =?us-ascii?Q?Xv5lJ4wExHXF0rVLvWt8Ze0dmadaLtPCBubm/Z3tNcUzXDQTHa9iZMpGlOoh?= =?us-ascii?Q?Lyd7W3TWlNiLxWpGAPnHW7UiUyJeqtTGdL4qrtmP56282OYuPyTU3S7vtP8y?= =?us-ascii?Q?WilavNwb2l3z6TE7EntApOgbNnb/eUbTpt9HVkI7ijwnBCLpPDJly2akEhIl?= =?us-ascii?Q?8LcCINNVxt/6yHokhfM3h8hMauK/gEh91n0h9gW3WLpidr52s4hr4BD/ILKx?= =?us-ascii?Q?rEvAqvXT/ul/JhD9O+6U3O/1OAfAztgWjrdWx57fdgUJk8ElWLQdNJYNgjXC?= =?us-ascii?Q?y81fXDKUTtpDx+99lYXFdTyXoeM+d0WkE3FAHyWU+0vgIRa+F9f4aZbYdSm0?= =?us-ascii?Q?zmA9bugHFdIhPoqexRIHhhm77mO5vAiIJeE9y8W8UZQFqG7i5lqwe9lGExC3?= =?us-ascii?Q?OOPKiRfapx/+BeLsdU7QyfruVqjiz6Qe2bMso0a/v6TBRW0NTDhZy1VFmIWJ?= =?us-ascii?Q?8hR8HK8QmeJ+kHA=3D?= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230040)(1800799024)(376014)(36860700013)(82310400026)(7053199007)(13003099007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Feb 2025 12:38:34.7227 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3201f921-8c85-4be2-2a98-08dd5019290a 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.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN3PEPF0000B06D.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR12MB6573 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=01778ceb375343d651eb169cdca88b32126aafe6 Thanks. Xueming Li --- >From 01778ceb375343d651eb169cdca88b32126aafe6 Mon Sep 17 00:00:00 2001 From: Zerun Fu Date: Wed, 22 Jan 2025 09:33:20 +0800 Subject: [PATCH] net/nfp: fix misuse of function return values Cc: Xueming Li [ upstream commit f19ffdb1574cb0a9c9566b0b5c4098beb95ced49 ] The 'nfp_ct_offload_add()' return 0 means the result is right while return negative number means the wrong result. The caller assigns the 'int' variable to the 'bool' variable. So the negative number will be transform to 'true'. This will cause an error because 'true' will be regard as no problem. Fixes: b4ae16eae01c ("net/nfp: support to add and delete flows to firmware") Signed-off-by: Zerun Fu Reviewed-by: Chaoyong He Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- drivers/net/nfp/flower/nfp_conntrack.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/nfp/flower/nfp_conntrack.c b/drivers/net/nfp/flower/nfp_conntrack.c index f89003be8b..654b449e90 100644 --- a/drivers/net/nfp/flower/nfp_conntrack.c +++ b/drivers/net/nfp/flower/nfp_conntrack.c @@ -1436,6 +1436,7 @@ nfp_ct_do_flow_merge(struct nfp_ct_zone_entry *ze, struct nfp_ct_flow_entry *pre_ct_entry, struct nfp_ct_flow_entry *post_ct_entry) { + int err; bool ret; uint64_t new_cookie[2]; uint8_t cnt_same_item = 0; @@ -1504,9 +1505,10 @@ nfp_ct_do_flow_merge(struct nfp_ct_zone_entry *ze, } /* Send to firmware */ - ret = nfp_ct_offload_add(pre_ct_entry->repr, merge_entry); - if (ret != 0) { + err = nfp_ct_offload_add(pre_ct_entry->repr, merge_entry); + if (err != 0) { PMD_DRV_LOG(ERR, "Send the merged flow to firmware failed"); + ret = false; goto merge_table_del; } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-18 19:39:01.692836664 +0800 +++ 0027-net-nfp-fix-misuse-of-function-return-values.patch 2025-02-18 19:39:00.498244070 +0800 @@ -1 +1 @@ -From f19ffdb1574cb0a9c9566b0b5c4098beb95ced49 Mon Sep 17 00:00:00 2001 +From 01778ceb375343d651eb169cdca88b32126aafe6 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit f19ffdb1574cb0a9c9566b0b5c4098beb95ced49 ] @@ -14 +16,0 @@ -Cc: stable@dpdk.org @@ -25 +27 @@ -index 0b21e4ee5b..439a1a1b0e 100644 +index f89003be8b..654b449e90 100644 @@ -28 +30 @@ -@@ -1440,6 +1440,7 @@ nfp_ct_do_flow_merge(struct nfp_ct_zone_entry *ze, +@@ -1436,6 +1436,7 @@ nfp_ct_do_flow_merge(struct nfp_ct_zone_entry *ze, @@ -36 +38 @@ -@@ -1508,9 +1509,10 @@ nfp_ct_do_flow_merge(struct nfp_ct_zone_entry *ze, +@@ -1504,9 +1505,10 @@ nfp_ct_do_flow_merge(struct nfp_ct_zone_entry *ze, @@ -40 +42 @@ -- ret = nfp_ct_offload_add(pre_ct_entry->dev, merge_entry); +- ret = nfp_ct_offload_add(pre_ct_entry->repr, merge_entry); @@ -42 +44 @@ -+ err = nfp_ct_offload_add(pre_ct_entry->dev, merge_entry); ++ err = nfp_ct_offload_add(pre_ct_entry->repr, merge_entry); @@ -44 +46 @@ - PMD_DRV_LOG(ERR, "Send the merged flow to firmware failed."); + PMD_DRV_LOG(ERR, "Send the merged flow to firmware failed");