mirror of
https://github.com/Fishwaldo/linux-bl808.git
synced 2025-06-17 20:25:19 +00:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next
Daniel Borkmann says: ==================== pull-request: bpf-next 2020-07-04 The following pull-request contains BPF updates for your *net-next* tree. We've added 73 non-merge commits during the last 17 day(s) which contain a total of 106 files changed, 5233 insertions(+), 1283 deletions(-). The main changes are: 1) bpftool ability to show PIDs of processes having open file descriptors for BPF map/program/link/BTF objects, relying on BPF iterator progs to extract this info efficiently, from Andrii Nakryiko. 2) Addition of BPF iterator progs for dumping TCP and UDP sockets to seq_files, from Yonghong Song. 3) Support access to BPF map fields in struct bpf_map from programs through BTF struct access, from Andrey Ignatov. 4) Add a bpf_get_task_stack() helper to be able to dump /proc/*/stack via seq_file from BPF iterator progs, from Song Liu. 5) Make SO_KEEPALIVE and related options available to bpf_setsockopt() helper, from Dmitry Yakunin. 6) Optimize BPF sk_storage selection of its caching index, from Martin KaFai Lau. 7) Removal of redundant synchronize_rcu()s from BPF map destruction which has been a historic leftover, from Alexei Starovoitov. 8) Several improvements to test_progs to make it easier to create a shell loop that invokes each test individually which is useful for some CIs, from Jesper Dangaard Brouer. 9) Fix bpftool prog dump segfault when compiled without skeleton code on older clang versions, from John Fastabend. 10) Bunch of cleanups and minor improvements, from various others. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
commit
f91c031e65
103 changed files with 5242 additions and 1276 deletions
|
|
@ -93,162 +93,6 @@ static void *alloc_value(struct bpf_map_info *info)
|
|||
return malloc(info->value_size);
|
||||
}
|
||||
|
||||
static int map_fd_by_name(char *name, int **fds)
|
||||
{
|
||||
unsigned int id = 0;
|
||||
int fd, nb_fds = 0;
|
||||
void *tmp;
|
||||
int err;
|
||||
|
||||
while (true) {
|
||||
struct bpf_map_info info = {};
|
||||
__u32 len = sizeof(info);
|
||||
|
||||
err = bpf_map_get_next_id(id, &id);
|
||||
if (err) {
|
||||
if (errno != ENOENT) {
|
||||
p_err("%s", strerror(errno));
|
||||
goto err_close_fds;
|
||||
}
|
||||
return nb_fds;
|
||||
}
|
||||
|
||||
fd = bpf_map_get_fd_by_id(id);
|
||||
if (fd < 0) {
|
||||
p_err("can't get map by id (%u): %s",
|
||||
id, strerror(errno));
|
||||
goto err_close_fds;
|
||||
}
|
||||
|
||||
err = bpf_obj_get_info_by_fd(fd, &info, &len);
|
||||
if (err) {
|
||||
p_err("can't get map info (%u): %s",
|
||||
id, strerror(errno));
|
||||
goto err_close_fd;
|
||||
}
|
||||
|
||||
if (strncmp(name, info.name, BPF_OBJ_NAME_LEN)) {
|
||||
close(fd);
|
||||
continue;
|
||||
}
|
||||
|
||||
if (nb_fds > 0) {
|
||||
tmp = realloc(*fds, (nb_fds + 1) * sizeof(int));
|
||||
if (!tmp) {
|
||||
p_err("failed to realloc");
|
||||
goto err_close_fd;
|
||||
}
|
||||
*fds = tmp;
|
||||
}
|
||||
(*fds)[nb_fds++] = fd;
|
||||
}
|
||||
|
||||
err_close_fd:
|
||||
close(fd);
|
||||
err_close_fds:
|
||||
while (--nb_fds >= 0)
|
||||
close((*fds)[nb_fds]);
|
||||
return -1;
|
||||
}
|
||||
|
||||
static int map_parse_fds(int *argc, char ***argv, int **fds)
|
||||
{
|
||||
if (is_prefix(**argv, "id")) {
|
||||
unsigned int id;
|
||||
char *endptr;
|
||||
|
||||
NEXT_ARGP();
|
||||
|
||||
id = strtoul(**argv, &endptr, 0);
|
||||
if (*endptr) {
|
||||
p_err("can't parse %s as ID", **argv);
|
||||
return -1;
|
||||
}
|
||||
NEXT_ARGP();
|
||||
|
||||
(*fds)[0] = bpf_map_get_fd_by_id(id);
|
||||
if ((*fds)[0] < 0) {
|
||||
p_err("get map by id (%u): %s", id, strerror(errno));
|
||||
return -1;
|
||||
}
|
||||
return 1;
|
||||
} else if (is_prefix(**argv, "name")) {
|
||||
char *name;
|
||||
|
||||
NEXT_ARGP();
|
||||
|
||||
name = **argv;
|
||||
if (strlen(name) > BPF_OBJ_NAME_LEN - 1) {
|
||||
p_err("can't parse name");
|
||||
return -1;
|
||||
}
|
||||
NEXT_ARGP();
|
||||
|
||||
return map_fd_by_name(name, fds);
|
||||
} else if (is_prefix(**argv, "pinned")) {
|
||||
char *path;
|
||||
|
||||
NEXT_ARGP();
|
||||
|
||||
path = **argv;
|
||||
NEXT_ARGP();
|
||||
|
||||
(*fds)[0] = open_obj_pinned_any(path, BPF_OBJ_MAP);
|
||||
if ((*fds)[0] < 0)
|
||||
return -1;
|
||||
return 1;
|
||||
}
|
||||
|
||||
p_err("expected 'id', 'name' or 'pinned', got: '%s'?", **argv);
|
||||
return -1;
|
||||
}
|
||||
|
||||
int map_parse_fd(int *argc, char ***argv)
|
||||
{
|
||||
int *fds = NULL;
|
||||
int nb_fds, fd;
|
||||
|
||||
fds = malloc(sizeof(int));
|
||||
if (!fds) {
|
||||
p_err("mem alloc failed");
|
||||
return -1;
|
||||
}
|
||||
nb_fds = map_parse_fds(argc, argv, &fds);
|
||||
if (nb_fds != 1) {
|
||||
if (nb_fds > 1) {
|
||||
p_err("several maps match this handle");
|
||||
while (nb_fds--)
|
||||
close(fds[nb_fds]);
|
||||
}
|
||||
fd = -1;
|
||||
goto exit_free;
|
||||
}
|
||||
|
||||
fd = fds[0];
|
||||
exit_free:
|
||||
free(fds);
|
||||
return fd;
|
||||
}
|
||||
|
||||
int map_parse_fd_and_info(int *argc, char ***argv, void *info, __u32 *info_len)
|
||||
{
|
||||
int err;
|
||||
int fd;
|
||||
|
||||
fd = map_parse_fd(argc, argv);
|
||||
if (fd < 0)
|
||||
return -1;
|
||||
|
||||
err = bpf_obj_get_info_by_fd(fd, info, info_len);
|
||||
if (err) {
|
||||
p_err("can't get map info: %s", strerror(errno));
|
||||
close(fd);
|
||||
return err;
|
||||
}
|
||||
|
||||
return fd;
|
||||
}
|
||||
|
||||
static int do_dump_btf(const struct btf_dumper *d,
|
||||
struct bpf_map_info *map_info, void *key,
|
||||
void *value)
|
||||
|
|
@ -629,7 +473,7 @@ static int show_map_close_json(int fd, struct bpf_map_info *info)
|
|||
if (owner_prog_type) {
|
||||
unsigned int prog_type = atoi(owner_prog_type);
|
||||
|
||||
if (prog_type < ARRAY_SIZE(prog_type_name))
|
||||
if (prog_type < prog_type_name_size)
|
||||
jsonw_string_field(json_wtr, "owner_prog_type",
|
||||
prog_type_name[prog_type]);
|
||||
else
|
||||
|
|
@ -666,6 +510,8 @@ static int show_map_close_json(int fd, struct bpf_map_info *info)
|
|||
jsonw_end_array(json_wtr);
|
||||
}
|
||||
|
||||
emit_obj_refs_json(&refs_table, info->id, json_wtr);
|
||||
|
||||
jsonw_end_object(json_wtr);
|
||||
|
||||
return 0;
|
||||
|
|
@ -712,7 +558,7 @@ static int show_map_close_plain(int fd, struct bpf_map_info *info)
|
|||
if (owner_prog_type) {
|
||||
unsigned int prog_type = atoi(owner_prog_type);
|
||||
|
||||
if (prog_type < ARRAY_SIZE(prog_type_name))
|
||||
if (prog_type < prog_type_name_size)
|
||||
printf("owner_prog_type %s ",
|
||||
prog_type_name[prog_type]);
|
||||
else
|
||||
|
|
@ -753,6 +599,8 @@ static int show_map_close_plain(int fd, struct bpf_map_info *info)
|
|||
if (frozen)
|
||||
printf("%sfrozen", info->btf_id ? " " : "");
|
||||
|
||||
emit_obj_refs_plain(&refs_table, info->id, "\n\tpids ");
|
||||
|
||||
printf("\n");
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -811,6 +659,7 @@ static int do_show(int argc, char **argv)
|
|||
|
||||
if (show_pinned)
|
||||
build_pinned_obj_table(&map_table, BPF_OBJ_MAP);
|
||||
build_obj_refs_table(&refs_table, BPF_OBJ_MAP);
|
||||
|
||||
if (argc == 2)
|
||||
return do_show_subset(argc, argv);
|
||||
|
|
@ -854,6 +703,8 @@ static int do_show(int argc, char **argv)
|
|||
if (json_output)
|
||||
jsonw_end_array(json_wtr);
|
||||
|
||||
delete_obj_refs_table(&refs_table);
|
||||
|
||||
return errno == ENOENT ? 0 : -1;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue