Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2bb3c547 authored by Daniel Borkmann's avatar Daniel Borkmann Committed by Greg Kroah-Hartman
Browse files

bpf: add map_lookup_elem_sys_only for lookups from syscall side 



commit c6110222c6f49ea68169f353565eb865488a8619 upstream.

Add a callback map_lookup_elem_sys_only() that map implementations
could use over map_lookup_elem() from system call side in case the
map implementation needs to handle the latter differently than from
the BPF data path. If map_lookup_elem_sys_only() is set, this will
be preferred pick for map lookups out of user space. This hook is
used in a follow-up fix for LRU map, but once development window
opens, we can convert other map types from map_lookup_elem() (here,
the one called upon BPF_MAP_LOOKUP_ELEM cmd is meant) over to use
the callback to simplify and clean up the latter.

Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Acked-by: default avatarMartin KaFai Lau <kafai@fb.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3ded3aaa

include/linux/bpf.h

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,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);

kernel/bpf/syscall.c

+4 −1
Original line number Diff line number Diff line
@@ -721,6 +721,9 @@ static int map_lookup_elem(union bpf_attr *attr) 
		err = bpf_fd_reuseport_array_lookup_elem(map, key, value);

	} else {

		rcu_read_lock();

		if (map->ops->map_lookup_elem_sys_only)

			ptr = map->ops->map_lookup_elem_sys_only(map, key);

		else

			ptr = map->ops->map_lookup_elem(map, key);

		if (ptr)

			memcpy(value, ptr, value_size);