Commit e02daf4c authored by Andrii Nakryiko's avatar Andrii Nakryiko
Browse files

Merge branch 'core_reloc fixes for s390' 

Ilya Leoshkevich says:

====================

v2: https://lore.kernel.org/bpf/20211025131214.731972-1-iii@linux.ibm.com/
v2 -> v3: Split the fix from the cleanup (Daniel).

v1: https://lore.kernel.org/bpf/20211021234653.643302-1-iii@linux.ibm.com/


v1 -> v2: Drop bpf_core_calc_field_relo() restructuring, split the
          __BYTE_ORDER__ change (Andrii).

Hi,

this series fixes test failures in core_reloc on s390.

Patch 1 fixes an endianness bug with __BYTE_ORDER vs __BYTE_ORDER__.
Patches 2-5 make the rest of the code consistent in that respect.
Patch 6 fixes an endianness issue in test_core_reloc_mods.

Best regards,
Ilya
====================

Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
parents 124c6003 2e2c6d3f

samples/seccomp/bpf-helper.h

+4 −4
Original line number Diff line number Diff line
@@ -62,9 +62,9 @@ void seccomp_bpf_print(struct sock_filter *filter, size_t count); 
#define EXPAND(...) __VA_ARGS__



/* Ensure that we load the logically correct offset. */

#if __BYTE_ORDER == __LITTLE_ENDIAN

#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__

#define LO_ARG(idx) offsetof(struct seccomp_data, args[(idx)])

#elif __BYTE_ORDER == __BIG_ENDIAN

#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__

#define LO_ARG(idx) offsetof(struct seccomp_data, args[(idx)]) + sizeof(__u32)

#else

#error "Unknown endianness"
@@ -85,10 +85,10 @@ void seccomp_bpf_print(struct sock_filter *filter, size_t count); 
#elif __BITS_PER_LONG == 64



/* Ensure that we load the logically correct offset. */

#if __BYTE_ORDER == __LITTLE_ENDIAN

#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__

#define ENDIAN(_lo, _hi) _lo, _hi

#define HI_ARG(idx) offsetof(struct seccomp_data, args[(idx)]) + sizeof(__u32)

#elif __BYTE_ORDER == __BIG_ENDIAN

#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__

#define ENDIAN(_lo, _hi) _hi, _lo

#define HI_ARG(idx) offsetof(struct seccomp_data, args[(idx)])

#endif

tools/lib/bpf/bpf_core_read.h

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ enum bpf_enum_value_kind { 
#define __CORE_RELO(src, field, info)					      \

	__builtin_preserve_field_info((src)->field, BPF_FIELD_##info)



#if __BYTE_ORDER == __LITTLE_ENDIAN

#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__

#define __CORE_BITFIELD_PROBE_READ(dst, src, fld)			      \

	bpf_probe_read_kernel(						      \

			(void *)dst,				      \

tools/lib/bpf/btf.c

+2 −2
Original line number Diff line number Diff line
@@ -538,9 +538,9 @@ int btf__set_pointer_size(struct btf *btf, size_t ptr_sz) 


static bool is_host_big_endian(void)

{

#if __BYTE_ORDER == __LITTLE_ENDIAN

#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__

	return false;

#elif __BYTE_ORDER == __BIG_ENDIAN

#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__

	return true;

#else

# error "Unrecognized __BYTE_ORDER__"

tools/lib/bpf/btf_dump.c

+4 −4
Original line number Diff line number Diff line
@@ -1576,11 +1576,11 @@ static int btf_dump_get_bitfield_value(struct btf_dump *d, 
	/* Bitfield value retrieval is done in two steps; first relevant bytes are

	 * stored in num, then we left/right shift num to eliminate irrelevant bits.

	 */

#if __BYTE_ORDER == __LITTLE_ENDIAN

#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__

	for (i = t->size - 1; i >= 0; i--)

		num = num * 256 + bytes[i];

	nr_copy_bits = bit_sz + bits_offset;

#elif __BYTE_ORDER == __BIG_ENDIAN

#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__

	for (i = 0; i < t->size; i++)

		num = num * 256 + bytes[i];

	nr_copy_bits = t->size * 8 - bits_offset;
@@ -1700,10 +1700,10 @@ static int btf_dump_int_data(struct btf_dump *d, 
		/* avoid use of __int128 as some 32-bit platforms do not

		 * support it.

		 */

#if __BYTE_ORDER == __LITTLE_ENDIAN

#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__

		lsi = ints[0];

		msi = ints[1];

#elif __BYTE_ORDER == __BIG_ENDIAN

#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__

		lsi = ints[1];

		msi = ints[0];

#else

tools/lib/bpf/libbpf.c

+2 −2
Original line number Diff line number Diff line
@@ -1299,10 +1299,10 @@ static int bpf_object__elf_init(struct bpf_object *obj) 


static int bpf_object__check_endianness(struct bpf_object *obj)

{

#if __BYTE_ORDER == __LITTLE_ENDIAN

#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__

	if (obj->efile.ehdr->e_ident[EI_DATA] == ELFDATA2LSB)

		return 0;

#elif __BYTE_ORDER == __BIG_ENDIAN

#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__

	if (obj->efile.ehdr->e_ident[EI_DATA] == ELFDATA2MSB)

		return 0;

#else