Commit d6c9c24e authored by Christy Lee's avatar Christy Lee Committed by Andrii Nakryiko
Browse files

libbpf: Rename bpf_prog_attach_xattr() to bpf_prog_attach_opts() 



All xattr APIs are being dropped, let's converge to the convention used in
high-level APIs and rename bpf_prog_attach_xattr to bpf_prog_attach_opts.

Signed-off-by: default avatarChristy Lee <christylee@fb.com>
Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20220107184604.3668544-2-christylee@fb.com
parent 622a5b58

tools/lib/bpf/bpf.c

+7 −2
Original line number Diff line number Diff line
@@ -754,10 +754,10 @@ int bpf_prog_attach(int prog_fd, int target_fd, enum bpf_attach_type type, 
		.flags = flags,

	);



	return bpf_prog_attach_xattr(prog_fd, target_fd, type, &opts);

	return bpf_prog_attach_opts(prog_fd, target_fd, type, &opts);

}



int bpf_prog_attach_xattr(int prog_fd, int target_fd,

int bpf_prog_attach_opts(int prog_fd, int target_fd,

			  enum bpf_attach_type type,

			  const struct bpf_prog_attach_opts *opts)

{
@@ -778,6 +778,11 @@ int bpf_prog_attach_xattr(int prog_fd, int target_fd, 
	return libbpf_err_errno(ret);

}



__attribute__((alias("bpf_prog_attach_opts")))

int bpf_prog_attach_xattr(int prog_fd, int target_fd,

			  enum bpf_attach_type type,

			  const struct bpf_prog_attach_opts *opts);



int bpf_prog_detach(int target_fd, enum bpf_attach_type type)

{

	union bpf_attr attr;

tools/lib/bpf/bpf.h

+4 −0
Original line number Diff line number Diff line
@@ -391,6 +391,10 @@ struct bpf_prog_attach_opts { 


LIBBPF_API int bpf_prog_attach(int prog_fd, int attachable_fd,

			       enum bpf_attach_type type, unsigned int flags);

LIBBPF_API int bpf_prog_attach_opts(int prog_fd, int attachable_fd,

				     enum bpf_attach_type type,

				     const struct bpf_prog_attach_opts *opts);

LIBBPF_DEPRECATED_SINCE(0, 8, "use bpf_prog_attach_opts() instead")

LIBBPF_API int bpf_prog_attach_xattr(int prog_fd, int attachable_fd,

				     enum bpf_attach_type type,

				     const struct bpf_prog_attach_opts *opts);

tools/lib/bpf/libbpf.map

+1 −0
Original line number Diff line number Diff line
@@ -247,6 +247,7 @@ LIBBPF_0.0.8 { 
		bpf_link_create;

		bpf_link_update;

		bpf_map__set_initial_value;

		bpf_prog_attach_opts;

		bpf_program__attach_cgroup;

		bpf_program__attach_lsm;

		bpf_program__is_lsm;