Commit 5117c26e authored by Jiri Olsa's avatar Jiri Olsa Committed by Alexei Starovoitov
Browse files

libbpf: Add bpf_link_create support for multi kprobes 



Adding new kprobe_multi struct to bpf_link_create_opts object
to pass multiple kprobe data to link_create attr uapi.

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20220316122419.933957-9-jolsa@kernel.org
parent 85153ac0

tools/lib/bpf/bpf.c

+9 −0
Original line number Diff line number Diff line
@@ -854,6 +854,15 @@ int bpf_link_create(int prog_fd, int target_fd, 
		if (!OPTS_ZEROED(opts, perf_event))

			return libbpf_err(-EINVAL);

		break;

	case BPF_TRACE_KPROBE_MULTI:

		attr.link_create.kprobe_multi.flags = OPTS_GET(opts, kprobe_multi.flags, 0);

		attr.link_create.kprobe_multi.cnt = OPTS_GET(opts, kprobe_multi.cnt, 0);

		attr.link_create.kprobe_multi.syms = ptr_to_u64(OPTS_GET(opts, kprobe_multi.syms, 0));

		attr.link_create.kprobe_multi.addrs = ptr_to_u64(OPTS_GET(opts, kprobe_multi.addrs, 0));

		attr.link_create.kprobe_multi.cookies = ptr_to_u64(OPTS_GET(opts, kprobe_multi.cookies, 0));

		if (!OPTS_ZEROED(opts, kprobe_multi))

			return libbpf_err(-EINVAL);

		break;

	default:

		if (!OPTS_ZEROED(opts, flags))

			return libbpf_err(-EINVAL);

tools/lib/bpf/bpf.h

+8 −1
Original line number Diff line number Diff line
@@ -413,10 +413,17 @@ struct bpf_link_create_opts { 
		struct {

			__u64 bpf_cookie;

		} perf_event;

		struct {

			__u32 flags;

			__u32 cnt;

			const char **syms;

			const unsigned long *addrs;

			const __u64 *cookies;

		} kprobe_multi;

	};

	size_t :0;

};

#define bpf_link_create_opts__last_field perf_event

#define bpf_link_create_opts__last_field kprobe_multi.cookies



LIBBPF_API int bpf_link_create(int prog_fd, int target_fd,

			       enum bpf_attach_type attach_type,