Skip to contentSkip to conversation

perf lock contention: Change stack_id type to s32

PATCH Applied Namhyung Kim 2 participants 2 messages Aug 12, 2024 perf events

lore
Share & tools
lore

Namhyung Kim

author maintainer
#0 lore raw

PATCH v2 1/1 perf lock contention: Change stack_id type to s32

The bpf_get_stackid() helper returns a signed type to check whether it failed to get a stacktrace or not. But it saved the result in u32 and checked if the value is negative.

      376         if (needs_callstack) {
      377                 pelem->stack_id = bpf_get_stackid(ctx, &stacks,
      378                                                   BPF_F_FAST_STACK_CMP | stack_skip);

--> 379 if (pelem->stack_id < 0)

./tools/perf/util/bpf_skel/lock_contention.bpf.c:379 contention_begin()
warn: unsigned 'pelem->stack_id' is never less than zero.

Let's change the type to s32 instead.

Fixes 6d499a6b3d90 ("perf lock: Print the number of lost entries for BPF")

---
v2) fix build error for s32

 tools/perf/util/bpf_skel/lock_data.h       | 4 ++--
 tools/perf/util/bpf_skel/vmlinux/vmlinux.h | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
tools/perf/util/bpf_skel/lock_data.h +2 -2
index 36af11faad03..de12892f992f 100644
@@ -7,11 +7,11 @@ struct tstamp_data {
 	u64 timestamp;
 	u64 lock;
 	u32 flags;
-	u32 stack_id;
+	s32 stack_id;
 };
 
 struct contention_key {
-	u32 stack_id;
+	s32 stack_id;
 	u32 pid;
 	u64 lock_addr_or_cgroup;
 };
tools/perf/util/bpf_skel/vmlinux/vmlinux.h +1 -0
index e9028235d771..d818e30c5457 100644
@@ -15,6 +15,7 @@
 
 typedef __u8 u8;
 typedef __u32 u32;
+typedef __s32 s32;
 typedef __u64 u64;
 typedef __s64 s64;
 
Signature · 1 line
2.46.0.76.ge559c4bf1a-goog
maintainer Applied
#1 lore raw
Quoted 12 lines · Namhyung Kim

The bpf_get_stackid() helper returns a signed type to check whether it failed to get a stacktrace or not. But it saved the result in u32 and checked if the value is negative.

      376         if (needs_callstack) {
      377                 pelem->stack_id = bpf_get_stackid(ctx, &stacks,
      378                                                   BPF_F_FAST_STACK_CMP | stack_skip);

--> 379 if (pelem->stack_id < 0)

./tools/perf/util/bpf_skel/lock_contention.bpf.c:379 contention_begin()
warn: unsigned 'pelem->stack_id' is never less than zero.

Quoted 7 lines

Let's change the type to s32 instead.

Fixes 6d499a6b3d90 ("perf lock: Print the number of lost entries for BPF")

---
v2) fix build error for s32

Thanks, applied to perf-tools-next,

- Arnaldo

Quoted 36 lines
 tools/perf/util/bpf_skel/lock_data.h       | 4 ++--
 tools/perf/util/bpf_skel/vmlinux/vmlinux.h | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
tools/perf/util/bpf_skel/lock_data.h +2 -2
index 36af11faad03..de12892f992f 100644
@@ -7,11 +7,11 @@ struct tstamp_data {
 	u64 timestamp;
 	u64 lock;
 	u32 flags;
-	u32 stack_id;
+	s32 stack_id;
 };
 
 struct contention_key {
-	u32 stack_id;
+	s32 stack_id;
 	u32 pid;
 	u64 lock_addr_or_cgroup;
 };
tools/perf/util/bpf_skel/vmlinux/vmlinux.h +1 -0
index e9028235d771..d818e30c5457 100644
@@ -15,6 +15,7 @@
 
 typedef __u8 u8;
 typedef __u32 u32;
+typedef __s32 s32;
 typedef __u64 u64;
 typedef __s64 s64;
 
Signature · 1 line
2.46.0.76.ge559c4bf1a-goog