bpf: Resolve fext program type when checking map compatibility
Subsystems (6)
PATCH v4 1/2 bpf: Resolve fext program type when checking map compatibility
The bpf_prog_map_compatible() check makes sure that BPF program types are not mixed inside BPF map types that can contain programs (tail call maps, cpumaps and devmaps). It does this by setting the fields of the map->owner struct to the values of the first program being checked against, and rejecting any subsequent programs if the values don't match.
One of the values being set in the map owner struct is the program type, and since the code did not resolve the prog type for fext programs, the map owner type would be set to PROG_TYPE_EXT and subsequent loading of programs of the target type into the map would fail.
This bug is seen in particular for XDP programs that are loaded as PROG_TYPE_EXT using libxdp; these cannot insert programs into devmaps and cpumaps because the check fails as described above.
Fix the bug by resolving the fext program type to its target program type as elsewhere in the verifier. This requires constifying the parameter of resolve_prog_type() to avoid a compiler warning from the new call site.
v3:
- Add Yonghong's ACk
--- include/linux/bpf_verifier.h | 2 +- kernel/bpf/core.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-)
include/linux/bpf_verifier.h +1 -1
@@ -642,7 +642,7 @@ static inline u32 type_flag(u32 type) }/* only use after check_attach_btf_id() */ -static inline enum bpf_prog_type resolve_prog_type (struct bpf_prog *prog) +static inline enum bpf_prog_type resolve_prog_type (const struct bpf_prog *prog) {return prog->type ==BPF_PROG_TYPE_EXT ? prog->aux->dst_prog->type : prog->type;
kernel/bpf/core.c +3 -2
@@ -2088,6 +2088,7 @@ static unsigned int __bpf_prog_ret0_warn(const void *ctx,bool bpf_prog_map_compatible (struct bpf_map *map,const struct bpf_prog *fp) { +enum bpf_prog_type prog_type =resolve_prog_type (fp);bool ret;if (fp->kprobe_override)
@@ -2098,12 +2099,12 @@ bool bpf_prog_map_compatible(struct bpf_map *map,/* There's no owner yet where we could check for * compatibility. */ - map->owner.type = fp->type; + map->owner.type = prog_type; map->owner.jited = fp->jited; map->owner.xdp_has_frags = fp->aux->xdp_has_frags; ret = true; }else { - ret = map->owner.type == fp->type && + ret = map->owner.type == prog_type && map->owner.jited == fp->jited && map->owner.xdp_has_frags == fp->aux->xdp_has_frags; }
Signature · 1 line
2.38.1
PATCH v4 2/2 selftests/bpf: Add a test for using a cpumap from an freplace-to-XDP program
This adds a simple test for inserting an XDP program into a cpumap that is "owned" by an XDP program that was loaded as PROG_TYPE_EXT (as libxdp does). Prior to the kernel fix this would fail because the map type ownership would be set to PROG_TYPE_EXT instead of being resolved to PROG_TYPE_XDP.
v4:
- Use skeletons for selftest
v3:
- Update comment to better explain the cause
- Add Yonghong's ACK
--- .../selftests/bpf/prog_tests/fexit_bpf2bpf.c | 54 +++++++++++++++++++ .../selftests/bpf/progs/freplace_progmap.c | 24 +++++++++ 2 files changed, 78 insertions(+) create mode 100644 tools/testing/selftests/bpf/progs/freplace_progmap.c
tools/testing/selftests/bpf/prog_tests/fexit_bpf2bpf.c +54 -0
@@ -4,6 +4,8 @@#include <network_helpers.h> #include <bpf/btf.h> #include "bind4_prog.skel.h" +#include "freplace_progmap.skel.h" +#include "xdp_dummy.skel.h" typedef int (*test_cb )(struct bpf_object *obj);
@@ -500,6 +502,56 @@ static void test_fentry_to_cgroup_bpf(void)bind4_prog__destroy (skel); } +static void test_func_replace_progmap (void ) +{ +struct bpf_cpumap_val value = { .qsize =1 }; +struct freplace_progmap *skel =NULL ; +struct xdp_dummy *tgt_skel =NULL ; +int err, tgt_fd; +__u32 key =0 ; + + skel =freplace_progmap__open (); +if (!ASSERT_OK_PTR (skel,"prog_open" )) +return ; + + tgt_skel =xdp_dummy__open_and_load (); +if (!ASSERT_OK_PTR (tgt_skel,"tgt_prog_load" )) + goto out; + + tgt_fd =bpf_program__fd (tgt_skel->progs.xdp_dummy_prog); + +/* Change the 'redirect' program type to be a PROG_TYPE_EXT +* with an XDP target +*/ +bpf_program__set_type (skel->progs.xdp_cpumap_prog,BPF_PROG_TYPE_EXT ); +bpf_program__set_expected_attach_type (skel->progs.xdp_cpumap_prog,0 ); + err =bpf_program__set_attach_target (skel->progs.xdp_cpumap_prog, + tgt_fd,"xdp_dummy_prog" ); +if (!ASSERT_OK (err,"set_attach_target" )) + goto out; + + err =freplace_progmap__load (skel); +if (!ASSERT_OK (err,"obj_load" )) + goto out; + +/* Prior to fixing the kernel, loading the PROG_TYPE_EXT 'redirect' +* program above will cause the map owner type of 'cpumap' to be set to +* PROG_TYPE_EXT. This in turn will cause the bpf_map_update_elem() +* below to fail, because the program we are inserting into the map is +* of PROG_TYPE_XDP. After fixing the kernel, the initial ownership will +* be correctly resolved to the *target* of the PROG_TYPE_EXT program +* (i.e., PROG_TYPE_XDP) and the map update will succeed. +*/ + value.bpf_prog.fd =bpf_program__fd (skel->progs.xdp_drop_prog); + err =bpf_map_update_elem (bpf_map__fd (skel->maps.cpu_map), + &key, &value,0 ); +ASSERT_OK (err,"map_update" ); + +out: +xdp_dummy__destroy (tgt_skel); +freplace_progmap__destroy (skel); +} +/* NOTE: affect other tests, must run in serial mode */ void serial_test_fexit_bpf2bpf (void ) {
@@ -525,4 +577,6 @@ void serial_test_fexit_bpf2bpf(void)test_func_replace_global_func ();if (test__start_subtest ("fentry_to_cgroup_bpf" ))test_fentry_to_cgroup_bpf (); +if (test__start_subtest ("func_replace_progmap" )) +test_func_replace_progmap (); }
tools/testing/selftests/bpf/progs/freplace_progmap.c new file +24 -0
@@ -0,0 +1,24 @@ +// SPDX-License-Identifier: GPL-2.0 +#include <linux/bpf.h> +#include <bpf/bpf_helpers.h> + +struct { + __uint(type, BPF_MAP_TYPE_CPUMAP); + __uint(key_size, sizeof(__u32)); + __uint(value_size, sizeof(struct bpf_cpumap_val)); + __uint(max_entries, 1); +} cpu_map SEC(".maps"); + +SEC("xdp/cpumap") +int xdp_drop_prog (struct xdp_md *ctx) +{ +return XDP_DROP ; +} + +SEC("xdp") +int xdp_cpumap_prog (struct xdp_md *ctx) +{ +return bpf_redirect_map (&cpu_map,0 ,XDP_PASS ); +} + +char _license[] SEC("license") = "GPL";
Signature · 1 line
2.38.1
Re: [PATCH bpf v4 2/2] selftests/bpf: Add a test for using a cpumap from an freplace-to-XDP program
Quoted 51 lines · Toke Høiland-Jørgensen
This adds a simple test for inserting an XDP program into a cpumap that is "owned" by an XDP program that was loaded as
PROG_TYPE_EXT(as libxdp does). Prior to the kernel fix this would fail because the map type ownership would be set toPROG_TYPE_EXTinstead of being resolved toPROG_TYPE_XDP.v4:
- Use skeletons for selftest
v3:
- Update comment to better explain the cause
- Add Yonghong's ACKAcked-by Yonghong Song <[email protected]>Signed-off-by Toke Høiland-Jørgensen <[email protected]>--- .../selftests/bpf/prog_tests/fexit_bpf2bpf.c | 54 +++++++++++++++++++ .../selftests/bpf/progs/freplace_progmap.c | 24 +++++++++ 2 files changed, 78 insertions(+) create mode 100644 tools/testing/selftests/bpf/progs/freplace_progmap.ctools/testing/selftests/bpf/prog_tests/fexit_bpf2bpf.c +15
-0@@ -4,6 +4,8 @@#include <network_helpers.h> #include <bpf/btf.h> #include "bind4_prog.skel.h" +#include "freplace_progmap.skel.h" +#include "xdp_dummy.skel.h" typedef int (*test_cb )(struct bpf_object *obj);@@ -500,6 +502,56 @@ static void test_fentry_to_cgroup_bpf(void)bind4_prog__destroy (skel); } +static void test_func_replace_progmap (void ) +{ +struct bpf_cpumap_val value = { .qsize =1 }; +struct freplace_progmap *skel =NULL ; +struct xdp_dummy *tgt_skel =NULL ; +int err, tgt_fd; +__u32 key =0 ; + + skel =freplace_progmap__open (); +if (!ASSERT_OK_PTR (skel,"prog_open" )) +return ; + + tgt_skel =xdp_dummy__open_and_load ();
tools/testing/selftests/bpf/prog_tests/fexit_bpf2bpf.c static void test_fentry_to_cgroup_bpf(void) · line 527
Quoted 10 lines
tools/testing/selftests/bpf/prog_tests/fexit_bpf2bpf.c +10
-0+if (!ASSERT_OK_PTR (tgt_skel,"tgt_prog_load" )) + goto out; + + tgt_fd =bpf_program__fd (tgt_skel->progs.xdp_dummy_prog); + +/* Change the 'redirect' program type to be a PROG_TYPE_EXT +* with an XDP target +*/ +bpf_program__set_type (skel->progs.xdp_cpumap_prog,BPF_PROG_TYPE_EXT ); +bpf_program__set_expected_attach_type (skel->progs.xdp_cpumap_prog,0 );
you shouldn't need this manual override if you mark xdp_cpumap_prog as SEC("freplace"), or am I missing something?
but other than this minor thing looks good to me, thanks
Quoted 43 lines
tools/testing/selftests/bpf/prog_tests/fexit_bpf2bpf.c +29
-0+ err =bpf_program__set_attach_target (skel->progs.xdp_cpumap_prog, + tgt_fd,"xdp_dummy_prog" ); +if (!ASSERT_OK (err,"set_attach_target" )) + goto out; + + err =freplace_progmap__load (skel); +if (!ASSERT_OK (err,"obj_load" )) + goto out; + +/* Prior to fixing the kernel, loading the PROG_TYPE_EXT 'redirect' +* program above will cause the map owner type of 'cpumap' to be set to +* PROG_TYPE_EXT. This in turn will cause the bpf_map_update_elem() +* below to fail, because the program we are inserting into the map is +* of PROG_TYPE_XDP. After fixing the kernel, the initial ownership will +* be correctly resolved to the *target* of the PROG_TYPE_EXT program +* (i.e., PROG_TYPE_XDP) and the map update will succeed. +*/ + value.bpf_prog.fd =bpf_program__fd (skel->progs.xdp_drop_prog); + err =bpf_map_update_elem (bpf_map__fd (skel->maps.cpu_map), + &key, &value,0 ); +ASSERT_OK (err,"map_update" ); + +out: +xdp_dummy__destroy (tgt_skel); +freplace_progmap__destroy (skel); +} +/* NOTE: affect other tests, must run in serial mode */ void serial_test_fexit_bpf2bpf (void ) {@@ -525,4 +577,6 @@ void serial_test_fexit_bpf2bpf(void)test_func_replace_global_func ();if (test__start_subtest ("fentry_to_cgroup_bpf" ))test_fentry_to_cgroup_bpf (); +if (test__start_subtest ("func_replace_progmap" )) +test_func_replace_progmap (); }tools/testing/selftests/bpf/progs/freplace_progmap.c new file +0
-0
tools/testing/selftests/bpf/progs/freplace_progmap.c line 8
Quoted 8 lines
tools/testing/selftests/bpf/progs/freplace_progmap.c new file +8
-0@@ -0,0 +1,24 @@ +// SPDX-License-Identifier: GPL-2.0 +#include <linux/bpf.h> +#include <bpf/bpf_helpers.h> + +struct { + __uint(type, BPF_MAP_TYPE_CPUMAP); + __uint(key_size, sizeof(__u32)); + __uint(value_size, sizeof(struct bpf_cpumap_val));
ok, another minor nit which you ignored, libbpf should be smart enough to accept
__type(key, __u32);__type(value, struct bpf_cpumap_val);
And if it's not it would be good to know that it's not (and trivially fix it).
Quoted 19 lines
tools/testing/selftests/bpf/progs/freplace_progmap.c new file +16
-1+__uint (max_entries,1 ); +} cpu_map SEC(".maps"); + +SEC("xdp/cpumap") +int xdp_drop_prog (struct xdp_md *ctx) +{ +return XDP_DROP ; +} + +SEC("xdp") +int xdp_cpumap_prog (struct xdp_md *ctx) +{ +return bpf_redirect_map (&cpu_map,0 ,XDP_PASS ); +} + +char _license[] SEC("license") = "GPL"; --2.38.1
Re: [PATCH bpf v4 2/2] selftests/bpf: Add a test for using a cpumap from an freplace-to-XDP program
Quoted 57 lines · Andrii Nakryiko
Quoted 56 lines · Toke Høiland-Jørgensen
This adds a simple test for inserting an XDP program into a cpumap that is "owned" by an XDP program that was loaded as
PROG_TYPE_EXT(as libxdp does). Prior to the kernel fix this would fail because the map type ownership would be set toPROG_TYPE_EXTinstead of being resolved toPROG_TYPE_XDP.v4:
- Use skeletons for selftest
v3:
- Update comment to better explain the cause
- Add Yonghong's ACKAcked-by Yonghong Song <[email protected]>Signed-off-by Toke Høiland-Jørgensen <[email protected]>--- .../selftests/bpf/prog_tests/fexit_bpf2bpf.c | 54 +++++++++++++++++++ .../selftests/bpf/progs/freplace_progmap.c | 24 +++++++++ 2 files changed, 78 insertions(+) create mode 100644 tools/testing/selftests/bpf/progs/freplace_progmap.ctools/testing/selftests/bpf/prog_tests/fexit_bpf2bpf.c +20
-0@@ -4,6 +4,8 @@#include <network_helpers.h> #include <bpf/btf.h> #include "bind4_prog.skel.h" +#include "freplace_progmap.skel.h" +#include "xdp_dummy.skel.h" typedef int (*test_cb )(struct bpf_object *obj);@@ -500,6 +502,56 @@ static void test_fentry_to_cgroup_bpf(void)bind4_prog__destroy (skel); } +static void test_func_replace_progmap (void ) +{ +struct bpf_cpumap_val value = { .qsize =1 }; +struct freplace_progmap *skel =NULL ; +struct xdp_dummy *tgt_skel =NULL ; +int err, tgt_fd; +__u32 key =0 ; + + skel =freplace_progmap__open (); +if (!ASSERT_OK_PTR (skel,"prog_open" )) +return ; + + tgt_skel =xdp_dummy__open_and_load (); +if (!ASSERT_OK_PTR (tgt_skel,"tgt_prog_load" )) + goto out; + + tgt_fd =bpf_program__fd (tgt_skel->progs.xdp_dummy_prog); +
Quoted 8 lines
tools/testing/selftests/bpf/prog_tests/fexit_bpf2bpf.c static void test_fentry_to_cgroup_bpf(void) · line 527
Quoted 5 lines
tools/testing/selftests/bpf/prog_tests/fexit_bpf2bpf.c +5
-0+/* Change the 'redirect' program type to be a PROG_TYPE_EXT +* with an XDP target +*/ +bpf_program__set_type (skel->progs.xdp_cpumap_prog,BPF_PROG_TYPE_EXT ); +bpf_program__set_expected_attach_type (skel->progs.xdp_cpumap_prog,0 );you shouldn't need this manual override if you mark
xdp_cpumap_progasSEC("freplace"), or am I missing something?
No, you're right; I guess I was just too focused on recreating the flow we use in libxdp. Will fix!
Quoted 54 lines
Quoted 43 lines
tools/testing/selftests/bpf/prog_tests/fexit_bpf2bpf.c +29
-0+ err =bpf_program__set_attach_target (skel->progs.xdp_cpumap_prog, + tgt_fd,"xdp_dummy_prog" ); +if (!ASSERT_OK (err,"set_attach_target" )) + goto out; + + err =freplace_progmap__load (skel); +if (!ASSERT_OK (err,"obj_load" )) + goto out; + +/* Prior to fixing the kernel, loading the PROG_TYPE_EXT 'redirect' +* program above will cause the map owner type of 'cpumap' to be set to +* PROG_TYPE_EXT. This in turn will cause the bpf_map_update_elem() +* below to fail, because the program we are inserting into the map is +* of PROG_TYPE_XDP. After fixing the kernel, the initial ownership will +* be correctly resolved to the *target* of the PROG_TYPE_EXT program +* (i.e., PROG_TYPE_XDP) and the map update will succeed. +*/ + value.bpf_prog.fd =bpf_program__fd (skel->progs.xdp_drop_prog); + err =bpf_map_update_elem (bpf_map__fd (skel->maps.cpu_map), + &key, &value,0 ); +ASSERT_OK (err,"map_update" ); + +out: +xdp_dummy__destroy (tgt_skel); +freplace_progmap__destroy (skel); +} +/* NOTE: affect other tests, must run in serial mode */ void serial_test_fexit_bpf2bpf (void ) {@@ -525,4 +577,6 @@ void serial_test_fexit_bpf2bpf(void)test_func_replace_global_func ();if (test__start_subtest ("fentry_to_cgroup_bpf" ))test_fentry_to_cgroup_bpf (); +if (test__start_subtest ("func_replace_progmap" )) +test_func_replace_progmap (); }tools/testing/selftests/bpf/progs/freplace_progmap.c new file +0
-0tools/testing/selftests/bpf/progs/freplace_progmap.c line 8
Quoted 8 lines
tools/testing/selftests/bpf/progs/freplace_progmap.c new file +8
-0@@ -0,0 +1,24 @@ +// SPDX-License-Identifier: GPL-2.0 +#include <linux/bpf.h> +#include <bpf/bpf_helpers.h> + +struct { + __uint(type, BPF_MAP_TYPE_CPUMAP); + __uint(key_size, sizeof(__u32)); + __uint(value_size, sizeof(struct bpf_cpumap_val));ok, another minor nit which you ignored, libbpf should be smart enough to accept
Quoted 5 lines
__type(key, __u32);__type(value, struct bpf_cpumap_val);And if it's not it would be good to know that it's not (and trivially fix it).
Ah, actually saw that comment on the previous version, and then completely forgot about it when I was fixing things up. Sorry about that; will change!
-Toke