Commit 42fae973 authored by Ilya Leoshkevich's avatar Ilya Leoshkevich Committed by Alexei Starovoitov
Browse files

libbpf: Fix BPF_PROBE_READ{_STR}_INTO() on s390x 



BPF_PROBE_READ_INTO() and BPF_PROBE_READ_STR_INTO() should map to
bpf_probe_read() and bpf_probe_read_str() respectively in order to work
correctly on architectures with !ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE.

Signed-off-by: default avatarIlya Leoshkevich <iii@linux.ibm.com>
Link: https://lore.kernel.org/r/20230128000650.1516334-24-iii@linux.ibm.com


Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent 25c76ed4

tools/lib/bpf/bpf_core_read.h

+2 −2
Original line number Diff line number Diff line
@@ -364,7 +364,7 @@ enum bpf_enum_value_kind { 


/* Non-CO-RE variant of BPF_CORE_READ_INTO() */

#define BPF_PROBE_READ_INTO(dst, src, a, ...) ({			    \

	___core_read(bpf_probe_read, bpf_probe_read,			    \

	___core_read(bpf_probe_read_kernel, bpf_probe_read_kernel,	    \

		     dst, (src), a, ##__VA_ARGS__)			    \

})
@@ -400,7 +400,7 @@ enum bpf_enum_value_kind { 


/* Non-CO-RE variant of BPF_CORE_READ_STR_INTO() */

#define BPF_PROBE_READ_STR_INTO(dst, src, a, ...) ({			    \

	___core_read(bpf_probe_read_str, bpf_probe_read,		    \

	___core_read(bpf_probe_read_kernel_str, bpf_probe_read_kernel,	    \

		     dst, (src), a, ##__VA_ARGS__)			    \

})