Commit 5af25a41 authored by Pu Lehui's avatar Pu Lehui Committed by Andrii Nakryiko
Browse files

libbpf: Fix usdt_cookie being cast to 32 bits 



The usdt_cookie is defined as __u64, which should not be
used as a long type because it will be cast to 32 bits
in 32-bit platforms.

Signed-off-by: default avatarPu Lehui <pulehui@huawei.com>
Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20220419145238.482134-2-pulehui@huawei.com
parent dcf456c9

tools/lib/bpf/libbpf.c

+1 −1
Original line number Diff line number Diff line
@@ -10993,7 +10993,7 @@ struct bpf_link *bpf_program__attach_usdt(const struct bpf_program *prog, 
	char resolved_path[512];

	struct bpf_object *obj = prog->obj;

	struct bpf_link *link;

	long usdt_cookie;

	__u64 usdt_cookie;

	int err;



	if (!OPTS_VALID(opts, bpf_uprobe_opts))

tools/lib/bpf/libbpf_internal.h

+1 −1
Original line number Diff line number Diff line
@@ -571,6 +571,6 @@ struct bpf_link * usdt_manager_attach_usdt(struct usdt_manager *man, 
					   const struct bpf_program *prog,

					   pid_t pid, const char *path,

					   const char *usdt_provider, const char *usdt_name,

					   long usdt_cookie);

					   __u64 usdt_cookie);



#endif /* __LIBBPF_LIBBPF_INTERNAL_H */

tools/lib/bpf/usdt.c

+4 −4
Original line number Diff line number Diff line
@@ -557,10 +557,10 @@ static int parse_usdt_note(Elf *elf, const char *path, long base_addr, 
			   GElf_Nhdr *nhdr, const char *data, size_t name_off, size_t desc_off,

			   struct usdt_note *usdt_note);



static int parse_usdt_spec(struct usdt_spec *spec, const struct usdt_note *note, long usdt_cookie);

static int parse_usdt_spec(struct usdt_spec *spec, const struct usdt_note *note, __u64 usdt_cookie);



static int collect_usdt_targets(struct usdt_manager *man, Elf *elf, const char *path, pid_t pid,

				const char *usdt_provider, const char *usdt_name, long usdt_cookie,

				const char *usdt_provider, const char *usdt_name, __u64 usdt_cookie,

				struct usdt_target **out_targets, size_t *out_target_cnt)

{

	size_t off, name_off, desc_off, seg_cnt = 0, lib_seg_cnt = 0, target_cnt = 0;
@@ -939,7 +939,7 @@ static int allocate_spec_id(struct usdt_manager *man, struct hashmap *specs_hash 
struct bpf_link *usdt_manager_attach_usdt(struct usdt_manager *man, const struct bpf_program *prog,

					  pid_t pid, const char *path,

					  const char *usdt_provider, const char *usdt_name,

					  long usdt_cookie)

					  __u64 usdt_cookie)

{

	int i, fd, err, spec_map_fd, ip_map_fd;

	LIBBPF_OPTS(bpf_uprobe_opts, opts);
@@ -1141,7 +1141,7 @@ static int parse_usdt_note(Elf *elf, const char *path, long base_addr, 


static int parse_usdt_arg(const char *arg_str, int arg_num, struct usdt_arg_spec *arg);



static int parse_usdt_spec(struct usdt_spec *spec, const struct usdt_note *note, long usdt_cookie)

static int parse_usdt_spec(struct usdt_spec *spec, const struct usdt_note *note, __u64 usdt_cookie)

{

	const char *s;

	int len;