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 C448346211 for ; Thu, 13 Feb 2025 11:01:26 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BF94040287; Thu, 13 Feb 2025 11:01:26 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 71CAF40287 for ; Thu, 13 Feb 2025 11:01:25 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739440885; 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=ykCc68nOMtf2SsE3LB+CASBlqdFusUSJRRFShWoDffM=; b=HfV4HHFOPLXSvmCBgeF1umUQFWmM6waOyXoD3au9+I//YnNGAdcjHhCwOrpfJNlHx8Fdg8 RrK0DYeWc/d75mNbfzWTXZFWertMC14SF+jEimJ0rQ41HvcAqop4UFYnzDVdAAGWp2K38m W+Ayx77w033Py11YS6ZWYjwtF9pSKNo= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-142-i0U9y09VNg-vctL78Ii7lw-1; Thu, 13 Feb 2025 05:01:19 -0500 X-MC-Unique: i0U9y09VNg-vctL78Ii7lw-1 X-Mimecast-MFC-AGG-ID: i0U9y09VNg-vctL78Ii7lw_1739440878 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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 939C619560BC; Thu, 13 Feb 2025 10:01:18 +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 691231800365; Thu, 13 Feb 2025 10:01:16 +0000 (UTC) From: Kevin Traynor 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 24.11.2 Date: Thu, 13 Feb 2025 09:58:08 +0000 Message-ID: <20250213095933.362078-41-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: inn5s3Ov1n9dmK7wSc5ylFBRV2ycCF2kUH9GQMVbPlM_1739440878 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/64c3aa631f76779366ce3a71c35985baac6806f4 Thanks. Kevin --- >From 64c3aa631f76779366ce3a71c35985baac6806f4 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 [ 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 0b21e4ee5b..439a1a1b0e 100644 --- a/drivers/net/nfp/flower/nfp_conntrack.c +++ b/drivers/net/nfp/flower/nfp_conntrack.c @@ -1441,4 +1441,5 @@ nfp_ct_do_flow_merge(struct nfp_ct_zone_entry *ze, struct nfp_ct_flow_entry *post_ct_entry) { + int err; bool ret; uint64_t new_cookie[2]; @@ -1509,7 +1510,8 @@ nfp_ct_do_flow_merge(struct nfp_ct_zone_entry *ze, /* Send to firmware */ - ret = nfp_ct_offload_add(pre_ct_entry->dev, merge_entry); - if (ret != 0) { + err = nfp_ct_offload_add(pre_ct_entry->dev, merge_entry); + if (err != 0) { PMD_DRV_LOG(ERR, "Send the merged flow to firmware failed."); + ret = false; goto merge_table_del; } -- 2.48.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-12 17:29:38.985494059 +0000 +++ 0041-net-nfp-fix-misuse-of-function-return-values.patch 2025-02-12 17:29:34.320945751 +0000 @@ -1 +1 @@ -From f19ffdb1574cb0a9c9566b0b5c4098beb95ced49 Mon Sep 17 00:00:00 2001 +From 64c3aa631f76779366ce3a71c35985baac6806f4 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit f19ffdb1574cb0a9c9566b0b5c4098beb95ced49 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org