Commit a0fe3e57 authored by Alexei Starovoitov's avatar Alexei Starovoitov Committed by Daniel Borkmann
Browse files

libbpf: add bpf_raw_tracepoint_open helper 



add bpf_raw_tracepoint_open(const char *name, int prog_fd) api to libbpf

Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parent c4f6699d

tools/include/uapi/linux/bpf.h

+11 −0
Original line number Original line Diff line number Diff line
@@ -94,6 +94,7 @@ enum bpf_cmd { 
	BPF_MAP_GET_FD_BY_ID,

	BPF_MAP_GET_FD_BY_ID,

	BPF_OBJ_GET_INFO_BY_FD,

	BPF_OBJ_GET_INFO_BY_FD,

	BPF_PROG_QUERY,

	BPF_PROG_QUERY,

	BPF_RAW_TRACEPOINT_OPEN,

};

};





enum bpf_map_type {

enum bpf_map_type {
@@ -134,6 +135,7 @@ enum bpf_prog_type { 
	BPF_PROG_TYPE_SK_SKB,

	BPF_PROG_TYPE_SK_SKB,

	BPF_PROG_TYPE_CGROUP_DEVICE,

	BPF_PROG_TYPE_CGROUP_DEVICE,

	BPF_PROG_TYPE_SK_MSG,

	BPF_PROG_TYPE_SK_MSG,

	BPF_PROG_TYPE_RAW_TRACEPOINT,

};

};





enum bpf_attach_type {

enum bpf_attach_type {
@@ -344,6 +346,11 @@ union bpf_attr { 
		__aligned_u64	prog_ids;

		__aligned_u64	prog_ids;

		__u32		prog_cnt;

		__u32		prog_cnt;

	} query;

	} query;



	struct {

		__u64 name;

		__u32 prog_fd;

	} raw_tracepoint;

} __attribute__((aligned(8)));

} __attribute__((aligned(8)));





/* BPF helper function descriptions:

/* BPF helper function descriptions:
@@ -1151,4 +1158,8 @@ struct bpf_cgroup_dev_ctx { 
	__u32 minor;

	__u32 minor;

};

};





struct bpf_raw_tracepoint_args {

	__u64 args[0];

};



#endif /* _UAPI__LINUX_BPF_H__ */
 
#endif /* _UAPI__LINUX_BPF_H__ */

tools/lib/bpf/bpf.c

+11 −0
Original line number Original line Diff line number Diff line
@@ -428,6 +428,17 @@ int bpf_obj_get_info_by_fd(int prog_fd, void *info, __u32 *info_len) 
	return err;

	return err;

}

}





int bpf_raw_tracepoint_open(const char *name, int prog_fd)

{

	union bpf_attr attr;



	bzero(&attr, sizeof(attr));

	attr.raw_tracepoint.name = ptr_to_u64(name);

	attr.raw_tracepoint.prog_fd = prog_fd;



	return sys_bpf(BPF_RAW_TRACEPOINT_OPEN, &attr, sizeof(attr));

}



int bpf_set_link_xdp_fd(int ifindex, int fd, __u32 flags)

int bpf_set_link_xdp_fd(int ifindex, int fd, __u32 flags)

{

{

	struct sockaddr_nl sa;

	struct sockaddr_nl sa;

tools/lib/bpf/bpf.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -79,4 +79,5 @@ int bpf_map_get_fd_by_id(__u32 id); 
int bpf_obj_get_info_by_fd(int prog_fd, void *info, __u32 *info_len);

int bpf_obj_get_info_by_fd(int prog_fd, void *info, __u32 *info_len);

int bpf_prog_query(int target_fd, enum bpf_attach_type type, __u32 query_flags,

int bpf_prog_query(int target_fd, enum bpf_attach_type type, __u32 query_flags,

		   __u32 *attach_flags, __u32 *prog_ids, __u32 *prog_cnt);

		   __u32 *attach_flags, __u32 *prog_ids, __u32 *prog_cnt);

int bpf_raw_tracepoint_open(const char *name, int prog_fd);

#endif
 
#endif