bpf: support BPF_PROG_QUERY for progs attached to sockmap
Quoted 23 lines · Di Zhu
Quoted 7 lines
Right now there is no way to query whether BPF programs are attached to a sockmap or not.
we can use the standard interface in libbpf to query, such as:
bpf_prog_query(mapFd, BPF_SK_SKB_STREAM_PARSER, 0, NULL, ...); the mapFd is the fd of sockmap.Quoted 6 lines
Signed-off-by Di Zhu <[email protected]>Acked-by Yonghong Song <[email protected]>--- include/linux/bpf.h | 9 +++++ kernel/bpf/syscall.c | 5 +++ net/core/sock_map.c | 78++++++++++++++++++++++++++++++++++++++++----
include/linux/bpf.h int bpf_prog_test_run_syscall(struct bpf_prog
Quoted 7 lines
3 files changed, 85 insertions(+), 7 deletions(-)include/linux/bpf.h +0
-0@@ -2071,6 +2071,9 @@ int bpf_prog_test_run_syscall(struct bpf_prog*prog,
Quoted 6 lines
include/linux/bpf.h int bpf_prog_test_run_syscall(struct bpf_prog · line 2071
Quoted 1 line
include/linux/bpf.h +0
-0int sock_map_get_from_fd(const union bpf_attr *attr, struct bpf_prog*prog);
include/linux/bpf.h int bpf_prog_test_run_syscall(struct bpf_prog · line 2072
Quoted 1 line
include/linux/bpf.h +0
-0int sock_map_prog_detach(const union bpf_attr *attr, enum bpf_prog_typeptype);
include/linux/bpf.h int bpf_prog_test_run_syscall(struct bpf_prog · line 2073
Quoted 1 line
include/linux/bpf.h +0
-0int sock_map_update_elem_sys(struct bpf_map *map, void *key, void *value,u64 flags);
.......
Quoted 36 lines
Quoted 23 lines
include/linux/bpf.h +23
-0+int sock_map_bpf_prog_query (const union bpf_attr *attr, +union bpf_attr __user *uattr) +{ +__u32 __user *prog_ids =u64_to_user_ptr (attr->query.prog_ids); +u32 prog_cnt =0 , flags =0 , ufd = attr->target_fd; +struct bpf_prog **pprog; +struct bpf_prog *prog; +struct bpf_map *map; +struct fd f; +u32 id =0 ; +int ret; + +if (attr->query.query_flags) +return -EINVAL ; + + f =fdget (ufd); + map =__bpf_map_get (f); +if (IS_ERR (map)) +return PTR_ERR (map); + +rcu_read_lock (); + + ret =sock_map_prog_lookup (map, &pprog, attr->query.attach_type);include/linux/bpf.h int bpf_prog_test_run_syscall(struct bpf_prog
Quoted 10 lines
include/linux/bpf.h +10
-0+if (ret) + goto end; + + prog = *pprog; + prog_cnt = !prog ?0 :1 ; + +if (!attr->query.prog_cnt || !prog_ids || !prog_cnt) + goto end; + + id = prog->aux->id;^ This looks like a concurrent read/write.
Quoted 6 lines
Would wrap with
READ_ONCE()and correspondingWRITE_ONCE()inbpf_prog_free_id(). See [1] for rationale.[1]
https://github.com/google/kernel-sanitizers/blob/master/other/READ_WRITE_O
NCE.md
Thanks for your advice, I will modify this code.
Quoted 22 lines
Quoted 22 lines
include/linux/bpf.h +19
-0+ +/* we do not hold the refcnt, the bpf prog may be released +* asynchronously and the id would be set to 0. +*/ +if (id ==0 ) + prog_cnt =0 ; + +end: +rcu_read_unlock (); + +if (copy_to_user (&uattr->query.attach_flags, &flags,sizeof (flags)) || + (id !=0 &©_to_user (prog_ids, &id,sizeof (u32))) || +copy_to_user (&uattr->query.prog_cnt, &prog_cnt,sizeof (prog_cnt))) + ret = -EFAULT ; + +fdput (f); +return ret; +} +static void sock_map_unlink (struct sock *sk,struct sk_psock_link *link) {switch (link->map->map_type) {