Commit 694731e8 authored by Andrii Nakryiko's avatar Andrii Nakryiko Committed by Daniel Borkmann
Browse files

selftests/bpf: Adjust CO-RE reloc tests for new bpf_core_read() macro 



To allow adding a variadic BPF_CORE_READ macro with slightly different
syntax and semantics, define CORE_READ in CO-RE reloc tests, which is
a thin wrapper around low-level bpf_core_read() macro, which in turn is
just a wrapper around bpf_probe_read().

Signed-off-by: default avatarAndrii Nakryiko <andriin@fb.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Acked-by: default avatarJohn Fastabend <john.fastabend@gmail.com>
Acked-by: default avatarSong Liu <songliubraving@fb.com>
Link: https://lore.kernel.org/bpf/20191008175942.1769476-4-andriin@fb.com
parent 36b5d471

tools/testing/selftests/bpf/bpf_helpers.h

+4 −4
Original line number Original line Diff line number Diff line
@@ -223,7 +223,7 @@ struct pt_regs; 
#endif

#endif





/*

/*

 * BPF_CORE_READ abstracts away bpf_probe_read() call and captures offset

 * bpf_core_read() abstracts away bpf_probe_read() call and captures offset

 * relocation for source address using __builtin_preserve_access_index()

 * relocation for source address using __builtin_preserve_access_index()

 * built-in, provided by Clang.

 * built-in, provided by Clang.

 *

 *
@@ -238,8 +238,8 @@ struct pt_regs; 
 * actual field offset, based on target kernel BTF type that matches original

 * actual field offset, based on target kernel BTF type that matches original

 * (local) BTF, used to record relocation.

 * (local) BTF, used to record relocation.

 */

 */

#define BPF_CORE_READ(dst, src)						\

#define bpf_core_read(dst, sz, src)					    \

	bpf_probe_read((dst), sizeof(*(src)),				\

	bpf_probe_read(dst, sz,						    \

		       __builtin_preserve_access_index(src))

		       (const void *)__builtin_preserve_access_index(src))





#endif
 
#endif

tools/testing/selftests/bpf/progs/test_core_reloc_arrays.c

+6 −4
Original line number Original line Diff line number Diff line
@@ -31,6 +31,8 @@ struct core_reloc_arrays { 
	struct core_reloc_arrays_substruct d[1][2];

	struct core_reloc_arrays_substruct d[1][2];

};

};





#define CORE_READ(dst, src) bpf_core_read(dst, sizeof(*(dst)), src)



SEC("raw_tracepoint/sys_enter")

SEC("raw_tracepoint/sys_enter")

int test_core_arrays(void *ctx)

int test_core_arrays(void *ctx)

{

{
@@ -38,16 +40,16 @@ int test_core_arrays(void *ctx) 
	struct core_reloc_arrays_output *out = (void *)&data.out;

	struct core_reloc_arrays_output *out = (void *)&data.out;





	/* in->a[2] */

	/* in->a[2] */

	if (BPF_CORE_READ(&out->a2, &in->a[2]))

	if (CORE_READ(&out->a2, &in->a[2]))

		return 1;

		return 1;

	/* in->b[1][2][3] */

	/* in->b[1][2][3] */

	if (BPF_CORE_READ(&out->b123, &in->b[1][2][3]))

	if (CORE_READ(&out->b123, &in->b[1][2][3]))

		return 1;

		return 1;

	/* in->c[1].c */

	/* in->c[1].c */

	if (BPF_CORE_READ(&out->c1c, &in->c[1].c))

	if (CORE_READ(&out->c1c, &in->c[1].c))

		return 1;

		return 1;

	/* in->d[0][0].d */

	/* in->d[0][0].d */

	if (BPF_CORE_READ(&out->d00d, &in->d[0][0].d))

	if (CORE_READ(&out->d00d, &in->d[0][0].d))

		return 1;

		return 1;





	return 0;

	return 0;

tools/testing/selftests/bpf/progs/test_core_reloc_flavors.c

+5 −3
Original line number Original line Diff line number Diff line
@@ -39,6 +39,8 @@ struct core_reloc_flavors___weird { 
	};

	};

};

};





#define CORE_READ(dst, src) bpf_core_read(dst, sizeof(*(dst)), src)



SEC("raw_tracepoint/sys_enter")

SEC("raw_tracepoint/sys_enter")

int test_core_flavors(void *ctx)

int test_core_flavors(void *ctx)

{

{
@@ -48,13 +50,13 @@ int test_core_flavors(void *ctx) 
	struct core_reloc_flavors *out = (void *)&data.out;

	struct core_reloc_flavors *out = (void *)&data.out;





	/* read a using weird layout */

	/* read a using weird layout */

	if (BPF_CORE_READ(&out->a, &in_weird->a))

	if (CORE_READ(&out->a, &in_weird->a))

		return 1;

		return 1;

	/* read b using reversed layout */

	/* read b using reversed layout */

	if (BPF_CORE_READ(&out->b, &in_rev->b))

	if (CORE_READ(&out->b, &in_rev->b))

		return 1;

		return 1;

	/* read c using original layout */

	/* read c using original layout */

	if (BPF_CORE_READ(&out->c, &in_orig->c))

	if (CORE_READ(&out->c, &in_orig->c))

		return 1;

		return 1;





	return 0;

	return 0;

tools/testing/selftests/bpf/progs/test_core_reloc_ints.c

+10 −8
Original line number Original line Diff line number Diff line
@@ -23,20 +23,22 @@ struct core_reloc_ints { 
	int64_t		s64_field;

	int64_t		s64_field;

};

};





#define CORE_READ(dst, src) bpf_core_read(dst, sizeof(*(dst)), src)



SEC("raw_tracepoint/sys_enter")

SEC("raw_tracepoint/sys_enter")

int test_core_ints(void *ctx)

int test_core_ints(void *ctx)

{

{

	struct core_reloc_ints *in = (void *)&data.in;

	struct core_reloc_ints *in = (void *)&data.in;

	struct core_reloc_ints *out = (void *)&data.out;

	struct core_reloc_ints *out = (void *)&data.out;





	if (BPF_CORE_READ(&out->u8_field, &in->u8_field) ||

	if (CORE_READ(&out->u8_field, &in->u8_field) ||

	    BPF_CORE_READ(&out->s8_field, &in->s8_field) ||

	    CORE_READ(&out->s8_field, &in->s8_field) ||

	    BPF_CORE_READ(&out->u16_field, &in->u16_field) ||

	    CORE_READ(&out->u16_field, &in->u16_field) ||

	    BPF_CORE_READ(&out->s16_field, &in->s16_field) ||

	    CORE_READ(&out->s16_field, &in->s16_field) ||

	    BPF_CORE_READ(&out->u32_field, &in->u32_field) ||

	    CORE_READ(&out->u32_field, &in->u32_field) ||

	    BPF_CORE_READ(&out->s32_field, &in->s32_field) ||

	    CORE_READ(&out->s32_field, &in->s32_field) ||

	    BPF_CORE_READ(&out->u64_field, &in->u64_field) ||

	    CORE_READ(&out->u64_field, &in->u64_field) ||

	    BPF_CORE_READ(&out->s64_field, &in->s64_field))

	    CORE_READ(&out->s64_field, &in->s64_field))

		return 1;

		return 1;





	return 0;

	return 0;

tools/testing/selftests/bpf/progs/test_core_reloc_kernel.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -17,6 +17,8 @@ struct task_struct { 
	int tgid;

	int tgid;

};

};





#define CORE_READ(dst, src) bpf_core_read(dst, sizeof(*(dst)), src)



SEC("raw_tracepoint/sys_enter")

SEC("raw_tracepoint/sys_enter")

int test_core_kernel(void *ctx)

int test_core_kernel(void *ctx)

{

{
@@ -24,8 +26,8 @@ int test_core_kernel(void *ctx) 
	uint64_t pid_tgid = bpf_get_current_pid_tgid();

	uint64_t pid_tgid = bpf_get_current_pid_tgid();

	int pid, tgid;

	int pid, tgid;





	if (BPF_CORE_READ(&pid, &task->pid) ||

	if (CORE_READ(&pid, &task->pid) ||

	    BPF_CORE_READ(&tgid, &task->tgid))

	    CORE_READ(&tgid, &task->tgid))

		return 1;

		return 1;





	/* validate pid + tgid matches */

	/* validate pid + tgid matches */

CRA Git | Maintained and supported by SUSTech CRA and CCSE