openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

bpf: add owner_prog_type and accounted mem to array map's fdinfo 

Allow for checking the owner_prog_type of a program array map. In some
cases bpf(2) can return -EINVAL /after/ the verifier passed and did all
the rewrites of the bpf program.

The reason that lets us fail at this late stage is that program array
maps are incompatible. Allow users to inspect this earlier after they
got the map fd through BPF_OBJ_GET command. tc will get support for this.

Also, display how much we charged the map with regards to RLIMIT_MEMLOCK.

Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Daniel Borkmann 2016-11-26 01:28:07 +01:00 committed by David S. Miller
parent c491680f8f
commit 21116b7068
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
kernel/bpf/syscall.c
View File

@ -138,18 +138,31 @@ static int bpf_map_release(struct inode *inode, struct file *filp)
static void bpf_map_show_fdinfo(struct seq_file *m, struct file *filp) static void bpf_map_show_fdinfo(struct seq_file *m, struct file *filp)
{ {
const struct bpf_map *map = filp->private_data; const struct bpf_map *map = filp->private_data;
const struct bpf_array *array;
u32 owner_prog_type = 0;
if (map->map_type == BPF_MAP_TYPE_PROG_ARRAY) {
array = container_of(map, struct bpf_array, map);
owner_prog_type = array->owner_prog_type;
}
seq_printf(m, seq_printf(m,
"map_type:\t%u\n" "map_type:\t%u\n"
"key_size:\t%u\n" "key_size:\t%u\n"
"value_size:\t%u\n" "value_size:\t%u\n"
"max_entries:\t%u\n" "max_entries:\t%u\n"
"map_flags:\t%#x\n", "map_flags:\t%#x\n"
"memlock:\t%llu\n",
map->map_type, map->map_type,
map->key_size, map->key_size,
map->value_size, map->value_size,
map->max_entries, map->max_entries,
map->map_flags); map->map_flags,
map->pages * 1ULL << PAGE_SHIFT);
if (owner_prog_type)
seq_printf(m, "owner_prog_type:\t%u\n",
owner_prog_type);
} }
#endif #endif