Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

selftests/bpf: Don't rely on preserving volatile in PT_REGS macros in loop3

PT_REGS*() macro on some architectures force-cast struct pt_regs to
other types (user_pt_regs, etc) and might drop volatile modifiers, if any.
Volatile isn't really required as pt_regs value isn't supposed to change
during the BPF program run, so this is correct behavior.

But progs/loop3.c relies on that volatile modifier to ensure that loop
is preserved. Fix loop3.c by declaring i and sum variables as volatile
instead. It preserves the loop and makes the test pass on all
architectures (including s390x which is currently broken).

Fixes: 3cc31d794097 ("libbpf: Normalize PT_REGS_xxx() macro definitions")
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Link: https://lore.kernel.org/bpf/20220106205156.955373-1-andrii@kernel.org

authored by

Andrii Nakryiko and committed by
Daniel Borkmann
70bc7933 1372d34c

+2 -2
+2 -2
tools/testing/selftests/bpf/progs/loop3.c
··· 12 12 char _license[] SEC("license") = "GPL"; 13 13 14 14 SEC("raw_tracepoint/consume_skb") 15 - int while_true(volatile struct pt_regs* ctx) 15 + int while_true(struct pt_regs *ctx) 16 16 { 17 - __u64 i = 0, sum = 0; 17 + volatile __u64 i = 0, sum = 0; 18 18 do { 19 19 i++; 20 20 sum += PT_REGS_RC(ctx);