patch 'pipeline: fix build with sanitizers or debug options' has been queued to stable release 24.11.7

luca.boccassi at gmail.com luca.boccassi at gmail.com
Thu Jun 11 15:19:16 CEST 2026


Hi,

FYI, your patch has been queued to stable release 24.11.7

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/13/26. 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/b3bd51e704a4664132e82e0416342298bec7444f

Thanks.

Luca Boccassi

---
>From b3bd51e704a4664132e82e0416342298bec7444f Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand at redhat.com>
Date: Fri, 20 Mar 2026 14:33:09 +0100
Subject: [PATCH] pipeline: fix build with sanitizers or debug options
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[ upstream commit 2756b838151c2339b4f957049c034fcf62309aca ]

Similar to commit 84f5ac9418ea ("pipeline: fix build with ASan").

Here we are again. Depending on options (like debug, or ASan, or UBSan),
compilation can fail because of dumb construct like CHECK(0, XXX).
Dumb, because such an expression macro expands as: if (0) return -XXX;

../lib/pipeline/rte_swx_pipeline.c: In function ‘instr_movh_translate’:
../lib/pipeline/rte_swx_pipeline.c:3461:1: error: control reaches end of
	non-void function [-Werror=return-type]
 3461 | }
      | ^

Remove any such call when at the end of functions, using a regexp:
%s/CHECK(0, \(.*\))\(;\n}\)/return -\1\2/

Fixes: c6b752cdf215 ("pipeline: introduce SWX extern instruction")
Fixes: cdaa937d3eaa ("pipeline: support selector table")
Fixes: 2f8168eac37a ("pipeline: add instruction for IPv6 address upper half")

Signed-off-by: David Marchand <david.marchand at redhat.com>
Acked-by: Cristian Dumitrescu <cristian.dumitrescu at intel.com>
---
 lib/pipeline/rte_swx_pipeline.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/pipeline/rte_swx_pipeline.c b/lib/pipeline/rte_swx_pipeline.c
index 18977f7258..05de839446 100644
--- a/lib/pipeline/rte_swx_pipeline.c
+++ b/lib/pipeline/rte_swx_pipeline.c
@@ -2509,7 +2509,7 @@ instr_table_translate(struct rte_swx_pipeline *p,
 		return 0;
 	}
 
-	CHECK(0, EINVAL);
+	return -EINVAL;
 }
 
 static inline void
@@ -3034,7 +3034,7 @@ instr_extern_translate(struct rte_swx_pipeline *p,
 		return 0;
 	}
 
-	CHECK(0, EINVAL);
+	return -EINVAL;
 }
 
 static inline void
@@ -3442,7 +3442,7 @@ instr_movh_translate(struct rte_swx_pipeline *p,
 		return 0;
 	}
 
-	CHECK(0, EINVAL);
+	return -EINVAL;
 }
 
 static inline void
-- 
2.47.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2026-06-11 14:20:01.665386219 +0100
+++ 0007-pipeline-fix-build-with-sanitizers-or-debug-options.patch	2026-06-11 14:20:01.174745010 +0100
@@ -1 +1 @@
-From 2756b838151c2339b4f957049c034fcf62309aca Mon Sep 17 00:00:00 2001
+From b3bd51e704a4664132e82e0416342298bec7444f Mon Sep 17 00:00:00 2001
@@ -8,0 +9,2 @@
+[ upstream commit 2756b838151c2339b4f957049c034fcf62309aca ]
+
@@ -27 +28,0 @@
-Cc: stable at dpdk.org
@@ -36 +37 @@
-index a9157815e4..8ceb1fe88d 100644
+index 18977f7258..05de839446 100644
@@ -39 +40 @@
-@@ -2524,7 +2524,7 @@ instr_table_translate(struct rte_swx_pipeline *p,
+@@ -2509,7 +2509,7 @@ instr_table_translate(struct rte_swx_pipeline *p,
@@ -48 +49 @@
-@@ -3049,7 +3049,7 @@ instr_extern_translate(struct rte_swx_pipeline *p,
+@@ -3034,7 +3034,7 @@ instr_extern_translate(struct rte_swx_pipeline *p,
@@ -57 +58 @@
-@@ -3457,7 +3457,7 @@ instr_movh_translate(struct rte_swx_pipeline *p,
+@@ -3442,7 +3442,7 @@ instr_movh_translate(struct rte_swx_pipeline *p,


More information about the stable mailing list