[PATCH v1 30/48] perf lock: Silence -Wshorten-64-to-32 warnings

Ian Rogers
2025-04-01T18:25:37Z

tools/perf/builtin-lock.c | 16 ++++++++--------
tools/perf/util/bpf_lock_contention.c | 17 +++++++++--------
2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/tools/perf/builtin-lock.c b/tools/perf/builtin-lock.c
index 05e7bc30488a..0f7e627394aa 100644
--- a/tools/perf/builtin-lock.c
+++ b/tools/perf/builtin-lock.c
@@ -569,7 +569,7 @@ static int report_lock_acquire_event(struct evsel *evsel,
struct lock_seq_stat *seq;
const char *name = evsel__strval(evsel, sample, "name");
u64 addr = evsel__intval(evsel, sample, "lockdep_addr");
- int flag = evsel__intval(evsel, sample, "flags");
+ int flag = (int)evsel__intval(evsel, sample, "flags");
u64 key;
int ret;

@@ -837,7 +837,7 @@ static int get_symbol_name_offset(struct map *map, struct symbol *sym, u64 ip,
if (offset)
return scnprintf(buf, size, "%s+%#lx", sym->name, offset);
else
- return strlcpy(buf, sym->name, size);
+ return (int)strlcpy(buf, sym->name, size);
}
static int lock_contention_caller(struct evsel *evsel, struct perf_sample *sample,
char *buf, int size)
@@ -968,7 +968,7 @@ static int report_lock_contention_begin_event(struct evsel *evsel,
struct thread_stat *ts;
struct lock_seq_stat *seq;
u64 addr = evsel__intval(evsel, sample, "lock_addr");
- unsigned int flags = evsel__intval(evsel, sample, "flags");
+ unsigned int flags = (unsigned int)evsel__intval(evsel, sample, "flags");
u64 key;
int i, ret;
static bool kmap_loaded;
@@ -1303,7 +1303,7 @@ static void print_result(void)
struct thread *t;

/* st->addr contains tid of thread */
- t = perf_session__findnew(session, st->addr);
+ t = perf_session__findnew(session, (int)st->addr);
name = thread__comm_str(t);
}

@@ -1638,7 +1638,7 @@ static void print_lock_stat_stdio(struct lock_contention *con, struct lock_stat
fprintf(lock_output, " %10s %s\n", get_type_flags_name(st->flags), st->name);
break;
case LOCK_AGGR_TASK:
- pid = st->addr;
+ pid = (int)st->addr;
t = perf_session__findnew(session, pid);
fprintf(lock_output, " %10d %s\n",
pid, pid == -1 ? "Unknown" : thread__comm_str(t));
@@ -1691,7 +1691,7 @@ static void print_lock_stat_csv(struct lock_contention *con, struct lock_stat *s
fprintf(lock_output, "\n");
break;
case LOCK_AGGR_TASK:
- pid = st->addr;
+ pid = (int)st->addr;
t = perf_session__findnew(session, pid);
fprintf(lock_output, "%d%s %s\n", pid, sep,
pid == -1 ? "Unknown" : thread__comm_str(t));
@@ -1870,7 +1870,7 @@ static int __cmd_report(bool display_info)
session = perf_session__new(&data, &eops);
if (IS_ERR(session)) {
pr_err("Initializing perf session failed\n");
- return PTR_ERR(session);
+ return (int)PTR_ERR(session);
}

symbol_conf.allow_aliases = true;
@@ -2023,7 +2023,7 @@ static int __cmd_contention(int argc, const char **argv)
session = perf_session__new(use_bpf ? NULL : &data, &eops);
if (IS_ERR(session)) {
pr_err("Initializing perf session failed\n");
- err = PTR_ERR(session);
+ err = (int)PTR_ERR(session);
session = NULL;
goto out_delete;
}
diff --git a/tools/perf/util/bpf_lock_contention.c b/tools/perf/util/bpf_lock_contention.c
index 5af8f6d1bc95..5a7a820000d4 100644
--- a/tools/perf/util/bpf_lock_contention.c
+++ b/tools/perf/util/bpf_lock_contention.c
@@ -54,7 +54,7 @@ static void check_slab_cache_iter(struct lock_contention *con)

has_slab_iter = true;

- bpf_map__set_max_entries(skel->maps.slab_caches, con->map_nr_entries);
+ bpf_map__set_max_entries(skel->maps.slab_caches, (__u32)con->map_nr_entries);
out:
btf__free(btf);
}
@@ -123,23 +123,24 @@ int lock_contention_prepare(struct lock_contention *con)
}

bpf_map__set_value_size(skel->maps.stacks, con->max_stack * sizeof(u64));
- bpf_map__set_max_entries(skel->maps.lock_stat, con->map_nr_entries);
- bpf_map__set_max_entries(skel->maps.tstamp, con->map_nr_entries);
+ bpf_map__set_max_entries(skel->maps.lock_stat, (__u32)con->map_nr_entries);
+ bpf_map__set_max_entries(skel->maps.tstamp, (__u32)con->map_nr_entries);

if (con->aggr_mode == LOCK_AGGR_TASK)
- bpf_map__set_max_entries(skel->maps.task_data, con->map_nr_entries);
+ bpf_map__set_max_entries(skel->maps.task_data, (__u32)con->map_nr_entries);
else
bpf_map__set_max_entries(skel->maps.task_data, 1);

if (con->save_callstack) {
- bpf_map__set_max_entries(skel->maps.stacks, con->map_nr_entries);
+ bpf_map__set_max_entries(skel->maps.stacks, (__u32)con->map_nr_entries);
if (con->owner) {
bpf_map__set_value_size(skel->maps.stack_buf, con->max_stack * sizeof(u64));
bpf_map__set_key_size(skel->maps.owner_stacks,
con->max_stack * sizeof(u64));
- bpf_map__set_max_entries(skel->maps.owner_stacks, con->map_nr_entries);
- bpf_map__set_max_entries(skel->maps.owner_data, con->map_nr_entries);
- bpf_map__set_max_entries(skel->maps.owner_stat, con->map_nr_entries);
+ bpf_map__set_max_entries(skel->maps.owner_stacks,
+ (__u32)con->map_nr_entries);
+ bpf_map__set_max_entries(skel->maps.owner_data, (__u32)con->map_nr_entries);
+ bpf_map__set_max_entries(skel->maps.owner_stat, (__u32)con->map_nr_entries);
skel->rodata->max_stack = con->max_stack;
}
} else {
--
2.49.0.504.g3bcea36a83-goog