selftests/bpf: Remove duplicate copies of the arena spinlock qnodes
Subsystems (4)
Changwoo Min
reviewerPATCH 1/1 selftests/bpf: Remove duplicate copies of the arena spinlock qnodes
bpf_arena_spin_lock.h defines its 64KB qnodes array in the header, so every translation unit including it emits a copy. __weak makes them all resolve to one instance, but bpftool gen object merges only the symbols and concatenates each input's .addr_space.1 bytes, leaving the surplus copies unreferenced in the linked object.
libarena links ten such units, so nine copies were dead weight (bytes):
object before after
-----------------------------------------------------
.addr_space.1 in libarena.bpf.o 676200 86376
libarena.skel.h 2100123 892371
libarena_asan.skel.h 2641124 1466477
Declare qnodes in the header and let each program define it once:
libarena in src/common.bpf.c, and the arena_spin_lock test beside the lock it guards.
Tested with test_progs -t arena_spin_lock and -t libarena.
--- .../selftests/bpf/libarena/include/bpf_arena_spin_lock.h | 7 +------ tools/testing/selftests/bpf/libarena/src/common.bpf.c | 7 +++++++ tools/testing/selftests/bpf/progs/arena_spin_lock.c | 7 +++++++ 3 files changed, 15 insertions(+), 6 deletions(-)
tools/testing/selftests/bpf/libarena/include/bpf_arena_spin_lock.h +1 -6
@@ -103,12 +103,7 @@ struct arena_qnode {#define _Q_LOCKED_VAL (1U << _Q_LOCKED_OFFSET)#define _Q_PENDING_VAL (1U << _Q_PENDING_OFFSET) -/* -* The qnodes are marked __weak so we can define them in the header -* while still ensuring all compilation units use the same struct -* instance. -*/ -struct arena_qnode __weak __arena __hidden qnodes[_Q_MAX_CPUS][_Q_MAX_NODES]; +extern struct arena_qnode __arena __hidden qnodes[_Q_MAX_CPUS][_Q_MAX_NODES];static inline u32 encode_tail (int cpu,int idx) {
tools/testing/selftests/bpf/libarena/src/common.bpf.c +7 -0
@@ -8,6 +8,13 @@ const volatile u32 zero = 0; struct buddy __arena buddy; +/* +* Storage for the queue nodes declared by bpf_arena_spin_lock.h. Each program +* linking the arena spinlock provides exactly one definition, so that the array +* is emitted once rather than once per translation unit. +*/ +struct arena_qnode __arena __hidden qnodes[_Q_MAX_CPUS][_Q_MAX_NODES]; +int arena_fls (__u64 word) {if (!word)
tools/testing/selftests/bpf/progs/arena_spin_lock.c +7 -0
@@ -23,6 +23,13 @@ int cs_count;#if defined(ENABLE_ATOMICS_TESTS ) && defined(__BPF_FEATURE_ADDR_SPACE_CAST) arena_spinlock_t __arena lock;int test_skip =1 ; + +/* +* Storage for the queue nodes declared by bpf_arena_spin_lock.h. Each program +* linking the arena spinlock provides exactly one definition; libarena's lives +* in libarena/src/common.bpf.c. +*/ +struct arena_qnode __arena __hidden qnodes[_Q_MAX_CPUS][_Q_MAX_NODES];#else int test_skip =2 ;#endif
Signature · 1 line
2.55.0
Kumar Kartikeya Dwivedi
maintainerQuoted 14 lines · Changwoo Min
bpf_arena_spin_lock.hdefines its 64KB qnodes array in the header, so every translation unit including it emits a copy.__weakmakes them all resolve to one instance, but bpftool gen object merges only the symbols and concatenates each input's .addr_space.1 bytes, leaving the surplus copies unreferenced in the linked object.libarena links ten such units, so nine copies were dead weight (bytes):
object before after
-----------------------------------------------------
.addr_space.1 in libarena.bpf.o 676200 86376
libarena.skel.h2100123 892371
libarena_asan.skel.h2641124 1466477
Quoted 8 lines
Declare qnodes in the header and let each program define it once:
libarena insrc/common.bpf.c, and thearena_spin_locktest beside the lock it guards.Tested with
test_progs-tarena_spin_lockand -t libarena.Signed-off-by Changwoo Min <[email protected]>---
This seems ok to me. I don't have better ideas. Emil, any thoughts?
Quoted 59 lines
.../selftests/bpf/libarena/include/bpf_arena_spin_lock.h | 7 +------ tools/testing/selftests/bpf/libarena/src/common.bpf.c | 7 +++++++ tools/testing/selftests/bpf/progs/arena_spin_lock.c | 7 +++++++ 3 files changed, 15 insertions(+), 6 deletions(-)tools/testing/selftests/bpf/libarena/include/bpf_arena_spin_lock.h +1
-6@@ -103,12 +103,7 @@ struct arena_qnode {#define _Q_LOCKED_VAL (1U << _Q_LOCKED_OFFSET)#define _Q_PENDING_VAL (1U << _Q_PENDING_OFFSET) -/* -* The qnodes are marked __weak so we can define them in the header -* while still ensuring all compilation units use the same struct -* instance. -*/ -struct arena_qnode __weak __arena __hidden qnodes[_Q_MAX_CPUS][_Q_MAX_NODES]; +extern struct arena_qnode __arena __hidden qnodes[_Q_MAX_CPUS][_Q_MAX_NODES];static inline u32 encode_tail (int cpu,int idx) {tools/testing/selftests/bpf/libarena/src/common.bpf.c +7
-0@@ -8,6 +8,13 @@ const volatile u32 zero = 0; struct buddy __arena buddy; +/* +* Storage for the queue nodes declared by bpf_arena_spin_lock.h. Each program +* linking the arena spinlock provides exactly one definition, so that the array +* is emitted once rather than once per translation unit. +*/ +struct arena_qnode __arena __hidden qnodes[_Q_MAX_CPUS][_Q_MAX_NODES]; +int arena_fls (__u64 word) {if (!word)tools/testing/selftests/bpf/progs/arena_spin_lock.c +7
-0@@ -23,6 +23,13 @@ int cs_count;#if defined(ENABLE_ATOMICS_TESTS ) && defined(__BPF_FEATURE_ADDR_SPACE_CAST) arena_spinlock_t __arena lock;int test_skip =1 ; + +/* +* Storage for the queue nodes declared by bpf_arena_spin_lock.h. Each program +* linking the arena spinlock provides exactly one definition; libarena's lives +* in libarena/src/common.bpf.c. +*/ +struct arena_qnode __arena __hidden qnodes[_Q_MAX_CPUS][_Q_MAX_NODES];#else int test_skip =2 ;#endif
Daniel Borkmann
maintainerQuoted 14 lines · Changwoo Min
bpf_arena_spin_lock.hdefines its 64KB qnodes array in the header, so every translation unit including it emits a copy.__weakmakes them all resolve to one instance, but bpftool gen object merges only the symbols and concatenates each input's .addr_space.1 bytes, leaving the surplus copies unreferenced in the linked object.libarena links ten such units, so nine copies were dead weight (bytes):
object before after ----------------------------------------------------- .addr_space.1 in libarena.bpf.o 676200 86376 libarena.skel.h 2100123 892371 libarena_asan.skel.h 2641124 1466477
Quoted 7 lines
Declare qnodes in the header and let each program define it once:
libarena insrc/common.bpf.c, and thearena_spin_locktest beside the lock it guards.Tested with
test_progs-tarena_spin_lockand -t libarena.Signed-off-by Changwoo Min <[email protected]>
This doesn't apply cleanly, could you respin against latest bpf-next?
Thanks,
Daniel
Changwoo Min
reviewerHi Daniel,
Quoted 15 lines · Daniel Borkmann
Quoted 14 lines · Changwoo Min
bpf_arena_spin_lock.hdefines its 64KB qnodes array in the header, so every translation unit including it emits a copy.__weakmakes them all resolve to one instance, but bpftool gen object merges only the symbols and concatenates each input's .addr_space.1 bytes, leaving the surplus copies unreferenced in the linked object.libarena links ten such units, so nine copies were dead weight (bytes):
object before after
-----------------------------------------------------
.addr_space.1 in libarena.bpf.o 676200 86376 libarena.skel.h 2100123 892371 libarena_asan.skel.h 2641124 1466477
Quoted 8 lines
Quoted 7 lines
Declare qnodes in the header and let each program define it once:
libarena insrc/common.bpf.c, and thearena_spin_locktest beside the lock it guards.Tested with
test_progs-tarena_spin_lockand -t libarena.Signed-off-by Changwoo Min <[email protected]>This doesn't apply cleanly, could you respin against latest bpf-next?
Sure. I will send the v2 rebased on the HEAD of the the bpf-next tree soon.
Regards.
Changwoo Min
Quoted 4 lines
Thanks,
Daniel
Emil Tsalapatis
Reviewed-byQuoted 27 lines · Changwoo Min
Quoted 2 lines
Hi Daniel,
Quoted 22 lines · Daniel Borkmann
Quoted 21 lines · Changwoo Min
bpf_arena_spin_lock.hdefines its 64KB qnodes array in the header, so every translation unit including it emits a copy.__weakmakes them all resolve to one instance, but bpftool gen object merges only the symbols and concatenates each input's .addr_space.1 bytes, leaving the surplus copies unreferenced in the linked object.libarena links ten such units, so nine copies were dead weight (bytes):
object before after ----------------------------------------------------- .addr_space.1 in libarena.bpf.o 676200 86376 libarena.skel.h 2100123 892371 libarena_asan.skel.h 2641124 1466477Declare qnodes in the header and let each program define it once:
libarena insrc/common.bpf.c, and thearena_spin_locktest beside the lock it guards.Tested with
test_progs-tarena_spin_lockand -t libarena.Signed-off-by Changwoo Min <[email protected]>
Hi Changwoo,
Sorry for the late reply, for the next version feel free to add:
Quoted 13 lines
Quoted 1 line
This doesn't apply cleanly, could you respin against latest bpf-next?
Sure. I will send the v2 rebased on the HEAD of the the bpf-next tree soon.
Regards.
Changwoo MinQuoted 4 lines
Thanks,
Daniel
Kumar Kartikeya Dwivedi
maintainerQuoted 27 lines · Emil Tsalapatis
Quoted 26 lines · Changwoo Min
Quoted 2 lines
Hi Daniel,
Quoted 21 lines · Daniel Borkmann
Quoted 20 lines · Changwoo Min
bpf_arena_spin_lock.hdefines its 64KB qnodes array in the header, so every translation unit including it emits a copy.__weakmakes them all resolve to one instance, but bpftool gen object merges only the symbols and concatenates each input's .addr_space.1 bytes, leaving the surplus copies unreferenced in the linked object.libarena links ten such units, so nine copies were dead weight (bytes):
object before after ----------------------------------------------------- .addr_space.1 in libarena.bpf.o 676200 86376 libarena.skel.h 2100123 892371 libarena_asan.skel.h 2641124 1466477Declare qnodes in the header and let each program define it once:
libarena insrc/common.bpf.c, and thearena_spin_locktest beside the lock it guards.Tested with
test_progs-tarena_spin_lockand -t libarena.
Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Signed-off-by Changwoo Min <[email protected]>Hi Changwoo,
Sorry for the late reply, for the next version feel free to add:
Reviewed-by Emil Tsalapatis <[email protected]>
Added the tag to v2 and applied, thanks.
Quoted 13 lines
Quoted 13 lines
Quoted 1 line
This doesn't apply cleanly, could you respin against latest bpf-next?
Sure. I will send the v2 rebased on the HEAD of the the bpf-next tree soon.
Regards.
Changwoo MinQuoted 4 lines
Thanks,
Daniel