Add a new API to accept the log opts, instead of extending the existing struct bpf_link_create_opts.
In the struct bpf_link_create_opts, it seems not proper to append a tailing common log field prior to those variant length fields. Add a new API to avoid breaking the struct bpf_link_create_opts. Signed-off-by: Leon Hwang <[email protected]> --- tools/lib/bpf/bpf.c | 24 ++++++++++++++++++++---- tools/lib/bpf/bpf.h | 5 +++++ tools/lib/bpf/libbpf.map | 1 + 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/tools/lib/bpf/bpf.c b/tools/lib/bpf/bpf.c index 17e73e443bc7..eb127d71f3c8 100644 --- a/tools/lib/bpf/bpf.c +++ b/tools/lib/bpf/bpf.c @@ -788,9 +788,10 @@ int bpf_prog_detach2(int prog_fd, int target_fd, enum bpf_attach_type type) return bpf_prog_detach_opts(prog_fd, target_fd, type, NULL); } -int bpf_link_create(int prog_fd, int target_fd, - enum bpf_attach_type attach_type, - const struct bpf_link_create_opts *opts) +static int __bpf_link_create(int prog_fd, int target_fd, + enum bpf_attach_type attach_type, + const struct bpf_link_create_opts *opts, + struct bpf_log_opts *log_opts) { const size_t attr_sz = offsetofend(union bpf_attr, link_create); __u32 target_btf_id, iter_info_len, relative_id; @@ -965,7 +966,7 @@ int bpf_link_create(int prog_fd, int target_fd, break; } proceed: - fd = sys_bpf_fd(BPF_LINK_CREATE, &attr, attr_sz); + fd = __sys_bpf_fd(&attr, attr_sz, BPF_LINK_CREATE, log_opts); if (fd >= 0) return fd; /* we'll get EINVAL if LINK_CREATE doesn't support attaching fentry @@ -999,6 +1000,21 @@ int bpf_link_create(int prog_fd, int target_fd, } } +int bpf_link_create(int prog_fd, int target_fd, + enum bpf_attach_type attach_type, + const struct bpf_link_create_opts *opts) +{ + return __bpf_link_create(prog_fd, target_fd, attach_type, opts, NULL); +} + +int bpf_link_create_log(int prog_fd, int target_fd, + enum bpf_attach_type attach_type, + const struct bpf_link_create_opts *opts, + struct bpf_log_opts *log_opts) +{ + return __bpf_link_create(prog_fd, target_fd, attach_type, opts, log_opts); +} + int bpf_link_detach(int link_fd) { const size_t attr_sz = offsetofend(union bpf_attr, link_detach); diff --git a/tools/lib/bpf/bpf.h b/tools/lib/bpf/bpf.h index 826d9cc9ab65..dedaf8086902 100644 --- a/tools/lib/bpf/bpf.h +++ b/tools/lib/bpf/bpf.h @@ -484,6 +484,11 @@ LIBBPF_API int bpf_link_create(int prog_fd, int target_fd, enum bpf_attach_type attach_type, const struct bpf_link_create_opts *opts); +LIBBPF_API int bpf_link_create_log(int prog_fd, int target_fd, + enum bpf_attach_type attach_type, + const struct bpf_link_create_opts *opts, + struct bpf_log_opts *log_opts); + LIBBPF_API int bpf_link_detach(int link_fd); struct bpf_link_update_opts { diff --git a/tools/lib/bpf/libbpf.map b/tools/lib/bpf/libbpf.map index eeba4072a5da..990e2f926ecc 100644 --- a/tools/lib/bpf/libbpf.map +++ b/tools/lib/bpf/libbpf.map @@ -458,6 +458,7 @@ LIBBPF_1.7.0 { LIBBPF_1.8.0 { global: + bpf_link_create_log; bpf_map__attach_cgroup_opts; bpf_prog_stream_open; bpf_program__add_flags; -- 2.55.0
