summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorAlexei Starovoitov <ast@kernel.org>2019-05-14 20:47:29 +0300
committerAlexei Starovoitov <ast@kernel.org>2019-05-14 20:47:30 +0300
commit5db17c96771ffa735f5cdfbd9b44f52f319f2637 (patch)
tree18e46b9920b1807e4146e9ea2a273e3f3c4dcba4 /include/linux
parent2474c62898c63f8bb122ffda2cd93fdaad55603a (diff)
parentd2baab62a1434d3f81ce83e82cbc53e7f2843bbc (diff)
downloadlinux-5db17c96771ffa735f5cdfbd9b44f52f319f2637.tar.xz
Merge branch 'lru-map-fix'
Daniel Borkmann says: ==================== This set fixes LRU map eviction in combination with map lookups out of system call side from user space. Main patch is the second one and test cases are adapted and added in the last one. Thanks! ==================== Acked-by: Andrii Nakryiko <andriin@fb.com> Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/bpf.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/bpf.h b/include/linux/bpf.h
index 59631dd0777c..4fb3aa2dc975 100644
--- a/include/linux/bpf.h
+++ b/include/linux/bpf.h
@@ -36,6 +36,7 @@ struct bpf_map_ops {
void (*map_free)(struct bpf_map *map);
int (*map_get_next_key)(struct bpf_map *map, void *key, void *next_key);
void (*map_release_uref)(struct bpf_map *map);
+ void *(*map_lookup_elem_sys_only)(struct bpf_map *map, void *key);
/* funcs callable from userspace and from eBPF programs */
void *(*map_lookup_elem)(struct bpf_map *map, void *key);