microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

libbpf: Remove unused parameter `def` to get_map_field_int 

Has been unused since commit ef99b02b23 ("libbpf: capture value in BTF
type info for BTF-defined map defs").

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Reviewed-by: Quentin Monnet <quentin@isovalent.com>
Acked-by: Andrii Nakryiko <andriin@fb.com>
Link: https://lore.kernel.org/bpf/20200325113655.19341-1-tklauser@distanz.ch
This commit is contained in:
Tobias Klauser 2020-03-25 12:36:55 +01:00 коммит произвёл Daniel Borkmann
Родитель 8c061865f5
Коммит 9fc9aad99e
1 изменённых файлов: 6 добавлений и 10 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

16
tools/lib/bpf/libbpf.c
Просмотреть файл

@ -1845,7 +1845,6 @@ resolve_func_ptr(const struct btf *btf, __u32 id, __u32 *res_id)
* type definition, while using only sizeof(void *) space in ELF data section. * type definition, while using only sizeof(void *) space in ELF data section.
*/ */
static bool get_map_field_int(const char *map_name, const struct btf *btf, static bool get_map_field_int(const char *map_name, const struct btf *btf,
const struct btf_type *def,
const struct btf_member *m, __u32 *res) const struct btf_member *m, __u32 *res)
{ {
const struct btf_type *t = skip_mods_and_typedefs(btf, m->type, NULL); const struct btf_type *t = skip_mods_and_typedefs(btf, m->type, NULL);
@ -1972,19 +1971,19 @@ static int bpf_object__init_user_btf_map(struct bpf_object *obj,
return -EINVAL; return -EINVAL;
} }
if (strcmp(name, "type") == 0) { if (strcmp(name, "type") == 0) {
if (!get_map_field_int(map_name, obj->btf, def, m, if (!get_map_field_int(map_name, obj->btf, m,
&map->def.type)) &map->def.type))
return -EINVAL; return -EINVAL;
pr_debug("map '%s': found type = %u.\n", pr_debug("map '%s': found type = %u.\n",
map_name, map->def.type); map_name, map->def.type);
} else if (strcmp(name, "max_entries") == 0) { } else if (strcmp(name, "max_entries") == 0) {
if (!get_map_field_int(map_name, obj->btf, def, m, if (!get_map_field_int(map_name, obj->btf, m,
&map->def.max_entries)) &map->def.max_entries))
return -EINVAL; return -EINVAL;
pr_debug("map '%s': found max_entries = %u.\n", pr_debug("map '%s': found max_entries = %u.\n",
map_name, map->def.max_entries); map_name, map->def.max_entries);
} else if (strcmp(name, "map_flags") == 0) { } else if (strcmp(name, "map_flags") == 0) {
if (!get_map_field_int(map_name, obj->btf, def, m, if (!get_map_field_int(map_name, obj->btf, m,
&map->def.map_flags)) &map->def.map_flags))
return -EINVAL; return -EINVAL;
pr_debug("map '%s': found map_flags = %u.\n", pr_debug("map '%s': found map_flags = %u.\n",
@ -1992,8 +1991,7 @@ static int bpf_object__init_user_btf_map(struct bpf_object *obj,
} else if (strcmp(name, "key_size") == 0) { } else if (strcmp(name, "key_size") == 0) {
__u32 sz; __u32 sz;
if (!get_map_field_int(map_name, obj->btf, def, m, if (!get_map_field_int(map_name, obj->btf, m, &sz))
&sz))
return -EINVAL; return -EINVAL;
pr_debug("map '%s': found key_size = %u.\n", pr_debug("map '%s': found key_size = %u.\n",
map_name, sz); map_name, sz);
@ -2035,8 +2033,7 @@ static int bpf_object__init_user_btf_map(struct bpf_object *obj,
} else if (strcmp(name, "value_size") == 0) { } else if (strcmp(name, "value_size") == 0) {
__u32 sz; __u32 sz;
if (!get_map_field_int(map_name, obj->btf, def, m, if (!get_map_field_int(map_name, obj->btf, m, &sz))
&sz))
return -EINVAL; return -EINVAL;
pr_debug("map '%s': found value_size = %u.\n", pr_debug("map '%s': found value_size = %u.\n",
map_name, sz); map_name, sz);
@ -2079,8 +2076,7 @@ static int bpf_object__init_user_btf_map(struct bpf_object *obj,
__u32 val; __u32 val;
int err; int err;
if (!get_map_field_int(map_name, obj->btf, def, m, if (!get_map_field_int(map_name, obj->btf, m, &val))
&val))
return -EINVAL; return -EINVAL;
pr_debug("map '%s': found pinning = %u.\n", pr_debug("map '%s': found pinning = %u.\n",
map_name, val); map_name, val);