Skip to contentSkip to conversation

bpf: Resolve fext program type when checking map compatibility

PATCH Superseded Toke Høiland-Jørgensen 3 participants 5 messages Dec 9, 2022 – Dec 13, 2022

Subsystems (6)

v2 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 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.

Fixes f45d5b6ce2e8 ("bpf: generalise tail call map compatibility check")

---
No changes since v1, this just adds a selftest (in patch 2).

 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
index 9e1e6965f407..0eb8f035b3d9 100644
@@ -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
index 25a54e04560e..17ab3e15ac25 100644
@@ -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
#1 lore raw

PATCH v2 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.

---
 .../selftests/bpf/prog_tests/fexit_bpf2bpf.c  | 53 +++++++++++++++++++
 .../selftests/bpf/progs/freplace_progmap.c    | 24 +++++++++
 tools/testing/selftests/bpf/testing_helpers.c | 24 ++++++++-
 tools/testing/selftests/bpf/testing_helpers.h |  2 +
 4 files changed, 101 insertions(+), 2 deletions(-)
 create mode 100644 tools/testing/selftests/bpf/progs/freplace_progmap.c
tools/testing/selftests/bpf/prog_tests/fexit_bpf2bpf.c +53 -0
index d1e32e792536..dac088217f0f 100644
@@ -500,6 +500,57 @@ 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 bpf_object *obj, *tgt_obj = NULL;
+	struct bpf_program *drop, *redirect;
+	struct bpf_map *cpumap;
+	int err, tgt_fd;
+	__u32 key = 0;
+
+	err = bpf_prog_test_open("freplace_progmap.bpf.o", BPF_PROG_TYPE_UNSPEC, &obj);
+	if (!ASSERT_OK(err, "prog_open"))
+		return;
+
+	err = bpf_prog_test_load("xdp_dummy.bpf.o", BPF_PROG_TYPE_UNSPEC, &tgt_obj, &tgt_fd);
+	if (!ASSERT_OK(err, "tgt_prog_load"))
+		goto out;
+
+	drop = bpf_object__find_program_by_name(obj, "xdp_drop_prog");
+	redirect = bpf_object__find_program_by_name(obj, "xdp_cpumap_prog");
+	cpumap = bpf_object__find_map_by_name(obj, "cpu_map");
+
+	if (!ASSERT_OK_PTR(drop, "drop") || !ASSERT_OK_PTR(redirect, "redirect") ||
+	    !ASSERT_OK_PTR(cpumap, "cpumap"))
+		goto out;
+
+	/* Change the 'redirect' program type to be a PROG_TYPE_EXT
+	 * with an XDP target
+	 */
+	bpf_program__set_type(redirect, BPF_PROG_TYPE_EXT);
+	bpf_program__set_expected_attach_type(redirect, 0);
+	err = bpf_program__set_attach_target(redirect, tgt_fd, "xdp_dummy_prog");
+	if (!ASSERT_OK(err, "set_attach_target"))
+		goto out;
+
+	err = bpf_object__load(obj);
+	if (!ASSERT_OK(err, "obj_load"))
+		goto out;
+
+	/* This will fail if the map is "owned" by a PROG_TYPE_EXT program,
+	 * which, prior to fixing the kernel, it will be since the map is used
+	 * from the 'redirect' prog above
+	 */
+	value.bpf_prog.fd = bpf_program__fd(drop);
+	err = bpf_map_update_elem(bpf_map__fd(cpumap), &key, &value, 0);
+	ASSERT_OK(err, "map_update");
+
+out:
+	bpf_object__close(tgt_obj);
+	bpf_object__close(obj);
+}
+
 /* NOTE: affect other tests, must run in serial mode */
 void serial_test_fexit_bpf2bpf(void)
 {
@@ -525,4 +576,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
new file mode 100644
index 000000000000..68174c3d7b37
@@ -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";
tools/testing/selftests/bpf/testing_helpers.c +22 -2
index 9695318e8132..2050244e6f24 100644
@@ -174,8 +174,8 @@ __u32 link_info_prog_id(const struct bpf_link *link, struct bpf_link_info *info)
 
 int extra_prog_load_log_flags = 0;
 
-int bpf_prog_test_load(const char *file, enum bpf_prog_type type,
-		       struct bpf_object **pobj, int *prog_fd)
+int bpf_prog_test_open(const char *file, enum bpf_prog_type type,
+		       struct bpf_object **pobj)
 {
 	LIBBPF_OPTS(bpf_object_open_opts, opts,
 		.kernel_log_level = extra_prog_load_log_flags,
@@ -201,6 +201,26 @@ int bpf_prog_test_load(const char *file, enum bpf_prog_type type,
 	flags = bpf_program__flags(prog) | BPF_F_TEST_RND_HI32;
 	bpf_program__set_flags(prog, flags);
 
+	*pobj = obj;
+	return 0;
+err_out:
+	bpf_object__close(obj);
+	return err;
+}
+
+int bpf_prog_test_load(const char *file, enum bpf_prog_type type,
+		       struct bpf_object **pobj, int *prog_fd)
+{
+	struct bpf_program *prog;
+	struct bpf_object *obj;
+	int err;
+
+	err = bpf_prog_test_open(file, type, &obj);
+	if (err)
+		return err;
+
+	prog = bpf_object__next_program(obj, NULL);
+
 	err = bpf_object__load(obj);
 	if (err)
 		goto err_out;
tools/testing/selftests/bpf/testing_helpers.h +2 -0
index 6ec00bf79cb5..977eb520d119 100644
@@ -6,6 +6,8 @@
 
 int parse_num_list(const char *s, bool **set, int *set_len);
 __u32 link_info_prog_id(const struct bpf_link *link, struct bpf_link_info *info);
+int bpf_prog_test_open(const char *file, enum bpf_prog_type type,
+		       struct bpf_object **pobj);
 int bpf_prog_test_load(const char *file, enum bpf_prog_type type,
 		       struct bpf_object **pobj, int *prog_fd);
 int bpf_test_load_program(enum bpf_prog_type type, const struct bpf_insn *insns,
Signature · 1 line
2.38.1
Acked-by on v2 2/2
#2 lore raw

Re: [PATCH bpf v2 2/2] selftests/bpf: Add a test for using a cpumap from an freplace-to-XDP program

Quoted 7 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 to PROG_TYPE_EXT instead of being resolved to PROG_TYPE_XDP.

LGTM with a small nit below.

Quoted 48 lines
---
  .../selftests/bpf/prog_tests/fexit_bpf2bpf.c  | 53 +++++++++++++++++++
  .../selftests/bpf/progs/freplace_progmap.c    | 24 +++++++++
  tools/testing/selftests/bpf/testing_helpers.c | 24 ++++++++-
  tools/testing/selftests/bpf/testing_helpers.h |  2 +
  4 files changed, 101 insertions(+), 2 deletions(-)

create mode 100644 tools/testing/selftests/bpf/progs/freplace_progmap.c

tools/testing/selftests/bpf/prog_tests/fexit_bpf2bpf.c +32 -0
index d1e32e792536..dac088217f0f 100644
@@ -500,6 +500,57 @@ 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 bpf_object *obj, *tgt_obj = NULL;
+	struct bpf_program *drop, *redirect;
+	struct bpf_map *cpumap;
+	int err, tgt_fd;
+	__u32 key = 0;
+
+	err = bpf_prog_test_open("freplace_progmap.bpf.o", BPF_PROG_TYPE_UNSPEC, &obj);
+	if (!ASSERT_OK(err, "prog_open"))
+		return;
+
+	err = bpf_prog_test_load("xdp_dummy.bpf.o", BPF_PROG_TYPE_UNSPEC, &tgt_obj, &tgt_fd);
+	if (!ASSERT_OK(err, "tgt_prog_load"))
+		goto out;
+
+	drop = bpf_object__find_program_by_name(obj, "xdp_drop_prog");
+	redirect = bpf_object__find_program_by_name(obj, "xdp_cpumap_prog");
+	cpumap = bpf_object__find_map_by_name(obj, "cpu_map");
+
+	if (!ASSERT_OK_PTR(drop, "drop") || !ASSERT_OK_PTR(redirect, "redirect") ||
+	    !ASSERT_OK_PTR(cpumap, "cpumap"))
+		goto out;
+
+	/* Change the 'redirect' program type to be a PROG_TYPE_EXT
+	 * with an XDP target
+	 */
+	bpf_program__set_type(redirect, BPF_PROG_TYPE_EXT);
+	bpf_program__set_expected_attach_type(redirect, 0);
+	err = bpf_program__set_attach_target(redirect, tgt_fd, "xdp_dummy_prog");
+	if (!ASSERT_OK(err, "set_attach_target"))

tools/testing/selftests/bpf/prog_tests/fexit_bpf2bpf.c static void test_fentry_to_cgroup_bpf(void) · line 544

Quoted 10 lines
tools/testing/selftests/bpf/prog_tests/fexit_bpf2bpf.c +10 -0
+		goto out;
+
+	err = bpf_object__load(obj);
+	if (!ASSERT_OK(err, "obj_load"))
+		goto out;
+
+	/* This will fail if the map is "owned" by a PROG_TYPE_EXT program,
+	 * which, prior to fixing the kernel, it will be since the map is used
+	 * from the 'redirect' prog above
+	 */

The comment is confusing like 'which, prior to fixing the kernel, it will be'. IIUC, the verifier expects the map 'owner' program type is PROG_TYPE_EXT, but it is XDP without this patch. Hence, the test will
fail without the patch 1.

Quoted 19 lines
tools/testing/selftests/bpf/prog_tests/fexit_bpf2bpf.c +11 -0
+	value.bpf_prog.fd = bpf_program__fd(drop);
+	err = bpf_map_update_elem(bpf_map__fd(cpumap), &key, &value, 0);
+	ASSERT_OK(err, "map_update");
+
+out:
+	bpf_object__close(tgt_obj);
+	bpf_object__close(obj);
+}
+
  /* NOTE: affect other tests, must run in serial mode */
  void serial_test_fexit_bpf2bpf(void)
  {
@@ -525,4 +576,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();
  }

[...]

#3 lore raw

Re: [PATCH bpf v2 2/2] selftests/bpf: Add a test for using a cpumap from an freplace-to-XDP program

In reply to Toke Høiland-Jørgensen
Quoted 91 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 to PROG_TYPE_EXT instead of being resolved to PROG_TYPE_XDP.

---
 .../selftests/bpf/prog_tests/fexit_bpf2bpf.c  | 53 +++++++++++++++++++
 .../selftests/bpf/progs/freplace_progmap.c    | 24 +++++++++
 tools/testing/selftests/bpf/testing_helpers.c | 24 ++++++++-
 tools/testing/selftests/bpf/testing_helpers.h |  2 +
 4 files changed, 101 insertions(+), 2 deletions(-)
 create mode 100644 tools/testing/selftests/bpf/progs/freplace_progmap.c
tools/testing/selftests/bpf/prog_tests/fexit_bpf2bpf.c +53 -0
index d1e32e792536..dac088217f0f 100644
@@ -500,6 +500,57 @@ 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 bpf_object *obj, *tgt_obj = NULL;
+       struct bpf_program *drop, *redirect;
+       struct bpf_map *cpumap;
+       int err, tgt_fd;
+       __u32 key = 0;
+
+       err = bpf_prog_test_open("freplace_progmap.bpf.o", BPF_PROG_TYPE_UNSPEC, &obj);
+       if (!ASSERT_OK(err, "prog_open"))
+               return;
+
+       err = bpf_prog_test_load("xdp_dummy.bpf.o", BPF_PROG_TYPE_UNSPEC, &tgt_obj, &tgt_fd);
+       if (!ASSERT_OK(err, "tgt_prog_load"))
+               goto out;
+
+       drop = bpf_object__find_program_by_name(obj, "xdp_drop_prog");
+       redirect = bpf_object__find_program_by_name(obj, "xdp_cpumap_prog");
+       cpumap = bpf_object__find_map_by_name(obj, "cpu_map");
+
+       if (!ASSERT_OK_PTR(drop, "drop") || !ASSERT_OK_PTR(redirect, "redirect") ||
+           !ASSERT_OK_PTR(cpumap, "cpumap"))
+               goto out;
+
+       /* Change the 'redirect' program type to be a PROG_TYPE_EXT
+        * with an XDP target
+        */
+       bpf_program__set_type(redirect, BPF_PROG_TYPE_EXT);
+       bpf_program__set_expected_attach_type(redirect, 0);
+       err = bpf_program__set_attach_target(redirect, tgt_fd, "xdp_dummy_prog");
+       if (!ASSERT_OK(err, "set_attach_target"))
+               goto out;
+
+       err = bpf_object__load(obj);
+       if (!ASSERT_OK(err, "obj_load"))
+               goto out;
+
+       /* This will fail if the map is "owned" by a PROG_TYPE_EXT program,
+        * which, prior to fixing the kernel, it will be since the map is used
+        * from the 'redirect' prog above
+        */
+       value.bpf_prog.fd = bpf_program__fd(drop);
+       err = bpf_map_update_elem(bpf_map__fd(cpumap), &key, &value, 0);
+       ASSERT_OK(err, "map_update");
+
+out:
+       bpf_object__close(tgt_obj);
+       bpf_object__close(obj);
+}
+
 /* NOTE: affect other tests, must run in serial mode */
 void serial_test_fexit_bpf2bpf(void)
 {
@@ -525,4 +576,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
new file mode 100644
index 000000000000..68174c3d7b37

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));

so old school... ;) have you tried:

__type(key, __u32);
__type(value, struct bpf_cpumap_val);

?

Quoted 45 lines
tools/testing/selftests/bpf/progs/freplace_progmap.c new file +16 -0
+       __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";
tools/testing/selftests/bpf/testing_helpers.c +12 -2
index 9695318e8132..2050244e6f24 100644
@@ -174,8 +174,8 @@ __u32 link_info_prog_id(const struct bpf_link *link, struct bpf_link_info *info)
 
 int extra_prog_load_log_flags = 0;
 
-int bpf_prog_test_load(const char *file, enum bpf_prog_type type,
-                      struct bpf_object **pobj, int *prog_fd)
+int bpf_prog_test_open(const char *file, enum bpf_prog_type type,
+                      struct bpf_object **pobj)
 {
        LIBBPF_OPTS(bpf_object_open_opts, opts,
                .kernel_log_level = extra_prog_load_log_flags,
@@ -201,6 +201,26 @@ int bpf_prog_test_load(const char *file, enum bpf_prog_type type,
        flags = bpf_program__flags(prog) | BPF_F_TEST_RND_HI32;
        bpf_program__set_flags(prog, flags);
 
+       *pobj = obj;
+       return 0;
+err_out:
+       bpf_object__close(obj);
+       return err;
+}
+
+int bpf_prog_test_load(const char *file, enum bpf_prog_type type,
+                      struct bpf_object **pobj, int *prog_fd)
+{

tools/testing/selftests/bpf/testing_helpers.c int bpf_prog_test_load(const char *file, enum bpf_prog_type type, · line 223

Quoted 10 lines
tools/testing/selftests/bpf/testing_helpers.c +10 -0
+       struct bpf_program *prog;
+       struct bpf_object *obj;
+       int err;
+
+       err = bpf_prog_test_open(file, type, &obj);
+       if (err)
+               return err;
+
+       prog = bpf_object__next_program(obj, NULL);
+

oh, wow, wait, do we really need to add more legacy stuff like this? Why can't you use BPF skeletons? Avoid all the lookups by name, no need for helpers like this?

Quoted 19 lines
tools/testing/selftests/bpf/testing_helpers.c +0 -0
        err = bpf_object__load(obj);
        if (err)
                goto err_out;
tools/testing/selftests/bpf/testing_helpers.h +2 -1
index 6ec00bf79cb5..977eb520d119 100644
@@ -6,6 +6,8 @@
 
 int parse_num_list(const char *s, bool **set, int *set_len);
 __u32 link_info_prog_id(const struct bpf_link *link, struct bpf_link_info *info);
+int bpf_prog_test_open(const char *file, enum bpf_prog_type type,
+                      struct bpf_object **pobj);
 int bpf_prog_test_load(const char *file, enum bpf_prog_type type,
                       struct bpf_object **pobj, int *prog_fd);
 int bpf_test_load_program(enum bpf_prog_type type, const struct bpf_insn *insns,
--

2.38.1

Acked-by on v2 1/2
#4 lore raw
In reply to Toke Høiland-Jørgensen
Quoted 15 lines · Toke Høiland-Jørgensen

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.

Quoted 6 lines

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.

Fixes f45d5b6ce2e8 ("bpf: generalise tail call map compatibility check")