libbpf: streamline netlink-based XDP APIs
Subsystems (6)
Andrii Nakryiko
maintainercover libbpf: streamline netlink-based XDP APIs
Revamp existing low-level XDP APIs provided by libbpf to follow more consistent naming (new APIs follow bpf_tc_xxx() approach where it makes sense) and be extensible without ABI breakages (OPTS-based). See patch #1 for details, remaining patches switch bpftool, selftests/bpf and samples/bpf to new APIs.
Andrii Nakryiko (4):
libbpf: streamline low-level XDP APIs
bpftool: use new API for attaching XDP program selftests/bpf: switch to new libbpf XDP APIs samples/bpf: adapt samples/bpf to bpf_xdp_xxx() APIs
samples/bpf/xdp1_user.c | 8 +- samples/bpf/xdp_adjust_tail_user.c | 8 +- samples/bpf/xdp_fwd_user.c | 4 +- samples/bpf/xdp_router_ipv4_user.c | 10 +- samples/bpf/xdp_rxq_info_user.c | 8 +- samples/bpf/xdp_sample_pkts_user.c | 8 +- samples/bpf/xdp_sample_user.c | 9 +- samples/bpf/xdp_tx_iptunnel_user.c | 10 +- samples/bpf/xdpsock_ctrl_proc.c | 2 +- samples/bpf/xdpsock_user.c | 10 +- samples/bpf/xsk_fwd.c | 4 +- tools/bpf/bpftool/net.c | 2 +- tools/lib/bpf/libbpf.h | 29 +++++ tools/lib/bpf/libbpf.map | 4 + tools/lib/bpf/netlink.c | 117 +++++++++++++----- .../selftests/bpf/prog_tests/xdp_attach.c | 29 ++--- .../bpf/prog_tests/xdp_cpumap_attach.c | 8 +- .../bpf/prog_tests/xdp_devmap_attach.c | 8 +- .../selftests/bpf/prog_tests/xdp_info.c | 14 +-- .../selftests/bpf/prog_tests/xdp_link.c | 26 ++-- .../selftests/bpf/xdp_redirect_multi.c | 8 +- tools/testing/selftests/bpf/xdping.c | 4 +- 22 files changed, 205 insertions(+), 125 deletions(-)
Signature · 1 line
2.30.2
Andrii Nakryiko
maintainerPATCH 1/4 libbpf: streamline low-level XDP APIs
Introduce 4 new netlink-based XDP APIs for attaching, detaching, and querying XDP programs:
- bpf_xdp_attach;
- bpf_xdp_detach;
- bpf_xdp_query;
- bpf_xdp_query_id.
These APIs replace bpf_set_link_xdp_fd, bpf_set_link_xdp_fd_opts, bpf_get_link_xdp_id, and bpf_get_link_xdp_info APIs ([0]). The latter don't follow a consistent naming pattern and some of them use non-extensible approaches (e.g., struct xdp_link_info which can't be modified without breaking libbpf ABI).
The approach I took with these low-level XDP APIs is similar to what we did with low-level TC APIs. There is a nice duality of bpf_tc_attach vs bpf_xdp_attach, and so on. I left bpf_xdp_attach() to support detaching when -1 is specified for prog_fd for generality and convenience, but bpf_xdp_detach() is preferred due to clearer naming and associated semantics. Both bpf_xdp_attach() and bpf_xdp_detach() accept the same opts struct allowing to specify expected old_prog_fd.
While doing the refactoring, I noticed that old APIs require users to specify opts with old_fd == -1 to declare "don't care about already attached XDP prog fd" condition. Otherwise, FD 0 is assumed, which is essentially never an intended behavior. So I made this behavior consistent with other kernel and libbpf APIs, in which zero FD means "no FD". This seems to be more in line with the latest thinking in BPF land and should cause less user confusion, hopefully.
For querying, I left two APIs, both more generic bpf_xdp_query() allowing to query multiple IDs and attach mode, but also
a specialization of it, bpf_xdp_query_id(), which returns only requested prog_id. Uses of prog_id returning bpf_get_link_xdp_id() were so prevalent across selftests and samples, that it seemed a very common use case and using bpf_xdp_query() for doing it felt very cumbersome with a highly branches if/else chain based on flags and attach mode.
Old APIs are scheduled for deprecation in libbpf 0.8 release.
[0] Closes: https://github.com/libbpf/libbpf/issues/309
--- tools/lib/bpf/libbpf.h | 29 ++++++++++ tools/lib/bpf/libbpf.map | 4 ++ tools/lib/bpf/netlink.c | 117 ++++++++++++++++++++++++++++----------- 3 files changed, 117 insertions(+), 33 deletions(-)
tools/lib/bpf/libbpf.h +29 -0
@@ -833,13 +833,42 @@ struct bpf_xdp_set_link_opts { };#define bpf_xdp_set_link_opts__last_field old_fd +LIBBPF_DEPRECATED_SINCE(0, 8, "use bpf_xdp_attach() instead") LIBBPF_API int bpf_set_link_xdp_fd(int ifindex, int fd, __u32 flags); +LIBBPF_DEPRECATED_SINCE(0, 8, "use bpf_xdp_attach() instead") LIBBPF_API int bpf_set_link_xdp_fd_opts(int ifindex, int fd, __u32 flags,const struct bpf_xdp_set_link_opts *opts); +LIBBPF_DEPRECATED_SINCE(0, 8, "use bpf_xdp_query_id() instead") LIBBPF_API int bpf_get_link_xdp_id(int ifindex, __u32 *prog_id, __u32 flags); +LIBBPF_DEPRECATED_SINCE(0, 8, "use bpf_xdp_query() instead") LIBBPF_API int bpf_get_link_xdp_info(int ifindex, struct xdp_link_info *info,size_t info_size,__u32 flags); +struct bpf_xdp_attach_opts { +size_t sz; +int old_prog_fd; + size_t :0; +}; +#define bpf_xdp_attach_opts__last_field old_prog_fd + +struct bpf_xdp_query_opts { +size_t sz; +__u32 prog_id;/* output */ +__u32 drv_prog_id;/* output */ +__u32 hw_prog_id;/* output */ +__u32 skb_prog_id;/* output */ +__u8 attach_mode;/* output */ + size_t :0; +}; +#define bpf_xdp_query_opts__last_field attach_mode + +LIBBPF_API int bpf_xdp_attach(int ifindex, int prog_fd, __u32 flags, +const struct bpf_xdp_attach_opts *opts); +LIBBPF_API int bpf_xdp_detach(int ifindex, __u32 flags, +const struct bpf_xdp_attach_opts *opts); +LIBBPF_API int bpf_xdp_query(int ifindex, int flags, struct bpf_xdp_query_opts *opts); +LIBBPF_API int bpf_xdp_query_id(int ifindex, int flags, __u32 *prog_id); +/* TC related API */ enum bpf_tc_attach_point {BPF_TC_INGRESS =1 <<0 ,
tools/lib/bpf/libbpf.map +4 -0
@@ -428,6 +428,10 @@ LIBBPF_0.7.0 { bpf_program__log_level; bpf_program__set_log_buf; bpf_program__set_log_level; + bpf_xdp_attach; + bpf_xdp_detach; + bpf_xdp_query; + bpf_xdp_query_id; libbpf_probe_bpf_helper; libbpf_probe_bpf_map_type; libbpf_probe_bpf_prog_type;
tools/lib/bpf/netlink.c +84 -33
159 lines not on this page · raw message
Signature · 1 line
2.30.2
Re: [PATCH bpf-next 1/4] libbpf: streamline low-level XDP APIs
Quoted 37 lines · Andrii Nakryiko
Introduce 4 new netlink-based XDP APIs for attaching, detaching, and querying XDP programs:
-bpf_xdp_attach;
-bpf_xdp_detach;
-bpf_xdp_query;
-bpf_xdp_query_id.These APIs replace
bpf_set_link_xdp_fd,bpf_set_link_xdp_fd_opts,bpf_get_link_xdp_id, andbpf_get_link_xdp_infoAPIs ([0]). The latter don't follow a consistent naming pattern and some of them use non-extensible approaches (e.g., structxdp_link_infowhich can't be modified without breaking libbpf ABI).The approach I took with these low-level XDP APIs is similar to what we did with low-level TC APIs. There is a nice duality of
bpf_tc_attachvsbpf_xdp_attach, and so on. I leftbpf_xdp_attach()to support detaching when -1 is specified forprog_fdfor generality and convenience, butbpf_xdp_detach()is preferred due to clearer naming and associated semantics. Bothbpf_xdp_attach()andbpf_xdp_detach()accept the same opts struct allowing to specify expectedold_prog_fd.While doing the refactoring, I noticed that old APIs require users to specify opts with
old_fd== -1 to declare "don't care about already attached XDP prog fd" condition. Otherwise, FD 0 is assumed, which is essentially never an intended behavior. So I made this behavior consistent with other kernel and libbpf APIs, in which zero FD means "no FD". This seems to be more in line with the latest thinking in BPF land and should cause less user confusion, hopefully.For querying, I left two APIs, both more generic
bpf_xdp_query()allowing to query multiple IDs and attach mode, but also
a specialization of it,bpf_xdp_query_id(), which returns only requestedprog_id. Uses ofprog_idreturningbpf_get_link_xdp_id()were so prevalent across selftests and samples, that it seemed a very common use case and usingbpf_xdp_query()for doing it felt very cumbersome with a highly branches if/else chain based on flags and attach mode.
Quoted 5 lines
Old APIs are scheduled for deprecation in libbpf 0.8 release.
[0] Closes: https://github.com/libbpf/libbpf/issues/309
Signed-off-by Andrii Nakryiko <[email protected]>
Andrii Nakryiko
maintainerPATCH 2/4 bpftool: use new API for attaching XDP program
In reply to Andrii NakryikoSwitch to new bpf_xdp_attach() API to avoid deprecation warnings.
--- tools/bpf/bpftool/net.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/bpf/bpftool/net.c +1 -1
@@ -551,7 +551,7 @@ static int do_attach_detach_xdp(int progfd, enum net_attach_type attach_type,if (attach_type ==NET_ATTACH_TYPE_XDP_OFFLOAD ) flags |=XDP_FLAGS_HW_MODE ; -return bpf_set_link_xdp_fd (ifindex, progfd, flags); +return bpf_xdp_attach (ifindex, progfd, flags,NULL ); }static int do_attach (int argc,char **argv)
Signature · 1 line
2.30.2
Andrii Nakryiko
maintainerPATCH 3/4 selftests/bpf: switch to new libbpf XDP APIs
In reply to Andrii NakryikoSwitch to using new bpf_xdp_*() APIs across all selftests. Take advantage of a more straightforward and user-friendly semantics of old_prog_fd (0 means "don't care") in few places.
--- .../selftests/bpf/prog_tests/xdp_attach.c | 29 +++++++++---------- .../bpf/prog_tests/xdp_cpumap_attach.c | 8 ++--- .../bpf/prog_tests/xdp_devmap_attach.c | 8 ++--- .../selftests/bpf/prog_tests/xdp_info.c | 14 ++++----- .../selftests/bpf/prog_tests/xdp_link.c | 26 ++++++++--------- .../selftests/bpf/xdp_redirect_multi.c | 8 ++--- tools/testing/selftests/bpf/xdping.c | 4 +-- 7 files changed, 47 insertions(+), 50 deletions(-)
tools/testing/selftests/bpf/prog_tests/xdp_attach.c +13 -16
@@ -11,8 +11,7 @@ void serial_test_xdp_attach(void)const char *file ="./test_xdp.o" ;struct bpf_prog_info info = {};int err, fd1, fd2, fd3; -DECLARE_LIBBPF_OPTS (bpf_xdp_set_link_opts, opts, - .old_fd = -1); +LIBBPF_OPTS (bpf_xdp_attach_opts, opts); len =sizeof (info);
@@ -38,49 +37,47 @@ void serial_test_xdp_attach(void)if (CHECK_FAIL (err)) goto out_2; - err =bpf_set_link_xdp_fd_opts (IFINDEX_LO , fd1,XDP_FLAGS_REPLACE , - &opts); + err =bpf_xdp_attach (IFINDEX_LO , fd1,XDP_FLAGS_REPLACE , &opts);if (CHECK (err,"load_ok" ,"initial load failed" )) goto out_close; - err =bpf_get_link_xdp_id (IFINDEX_LO , &id0,0 ); + err =bpf_xdp_query_id (IFINDEX_LO ,0 , &id0);if (CHECK (err || id0 != id1,"id1_check" ,"loaded prog id %u != id1 %u, err %d" , id0, id1, err)) goto out_close; - err =bpf_set_link_xdp_fd_opts (IFINDEX_LO , fd2,XDP_FLAGS_REPLACE , - &opts); + err =bpf_xdp_attach (IFINDEX_LO , fd2,XDP_FLAGS_REPLACE , &opts);if (CHECK (!err,"load_fail" ,"load with expected id didn't fail" )) goto out; - opts.old_fd = fd1; - err =bpf_set_link_xdp_fd_opts (IFINDEX_LO , fd2,0 , &opts); + opts.old_prog_fd = fd1; + err =bpf_xdp_attach (IFINDEX_LO , fd2,0 , &opts);if (CHECK (err,"replace_ok" ,"replace valid old_fd failed" )) goto out; - err =bpf_get_link_xdp_id (IFINDEX_LO , &id0,0 ); + err =bpf_xdp_query_id (IFINDEX_LO ,0 , &id0);if (CHECK (err || id0 != id2,"id2_check" ,"loaded prog id %u != id2 %u, err %d" , id0, id2, err)) goto out_close; - err =bpf_set_link_xdp_fd_opts (IFINDEX_LO , fd3,0 , &opts); + err =bpf_xdp_attach (IFINDEX_LO , fd3,0 , &opts);if (CHECK (!err,"replace_fail" ,"replace invalid old_fd didn't fail" )) goto out; - err =bpf_set_link_xdp_fd_opts (IFINDEX_LO ,-1 ,0 , &opts); + err =bpf_xdp_detach (IFINDEX_LO ,0 , &opts);if (CHECK (!err,"remove_fail" ,"remove invalid old_fd didn't fail" )) goto out; - opts.old_fd = fd2; - err =bpf_set_link_xdp_fd_opts (IFINDEX_LO ,-1 ,0 , &opts); + opts.old_prog_fd = fd2; + err =bpf_xdp_detach (IFINDEX_LO ,0 , &opts);if (CHECK (err,"remove_ok" ,"remove valid old_fd failed" )) goto out; - err =bpf_get_link_xdp_id (IFINDEX_LO , &id0,0 ); + err =bpf_xdp_query_id (IFINDEX_LO ,0 , &id0);if (CHECK (err || id0 !=0 ,"unload_check" ,"loaded prog id %u != 0, err %d" , id0, err)) goto out_close; out: -bpf_set_link_xdp_fd (IFINDEX_LO ,-1 ,0 ); +bpf_xdp_detach (IFINDEX_LO ,0 ,NULL ); out_close:bpf_object__close (obj3); out_2:
tools/testing/selftests/bpf/prog_tests/xdp_cpumap_attach.c +4 -4
@@ -23,11 +23,11 @@ void serial_test_xdp_cpumap_attach(void)return ; prog_fd =bpf_program__fd (skel->progs.xdp_redir_prog); - err =bpf_set_link_xdp_fd (IFINDEX_LO , prog_fd,XDP_FLAGS_SKB_MODE ); + err =bpf_xdp_attach (IFINDEX_LO , prog_fd,XDP_FLAGS_SKB_MODE ,NULL );if (!ASSERT_OK (err,"Generic attach of program with 8-byte CPUMAP" )) goto out_close; - err =bpf_set_link_xdp_fd (IFINDEX_LO ,-1 ,XDP_FLAGS_SKB_MODE ); + err =bpf_xdp_detach (IFINDEX_LO ,XDP_FLAGS_SKB_MODE ,NULL );ASSERT_OK (err,"XDP program detach" ); prog_fd =bpf_program__fd (skel->progs.xdp_dummy_cm);
@@ -45,9 +45,9 @@ void serial_test_xdp_cpumap_attach(void)ASSERT_EQ (info.id, val.bpf_prog.id,"Match program id to cpumap entry prog_id" );/* can not attach BPF_XDP_CPUMAP program to a device */ - err =bpf_set_link_xdp_fd (IFINDEX_LO , prog_fd,XDP_FLAGS_SKB_MODE ); + err =bpf_xdp_attach (IFINDEX_LO , prog_fd,XDP_FLAGS_SKB_MODE ,NULL );if (!ASSERT_NEQ (err,0 ,"Attach of BPF_XDP_CPUMAP program" )) -bpf_set_link_xdp_fd (IFINDEX_LO ,-1 ,XDP_FLAGS_SKB_MODE ); +bpf_xdp_detach (IFINDEX_LO ,XDP_FLAGS_SKB_MODE ,NULL ); val.qsize =192 ; val.bpf_prog.fd =bpf_program__fd (skel->progs.xdp_dummy_prog);
tools/testing/selftests/bpf/prog_tests/xdp_devmap_attach.c +4 -4
@@ -25,11 +25,11 @@ static void test_xdp_with_devmap_helpers(void)return ; dm_fd =bpf_program__fd (skel->progs.xdp_redir_prog); - err =bpf_set_link_xdp_fd (IFINDEX_LO , dm_fd,XDP_FLAGS_SKB_MODE ); + err =bpf_xdp_attach (IFINDEX_LO , dm_fd,XDP_FLAGS_SKB_MODE ,NULL );if (!ASSERT_OK (err,"Generic attach of program with 8-byte devmap" )) goto out_close; - err =bpf_set_link_xdp_fd (IFINDEX_LO ,-1 ,XDP_FLAGS_SKB_MODE ); + err =bpf_xdp_detach (IFINDEX_LO ,XDP_FLAGS_SKB_MODE ,NULL );ASSERT_OK (err,"XDP program detach" ); dm_fd =bpf_program__fd (skel->progs.xdp_dummy_dm);
@@ -47,9 +47,9 @@ static void test_xdp_with_devmap_helpers(void)ASSERT_EQ (info.id, val.bpf_prog.id,"Match program id to devmap entry prog_id" );/* can not attach BPF_XDP_DEVMAP program to a device */ - err =bpf_set_link_xdp_fd (IFINDEX_LO , dm_fd,XDP_FLAGS_SKB_MODE ); + err =bpf_xdp_attach (IFINDEX_LO , dm_fd,XDP_FLAGS_SKB_MODE ,NULL );if (!ASSERT_NEQ (err,0 ,"Attach of BPF_XDP_DEVMAP program" )) -bpf_set_link_xdp_fd (IFINDEX_LO ,-1 ,XDP_FLAGS_SKB_MODE ); +bpf_xdp_detach (IFINDEX_LO ,XDP_FLAGS_SKB_MODE ,NULL ); val.ifindex =1 ; val.bpf_prog.fd =bpf_program__fd (skel->progs.xdp_dummy_prog);
tools/testing/selftests/bpf/prog_tests/xdp_info.c +7 -7
@@ -14,13 +14,13 @@ void serial_test_xdp_info(void)/* Get prog_id for XDP_ATTACHED_NONE mode */ - err =bpf_get_link_xdp_id (IFINDEX_LO , &prog_id,0 ); + err =bpf_xdp_query_id (IFINDEX_LO ,0 , &prog_id);if (CHECK (err,"get_xdp_none" ,"errno=%d\n" , errno))return ;if (CHECK (prog_id,"prog_id_none" ,"unexpected prog_id=%u\n" , prog_id))return ; - err =bpf_get_link_xdp_id (IFINDEX_LO , &prog_id,XDP_FLAGS_SKB_MODE ); + err =bpf_xdp_query_id (IFINDEX_LO ,XDP_FLAGS_SKB_MODE , &prog_id);if (CHECK (err,"get_xdp_none_skb" ,"errno=%d\n" , errno))return ; if (CHECK(prog_id, "prog_id_none_skb", "unexpected prog_id=%u\n",
@@ -37,32 +37,32 @@ void serial_test_xdp_info(void)if (CHECK (err,"get_prog_info" ,"errno=%d\n" , errno)) goto out_close; - err =bpf_set_link_xdp_fd (IFINDEX_LO , prog_fd,XDP_FLAGS_SKB_MODE ); + err =bpf_xdp_attach (IFINDEX_LO , prog_fd,XDP_FLAGS_SKB_MODE ,NULL );if (CHECK (err,"set_xdp_skb" ,"errno=%d\n" , errno)) goto out_close;/* Get prog_id for single prog mode */ - err =bpf_get_link_xdp_id (IFINDEX_LO , &prog_id,0 ); + err =bpf_xdp_query_id (IFINDEX_LO ,0 , &prog_id);if (CHECK (err,"get_xdp" ,"errno=%d\n" , errno)) goto out;if (CHECK (prog_id != info.id,"prog_id" ,"prog_id not available\n" )) goto out; - err =bpf_get_link_xdp_id (IFINDEX_LO , &prog_id,XDP_FLAGS_SKB_MODE ); + err =bpf_xdp_query_id (IFINDEX_LO ,XDP_FLAGS_SKB_MODE , &prog_id);if (CHECK (err,"get_xdp_skb" ,"errno=%d\n" , errno)) goto out;if (CHECK (prog_id != info.id,"prog_id_skb" ,"prog_id not available\n" )) goto out; - err =bpf_get_link_xdp_id (IFINDEX_LO , &prog_id,XDP_FLAGS_DRV_MODE ); + err =bpf_xdp_query_id (IFINDEX_LO ,XDP_FLAGS_DRV_MODE , &prog_id);if (CHECK (err,"get_xdp_drv" ,"errno=%d\n" , errno)) goto out;if (CHECK (prog_id,"prog_id_drv" ,"unexpected prog_id=%u\n" , prog_id)) goto out; out: -bpf_set_link_xdp_fd (IFINDEX_LO ,-1 ,0 ); +bpf_xdp_detach (IFINDEX_LO ,0 ,NULL ); out_close:bpf_object__close (obj); }
tools/testing/selftests/bpf/prog_tests/xdp_link.c +13 -13
@@ -9,8 +9,8 @@void serial_test_xdp_link (void ) {__u32 duration =0 , id1, id2, id0 =0 , prog_fd1, prog_fd2, err; - DECLARE_LIBBPF_OPTS(bpf_xdp_set_link_opts, opts, .old_fd = -1);struct test_xdp_link *skel1 =NULL , *skel2 =NULL ; +LIBBPF_OPTS (bpf_xdp_attach_opts, opts);struct bpf_link_info link_info;struct bpf_prog_info prog_info;struct bpf_link *link;
@@ -40,12 +40,12 @@ void serial_test_xdp_link(void) id2 = prog_info.id;/* set initial prog attachment */ - err =bpf_set_link_xdp_fd_opts (IFINDEX_LO , prog_fd1,XDP_FLAGS_REPLACE , &opts); + err =bpf_xdp_attach (IFINDEX_LO , prog_fd1,XDP_FLAGS_REPLACE , &opts);if (CHECK (err,"fd_attach" ,"initial prog attach failed: %d\n" , err)) goto cleanup;/* validate prog ID */ - err =bpf_get_link_xdp_id (IFINDEX_LO , &id0,0 ); + err =bpf_xdp_query_id (IFINDEX_LO ,0 , &id0);CHECK (err || id0 != id1,"id1_check" ,"loaded prog id %u != id1 %u, err %d" , id0, id1, err);
@@ -54,14 +54,14 @@ void serial_test_xdp_link(void)if (!ASSERT_ERR_PTR (link,"link_attach_should_fail" )) {bpf_link__destroy (link);/* best-effort detach prog */ - opts.old_fd = prog_fd1; -bpf_set_link_xdp_fd_opts (IFINDEX_LO ,-1 ,XDP_FLAGS_REPLACE , &opts); + opts.old_prog_fd = prog_fd1; +bpf_xdp_detach (IFINDEX_LO ,XDP_FLAGS_REPLACE , &opts); goto cleanup; }/* detach BPF program */ - opts.old_fd = prog_fd1; - err =bpf_set_link_xdp_fd_opts (IFINDEX_LO ,-1 ,XDP_FLAGS_REPLACE , &opts); + opts.old_prog_fd = prog_fd1; + err =bpf_xdp_detach (IFINDEX_LO ,XDP_FLAGS_REPLACE , &opts);if (CHECK (err,"prog_detach" ,"failed %d\n" , err)) goto cleanup;
@@ -72,24 +72,24 @@ void serial_test_xdp_link(void) skel1->links.xdp_handler = link;/* validate prog ID */ - err =bpf_get_link_xdp_id (IFINDEX_LO , &id0,0 ); + err =bpf_xdp_query_id (IFINDEX_LO ,0 , &id0);if (CHECK (err || id0 != id1,"id1_check" ,"loaded prog id %u != id1 %u, err %d" , id0, id1, err)) goto cleanup;/* BPF prog attach is not allowed to replace BPF link */ - opts.old_fd = prog_fd1; - err =bpf_set_link_xdp_fd_opts (IFINDEX_LO , prog_fd2,XDP_FLAGS_REPLACE , &opts); + opts.old_prog_fd = prog_fd1; + err =bpf_xdp_attach (IFINDEX_LO , prog_fd2,XDP_FLAGS_REPLACE , &opts);if (CHECK (!err,"prog_attach_fail" ,"unexpected success\n" )) goto cleanup;/* Can't force-update when BPF link is active */ - err =bpf_set_link_xdp_fd (IFINDEX_LO , prog_fd2,0 ); + err =bpf_xdp_attach (IFINDEX_LO , prog_fd2,0 ,NULL );if (CHECK (!err,"prog_update_fail" ,"unexpected success\n" )) goto cleanup;/* Can't force-detach when BPF link is active */ - err =bpf_set_link_xdp_fd (IFINDEX_LO ,-1 ,0 ); + err =bpf_xdp_detach (IFINDEX_LO ,0 ,NULL );if (CHECK (!err,"prog_detach_fail" ,"unexpected success\n" )) goto cleanup;
@@ -109,7 +109,7 @@ void serial_test_xdp_link(void) goto cleanup; skel2->links.xdp_handler = link; - err =bpf_get_link_xdp_id (IFINDEX_LO , &id0,0 ); + err =bpf_xdp_query_id (IFINDEX_LO ,0 , &id0);if (CHECK (err || id0 != id2,"id2_check" ,"loaded prog id %u != id2 %u, err %d" , id0, id1, err)) goto cleanup;
tools/testing/selftests/bpf/xdp_redirect_multi.c +4 -4
@@ -32,12 +32,12 @@ static void int_exit(int sig)int i;for (i =0 ; ifaces[i] >0 ; i++) { -if (bpf_get_link_xdp_id (ifaces[i], &prog_id, xdp_flags)) { -printf ("bpf_get_link_xdp_id failed\n" ); +if (bpf_xdp_query_id (ifaces[i], xdp_flags, &prog_id)) { +printf ("bpf_xdp_query_id failed\n" );exit (1 ); }if (prog_id) -bpf_set_link_xdp_fd (ifaces[i],-1 , xdp_flags); +bpf_xdp_detach (ifaces[i], xdp_flags,NULL ); }exit (0 );
@@ -210,7 +210,7 @@ int main(int argc, char **argv) }/* bind prog_fd to each interface */ - ret =bpf_set_link_xdp_fd (ifindex, prog_fd, xdp_flags); + ret =bpf_xdp_attach (ifindex, prog_fd, xdp_flags,NULL );if (ret) {printf ("Set xdp fd failed on %d\n" , ifindex); goto err_out;
tools/testing/selftests/bpf/xdping.c +2 -2
@@ -29,7 +29,7 @@ static __u32 xdp_flags = XDP_FLAGS_UPDATE_IF_NOEXIST;static void cleanup (int sig) { -bpf_set_link_xdp_fd (ifindex,-1 , xdp_flags); +bpf_xdp_detach (ifindex, xdp_flags,NULL );if (sig)exit (1 ); }
@@ -203,7 +203,7 @@ int main(int argc, char **argv)printf ("XDP setup disrupts network connectivity, hit Ctrl+C to quit\n" ); -if (bpf_set_link_xdp_fd (ifindex, prog_fd, xdp_flags) <0 ) { +if (bpf_xdp_attach (ifindex, prog_fd, xdp_flags,NULL ) <0 ) {fprintf (stderr,"Link set xdp fd failed for %s\n" , ifname); goto done; }
Signature · 1 line
2.30.2
Andrii Nakryiko
maintainerPATCH 4/4 samples/bpf: adapt samples/bpf to bpf_xdp_xxx() APIs
In reply to Andrii NakryikoUse new bpf_xdp_*() APIs across all XDP-related BPF samples.
--- samples/bpf/xdp1_user.c | 8 ++++---- samples/bpf/xdp_adjust_tail_user.c | 8 ++++---- samples/bpf/xdp_fwd_user.c | 4 ++-- samples/bpf/xdp_router_ipv4_user.c | 10 +++++----- samples/bpf/xdp_rxq_info_user.c | 8 ++++---- samples/bpf/xdp_sample_pkts_user.c | 8 ++++---- samples/bpf/xdp_sample_user.c | 9 ++++----- samples/bpf/xdp_tx_iptunnel_user.c | 10 +++++----- samples/bpf/xdpsock_ctrl_proc.c | 2 +- samples/bpf/xdpsock_user.c | 10 +++++----- samples/bpf/xsk_fwd.c | 4 ++-- 11 files changed, 40 insertions(+), 41 deletions(-)
samples/bpf/xdp1_user.c +4 -4
@@ -26,12 +26,12 @@ static void int_exit(int sig) {__u32 curr_prog_id =0 ; -if (bpf_get_link_xdp_id (ifindex, &curr_prog_id, xdp_flags)) { -printf ("bpf_get_link_xdp_id failed\n" ); +if (bpf_xdp_query_id (ifindex, xdp_flags, &curr_prog_id)) { +printf ("bpf_xdp_query_id failed\n" );exit (1 ); }if (prog_id == curr_prog_id) -bpf_set_link_xdp_fd (ifindex,-1 , xdp_flags); +bpf_xdp_detach (ifindex, xdp_flags,NULL );else if (!curr_prog_id)printf ("couldn't find a prog id on a given interface\n" );else
@@ -143,7 +143,7 @@ int main(int argc, char **argv)signal (SIGINT , int_exit);signal (SIGTERM , int_exit); -if (bpf_set_link_xdp_fd (ifindex, prog_fd, xdp_flags) <0 ) { +if (bpf_xdp_attach (ifindex, prog_fd, xdp_flags,NULL ) <0 ) {printf ("link set xdp fd failed\n" );return 1 ; }
samples/bpf/xdp_adjust_tail_user.c +4 -4
@@ -34,12 +34,12 @@ static void int_exit(int sig)__u32 curr_prog_id =0 ;if (ifindex >-1 ) { -if (bpf_get_link_xdp_id (ifindex, &curr_prog_id, xdp_flags)) { -printf ("bpf_get_link_xdp_id failed\n" ); +if (bpf_xdp_query_id (ifindex, xdp_flags, &curr_prog_id)) { +printf ("bpf_xdp_query_id failed\n" );exit (1 ); }if (prog_id == curr_prog_id) -bpf_set_link_xdp_fd (ifindex,-1 , xdp_flags); +bpf_xdp_detach (ifindex, xdp_flags,NULL );else if (!curr_prog_id)printf ("couldn't find a prog id on a given iface\n" );else
@@ -173,7 +173,7 @@ int main(int argc, char **argv)signal (SIGINT , int_exit);signal (SIGTERM , int_exit); -if (bpf_set_link_xdp_fd (ifindex, prog_fd, xdp_flags) <0 ) { +if (bpf_xdp_attach (ifindex, prog_fd, xdp_flags,NULL ) <0 ) {printf ("link set xdp fd failed\n" );return 1 ; }
samples/bpf/xdp_fwd_user.c +2 -2
@@ -33,7 +33,7 @@ static int do_attach(int idx, int prog_fd, int map_fd, const char *name) {int err; - err =bpf_set_link_xdp_fd (idx, prog_fd, xdp_flags); + err =bpf_xdp_attach (idx, prog_fd, xdp_flags,NULL );if (err <0 ) {printf ("ERROR: failed to attach program to %s\n" , name);return err;
@@ -51,7 +51,7 @@ static int do_detach(int idx, const char *name) {int err; - err =bpf_set_link_xdp_fd (idx,-1 , xdp_flags); + err =bpf_xdp_detach (idx, xdp_flags,NULL );if (err <0 )printf ("ERROR: failed to detach program from %s\n" , name);
samples/bpf/xdp_router_ipv4_user.c +5 -5
@@ -43,13 +43,13 @@ static void int_exit(int sig)int i =0 ;for (i =0 ; i < total_ifindex; i++) { -if (bpf_get_link_xdp_id (ifindex_list[i], &prog_id, flags)) { -printf ("bpf_get_link_xdp_id on iface %d failed\n" , +if (bpf_xdp_query_id (ifindex_list[i], flags, &prog_id)) { +printf ("bpf_xdp_query_id on iface %d failed\n" , ifindex_list[i]);exit (1 ); }if (prog_id_list[i] == prog_id) -bpf_set_link_xdp_fd (ifindex_list[i],-1 , flags); +bpf_xdp_detach (ifindex_list[i], flags,NULL );else if (!prog_id)printf ("couldn't find a prog id on iface %d\n" , ifindex_list[i]);
@@ -716,12 +716,12 @@ int main(int ac, char **argv) } prog_id_list = (__u32 *)calloc (total_ifindex,sizeof (__u32 *));for (i =0 ; i < total_ifindex; i++) { -if (bpf_set_link_xdp_fd (ifindex_list[i], prog_fd, flags) <0 ) { +if (bpf_xdp_attach (ifindex_list[i], prog_fd, flags,NULL ) <0 ) {printf ("link set xdp fd failed\n" );int recovery_index = i;for (i =0 ; i < recovery_index; i++) -bpf_set_link_xdp_fd (ifindex_list[i],-1 , flags); +bpf_xdp_detach (ifindex_list[i], flags,NULL );return 1 ; }
samples/bpf/xdp_rxq_info_user.c +4 -4
@@ -62,15 +62,15 @@ static void int_exit(int sig)__u32 curr_prog_id =0 ;if (ifindex >-1 ) { -if (bpf_get_link_xdp_id (ifindex, &curr_prog_id, xdp_flags)) { -printf ("bpf_get_link_xdp_id failed\n" ); +if (bpf_xdp_query_id (ifindex, xdp_flags, &curr_prog_id)) { +printf ("bpf_xdp_query_id failed\n" );exit (EXIT_FAIL ); }if (prog_id == curr_prog_id) {fprintf (stderr,"Interrupted: Removing XDP program on ifindex:%d device:%s\n" , ifindex, ifname); -bpf_set_link_xdp_fd (ifindex,-1 , xdp_flags); +bpf_xdp_detach (ifindex, xdp_flags,NULL ); }else if (!curr_prog_id) {printf ("couldn't find a prog id on a given iface\n" ); }else {
@@ -582,7 +582,7 @@ int main(int argc, char **argv)signal (SIGINT , int_exit);signal (SIGTERM , int_exit); -if (bpf_set_link_xdp_fd (ifindex, prog_fd, xdp_flags) <0 ) { +if (bpf_xdp_attach (ifindex, prog_fd, xdp_flags,NULL ) <0 ) {fprintf (stderr,"link set xdp fd failed\n" );return EXIT_FAIL_XDP ; }
samples/bpf/xdp_sample_pkts_user.c +4 -4
@@ -30,7 +30,7 @@ static int do_attach(int idx, int fd, const char *name)__u32 info_len =sizeof (info);int err; - err =bpf_set_link_xdp_fd (idx, fd, xdp_flags); + err =bpf_xdp_attach (idx, fd, xdp_flags,NULL );if (err <0 ) {printf ("ERROR: failed to attach program to %s\n" , name);return err;
@@ -51,13 +51,13 @@ static int do_detach(int idx, const char *name)__u32 curr_prog_id =0 ;int err =0 ; - err =bpf_get_link_xdp_id (idx, &curr_prog_id, xdp_flags); + err =bpf_xdp_query_id (idx, xdp_flags, &curr_prog_id);if (err) { -printf ("bpf_get_link_xdp_id failed\n" ); +printf ("bpf_xdp_query_id failed\n" );return err; }if (prog_id == curr_prog_id) { - err =bpf_set_link_xdp_fd (idx,-1 , xdp_flags); + err =bpf_xdp_detach (idx, xdp_flags,NULL );if (err <0 )printf ("ERROR: failed to detach prog from %s\n" , name); }else if (!curr_prog_id) {
samples/bpf/xdp_sample_user.c +4 -5
@@ -1265,7 +1265,7 @@ static int __sample_remove_xdp(int ifindex, __u32 prog_id, int xdp_flags)int ret;if (prog_id) { - ret =bpf_get_link_xdp_id (ifindex, &cur_prog_id, xdp_flags); + ret =bpf_xdp_query_id (ifindex, xdp_flags, &cur_prog_id);if (ret <0 )return -errno;
@@ -1278,7 +1278,7 @@ static int __sample_remove_xdp(int ifindex, __u32 prog_id, int xdp_flags) } } -return bpf_set_link_xdp_fd (ifindex,-1 , xdp_flags); +return bpf_xdp_detach (ifindex, xdp_flags,NULL ); } int sample_install_xdp(struct bpf_program *xdp_prog, int ifindex, bool generic,
@@ -1295,8 +1295,7 @@ int sample_install_xdp(struct bpf_program *xdp_prog, int ifindex, bool generic, xdp_flags |= !force ?XDP_FLAGS_UPDATE_IF_NOEXIST :0 ; xdp_flags |= generic ?XDP_FLAGS_SKB_MODE :XDP_FLAGS_DRV_MODE ; - ret =bpf_set_link_xdp_fd (ifindex,bpf_program__fd (xdp_prog), - xdp_flags); + ret =bpf_xdp_attach (ifindex,bpf_program__fd (xdp_prog), xdp_flags,NULL );if (ret <0 ) { ret = -errno; fprintf(stderr,
@@ -1308,7 +1307,7 @@ int sample_install_xdp(struct bpf_program *xdp_prog, int ifindex, bool generic,return ret; } - ret =bpf_get_link_xdp_id (ifindex, &prog_id, xdp_flags); + ret =bpf_xdp_query_id (ifindex, xdp_flags, &prog_id);if (ret <0 ) { ret = -errno; fprintf(stderr,
samples/bpf/xdp_tx_iptunnel_user.c +5 -5
@@ -32,12 +32,12 @@ static void int_exit(int sig)__u32 curr_prog_id =0 ;if (ifindex >-1 ) { -if (bpf_get_link_xdp_id (ifindex, &curr_prog_id, xdp_flags)) { -printf ("bpf_get_link_xdp_id failed\n" ); +if (bpf_xdp_query_id (ifindex, xdp_flags, &curr_prog_id)) { +printf ("bpf_xdp_query_id failed\n" );exit (1 ); }if (prog_id == curr_prog_id) -bpf_set_link_xdp_fd (ifindex,-1 , xdp_flags); +bpf_xdp_detach (ifindex, xdp_flags,NULL );else if (!curr_prog_id)printf ("couldn't find a prog id on a given iface\n" );else
@@ -288,7 +288,7 @@ int main(int argc, char **argv) } } -if (bpf_set_link_xdp_fd (ifindex, prog_fd, xdp_flags) <0 ) { +if (bpf_xdp_attach (ifindex, prog_fd, xdp_flags,NULL ) <0 ) {printf ("link set xdp fd failed\n" );return 1 ; }
@@ -302,7 +302,7 @@ int main(int argc, char **argv)poll_stats (kill_after_s); -bpf_set_link_xdp_fd (ifindex,-1 , xdp_flags); +bpf_xdp_detach (ifindex, xdp_flags,NULL );return 0 ; }
samples/bpf/xdpsock_ctrl_proc.c +1 -1
@@ -173,7 +173,7 @@ main(int argc, char **argv)unlink (SOCKET_NAME );/* Unset fd for given ifindex */ - err =bpf_set_link_xdp_fd (ifindex,-1 ,0 ); + err =bpf_xdp_detach (ifindex,0 ,NULL );if (err) {fprintf (stderr,"Error when unsetting bpf prog_fd for ifindex(%d)\n" , ifindex);return err;
samples/bpf/xdpsock_user.c +5 -5
@@ -571,13 +571,13 @@ static void remove_xdp_program(void) {u32 curr_prog_id =0 ; -if (bpf_get_link_xdp_id (opt_ifindex, &curr_prog_id, opt_xdp_flags)) { -printf ("bpf_get_link_xdp_id failed\n" ); +if (bpf_xdp_query_id (opt_ifindex, opt_xdp_flags, &curr_prog_id)) { +printf ("bpf_xdp_query_id failed\n" );exit (EXIT_FAILURE ); }if (prog_id == curr_prog_id) -bpf_set_link_xdp_fd (opt_ifindex,-1 , opt_xdp_flags); +bpf_xdp_detach (opt_ifindex, opt_xdp_flags,NULL );else if (!curr_prog_id)printf ("couldn't find a prog id on a given interface\n" );else
@@ -1027,7 +1027,7 @@ static struct xsk_socket_info *xsk_configure_socket(struct xsk_umem_info *umem,if (ret)exit_with_error (-ret); - ret =bpf_get_link_xdp_id (opt_ifindex, &prog_id, opt_xdp_flags); + ret =bpf_xdp_query_id (opt_ifindex, opt_xdp_flags, &prog_id);if (ret)exit_with_error (-ret);
@@ -1760,7 +1760,7 @@ static void load_xdp_program(char **argv, struct bpf_object **obj)exit (EXIT_FAILURE ); } -if (bpf_set_link_xdp_fd (opt_ifindex, prog_fd, opt_xdp_flags) <0 ) { +if (bpf_xdp_attach (opt_ifindex, prog_fd, opt_xdp_flags,NULL ) <0 ) {fprintf (stderr,"ERROR: link set xdp fd failed\n" );exit (EXIT_FAILURE ); }
samples/bpf/xsk_fwd.c +2 -2
@@ -974,8 +974,8 @@ static void remove_xdp_program(void)int i;for (i =0 ; i < n_ports; i++) -bpf_set_link_xdp_fd (if_nametoindex (port_params[i].iface),-1 , - port_params[i].xsk_cfg.xdp_flags); +bpf_xdp_detach (if_nametoindex (port_params[i].iface), + port_params[i].xsk_cfg.xdp_flags,NULL ); }int main (int argc,char **argv)
Signature · 1 line
2.30.2