bpf: support BPF_PROG_QUERY for progs attached to sockmap
Subsystems (7)
PATCH v6 1/2 bpf: support BPF_PROG_QUERY for progs attached to sockmap
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.
--- include/linux/bpf.h | 9 ++++++ kernel/bpf/syscall.c | 5 +++ net/core/sock_map.c | 77 ++++++++++++++++++++++++++++++++++++++++---- 3 files changed, 84 insertions(+), 7 deletions(-)
include/linux/bpf.h +9 -0
@@ -2071,6 +2071,9 @@ int bpf_prog_test_run_syscall(struct bpf_prog *prog,int sock_map_get_from_fd (const union bpf_attr *attr,struct bpf_prog *prog);int sock_map_prog_detach (const union bpf_attr *attr,enum bpf_prog_type ptype);int sock_map_update_elem_sys (struct bpf_map *map,void *key,void *value,u64 flags); +int sock_map_bpf_prog_query (const union bpf_attr *attr, +union bpf_attr __user *uattr); +void sock_map_unhash (struct sock *sk);void sock_map_close (struct sock *sk,long timeout);#else
@@ -2124,6 +2127,12 @@ static inline int sock_map_update_elem_sys(struct bpf_map *map, void *key, void {return -EOPNOTSUPP ; } + +static inline int sock_map_bpf_prog_query (const union bpf_attr *attr, +union bpf_attr __user *uattr) +{ +return -EINVAL ; +}#endif /* CONFIG_BPF_SYSCALL */ #endif /* CONFIG_NET && CONFIG_BPF_SYSCALL */
kernel/bpf/syscall.c +5 -0
@@ -3318,6 +3318,11 @@ static int bpf_prog_query(const union bpf_attr *attr,case BPF_FLOW_DISSECTOR :case BPF_SK_LOOKUP :return netns_bpf_prog_query (attr, uattr); +case BPF_SK_SKB_STREAM_PARSER : +case BPF_SK_SKB_STREAM_VERDICT : +case BPF_SK_MSG_VERDICT : +case BPF_SK_SKB_VERDICT : +return sock_map_bpf_prog_query (attr, uattr);default :return -EINVAL ; }
net/core/sock_map.c +70 -7
114 lines not on this page · raw message
Signature · 1 line
2.27.0
PATCH v6 2/2 selftests: bpf: test BPF_PROG_QUERY for progs attached to sockmap
Add test for querying progs attached to sockmap. we use an existing libbpf query interface to query prog cnt before and after progs attaching to sockmap and check whether the queried prog id is right.
--- .../selftests/bpf/prog_tests/sockmap_basic.c | 66 +++++++++++++++++++ .../bpf/progs/test_sockmap_progs_query.c | 24 +++++++ 2 files changed, 90 insertions(+) create mode 100644 tools/testing/selftests/bpf/progs/test_sockmap_progs_query.c
tools/testing/selftests/bpf/prog_tests/sockmap_basic.c +66 -0
@@ -8,6 +8,7 @@#include "test_sockmap_update.skel.h" #include "test_sockmap_invalid_update.skel.h" #include "test_sockmap_skb_verdict_attach.skel.h" +#include "test_sockmap_progs_query.skel.h" #include "bpf_iter_sockmap.skel.h" #define TCP_REPAIR 19/* TCP sock is under repair right now */
@@ -315,6 +316,63 @@ static void test_sockmap_skb_verdict_attach(enum bpf_attach_type first,test_sockmap_skb_verdict_attach__destroy (skel); } +static __u32 query_prog_id (int prog_fd) +{ +struct bpf_prog_info info = {}; +__u32 info_len =sizeof (info); +int err; + + err =bpf_obj_get_info_by_fd (prog_fd, &info, &info_len); +if (!ASSERT_OK (err,"bpf_obj_get_info_by_fd" ) || + !ASSERT_EQ (info_len,sizeof (info),"bpf_obj_get_info_by_fd" )) +return 0 ; + +return info.id; +} + +static void test_sockmap_progs_query (enum bpf_attach_type attach_type) +{ +struct test_sockmap_progs_query *skel; +int err, map_fd, verdict_fd, duration =0 ; +__u32 attach_flags =0 ; +__u32 prog_ids[3 ] = {}; +__u32 prog_cnt =3 ; + + skel =test_sockmap_progs_query__open_and_load (); +if (!ASSERT_OK_PTR (skel,"test_sockmap_progs_query__open_and_load" )) +return ; + + map_fd =bpf_map__fd (skel->maps.sock_map); + +if (attach_type ==BPF_SK_MSG_VERDICT ) + verdict_fd =bpf_program__fd (skel->progs.prog_skmsg_verdict); +else + verdict_fd =bpf_program__fd (skel->progs.prog_skb_verdict); + + err =bpf_prog_query (map_fd, attach_type,0 /* query flags */ , + &attach_flags, prog_ids, &prog_cnt); +ASSERT_OK (err,"bpf_prog_query failed" ); +ASSERT_EQ (attach_flags,0 ,"wrong attach_flags on query" ); +ASSERT_EQ (prog_cnt,0 ,"wrong program count on query" ); + + err =bpf_prog_attach (verdict_fd, map_fd, attach_type,0 ); +if (!ASSERT_OK (err,"bpf_prog_attach failed" )) + goto out; + + prog_cnt =1 ; + err =bpf_prog_query (map_fd, attach_type,0 /* query flags */ , + &attach_flags, prog_ids, &prog_cnt); +ASSERT_OK (err,"bpf_prog_query failed" ); +ASSERT_EQ (attach_flags,0 ,"wrong attach_flags on query" ); +ASSERT_EQ (prog_cnt,1 ,"wrong program count on query" ); +ASSERT_EQ (prog_ids[0 ],query_prog_id (verdict_fd), +"wrong prog_ids on query" ); + +bpf_prog_detach2 (verdict_fd, map_fd, attach_type); +out: +test_sockmap_progs_query__destroy (skel); +} +void test_sockmap_basic (void ) {if (test__start_subtest ("sockmap create_update_free" ))
@@ -341,4 +399,12 @@ void test_sockmap_basic(void)test_sockmap_skb_verdict_attach (BPF_SK_SKB_STREAM_VERDICT ,BPF_SK_SKB_VERDICT ); } +if (test__start_subtest ("sockmap msg_verdict progs query" )) +test_sockmap_progs_query (BPF_SK_MSG_VERDICT ); +if (test__start_subtest ("sockmap stream_parser progs query" )) +test_sockmap_progs_query (BPF_SK_SKB_STREAM_PARSER ); +if (test__start_subtest ("sockmap stream_verdict progs query" )) +test_sockmap_progs_query (BPF_SK_SKB_STREAM_VERDICT ); +if (test__start_subtest ("sockmap skb_verdict progs query" )) +test_sockmap_progs_query (BPF_SK_SKB_VERDICT ); }
tools/testing/selftests/bpf/progs/test_sockmap_progs_query.c new file +24 -0
@@ -0,0 +1,24 @@ +// SPDX-License-Identifier: GPL-2.0 +#include "vmlinux.h" +#include <bpf/bpf_helpers.h> + +struct { + __uint(type, BPF_MAP_TYPE_SOCKMAP); + __uint(max_entries, 1); + __type(key, __u32); + __type(value, __u64); +} sock_map SEC(".maps"); + +SEC("sk_skb") +int prog_skb_verdict (struct __sk_buff *skb) +{ +return SK_PASS ; +} + +SEC("sk_msg") +int prog_skmsg_verdict (struct sk_msg_md *msg) +{ +return SK_PASS ; +} + +char _license[] SEC("license") = "GPL";
Signature · 1 line
2.27.0
Re: [PATCH bpf-next v6 2/2] selftests: bpf: test BPF_PROG_QUERY for progs attached to sockmap
Quoted 7 lines · Di Zhu
Add test for querying progs attached to sockmap. we use an existing libbpf query interface to query prog cnt before and after progs attaching to sockmap and check whether the queried prog id is right.
Signed-off-by Di Zhu <[email protected]>Acked-by Yonghong Song <[email protected]>---
Re: [PATCH bpf-next v6 2/2] selftests: bpf: test BPF_PROG_QUERY for progs attached to sockmap
In reply to Di ZhuQuoted 37 lines · Di Zhu
Add test for querying progs attached to sockmap. we use an existing libbpf query interface to query prog cnt before and after progs attaching to sockmap and check whether the queried prog id is right.
Signed-off-by Di Zhu <[email protected]>Acked-by Yonghong Song <[email protected]>--- .../selftests/bpf/prog_tests/sockmap_basic.c | 66 +++++++++++++++++++ .../bpf/progs/test_sockmap_progs_query.c | 24 +++++++ 2 files changed, 90 insertions(+) create mode 100644 tools/testing/selftests/bpf/progs/test_sockmap_progs_query.ctools/testing/selftests/bpf/prog_tests/sockmap_basic.c +9
-0@@ -8,6 +8,7 @@#include "test_sockmap_update.skel.h" #include "test_sockmap_invalid_update.skel.h" #include "test_sockmap_skb_verdict_attach.skel.h" +#include "test_sockmap_progs_query.skel.h" #include "bpf_iter_sockmap.skel.h" #define TCP_REPAIR 19/* TCP sock is under repair right now */ @@ -315,6 +316,63 @@ static void test_sockmap_skb_verdict_attach(enum bpf_attach_type first,test_sockmap_skb_verdict_attach__destroy (skel); } +static __u32 query_prog_id (int prog_fd) +{ +struct bpf_prog_info info = {}; +__u32 info_len =sizeof (info); +int err; + + err =bpf_obj_get_info_by_fd (prog_fd, &info, &info_len); + if (!ASSERT_OK(err, "bpf_obj_get_info_by_fd") ||
tools/testing/selftests/bpf/prog_tests/sockmap_basic.c static void test_sockmap_skb_verdict_attach(enum bpf_attach_type first, · line 336
Quoted 10 lines
tools/testing/selftests/bpf/prog_tests/sockmap_basic.c +10
-0+ !ASSERT_EQ(info_len, sizeof(info), "bpf_obj_get_info_by_fd")) +return 0 ; + +return info.id; +} + +static void test_sockmap_progs_query (enum bpf_attach_type attach_type) +{ +struct test_sockmap_progs_query *skel; +int err, map_fd, verdict_fd, duration =0 ;
The 'duration' is unused.
You should have seen a warning while compiling the selftests?
Anyway. I've fixed it while applying.
Quoted 10 lines · Di Zhu
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.Signed-off-by Di Zhu <[email protected]>Acked-by Yonghong Song <[email protected]>---
Thanks for adding the annotation.