patch 'net/nfp: fix misuse of function return values' has been queued to stable release 23.11.4

[Xueming Li]

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 <xuemingl at nvidia.com>

---
>From 01778ceb375343d651eb169cdca88b32126aafe6 Mon Sep 17 00:00:00 2001
From: Zerun Fu <zerun.fu at corigine.com>
Date: Wed, 22 Jan 2025 09:33:20 +0800
Subject: [PATCH] net/nfp: fix misuse of function return values
Cc: Xueming Li <xuemingl at nvidia.com>

[ 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 <zerun.fu at corigine.com>
Reviewed-by: Chaoyong He <chaoyong.he at corigine.com>
Reviewed-by: Long Wu <long.wu at corigine.com>
Reviewed-by: Peng Zhang <peng.zhang at corigine.com>
---
 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 <xuemingl at nvidia.com>
+
+[ upstream commit f19ffdb1574cb0a9c9566b0b5c4098beb95ced49 ]
@@ -14 +16,0 @@
-Cc: stable at 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");