diff options
| author | Daniel Borkmann <daniel@iogearbox.net> | 2016-03-25 00:30:25 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-03-25 16:36:41 +0100 |
| commit | 322cea2f41adb62c975f46a3242f4e3b43226fa1 (patch) | |
| tree | 706f3bcffd78159e7cf735074ed7aacb0dfde437 /kernel/bpf | |
| parent | netpoll: Fix extra refcount release in netpoll_cleanup() (diff) | |
| download | linux-322cea2f41adb62c975f46a3242f4e3b43226fa1.tar.xz linux-322cea2f41adb62c975f46a3242f4e3b43226fa1.zip | |
bpf: add missing map_flags to bpf_map_show_fdinfo
Add map_flags attribute to bpf_map_show_fdinfo(), so that tools like
tc can check for them when loading objects from a pinned entry, e.g.
if user intent wrt allocation (BPF_F_NO_PREALLOC) is different to the
pinned object, it can bail out. Follow-up to 6c9059817432 ("bpf:
pre-allocate hash map elements"), so that tc can still support this
with v4.6.
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'kernel/bpf')
| -rw-r--r-- | kernel/bpf/syscall.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c index 2a2efe1bc76c..adc5e4bd74f8 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -137,11 +137,13 @@ static void bpf_map_show_fdinfo(struct seq_file *m, struct file *filp) "map_type:\t%u\n" "key_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->map_type, map->key_size, map->value_size, - map->max_entries); + map->max_entries, + map->map_flags); } #endif |