eal/freebsd: fix use of newer CPU_* macros
PATCH 1/1 eal/freebsd: fix use of newer CPU_* macros
From: David Marchand <[email protected]>
FreeBSD has updated its CPU macros to align more with the definitions used on Linux[1]. Unfortunately, while this makes compatibility better in future, it means we need to have both legacy and newer definition support. Use a meson check to determine which set of macros are used.
[1] https://cgit.freebsd.org/src/commit/?id=e2650af157bc7489deaf2c9054995f0f88a6e5da
Bugzilla ID: 1014
CC: [email protected]
---
The fixes lines are indicative only (as commits where the macros were introduced), since there is no real bug in DPDK, just a changed environment it has to build/run in.
--- lib/eal/freebsd/include/rte_os.h | 17 ++++++++++++++++- lib/eal/freebsd/meson.build | 11 +++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-)
lib/eal/freebsd/include/rte_os.h +16 -1
@@ -28,6 +28,8 @@ extern "C" {typedef cpuset_t rte_cpuset_t ;#define RTE_HAS_CPUSET + +#ifdef RTE_EAL_FREEBSD_CPUSET_LEGACY #define RTE_CPU_AND (dst, src1, src2) do \ { \ cpuset_t tmp; \
@@ -61,7 +63,20 @@ typedef cpuset_t rte_cpuset_t;CPU_ANDNOT (&tmp, src); \CPU_COPY (&tmp, dst); \ } while (0) -#endif +#endif /* CPU_NAND */ + +#else /* RTE_EAL_FREEBSD_CPUSET_LEGACY */ + +#define RTE_CPU_AND CPU_AND +#define RTE_CPU_OR CPU_OR +#define RTE_CPU_FILL CPU_FILL +#define RTE_CPU_NOT (dst,src) do { \ + cpu_set_t tmp; \ + CPU_FILL(&tmp); \ + CPU_XOR(dst, src, &tmp); \ +} while(0) + +#endif /* RTE_EAL_FREEBSD_CPUSET_LEGACY */ #ifdef __cplusplus }
lib/eal/freebsd/meson.build +11 -0
@@ -19,3 +19,14 @@ sources += files( ) deps += ['kvargs', 'telemetry'] + +# test for version of cpuset macros +cpuset_test_code = ''' + #include <sys/types.h> + #include <sys/cpuset.h> + void cpu_test_or(cpuset_t *s) { CPU_OR(s, s, s); } +''' + +if not cc.compiles(cpuset_test_code, name: 'Detect argument count for CPU_OR') + dpdk_conf.set('RTE_EAL_FREEBSD_CPUSET_LEGACY', 1) +endif
--
2.36.1
Quoted 19 lines
-----Original Message-----
From: Bruce Richardson <[email protected]>
Sent: 2022年5月21日 2:11
To: [email protected]
Cc: David Marchand <[email protected]>; [email protected]; Richardson, Bruce <[email protected]>
Subject: [PATCH] eal/freebsd: fix use of newer CPU_* macrosFrom: David Marchand <[email protected]>
FreeBSD has updated its CPU macros to align more with the definitions used on Linux[1]. Unfortunately, while this makes compatibility better in future, it means we need to have both legacy and newer definition support. Use a meson check to determine which set of macros are used.
[1]
https://cgit.freebsd.org/src/commit/?id=e2650af157bc7489deaf2c9054995f0f8
8a6e5da
Quoted 8 lines
Fixes c3568ea37670 ("eal: restrict control threads to startup CPU affinity")Fixes b6be16acfeb1 ("eal: fix control thread affinity with --lcores") Bugzilla ID:1014
CC: [email protected]Signed-off-by David Marchand <[email protected]>Signed-off-by Bruce Richardson <[email protected]>---
David Marchand
AppliedQuoted 10 lines · DaxueX
Quoted 10 lines
From: David Marchand <[email protected]>
FreeBSD has updated its CPU macros to align more with the definitions used on Linux[1]. Unfortunately, while this makes compatibility better in future, it means we need to have both legacy and newer definition support. Use a meson check to determine which set of macros are used.
[1]
https://cgit.freebsd.org/src/commit/?id=e2650af157bc7489deaf2c9054995f0f8
Quoted 8 lines
Quoted 7 lines
Bugzilla ID: 1014
Fixes c3568ea37670 ("eal: restrict control threads to startup CPU affinity")Fixes b6be16acfeb1 ("eal: fix control thread affinity with --lcores")Signed-off-by David Marchand <[email protected]>Signed-off-by Bruce Richardson <[email protected]>Tested-by Daxue Gao <[email protected]>
Applied, thanks Bruce.
Signature · 1 line
David Marchand