Skip to content

Commit

Permalink
selftests/bpf: Fix test_core_autosize on big-endian machines
Browse files Browse the repository at this point in the history
[ Upstream commit d164dd9 ]

The "probed" part of test_core_autosize copies an integer using
bpf_core_read() into an integer of a potentially different size.
On big-endian machines a destination offset is required for this to
produce a sensible result.

Fixes: 888d83b ("selftests/bpf: Validate libbpf's auto-sizing of LD/ST/STX instructions")
Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20210812224814.187460-1-iii@linux.ibm.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
iii-i authored and gregkh committed Sep 15, 2021
1 parent 0f625e1 commit 4bddb57
Showing 1 changed file with 15 additions and 5 deletions.
20 changes: 15 additions & 5 deletions tools/testing/selftests/bpf/progs/test_core_autosize.c
Expand Up @@ -125,30 +125,40 @@ int handle_downsize(void *ctx)
return 0;
}

#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
#define bpf_core_read_int bpf_core_read
#else
#define bpf_core_read_int(dst, sz, src) ({ \
/* Prevent "subtraction from stack pointer prohibited" */ \
volatile long __off = sizeof(*dst) - (sz); \
bpf_core_read((char *)(dst) + __off, sz, src); \
})
#endif

SEC("raw_tp/sys_enter")
int handle_probed(void *ctx)
{
struct test_struct___downsize *in = (void *)&input;
__u64 tmp;

tmp = 0;
bpf_core_read(&tmp, bpf_core_field_size(in->ptr), &in->ptr);
bpf_core_read_int(&tmp, bpf_core_field_size(in->ptr), &in->ptr);
ptr_probed = tmp;

tmp = 0;
bpf_core_read(&tmp, bpf_core_field_size(in->val1), &in->val1);
bpf_core_read_int(&tmp, bpf_core_field_size(in->val1), &in->val1);
val1_probed = tmp;

tmp = 0;
bpf_core_read(&tmp, bpf_core_field_size(in->val2), &in->val2);
bpf_core_read_int(&tmp, bpf_core_field_size(in->val2), &in->val2);
val2_probed = tmp;

tmp = 0;
bpf_core_read(&tmp, bpf_core_field_size(in->val3), &in->val3);
bpf_core_read_int(&tmp, bpf_core_field_size(in->val3), &in->val3);
val3_probed = tmp;

tmp = 0;
bpf_core_read(&tmp, bpf_core_field_size(in->val4), &in->val4);
bpf_core_read_int(&tmp, bpf_core_field_size(in->val4), &in->val4);
val4_probed = tmp;

return 0;
Expand Down

0 comments on commit 4bddb57

Please sign in to comment.