patch 'bpf: disable on 32-bit x86' has been queued to stable release 22.11.6
luca.boccassi at gmail.com
luca.boccassi at gmail.com
Tue Jun 25 01:58:48 CEST 2024
Hi,
FYI, your patch has been queued to stable release 22.11.6
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/27/24. 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/1f65019c2d7ff5396cb18a4ceeba231c6607b881
Thanks.
Luca Boccassi
---
>From 1f65019c2d7ff5396cb18a4ceeba231c6607b881 Mon Sep 17 00:00:00 2001
From: Luca Boccassi <bluca at debian.org>
Date: Thu, 25 Apr 2024 16:05:58 +0100
Subject: [PATCH] bpf: disable on 32-bit x86
[ upstream commit 4edbcc7b5313949083f7694847342b1a45659d6b ]
As per Intel, this is not supported, and the librte-bpf test fails on
32bit x86 kernels, so disable the library and the pmd.
Signed-off-by: Luca Boccassi <bluca at debian.org>
Acked-by: Stephen Hemminger <stephen at networkplumber.org>
---
app/test/meson.build | 11 ++++++++---
drivers/net/af_xdp/meson.build | 6 ++++++
lib/bpf/meson.build | 6 ++++++
3 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/app/test/meson.build b/app/test/meson.build
index eee02cd8ff..09cbe5e620 100644
--- a/app/test/meson.build
+++ b/app/test/meson.build
@@ -15,7 +15,6 @@ test_sources = files(
'test_barrier.c',
'test_bitops.c',
'test_bitmap.c',
- 'test_bpf.c',
'test_byteorder.c',
'test_cksum.c',
'test_cksum_perf.c',
@@ -161,8 +160,6 @@ fast_tests = [
['acl_autotest', true, true],
['atomic_autotest', false, true],
['bitmap_autotest', true, true],
- ['bpf_autotest', true, true],
- ['bpf_convert_autotest', true, true],
['bitops_autotest', true, true],
['byteorder_autotest', true, true],
['cksum_autotest', true, true],
@@ -430,6 +427,14 @@ if dpdk_conf.has('RTE_HAS_LIBPCAP')
endif
endif
+if arch_subdir != 'x86' or dpdk_conf.get('RTE_ARCH_64')
+ test_sources += 'test_bpf.c'
+ fast_tests += [
+ ['bpf_autotest', true, true],
+ ['bpf_convert_autotest', true, true],
+ ]
+endif
+
if cc.has_argument('-Wno-format-truncation')
cflags += '-Wno-format-truncation'
endif
diff --git a/drivers/net/af_xdp/meson.build b/drivers/net/af_xdp/meson.build
index 979b914bb6..1182ce5325 100644
--- a/drivers/net/af_xdp/meson.build
+++ b/drivers/net/af_xdp/meson.build
@@ -7,6 +7,12 @@ if is_windows
subdir_done()
endif
+if arch_subdir == 'x86' and dpdk_conf.get('RTE_ARCH_32')
+ build = false
+ reason = 'not supported on 32-bit x86'
+ subdir_done()
+endif
+
sources = files('rte_eth_af_xdp.c')
libxdp_ver = '>=1.2.2'
diff --git a/lib/bpf/meson.build b/lib/bpf/meson.build
index cd739bb827..aa258a9061 100644
--- a/lib/bpf/meson.build
+++ b/lib/bpf/meson.build
@@ -7,6 +7,12 @@ if is_windows
subdir_done()
endif
+if arch_subdir == 'x86' and dpdk_conf.get('RTE_ARCH_32')
+ build = false
+ reason = 'not supported on 32-bit x86'
+ subdir_done()
+endif
+
sources = files('bpf.c',
'bpf_dump.c',
'bpf_exec.c',
--
2.39.2
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2024-06-25 00:22:16.912750848 +0100
+++ 0062-bpf-disable-on-32-bit-x86.patch 2024-06-25 00:22:13.217186301 +0100
@@ -1 +1 @@
-From 4edbcc7b5313949083f7694847342b1a45659d6b Mon Sep 17 00:00:00 2001
+From 1f65019c2d7ff5396cb18a4ceeba231c6607b881 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 4edbcc7b5313949083f7694847342b1a45659d6b ]
+
@@ -9,2 +10,0 @@
-Cc: stable at dpdk.org
-
@@ -14,4 +14,4 @@
- doc/guides/rel_notes/release_24_07.rst | 5 +++++
- drivers/net/af_xdp/meson.build | 6 ++++++
- lib/bpf/meson.build | 6 ++++++
- 3 files changed, 17 insertions(+)
+ app/test/meson.build | 11 ++++++++---
+ drivers/net/af_xdp/meson.build | 6 ++++++
+ lib/bpf/meson.build | 6 ++++++
+ 3 files changed, 20 insertions(+), 3 deletions(-)
@@ -19,7 +19,24 @@
-diff --git a/doc/guides/rel_notes/release_24_07.rst b/doc/guides/rel_notes/release_24_07.rst
-index d4970cf6ec..1af7cb91a1 100644
---- a/doc/guides/rel_notes/release_24_07.rst
-+++ b/doc/guides/rel_notes/release_24_07.rst
-@@ -138,6 +138,11 @@ Removed Items
- Also, make sure to start the actual text at the margin.
- =======================================================
+diff --git a/app/test/meson.build b/app/test/meson.build
+index eee02cd8ff..09cbe5e620 100644
+--- a/app/test/meson.build
++++ b/app/test/meson.build
+@@ -15,7 +15,6 @@ test_sources = files(
+ 'test_barrier.c',
+ 'test_bitops.c',
+ 'test_bitmap.c',
+- 'test_bpf.c',
+ 'test_byteorder.c',
+ 'test_cksum.c',
+ 'test_cksum_perf.c',
+@@ -161,8 +160,6 @@ fast_tests = [
+ ['acl_autotest', true, true],
+ ['atomic_autotest', false, true],
+ ['bitmap_autotest', true, true],
+- ['bpf_autotest', true, true],
+- ['bpf_convert_autotest', true, true],
+ ['bitops_autotest', true, true],
+ ['byteorder_autotest', true, true],
+ ['cksum_autotest', true, true],
+@@ -430,6 +427,14 @@ if dpdk_conf.has('RTE_HAS_LIBPCAP')
+ endif
+ endif
@@ -27 +44,7 @@
-+* **Disabled the BPF library and net/af_xdp for 32-bit x86.**
++if arch_subdir != 'x86' or dpdk_conf.get('RTE_ARCH_64')
++ test_sources += 'test_bpf.c'
++ fast_tests += [
++ ['bpf_autotest', true, true],
++ ['bpf_convert_autotest', true, true],
++ ]
++endif
@@ -29,6 +52,3 @@
-+ BPF is not supported and the librte-bpf test fails on 32-bit x86 kernels.
-+ So disable the library and the pmd.
-+
-
- API Changes
- -----------
+ if cc.has_argument('-Wno-format-truncation')
+ cflags += '-Wno-format-truncation'
+ endif
@@ -36 +56 @@
-index 280bfa8f80..69d109ff46 100644
+index 979b914bb6..1182ce5325 100644
More information about the stable
mailing list