bpf: Fix BPF_PROG_QUERY last field check
Subsystems (5)
Daniel Borkmann
maintainerPATCH 1/7 bpf: Fix BPF_PROG_QUERY last field check
While working on the ebpf-go [0] library integration for bpf_mprog and tcx, Lorenz noticed that two subsequent BPF_PROG_QUERY requests currently fail. A typical workflow is to first gather the bpf_mprog count without passing program/ link arrays, followed by the second request which contains the actual array pointers.
The initial call populates count and revision fields. The second call gets rejected due to a BPF_PROG_QUERY_LAST_FIELD bug which should point to query.revision instead of query.link_attach_flags since the former is really the last member.
It was not noticed in libbpf as bpf_prog_query_opts() always calls bpf(2) with an on-stack bpf_attr that is memset() each time (and therefore query.revision was reset to zero).
--- kernel/bpf/syscall.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/bpf/syscall.c +1 -1
@@ -3913,7 +3913,7 @@ static int bpf_prog_detach(const union bpf_attr *attr)return ret; } -#define BPF_PROG_QUERY_LAST_FIELD query.link_attach_flags +#define BPF_PROG_QUERY_LAST_FIELD query.revisionstatic int bpf_prog_query (const union bpf_attr *attr,union bpf_attr __user *uattr)
Signature · 1 line
2.34.1
Daniel Borkmann
maintainerPATCH 2/7 bpf: Handle bpf_mprog_query with NULL entry
Improve consistency for bpf_mprog_query() API and let the latter also handle a NULL entry as can be the case for tcx. Instead of returning -ENOENT, we copy a count of 0 and revision of 1 to user space, so that this can be fed into a subsequent bpf_mprog_attach() call as expected_revision. A BPF self- test as part of this series has been added to assert this case.
--- kernel/bpf/mprog.c | 10 ++++++---- kernel/bpf/tcx.c | 8 +------- 2 files changed, 7 insertions(+), 11 deletions(-)
kernel/bpf/mprog.c +6 -4
@@ -401,14 +401,16 @@ int bpf_mprog_query(const union bpf_attr *attr, union bpf_attr __user *uattr,struct bpf_mprog_cp *cp;struct bpf_prog *prog;const u32 flags =0 ; +u32 id, count =0 ; +u64 revision =1 ;int i, ret =0 ; -u32 id, count; -u64 revision;if (attr->query.query_flags || attr->query.attach_flags)return -EINVAL ; - revision =bpf_mprog_revision (entry); - count =bpf_mprog_total (entry); +if (entry) { + revision =bpf_mprog_revision (entry); + count =bpf_mprog_total (entry); + }if (copy_to_user (&uattr->query.attach_flags, &flags,sizeof (flags)))return -EFAULT ;if (copy_to_user (&uattr->query.revision, &revision,sizeof (revision)))
kernel/bpf/tcx.c +1 -7
@@ -123,7 +123,6 @@ int tcx_prog_query(const union bpf_attr *attr, union bpf_attr __user *uattr) {bool ingress = attr->query.attach_type ==BPF_TCX_INGRESS ;struct net *net = current->nsproxy->net_ns; -struct bpf_mprog_entry *entry;struct net_device *dev;int ret;
@@ -133,12 +132,7 @@ int tcx_prog_query(const union bpf_attr *attr, union bpf_attr __user *uattr) ret = -ENODEV ; goto out; } - entry =tcx_entry_fetch (dev, ingress); -if (!entry) { - ret = -ENOENT ; - goto out; - } - ret =bpf_mprog_query (attr, uattr, entry); + ret =bpf_mprog_query (attr, uattr,tcx_entry_fetch (dev, ingress)); out:rtnl_unlock ();return ret;
Signature · 1 line
2.34.1
Daniel Borkmann
maintainerPATCH 3/7 bpf: Refuse unused attributes in bpf_prog_{attach,detach}
In reply to Daniel BorkmannFrom: Lorenz Bauer <[email protected]>
The recently added tcx attachment extended the BPF UAPI for attaching and detaching by a couple of fields. Those fields are currently only supported for tcx, other types like cgroups and flow dissector silently ignore the new fields except for the new flags.
This is problematic once we extend bpf_mprog to older attachment types, since it's hard to figure out whether the syscall really was successful if the kernel silently ignores non-zero values.
Explicitly reject non-zero fields relevant to bpf_mprog for attachment types which don't use the latter yet.
--- kernel/bpf/syscall.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-)
kernel/bpf/syscall.c +14 -5
@@ -3796,7 +3796,6 @@ static int bpf_prog_attach(const union bpf_attr *attr) {enum bpf_prog_type ptype;struct bpf_prog *prog; -u32 mask;int ret;if (CHECK_ATTR (BPF_PROG_ATTACH ))
@@ -3805,10 +3804,16 @@ static int bpf_prog_attach(const union bpf_attr *attr) ptype =attach_type_to_prog_type (attr->attach_type);if (ptype ==BPF_PROG_TYPE_UNSPEC )return -EINVAL ; - mask =bpf_mprog_supported (ptype) ? -BPF_F_ATTACH_MASK_MPROG :BPF_F_ATTACH_MASK_BASE ; -if (attr->attach_flags & ~mask) -return -EINVAL ; +if (bpf_mprog_supported (ptype)) { +if (attr->attach_flags & ~BPF_F_ATTACH_MASK_MPROG ) +return -EINVAL ; + }else { +if (attr->attach_flags & ~BPF_F_ATTACH_MASK_BASE ) +return -EINVAL ; +if (attr->relative_fd || + attr->expected_revision) +return -EINVAL ; + } prog =bpf_prog_get_type (attr->attach_bpf_fd, ptype);if (IS_ERR (prog))
@@ -3878,6 +3883,10 @@ static int bpf_prog_detach(const union bpf_attr *attr)if (IS_ERR (prog))return PTR_ERR (prog); } + }else if (attr->attach_flags || + attr->relative_fd || + attr->expected_revision) { +return -EINVAL ; }switch (ptype) {
Signature · 1 line
2.34.1
Daniel Borkmann
maintainerPATCH 4/7 selftests/bpf: Test bpf_mprog query API via libbpf and raw syscall
In reply to Daniel BorkmannAdd a new test case which performs double query of the bpf_mprog through libbpf API, but also via raw bpf(2) syscall. This is testing to gather first the count and then in a subsequent probe the full information with the program array without clearing passed structs in between.
# ./vmtest.sh -- ./test_progs -t tc_opts [...] ./test_progs -t tc_opts [ 1.398818] tsc: Refined TSC clocksource calibration: 3407.999 MHz [ 1.400263] clocksource: tsc: mask: 0xffffffffffffffff max_cycles: 0x311fd336761, max_idle_ns: 440795243819 ns [ 1.402734] clocksource: Switched to clocksource tsc [ 1.426639] bpf_testmod: loading out-of-tree module taints kernel. [ 1.428112] bpf_testmod: module verification failed: signature and/or required key missing - tainting kernel #252 tc_opts_after:OK #253 tc_opts_append:OK #254 tc_opts_basic:OK #255 tc_opts_before:OK #256 tc_opts_chain_classic:OK #257 tc_opts_chain_mixed:OK #258 tc_opts_delete_empty:OK #259 tc_opts_demixed:OK #260 tc_opts_detach:OK #261 tc_opts_detach_after:OK #262 tc_opts_detach_before:OK #263 tc_opts_dev_cleanup:OK #264 tc_opts_invalid:OK #265 tc_opts_max:OK #266 tc_opts_mixed:OK #267 tc_opts_prepend:OK #268 tc_opts_query:OK <--- (new test) #269 tc_opts_replace:OK #270 tc_opts_revision:OK Summary: 19/0 PASSED, 0 SKIPPED, 0 FAILED
--- .../selftests/bpf/prog_tests/tc_opts.c | 167 ++++++++++++++++++ 1 file changed, 167 insertions(+)
tools/testing/selftests/bpf/prog_tests/tc_opts.c +167 -0
@@ -2462,3 +2462,170 @@ void serial_test_tc_opts_max(void)test_tc_opts_max_target (BPF_TCX_INGRESS ,BPF_F_AFTER , true);test_tc_opts_max_target (BPF_TCX_EGRESS ,BPF_F_AFTER , false); } + +static void test_tc_opts_query_target (int target) +{ + const size_t attr_size = offsetofend(union bpf_attr, query); +LIBBPF_OPTS (bpf_prog_attach_opts, opta); +LIBBPF_OPTS (bpf_prog_detach_opts, optd); +LIBBPF_OPTS (bpf_prog_query_opts, optq); +__u32 fd1, fd2, fd3, fd4, id1, id2, id3, id4; +struct test_tc_link *skel; +union bpf_attr attr; +__u32 prog_ids[5 ]; +int err; + + skel =test_tc_link__open_and_load (); +if (!ASSERT_OK_PTR (skel,"skel_load" )) + goto cleanup; + + fd1 =bpf_program__fd (skel->progs.tc1); + fd2 =bpf_program__fd (skel->progs.tc2); + fd3 =bpf_program__fd (skel->progs.tc3); + fd4 =bpf_program__fd (skel->progs.tc4); + + id1 =id_from_prog_fd (fd1); + id2 =id_from_prog_fd (fd2); + id3 =id_from_prog_fd (fd3); + id4 =id_from_prog_fd (fd4); + +assert_mprog_count (target,0 ); + + LIBBPF_OPTS_RESET(opta, + .expected_revision = 1, + ); + + err =bpf_prog_attach_opts (fd1, loopback, target, &opta); +if (!ASSERT_EQ (err,0 ,"prog_attach" )) + goto cleanup; + +assert_mprog_count (target,1 ); + + LIBBPF_OPTS_RESET(opta, + .expected_revision = 2, + ); + + err =bpf_prog_attach_opts (fd2, loopback, target, &opta); +if (!ASSERT_EQ (err,0 ,"prog_attach" )) + goto cleanup1; + +assert_mprog_count (target,2 ); + + LIBBPF_OPTS_RESET(opta, + .expected_revision = 3, + ); + + err =bpf_prog_attach_opts (fd3, loopback, target, &opta); +if (!ASSERT_EQ (err,0 ,"prog_attach" )) + goto cleanup2; + +assert_mprog_count (target,3 ); + + LIBBPF_OPTS_RESET(opta, + .expected_revision = 4, + ); + + err =bpf_prog_attach_opts (fd4, loopback, target, &opta); +if (!ASSERT_EQ (err,0 ,"prog_attach" )) + goto cleanup3; + +assert_mprog_count (target,4 ); + +/* Test 1: Double query via libbpf API */ + err =bpf_prog_query_opts (loopback, target, &optq); +if (!ASSERT_OK (err,"prog_query" )) + goto cleanup4; + +ASSERT_EQ (optq.count,4 ,"count" ); +ASSERT_EQ (optq.revision,5 ,"revision" ); +ASSERT_EQ (optq.prog_ids,NULL ,"prog_ids" ); +ASSERT_EQ (optq.link_ids,NULL ,"link_ids" ); + +memset (prog_ids,0 ,sizeof (prog_ids)); + optq.prog_ids = prog_ids; + + err =bpf_prog_query_opts (loopback, target, &optq); +if (!ASSERT_OK (err,"prog_query" )) + goto cleanup4; + +ASSERT_EQ (optq.count,4 ,"count" ); +ASSERT_EQ (optq.revision,5 ,"revision" ); +ASSERT_EQ (optq.prog_ids[0 ], id1,"prog_ids[0]" ); +ASSERT_EQ (optq.prog_ids[1 ], id2,"prog_ids[1]" ); +ASSERT_EQ (optq.prog_ids[2 ], id3,"prog_ids[2]" ); +ASSERT_EQ (optq.prog_ids[3 ], id4,"prog_ids[3]" ); +ASSERT_EQ (optq.prog_ids[4 ],0 ,"prog_ids[4]" ); +ASSERT_EQ (optq.link_ids,NULL ,"link_ids" ); + +/* Test 2: Double query via bpf_attr & bpf(2) directly */ +memset (&attr,0 , attr_size); + attr.query.target_ifindex = loopback; + attr.query.attach_type = target; + + err =syscall (__NR_bpf,BPF_PROG_QUERY , &attr, attr_size); +if (!ASSERT_OK (err,"prog_query" )) + goto cleanup4; + +ASSERT_EQ (attr.query.count,4 ,"count" ); +ASSERT_EQ (attr.query.revision,5 ,"revision" ); +ASSERT_EQ (attr.query.query_flags,0 ,"query_flags" ); +ASSERT_EQ (attr.query.attach_flags,0 ,"attach_flags" ); +ASSERT_EQ (attr.query.target_ifindex, loopback,"target_ifindex" ); +ASSERT_EQ (attr.query.attach_type, target,"attach_type" ); +ASSERT_EQ (attr.query.prog_ids,0 ,"prog_ids" ); +ASSERT_EQ (attr.query.prog_attach_flags,0 ,"prog_attach_flags" ); +ASSERT_EQ (attr.query.link_ids,0 ,"link_ids" ); +ASSERT_EQ (attr.query.link_attach_flags,0 ,"link_attach_flags" ); + +memset (prog_ids,0 ,sizeof (prog_ids)); + attr.query.prog_ids =ptr_to_u64 (prog_ids); + + err =syscall (__NR_bpf,BPF_PROG_QUERY , &attr, attr_size); +if (!ASSERT_OK (err,"prog_query" )) + goto cleanup4; + +ASSERT_EQ (attr.query.count,4 ,"count" ); +ASSERT_EQ (attr.query.revision,5 ,"revision" ); +ASSERT_EQ (attr.query.query_flags,0 ,"query_flags" ); +ASSERT_EQ (attr.query.attach_flags,0 ,"attach_flags" ); +ASSERT_EQ (attr.query.target_ifindex, loopback,"target_ifindex" ); +ASSERT_EQ (attr.query.attach_type, target,"attach_type" ); +ASSERT_EQ (attr.query.prog_ids,ptr_to_u64 (prog_ids),"prog_ids" ); +ASSERT_EQ (prog_ids[0 ], id1,"prog_ids[0]" ); +ASSERT_EQ (prog_ids[1 ], id2,"prog_ids[1]" ); +ASSERT_EQ (prog_ids[2 ], id3,"prog_ids[2]" ); +ASSERT_EQ (prog_ids[3 ], id4,"prog_ids[3]" ); +ASSERT_EQ (prog_ids[4 ],0 ,"prog_ids[4]" ); +ASSERT_EQ (attr.query.prog_attach_flags,0 ,"prog_attach_flags" ); +ASSERT_EQ (attr.query.link_ids,0 ,"link_ids" ); +ASSERT_EQ (attr.query.link_attach_flags,0 ,"link_attach_flags" ); + +cleanup4: + err =bpf_prog_detach_opts (fd4, loopback, target, &optd); +ASSERT_OK (err,"prog_detach" ); +assert_mprog_count (target,3 ); + +cleanup3: + err =bpf_prog_detach_opts (fd3, loopback, target, &optd); +ASSERT_OK (err,"prog_detach" ); +assert_mprog_count (target,2 ); + +cleanup2: + err =bpf_prog_detach_opts (fd2, loopback, target, &optd); +ASSERT_OK (err,"prog_detach" ); +assert_mprog_count (target,1 ); + +cleanup1: + err =bpf_prog_detach_opts (fd1, loopback, target, &optd); +ASSERT_OK (err,"prog_detach" ); +assert_mprog_count (target,0 ); + +cleanup: +test_tc_link__destroy (skel); +} + +void serial_test_tc_opts_query (void ) +{ +test_tc_opts_query_target (BPF_TCX_INGRESS ); +test_tc_opts_query_target (BPF_TCX_EGRESS ); +}
Signature · 1 line
2.34.1
Daniel Borkmann
maintainerPATCH 5/7 selftests/bpf: Adapt assert_mprog_count to always expect 0 count
In reply to Daniel BorkmannSimplify __assert_mprog_count() to remove the -ENOENT corner case as the bpf_prog_query() now returns 0 when no bpf_mprog is attached. This also allows to convert a few test cases from using raw __assert_mprog_count() over to plain assert_mprog_count() helper.
--- tools/testing/selftests/bpf/prog_tests/tc_helpers.h | 11 ++++------- tools/testing/selftests/bpf/prog_tests/tc_links.c | 2 +- tools/testing/selftests/bpf/prog_tests/tc_opts.c | 6 +++--- 3 files changed, 8 insertions(+), 11 deletions(-)
tools/testing/selftests/bpf/prog_tests/tc_helpers.h +4 -7
@@ -45,7 +45,7 @@ static inline __u32 ifindex_from_link_fd(int fd)return link_info.tcx.ifindex; } -static inline void __assert_mprog_count (int target,int expected,bool miniq,int ifindex) +static inline void __assert_mprog_count (int target,int expected,int ifindex) {__u32 count =0 , attach_flags =0 ;int err;
@@ -53,20 +53,17 @@ static inline void __assert_mprog_count(int target, int expected, bool miniq, in err =bpf_prog_query (ifindex, target,0 , &attach_flags,NULL , &count);ASSERT_EQ (count, expected,"count" ); -if (!expected && !miniq) -ASSERT_EQ (err, -ENOENT ,"prog_query" ); -else - ASSERT_EQ(err, 0, "prog_query"); + ASSERT_EQ(err, 0, "prog_query"); }static inline void assert_mprog_count (int target,int expected) { -__assert_mprog_count (target, expected, false, loopback); +__assert_mprog_count (target, expected, loopback); }static inline void assert_mprog_count_ifindex (int ifindex,int target,int expected) { -__assert_mprog_count (target, expected, false, ifindex); +__assert_mprog_count (target, expected, ifindex); }#endif /* TC_HELPERS */
tools/testing/selftests/bpf/prog_tests/tc_links.c +1 -1
@@ -1667,7 +1667,7 @@ static void test_tc_chain_mixed(int target)if (!ASSERT_OK (err,"prog_detach" )) goto cleanup; -__assert_mprog_count (target,0 , true, loopback); +assert_mprog_count (target,0 );ASSERT_OK (system (ping_cmd), ping_cmd);
tools/testing/selftests/bpf/prog_tests/tc_opts.c +3 -3
@@ -635,7 +635,7 @@ static void test_tc_chain_classic(int target, bool chain_tc_old)if (!ASSERT_OK (err,"prog_detach" )) goto cleanup; -__assert_mprog_count (target,0 , chain_tc_old, loopback); +assert_mprog_count (target,0 ); cleanup:if (tc_attached) { tc_opts.flags = tc_opts.prog_fd = tc_opts.prog_id =0 ;
@@ -2250,7 +2250,7 @@ static void test_tc_opts_delete_empty(int target, bool chain_tc_old) BPF_TC_INGRESS :BPF_TC_EGRESS ; err =bpf_tc_hook_create (&tc_hook);ASSERT_OK (err,"bpf_tc_hook_create" ); -__assert_mprog_count (target,0 , true, loopback); +assert_mprog_count (target,0 ); } err =bpf_prog_detach_opts (0 , loopback, target, &optd);ASSERT_EQ (err, -ENOENT ,"prog_detach" );
@@ -2352,7 +2352,7 @@ static void test_tc_chain_mixed(int target) cleanup_opts: err =bpf_prog_detach_opts (detach_fd, loopback, target, &optd);ASSERT_OK (err,"prog_detach" ); -__assert_mprog_count (target,0 , true, loopback); +assert_mprog_count (target,0 );ASSERT_OK (system (ping_cmd), ping_cmd);
Signature · 1 line
2.34.1
Daniel Borkmann
maintainerPATCH 6/7 selftests/bpf: Test query on empty mprog and pass revision into attach
In reply to Daniel BorkmannAdd a new test case to query on an empty bpf_mprog and pass the revision directly into expected_revision for attachment to assert that this does succeed.
./test_progs -t tc_opts
[ 1.406778] tsc: Refined TSC clocksource calibration: 3407.990 MHz [ 1.408863] clocksource: tsc: mask: 0xffffffffffffffff max_cycles: 0x311fcaf6eb0, max_idle_ns: 440795321766 ns [ 1.412419] clocksource: Switched to clocksource tsc [ 1.428671] bpf_testmod: loading out-of-tree module taints kernel. [ 1.430260] bpf_testmod: module verification failed: signature and/or required key missing - tainting kernel #252 tc_opts_after:OK #253 tc_opts_append:OK #254 tc_opts_basic:OK #255 tc_opts_before:OK #256 tc_opts_chain_classic:OK #257 tc_opts_chain_mixed:OK #258 tc_opts_delete_empty:OK #259 tc_opts_demixed:OK #260 tc_opts_detach:OK #261 tc_opts_detach_after:OK #262 tc_opts_detach_before:OK #263 tc_opts_dev_cleanup:OK #264 tc_opts_invalid:OK #265 tc_opts_max:OK #266 tc_opts_mixed:OK #267 tc_opts_prepend:OK #268 tc_opts_query:OK #269 tc_opts_query_attach:OK <--- (new test) #270 tc_opts_replace:OK #271 tc_opts_revision:OK Summary: 20/0 PASSED, 0 SKIPPED, 0 FAILED
--- .../selftests/bpf/prog_tests/tc_opts.c | 59 +++++++++++++++++++ 1 file changed, 59 insertions(+)
tools/testing/selftests/bpf/prog_tests/tc_opts.c +59 -0
@@ -2629,3 +2629,62 @@ void serial_test_tc_opts_query(void)test_tc_opts_query_target (BPF_TCX_INGRESS );test_tc_opts_query_target (BPF_TCX_EGRESS ); } + +static void test_tc_opts_query_attach_target (int target) +{ +LIBBPF_OPTS (bpf_prog_attach_opts, opta); +LIBBPF_OPTS (bpf_prog_detach_opts, optd); +LIBBPF_OPTS (bpf_prog_query_opts, optq); +struct test_tc_link *skel; +__u32 prog_ids[2 ]; +__u32 fd1, id1; +int err; + + skel =test_tc_link__open_and_load (); +if (!ASSERT_OK_PTR (skel,"skel_load" )) + goto cleanup; + + fd1 =bpf_program__fd (skel->progs.tc1); + id1 =id_from_prog_fd (fd1); + + err =bpf_prog_query_opts (loopback, target, &optq); +if (!ASSERT_OK (err,"prog_query" )) + goto cleanup; + +ASSERT_EQ (optq.count,0 ,"count" ); +ASSERT_EQ (optq.revision,1 ,"revision" ); + + LIBBPF_OPTS_RESET(opta, + .expected_revision = optq.revision, + ); + + err =bpf_prog_attach_opts (fd1, loopback, target, &opta); +if (!ASSERT_EQ (err,0 ,"prog_attach" )) + goto cleanup; + +memset (prog_ids,0 ,sizeof (prog_ids)); + optq.prog_ids = prog_ids; + optq.count =ARRAY_SIZE (prog_ids); + + err =bpf_prog_query_opts (loopback, target, &optq); +if (!ASSERT_OK (err,"prog_query" )) + goto cleanup1; + +ASSERT_EQ (optq.count,1 ,"count" ); +ASSERT_EQ (optq.revision,2 ,"revision" ); +ASSERT_EQ (optq.prog_ids[0 ], id1,"prog_ids[0]" ); +ASSERT_EQ (optq.prog_ids[1 ],0 ,"prog_ids[1]" ); + +cleanup1: + err =bpf_prog_detach_opts (fd1, loopback, target, &optd); +ASSERT_OK (err,"prog_detach" ); +assert_mprog_count (target,0 ); +cleanup: +test_tc_link__destroy (skel); +} + +void serial_test_tc_opts_query_attach (void ) +{ +test_tc_opts_query_attach_target (BPF_TCX_INGRESS ); +test_tc_opts_query_attach_target (BPF_TCX_EGRESS ); +}
Signature · 1 line
2.34.1
Daniel Borkmann
maintainerPATCH 7/7 selftests/bpf: Make seen_tc* variable tests more robust
In reply to Daniel BorkmannMartin reported that on his local dev machine the test_tc_chain_mixed() fails as "test_tc_chain_mixed:FAIL:seen_tc5 unexpected seen_tc5: actual 1 != expected 0" and others occasionally, too.
However, when running in a more isolated setup (qemu in particular), it works fine for him. The reason is that there is a small race-window where seen_tc* could turn into true for various test cases when there is background traffic, e.g. after the asserts they often get reset. In such case when subsequent detach takes place, unrelated background traffic could have already flipped the bool to true beforehand.
Add a small helper tc_skel_reset_all_seen() to reset all bools before we do the ping test. At this point, everything is set up as expected and therefore no race can occur. All tc_{opts,links} tests continue to pass after this change.
--- .../selftests/bpf/prog_tests/tc_helpers.h | 5 ++ .../selftests/bpf/prog_tests/tc_links.c | 62 +++++++------------ .../selftests/bpf/prog_tests/tc_opts.c | 39 ++++++------ 3 files changed, 46 insertions(+), 60 deletions(-)
tools/testing/selftests/bpf/prog_tests/tc_helpers.h +5 -0
@@ -66,4 +66,9 @@ static inline void assert_mprog_count_ifindex(int ifindex, int target, int expec __assert_mprog_count(target, expected, ifindex); } +static inline void tc_skel_reset_all_seen (struct test_tc_link *skel) +{ +memset (skel->bss,0 ,sizeof (*skel->bss)); +} +#endif /* TC_HELPERS */
tools/testing/selftests/bpf/prog_tests/tc_links.c +22 -40
260 lines not on this page · raw message
tools/testing/selftests/bpf/prog_tests/tc_opts.c +19 -20
@@ -59,6 +59,7 @@ void serial_test_tc_opts_basic(void)ASSERT_EQ (optq.prog_ids[0 ], id1,"prog_ids[0]" );ASSERT_EQ (optq.prog_ids[1 ],0 ,"prog_ids[1]" ); +tc_skel_reset_all_seen (skel);ASSERT_OK (system (ping_cmd), ping_cmd);ASSERT_EQ (skel->bss->seen_tc1, true,"seen_tc1" );
@@ -83,6 +84,7 @@ void serial_test_tc_opts_basic(void)ASSERT_EQ (optq.prog_ids[0 ], id2,"prog_ids[0]" );ASSERT_EQ (optq.prog_ids[1 ],0 ,"prog_ids[1]" ); +tc_skel_reset_all_seen (skel);ASSERT_OK (system (ping_cmd), ping_cmd);ASSERT_EQ (skel->bss->seen_tc1, true,"seen_tc1" );
@@ -163,6 +165,7 @@ static void test_tc_opts_before_target(int target)ASSERT_EQ (optq.prog_ids[1 ], id2,"prog_ids[1]" );ASSERT_EQ (optq.prog_ids[2 ],0 ,"prog_ids[2]" ); +tc_skel_reset_all_seen (skel);ASSERT_OK (system (ping_cmd), ping_cmd);ASSERT_EQ (skel->bss->seen_tc1, true,"seen_tc1" );
@@ -219,6 +222,7 @@ static void test_tc_opts_before_target(int target)ASSERT_EQ (optq.prog_ids[3 ], id2,"prog_ids[3]" );ASSERT_EQ (optq.prog_ids[4 ],0 ,"prog_ids[4]" ); +tc_skel_reset_all_seen (skel);ASSERT_OK (system (ping_cmd), ping_cmd);ASSERT_EQ (skel->bss->seen_tc1, true,"seen_tc1" );
@@ -313,6 +317,7 @@ static void test_tc_opts_after_target(int target)ASSERT_EQ (optq.prog_ids[1 ], id2,"prog_ids[1]" );ASSERT_EQ (optq.prog_ids[2 ],0 ,"prog_ids[2]" ); +tc_skel_reset_all_seen (skel);ASSERT_OK (system (ping_cmd), ping_cmd);ASSERT_EQ (skel->bss->seen_tc1, true,"seen_tc1" );
@@ -369,6 +374,7 @@ static void test_tc_opts_after_target(int target)ASSERT_EQ (optq.prog_ids[3 ], id4,"prog_ids[3]" );ASSERT_EQ (optq.prog_ids[4 ],0 ,"prog_ids[4]" ); +tc_skel_reset_all_seen (skel);ASSERT_OK (system (ping_cmd), ping_cmd);ASSERT_EQ (skel->bss->seen_tc1, true,"seen_tc1" );
@@ -514,6 +520,7 @@ static void test_tc_opts_revision_target(int target)ASSERT_EQ (optq.prog_ids[1 ], id2,"prog_ids[1]" );ASSERT_EQ (optq.prog_ids[2 ],0 ,"prog_ids[2]" ); +tc_skel_reset_all_seen (skel);ASSERT_OK (system (ping_cmd), ping_cmd);ASSERT_EQ (skel->bss->seen_tc1, true,"seen_tc1" );
@@ -608,22 +615,20 @@ static void test_tc_chain_classic(int target, bool chain_tc_old)assert_mprog_count (target,2 ); +tc_skel_reset_all_seen (skel);ASSERT_OK (system (ping_cmd), ping_cmd);ASSERT_EQ (skel->bss->seen_tc1, true,"seen_tc1" );ASSERT_EQ (skel->bss->seen_tc2, true,"seen_tc2" );ASSERT_EQ (skel->bss->seen_tc3, chain_tc_old,"seen_tc3" ); - skel->bss->seen_tc1 = false; - skel->bss->seen_tc2 = false; - skel->bss->seen_tc3 = false; - err =bpf_prog_detach_opts (fd2, loopback, target, &optd);if (!ASSERT_OK (err,"prog_detach" )) goto cleanup_detach;assert_mprog_count (target,1 ); +tc_skel_reset_all_seen (skel);ASSERT_OK (system (ping_cmd), ping_cmd);ASSERT_EQ (skel->bss->seen_tc1, true,"seen_tc1" );
@@ -730,16 +735,13 @@ static void test_tc_opts_replace_target(int target)ASSERT_EQ (optq.prog_attach_flags[1 ],0 ,"prog_flags[1]" );ASSERT_EQ (optq.prog_attach_flags[2 ],0 ,"prog_flags[2]" ); +tc_skel_reset_all_seen (skel);ASSERT_OK (system (ping_cmd), ping_cmd);ASSERT_EQ (skel->bss->seen_tc1, true,"seen_tc1" );ASSERT_EQ (skel->bss->seen_tc2, true,"seen_tc2" );ASSERT_EQ (skel->bss->seen_tc3, false,"seen_tc3" ); - skel->bss->seen_tc1 = false; - skel->bss->seen_tc2 = false; - skel->bss->seen_tc3 = false; - LIBBPF_OPTS_RESET(opta, .flags = BPF_F_REPLACE, .replace_prog_fd = fd2,
@@ -767,16 +769,13 @@ static void test_tc_opts_replace_target(int target)ASSERT_EQ (optq.prog_ids[1 ], id1,"prog_ids[1]" );ASSERT_EQ (optq.prog_ids[2 ],0 ,"prog_ids[2]" ); +tc_skel_reset_all_seen (skel);ASSERT_OK (system (ping_cmd), ping_cmd);ASSERT_EQ (skel->bss->seen_tc1, true,"seen_tc1" );ASSERT_EQ (skel->bss->seen_tc2, false,"seen_tc2" );ASSERT_EQ (skel->bss->seen_tc3, true,"seen_tc3" ); - skel->bss->seen_tc1 = false; - skel->bss->seen_tc2 = false; - skel->bss->seen_tc3 = false; - LIBBPF_OPTS_RESET(opta, .flags = BPF_F_REPLACE | BPF_F_BEFORE, .replace_prog_fd = fd3,
@@ -805,6 +804,7 @@ static void test_tc_opts_replace_target(int target)ASSERT_EQ (optq.prog_ids[1 ], id1,"prog_ids[1]" );ASSERT_EQ (optq.prog_ids[2 ],0 ,"prog_ids[2]" ); +tc_skel_reset_all_seen (skel);ASSERT_OK (system (ping_cmd), ping_cmd);ASSERT_EQ (skel->bss->seen_tc1, true,"seen_tc1" );
@@ -1084,6 +1084,7 @@ static void test_tc_opts_prepend_target(int target)ASSERT_EQ (optq.prog_ids[1 ], id1,"prog_ids[1]" );ASSERT_EQ (optq.prog_ids[2 ],0 ,"prog_ids[2]" ); +tc_skel_reset_all_seen (skel);ASSERT_OK (system (ping_cmd), ping_cmd);ASSERT_EQ (skel->bss->seen_tc1, true,"seen_tc1" );
@@ -1124,6 +1125,7 @@ static void test_tc_opts_prepend_target(int target)ASSERT_EQ (optq.prog_ids[3 ], id1,"prog_ids[3]" );ASSERT_EQ (optq.prog_ids[4 ],0 ,"prog_ids[4]" ); +tc_skel_reset_all_seen (skel);ASSERT_OK (system (ping_cmd), ping_cmd);ASSERT_EQ (skel->bss->seen_tc1, true,"seen_tc1" );
@@ -1222,6 +1224,7 @@ static void test_tc_opts_append_target(int target)ASSERT_EQ (optq.prog_ids[1 ], id2,"prog_ids[1]" );ASSERT_EQ (optq.prog_ids[2 ],0 ,"prog_ids[2]" ); +tc_skel_reset_all_seen (skel);ASSERT_OK (system (ping_cmd), ping_cmd);ASSERT_EQ (skel->bss->seen_tc1, true,"seen_tc1" );
@@ -1262,6 +1265,7 @@ static void test_tc_opts_append_target(int target)ASSERT_EQ (optq.prog_ids[3 ], id4,"prog_ids[3]" );ASSERT_EQ (optq.prog_ids[4 ],0 ,"prog_ids[4]" ); +tc_skel_reset_all_seen (skel);ASSERT_OK (system (ping_cmd), ping_cmd);ASSERT_EQ (skel->bss->seen_tc1, true,"seen_tc1" );
@@ -2316,16 +2320,13 @@ static void test_tc_chain_mixed(int target)assert_mprog_count (target,1 ); +tc_skel_reset_all_seen (skel);ASSERT_OK (system (ping_cmd), ping_cmd);ASSERT_EQ (skel->bss->seen_tc4, false,"seen_tc4" );ASSERT_EQ (skel->bss->seen_tc5, false,"seen_tc5" );ASSERT_EQ (skel->bss->seen_tc6, true,"seen_tc6" ); - skel->bss->seen_tc4 = false; - skel->bss->seen_tc5 = false; - skel->bss->seen_tc6 = false; - LIBBPF_OPTS_RESET(opta, .flags = BPF_F_REPLACE, .replace_prog_fd = fd3,
@@ -2339,21 +2340,19 @@ static void test_tc_chain_mixed(int target)assert_mprog_count (target,1 ); +tc_skel_reset_all_seen (skel);ASSERT_OK (system (ping_cmd), ping_cmd);ASSERT_EQ (skel->bss->seen_tc4, true,"seen_tc4" );ASSERT_EQ (skel->bss->seen_tc5, true,"seen_tc5" );ASSERT_EQ (skel->bss->seen_tc6, false,"seen_tc6" ); - skel->bss->seen_tc4 = false; - skel->bss->seen_tc5 = false; - skel->bss->seen_tc6 = false; - cleanup_opts: err =bpf_prog_detach_opts (detach_fd, loopback, target, &optd);ASSERT_OK (err,"prog_detach" );assert_mprog_count (target,0 ); +tc_skel_reset_all_seen (skel);ASSERT_OK (system (ping_cmd), ping_cmd);ASSERT_EQ (skel->bss->seen_tc4, false,"seen_tc4" );
Signature · 1 line
2.34.1
This series was applied to bpf/bpf.git (master) by Martin KaFai Lau <[email protected]>:
Hello:
This series was applied to bpf/bpf.git (master)
by Martin KaFai Lau <[email protected]>:
Quoted 6 lines · On Sat, 7 Oct 2023 00:06:49 +0200 you wrote:
While working on the ebpf-go [0] library integration for
bpf_mprogand tcx, Lorenz noticed that two subsequentBPF_PROG_QUERYrequests currently fail. A typical workflow is to first gather thebpf_mprogcount without passing program/ link arrays, followed by the second request which contains the actual array pointers.
Quoted 6 lines
The initial call populates count and revision fields. The second call gets rejected due to a
BPF_PROG_QUERY_LAST_FIELDbug which should point to query.revision instead of query.link_attach_flags since the former is really the last member.[...]
Here is the summary with links:
- [bpf,1/7] bpf: Fix BPF_PROG_QUERY last field check
https://git.kernel.org/bpf/bpf/c/a4fe78386afb - [bpf,2/7] bpf: Handle bpf_mprog_query with NULL entry https://git.kernel.org/bpf/bpf/c/edfa9af0a73e - [bpf,3/7] bpf: Refuse unused attributes in bpf_prog_{attach,detach} https://git.kernel.org/bpf/bpf/c/ba62d61128bd - [bpf,4/7] selftests/bpf: Test bpf_mprog query API via libbpf and raw syscall https://git.kernel.org/bpf/bpf/c/f9b08790fa69 - [bpf,5/7] selftests/bpf: Adapt assert_mprog_count to always expect 0 count https://git.kernel.org/bpf/bpf/c/b77368269dda - [bpf,6/7] selftests/bpf: Test query on empty mprog and pass revision into attach https://git.kernel.org/bpf/bpf/c/685446b0629b - [bpf,7/7] selftests/bpf: Make seen_tc* variable tests more robust https://git.kernel.org/bpf/bpf/c/37345b8535b4
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html