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: Pu Lehui <pulehui@huawei.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20220419145238.482134-2-pulehui@huawei.com

diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
index 68cc134d070d35a2c7dd38b5a19834d00dff8b9a..8375021800f335fd97708e8b95a402c341dcc40d 100644 (file)
--- a/tools/lib/bpf/libbpf.c
+++ b/tools/lib/bpf/libbpf.c
@@ -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))

diff --git a/tools/lib/bpf/libbpf_internal.h b/tools/lib/bpf/libbpf_internal.h
index 080272421f6c34b2de0980e3e75f072803dc19ab..054cd8e93d7ce2a4a44d0e3788526bfd81a947bb 100644 (file)
--- a/tools/lib/bpf/libbpf_internal.h
+++ b/tools/lib/bpf/libbpf_internal.h
@@ -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 */

diff --git a/tools/lib/bpf/usdt.c b/tools/lib/bpf/usdt.c
index 934c25301ac1d4608d7594fbc30b83ba55d28a10..8e77a72601139aae2e023264d87d43eff238600e 100644 (file)
--- a/tools/lib/bpf/usdt.c
+++ b/tools/lib/bpf/usdt.c
@@ -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;