Commit ac9d1389 authored by Andrii Nakryiko's avatar Andrii Nakryiko Committed by Alexei Starovoitov

libbpf: Extract internal map names into constants

Instead of duplicating string literals, keep them in one place and consistent.
Signed-off-by: default avatarAndrii Nakryiko <andriin@fb.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20191214014710.3449601-2-andriin@fb.com
parent f7c0bbf2
...@@ -195,6 +195,10 @@ struct bpf_program { ...@@ -195,6 +195,10 @@ struct bpf_program {
__u32 prog_flags; __u32 prog_flags;
}; };
#define DATA_SEC ".data"
#define BSS_SEC ".bss"
#define RODATA_SEC ".rodata"
enum libbpf_map_type { enum libbpf_map_type {
LIBBPF_MAP_UNSPEC, LIBBPF_MAP_UNSPEC,
LIBBPF_MAP_DATA, LIBBPF_MAP_DATA,
...@@ -203,9 +207,9 @@ enum libbpf_map_type { ...@@ -203,9 +207,9 @@ enum libbpf_map_type {
}; };
static const char * const libbpf_type_to_btf_name[] = { static const char * const libbpf_type_to_btf_name[] = {
[LIBBPF_MAP_DATA] = ".data", [LIBBPF_MAP_DATA] = DATA_SEC,
[LIBBPF_MAP_BSS] = ".bss", [LIBBPF_MAP_BSS] = BSS_SEC,
[LIBBPF_MAP_RODATA] = ".rodata", [LIBBPF_MAP_RODATA] = RODATA_SEC,
}; };
struct bpf_map { struct bpf_map {
...@@ -736,13 +740,13 @@ int bpf_object__section_size(const struct bpf_object *obj, const char *name, ...@@ -736,13 +740,13 @@ int bpf_object__section_size(const struct bpf_object *obj, const char *name,
*size = 0; *size = 0;
if (!name) { if (!name) {
return -EINVAL; return -EINVAL;
} else if (!strcmp(name, ".data")) { } else if (!strcmp(name, DATA_SEC)) {
if (obj->efile.data) if (obj->efile.data)
*size = obj->efile.data->d_size; *size = obj->efile.data->d_size;
} else if (!strcmp(name, ".bss")) { } else if (!strcmp(name, BSS_SEC)) {
if (obj->efile.bss) if (obj->efile.bss)
*size = obj->efile.bss->d_size; *size = obj->efile.bss->d_size;
} else if (!strcmp(name, ".rodata")) { } else if (!strcmp(name, RODATA_SEC)) {
if (obj->efile.rodata) if (obj->efile.rodata)
*size = obj->efile.rodata->d_size; *size = obj->efile.rodata->d_size;
} else { } else {
...@@ -1684,10 +1688,10 @@ static int bpf_object__elf_collect(struct bpf_object *obj) ...@@ -1684,10 +1688,10 @@ static int bpf_object__elf_collect(struct bpf_object *obj)
name, obj->path, cp); name, obj->path, cp);
return err; return err;
} }
} else if (strcmp(name, ".data") == 0) { } else if (strcmp(name, DATA_SEC) == 0) {
obj->efile.data = data; obj->efile.data = data;
obj->efile.data_shndx = idx; obj->efile.data_shndx = idx;
} else if (strcmp(name, ".rodata") == 0) { } else if (strcmp(name, RODATA_SEC) == 0) {
obj->efile.rodata = data; obj->efile.rodata = data;
obj->efile.rodata_shndx = idx; obj->efile.rodata_shndx = idx;
} else { } else {
...@@ -1717,7 +1721,8 @@ static int bpf_object__elf_collect(struct bpf_object *obj) ...@@ -1717,7 +1721,8 @@ static int bpf_object__elf_collect(struct bpf_object *obj)
obj->efile.reloc_sects[nr_sects].shdr = sh; obj->efile.reloc_sects[nr_sects].shdr = sh;
obj->efile.reloc_sects[nr_sects].data = data; obj->efile.reloc_sects[nr_sects].data = data;
} else if (sh.sh_type == SHT_NOBITS && strcmp(name, ".bss") == 0) { } else if (sh.sh_type == SHT_NOBITS &&
strcmp(name, BSS_SEC) == 0) {
obj->efile.bss = data; obj->efile.bss = data;
obj->efile.bss_shndx = idx; obj->efile.bss_shndx = idx;
} else { } else {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment