patch 'test/bpf: skip dump if conversion fails' has been queued to stable release 21.11.1

Kevin Traynor ktraynor at redhat.com
Tue Mar 8 15:14:57 CET 2022


Hi,

FYI, your patch has been queued to stable release 21.11.1

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

Thanks.

Kevin

---
>From e2b0823a95ba389906b46b90979fc0f2d142b87c Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen at networkplumber.org>
Date: Thu, 10 Feb 2022 15:09:05 -0800
Subject: [PATCH] test/bpf: skip dump if conversion fails

[ upstream commit 78e7b29ff10c234b44f20fe7d031d60748920c2d ]

If conversion of cBPF to eBPF fails (in rte_bpf_convert)
then the test should not try and print the result.

Coverity issue: 373661
Fixes: 2eccf6afbea9 ("bpf: add function to convert classic BPF to DPDK BPF")

Signed-off-by: Stephen Hemminger <stephen at networkplumber.org>
Acked-by: Konstantin Ananyev <konstantin.ananyev at intel.com>
---
 app/test/test_bpf.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/test/test_bpf.c b/app/test/test_bpf.c
index 2d755a872f..c422fedf1f 100644
--- a/app/test/test_bpf.c
+++ b/app/test/test_bpf.c
@@ -3260,6 +3260,8 @@ test_bpf_dump(struct bpf_program *cbf, const struct rte_bpf_prm *prm)
 	bpf_dump(cbf, 1);
 
-	printf("\neBPF program (%u insns)\n", prm->nb_ins);
-	rte_bpf_dump(stdout, prm->ins, prm->nb_ins);
+	if (prm != NULL) {
+		printf("\neBPF program (%u insns)\n", prm->nb_ins);
+		rte_bpf_dump(stdout, prm->ins, prm->nb_ins);
+	}
 }
 
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-03-08 13:55:29.406818767 +0000
+++ 0042-test-bpf-skip-dump-if-conversion-fails.patch	2022-03-08 13:55:28.514315213 +0000
@@ -1 +1 @@
-From 78e7b29ff10c234b44f20fe7d031d60748920c2d Mon Sep 17 00:00:00 2001
+From e2b0823a95ba389906b46b90979fc0f2d142b87c Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 78e7b29ff10c234b44f20fe7d031d60748920c2d ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -20 +21 @@
-index d1e10adab5..805cce6406 100644
+index 2d755a872f..c422fedf1f 100644
@@ -23 +24 @@
-@@ -3274,6 +3274,8 @@ test_bpf_dump(struct bpf_program *cbf, const struct rte_bpf_prm *prm)
+@@ -3260,6 +3260,8 @@ test_bpf_dump(struct bpf_program *cbf, const struct rte_bpf_prm *prm)



More information about the stable mailing list