Skip to contentSkip to conversation

perf lock contention: Load kernel map before lookup

PATCH Applied Namhyung Kim 2 participants 3 messages Oct 30, 2025 – Nov 3, 2025 perf events

lore
Share & tools
lore

Namhyung Kim

author maintainer
#0 lore raw

PATCH 1/1 perf lock contention: Load kernel map before lookup

On some machines, it caused troubles when it tried to find kernel symbols. I think it's because kernel modules and kallsyms are messed up during load and split.

Basically we want to make sure the kernel map is loaded and the code has it in the lock_contention_read(). But recently we added more lookups in the lock_contention_prepare() which is called before _read().

Also the kernel map (kallsyms) may not be the first one in the group like on ARM. Let's use machine__kernel_map() rather than just loading the first map.

Fixes 688d2e8de231c54e ("perf lock contention: Add -l/--lock-addr option")
---
 tools/perf/util/bpf_lock_contention.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
tools/perf/util/bpf_lock_contention.c +3 -3
index 60b81d586323f379..7b5671f13c53525d 100644
@@ -184,6 +184,9 @@ int lock_contention_prepare(struct lock_contention *con)
 	struct evlist *evlist = con->evlist;
 	struct target *target = con->target;
 
+	/* make sure it loads the kernel map before lookup */
+	map__load(machine__kernel_map(con->machine));
+
 	skel = lock_contention_bpf__open();
 	if (!skel) {
 		pr_err("Failed to open lock-contention BPF skeleton\n");
@@ -749,9 +752,6 @@ int lock_contention_read(struct lock_contention *con)
 		bpf_prog_test_run_opts(prog_fd, &opts);
 	}
 
-	/* make sure it loads the kernel map */
-	maps__load_first(machine->kmaps);
-
 	prev_key = NULL;
 	while (!bpf_map_get_next_key(fd, prev_key, &key)) {
 		s64 ls_key;
Signature · 1 line
2.51.1.851.g4ebd6896fd-goog
reviewer Reviewed-by on v1 1/1
#1 lore raw
Quoted 9 lines · Namhyung Kim

On some machines, it caused troubles when it tried to find kernel symbols. I think it's because kernel modules and kallsyms are messed up during load and split.

Basically we want to make sure the kernel map is loaded and the code has it in the lock_contention_read(). But recently we added more lookups in the lock_contention_prepare() which is called before _read().

Quoted 6 lines

Also the kernel map (kallsyms) may not be the first one in the group like on ARM. Let's use machine__kernel_map() rather than just loading the first map.

Fixes 688d2e8de231c54e ("perf lock contention: Add -l/--lock-addr option")

Thanks,
Ian

Quoted 31 lines
---
 tools/perf/util/bpf_lock_contention.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
tools/perf/util/bpf_lock_contention.c +3 -4
index 60b81d586323f379..7b5671f13c53525d 100644
@@ -184,6 +184,9 @@ int lock_contention_prepare(struct lock_contention *con)
        struct evlist *evlist = con->evlist;
        struct target *target = con->target;
 
+       /* make sure it loads the kernel map before lookup */
+       map__load(machine__kernel_map(con->machine));
+
        skel = lock_contention_bpf__open();
        if (!skel) {
                pr_err("Failed to open lock-contention BPF skeleton\n");
@@ -749,9 +752,6 @@ int lock_contention_read(struct lock_contention *con)
                bpf_prog_test_run_opts(prog_fd, &opts);
        }
 
-       /* make sure it loads the kernel map */
-       maps__load_first(machine->kmaps);
-
        prev_key = NULL;
        while (!bpf_map_get_next_key(fd, prev_key, &key)) {
                s64 ls_key;
--

2.51.1.851.g4ebd6896fd-goog

author maintainer Applied
#2 lore raw
In reply to Namhyung Kim
Quoted 9 lines · Namhyung Kim

On some machines, it caused troubles when it tried to find kernel symbols. I think it's because kernel modules and kallsyms are messed up during load and split.

Basically we want to make sure the kernel map is loaded and the code has it in the lock_contention_read(). But recently we added more lookups in the lock_contention_prepare() which is called before _read().

[...]

Applied to perf-tools-next, thanks!

Best regards,
Namhyung