Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

selftests/bpf: xdp_metadata: Check XDP_REDIRCT support for dev-bound progs

Improve xdp_metadata bpf selftest in order to check it is possible for a
XDP dev-bound program to perform XDP_REDIRECT into a DEVMAP but it is still
not allowed to attach a XDP dev-bound program to a DEVMAP entry.

Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>
Acked-by: Stanislav Fomichev <sdf@fomichev.me>

authored by

Lorenzo Bianconi and committed by
Martin KaFai Lau
3678331c 714070c4

+34 -1
+21 -1
tools/testing/selftests/bpf/prog_tests/xdp_metadata.c
··· 351 351 struct xdp_metadata2 *bpf_obj2 = NULL; 352 352 struct xdp_metadata *bpf_obj = NULL; 353 353 struct bpf_program *new_prog, *prog; 354 + struct bpf_devmap_val devmap_e = {}; 355 + struct bpf_map *prog_arr, *devmap; 354 356 struct nstoken *tok = NULL; 355 357 __u32 queue_id = QUEUE_ID; 356 - struct bpf_map *prog_arr; 357 358 struct xsk tx_xsk = {}; 358 359 struct xsk rx_xsk = {}; 359 360 __u32 val, key = 0; ··· 410 409 bpf_program__set_ifindex(prog, rx_ifindex); 411 410 bpf_program__set_flags(prog, BPF_F_XDP_DEV_BOUND_ONLY); 412 411 412 + /* Make sure we can load a dev-bound program that performs 413 + * XDP_REDIRECT into a devmap. 414 + */ 415 + new_prog = bpf_object__find_program_by_name(bpf_obj->obj, "redirect"); 416 + bpf_program__set_ifindex(new_prog, rx_ifindex); 417 + bpf_program__set_flags(new_prog, BPF_F_XDP_DEV_BOUND_ONLY); 418 + 413 419 if (!ASSERT_OK(xdp_metadata__load(bpf_obj), "load skeleton")) 414 420 goto out; 415 421 ··· 429 421 if (!ASSERT_ERR(bpf_map__update_elem(prog_arr, &key, sizeof(key), 430 422 &val, sizeof(val), BPF_ANY), 431 423 "update prog_arr")) 424 + goto out; 425 + 426 + /* Make sure we can't add dev-bound programs to devmaps. */ 427 + devmap = bpf_object__find_map_by_name(bpf_obj->obj, "dev_map"); 428 + if (!ASSERT_OK_PTR(devmap, "no dev_map found")) 429 + goto out; 430 + 431 + devmap_e.bpf_prog.fd = val; 432 + if (!ASSERT_ERR(bpf_map__update_elem(devmap, &key, sizeof(key), 433 + &devmap_e, sizeof(devmap_e), 434 + BPF_ANY), 435 + "update dev_map")) 432 436 goto out; 433 437 434 438 /* Attach BPF program to RX interface. */
+13
tools/testing/selftests/bpf/progs/xdp_metadata.c
··· 19 19 __type(value, __u32); 20 20 } prog_arr SEC(".maps"); 21 21 22 + struct { 23 + __uint(type, BPF_MAP_TYPE_DEVMAP); 24 + __uint(key_size, sizeof(__u32)); 25 + __uint(value_size, sizeof(struct bpf_devmap_val)); 26 + __uint(max_entries, 1); 27 + } dev_map SEC(".maps"); 28 + 22 29 extern int bpf_xdp_metadata_rx_timestamp(const struct xdp_md *ctx, 23 30 __u64 *timestamp) __ksym; 24 31 extern int bpf_xdp_metadata_rx_hash(const struct xdp_md *ctx, __u32 *hash, ··· 100 93 &meta->rx_vlan_tci); 101 94 102 95 return bpf_redirect_map(&xsk, ctx->rx_queue_index, XDP_PASS); 96 + } 97 + 98 + SEC("xdp") 99 + int redirect(struct xdp_md *ctx) 100 + { 101 + return bpf_redirect_map(&dev_map, ctx->rx_queue_index, XDP_PASS); 103 102 } 104 103 105 104 char _license[] SEC("license") = "GPL";