Skip to contentSkip to conversation

selftests/bpf: Fix open-coded gettid syscall in uprobe syscall tests

PATCH Applied Jiri Olsa 2 participants 4 messages Oct 1, 2025

Subsystems (3)
lore
Share & tools
lore

Jiri Olsa

author reviewer
#0 lore raw

PATCH 1/3 selftests/bpf: Fix open-coded gettid syscall in uprobe syscall tests

Commit 0e2fb011a0ba ("selftests/bpf: Clean up open-coded gettid syscall invocations") addressed the issue that older libc may not have a gettid() function call wrapper for the associated syscall.

The uprobe syscall tests got in from tip tree, using sys_gettid in there.

Fixes 0e2fb011a0ba ("selftests/bpf: Clean up open-coded gettid syscall invocations")
---
 tools/testing/selftests/bpf/prog_tests/uprobe_syscall.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
tools/testing/selftests/bpf/prog_tests/uprobe_syscall.c +2 -2
index 6d75ede16e7c..955a37751b52 100644
@@ -661,7 +661,7 @@ static void *worker_trigger(void *arg)
 		rounds++;
 	}
 
-	printf("tid %d trigger rounds: %lu\n", gettid(), rounds);
+	printf("tid %ld trigger rounds: %lu\n", sys_gettid(), rounds);
 	return NULL;
 }
 
@@ -704,7 +704,7 @@ static void *worker_attach(void *arg)
 		rounds++;
 	}
 
-	printf("tid %d attach rounds: %lu hits: %d\n", gettid(), rounds, skel->bss->executed);
+	printf("tid %ld attach rounds: %lu hits: %d\n", sys_gettid(), rounds, skel->bss->executed);
 	uprobe_syscall_executed__destroy(skel);
 	free(ref);
 	return NULL;
Signature · 1 line
2.51.0
author reviewer
#1 lore raw

PATCH 2/3 selftests/bpf: Fix typo in subtest_basic_usdt after merge conflict

Use proper 'called' variable name.

Fixes ae28ed4578e6 ("Merge tag 'bpf-next-6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next")
---
 tools/testing/selftests/bpf/prog_tests/usdt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/bpf/prog_tests/usdt.c +1 -1
index 4f7f45e69315..f4be5269fa90 100644
@@ -142,7 +142,7 @@ static void subtest_basic_usdt(bool optimized)
 		goto cleanup;
 #endif
 
-	alled = TRIGGER(1);
+	called = TRIGGER(1);
 
 	ASSERT_EQ(bss->usdt0_called, called, "usdt0_called");
 	ASSERT_EQ(bss->usdt3_called, called, "usdt3_called");
Signature · 1 line
2.51.0
author reviewer
#2 lore raw

PATCH 3/3 selftests/bpf: Fix realloc size in bpf_get_addrs

In reply to Jiri Olsa

We will segfault once we call realloc in bpf_get_addrs due to wrong size argument.

Fixes 6302bdeb91df ("selftests/bpf: Add a kprobe_multi subtest to use addrs instead of syms")
---
 tools/testing/selftests/bpf/trace_helpers.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/bpf/trace_helpers.c +1 -1
index 171987627f3a..eeaab7013ca2 100644
@@ -732,7 +732,7 @@ int bpf_get_addrs(unsigned long **addrsp, size_t *cntp, bool kernel)
 
 		if (cnt == max_cnt) {
 			max_cnt += inc_cnt;
-			tmp_addrs = realloc(addrs, max_cnt);
+			tmp_addrs = realloc(addrs, max_cnt * sizeof(long));
 			if (!tmp_addrs) {
 				err = -ENOMEM;
 				goto error;
Signature · 1 line
2.51.0
#3 lore raw
In reply to Jiri Olsa
This series was applied to bpf/bpf.git (master) by Alexei Starovoitov <[email protected]>:

Hello:

This series was applied to bpf/bpf.git (master)
by Alexei Starovoitov <[email protected]>:

Quoted 10 lines · On Wed, 1 Oct 2025 14:22:21 +0200 you wrote:

Commit 0e2fb011a0ba ("selftests/bpf: Clean up open-coded gettid syscall invocations") addressed the issue that older libc may not have a gettid() function call wrapper for the associated syscall.

The uprobe syscall tests got in from tip tree, using sys_gettid in there.

Fixes 0e2fb011a0ba ("selftests/bpf: Clean up open-coded gettid syscall invocations")

[...]

Here is the summary with links:
- [bpf,1/3] selftests/bpf: Fix open-coded gettid syscall in uprobe syscall tests

    https://git.kernel.org/bpf/bpf/c/716d7388d3e7
  - [bpf,2/3] selftests/bpf: Fix typo in subtest_basic_usdt after merge conflict
    https://git.kernel.org/bpf/bpf/c/a5f5869dc234
  - [bpf,3/3] selftests/bpf: Fix realloc size in bpf_get_addrs
    https://git.kernel.org/bpf/bpf/c/4b946f6bb7d6

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html