Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74662ea5 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by Daniel Borkmann
Browse files

samples: bpf: rename struct bpf_map_def to avoid conflict with libbpf 



Both tools/lib/bpf/libbpf.h and samples/bpf/bpf_load.h define their
own version of struct bpf_map_def.  The version in bpf_load.h has
more fields.  libbpf does not support inner maps and its definition
of struct bpf_map_def lacks the related fields.  Rename the definition
in bpf_load.h (samples/bpf) to avoid conflicts.

Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: default avatarQuentin Monnet <quentin.monnet@netronome.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parent e3687510

samples/bpf/bpf_load.c

+5 −5
Original line number Diff line number Diff line
@@ -420,7 +420,7 @@ static int load_elf_maps_section(struct bpf_map_data *maps, int maps_shndx, 


	/* Keeping compatible with ELF maps section changes

	 * ------------------------------------------------

	 * The program size of struct bpf_map_def is known by loader

	 * The program size of struct bpf_load_map_def is known by loader

	 * code, but struct stored in ELF file can be different.

	 *

	 * Unfortunately sym[i].st_size is zero.  To calculate the
@@ -429,7 +429,7 @@ static int load_elf_maps_section(struct bpf_map_data *maps, int maps_shndx, 
	 * symbols.

	 */

	map_sz_elf = data_maps->d_size / nr_maps;

	map_sz_copy = sizeof(struct bpf_map_def);

	map_sz_copy = sizeof(struct bpf_load_map_def);

	if (map_sz_elf < map_sz_copy) {

		/*

		 * Backward compat, loading older ELF file with
@@ -448,8 +448,8 @@ static int load_elf_maps_section(struct bpf_map_data *maps, int maps_shndx, 


	/* Memcpy relevant part of ELF maps data to loader maps */

	for (i = 0; i < nr_maps; i++) {

		struct bpf_load_map_def *def;

		unsigned char *addr, *end;

		struct bpf_map_def *def;

		const char *map_name;

		size_t offset;
@@ -464,9 +464,9 @@ static int load_elf_maps_section(struct bpf_map_data *maps, int maps_shndx, 


		/* Symbol value is offset into ELF maps section data area */

		offset = sym[i].st_value;

		def = (struct bpf_map_def *)(data_maps->d_buf + offset);

		def = (struct bpf_load_map_def *)(data_maps->d_buf + offset);

		maps[i].elf_offset = offset;

		memset(&maps[i].def, 0, sizeof(struct bpf_map_def));

		memset(&maps[i].def, 0, sizeof(struct bpf_load_map_def));

		memcpy(&maps[i].def, def, map_sz_copy);



		/* Verify no newer features were requested */

samples/bpf/bpf_load.h

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
#define MAX_MAPS 32

#define MAX_PROGS 32



struct bpf_map_def {

struct bpf_load_map_def {

	unsigned int type;

	unsigned int key_size;

	unsigned int value_size;
@@ -21,7 +21,7 @@ struct bpf_map_data { 
	int fd;

	char *name;

	size_t elf_offset;

	struct bpf_map_def def;

	struct bpf_load_map_def def;

};



typedef void (*fixup_map_cb)(struct bpf_map_data *map, int idx);