[tip: perf/core] libbpf: Detect uprobe syscall with new error

[tip: perf/core] libbpf: Detect uprobe syscall with new error

[tip-bot2 for Jiri Olsa]

The following commit has been merged into the perf/core branch of tip:

Commit-ID:     c450c804b641003e0328e4b2ebf55c05f67e3d08
Gitweb:        https://git.kernel.org/tip/c450c804b641003e0328e4b2ebf55c05f67e3d08
Author:        Jiri Olsa <jolsa@kernel.org>
AuthorDate:    Fri, 03 Jul 2026 13:49:11 +02:00
Committer:     Peter Zijlstra <peterz@infradead.org>
CommitterDate: Fri, 03 Jul 2026 16:30:36 +02:00

libbpf: Detect uprobe syscall with new error

In the previous optimized uprobe fix we changed the syscall
error used for its detection from ENXIO to EPROTO.

Changing related probe_uprobe_syscall detection check.

Fixes: 05738da0efa1 ("libbpf: Add uprobe syscall feature detection")
Fixes: af734a7ddb4e ("uprobes/x86: Move optimized uprobe from nop5 to nop10")
Fixes: 40b54d7e3dab ("uprobes/x86: Move optimized uprobe from nop5 to nop10")
Fixes: 5c3c59c7952a ("uprobes/x86: Move optimized uprobe from nop5 to nop10")
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://patch.msgid.link/20260703114917.238144-8-jolsa@kernel.org
---
 tools/lib/bpf/features.c                                | 4 ++--
 tools/testing/selftests/bpf/prog_tests/uprobe_syscall.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/lib/bpf/features.c b/tools/lib/bpf/features.c
index b7e388f..e5641fa 100644
--- a/tools/lib/bpf/features.c
+++ b/tools/lib/bpf/features.c
@@ -577,10 +577,10 @@ static int probe_ldimm64_full_range_off(int token_fd)
 static int probe_uprobe_syscall(int token_fd)
 {
 	/*
-	 * If kernel supports uprobe() syscall, it will return -ENXIO when called
+	 * If kernel supports uprobe() syscall, it will return -EPROTO when called
 	 * from the outside of a kernel-generated uprobe trampoline.
 	 */
-	return syscall(__NR_uprobe) < 0 && errno == ENXIO;
+	return syscall(__NR_uprobe) < 0 && errno == EPROTO;
 }
 #else
 static int probe_uprobe_syscall(int token_fd)
diff --git a/tools/testing/selftests/bpf/prog_tests/uprobe_syscall.c b/tools/testing/selftests/bpf/prog_tests/uprobe_syscall.c
index 955a377..c944136 100644
--- a/tools/testing/selftests/bpf/prog_tests/uprobe_syscall.c
+++ b/tools/testing/selftests/bpf/prog_tests/uprobe_syscall.c
@@ -762,7 +762,7 @@ static void test_uprobe_error(void)
 	long err = syscall(__NR_uprobe);
 
 	ASSERT_EQ(err, -1, "error");
-	ASSERT_EQ(errno, ENXIO, "errno");
+	ASSERT_EQ(errno, EPROTO, "errno");
 }
 
 static void __test_uprobe_syscall(void)

Re: [tip: perf/core] libbpf: Detect uprobe syscall with new error

[Ingo Molnar]

* tip-bot2 for Jiri Olsa <tip-bot2@linutronix.de> wrote:

> The following commit has been merged into the perf/core branch of tip:
> 
> Commit-ID:     c450c804b641003e0328e4b2ebf55c05f67e3d08
> Gitweb:        https://git.kernel.org/tip/c450c804b641003e0328e4b2ebf55c05f67e3d08
> Author:        Jiri Olsa <jolsa@kernel.org>
> AuthorDate:    Fri, 03 Jul 2026 13:49:11 +02:00
> Committer:     Peter Zijlstra <peterz@infradead.org>
> CommitterDate: Fri, 03 Jul 2026 16:30:36 +02:00
> 
> libbpf: Detect uprobe syscall with new error
> 
> In the previous optimized uprobe fix we changed the syscall
> error used for its detection from ENXIO to EPROTO.
> 
> Changing related probe_uprobe_syscall detection check.
> 
> Fixes: 05738da0efa1 ("libbpf: Add uprobe syscall feature detection")
> Fixes: af734a7ddb4e ("uprobes/x86: Move optimized uprobe from nop5 to nop10")
> Fixes: 40b54d7e3dab ("uprobes/x86: Move optimized uprobe from nop5 to nop10")
> Fixes: 5c3c59c7952a ("uprobes/x86: Move optimized uprobe from nop5 to nop10")

The last 3 Fixes tags are bogus (just like the triplication itself),
those SHA1's don't exist anymore due to rebases.

I suppose it's meant to be:

  Fixes: 554ba38456da ("uprobes/x86: Move optimized uprobe from nop5 to nop10")

But why are we applying and then fixing later on a regression in
an earlier commit in the same series to begin with??

Anyway, I've fixed up the tag mishaps in a rebase in tip:perf/core,
but can we please not do something like this in the future?

Thanks,

	Ingo

[tip: perf/core] libbpf: Detect uprobe syscall with new error

[tip-bot2 for Jiri Olsa]

The following commit has been merged into the perf/core branch of tip:

Commit-ID:     8cae54c586084c81ab80f6ab020192eb2ce7aa0b
Gitweb:        https://git.kernel.org/tip/8cae54c586084c81ab80f6ab020192eb2ce7aa0b
Author:        Jiri Olsa <jolsa@kernel.org>
AuthorDate:    Fri, 03 Jul 2026 13:49:11 +02:00
Committer:     Ingo Molnar <mingo@kernel.org>
CommitterDate: Sat, 04 Jul 2026 10:56:30 +02:00

libbpf: Detect uprobe syscall with new error

In the previous optimized uprobe fix we changed the syscall
error used for its detection from ENXIO to EPROTO.

Changing related probe_uprobe_syscall detection check.

Fixes: 05738da0efa1 ("libbpf: Add uprobe syscall feature detection")
Fixes: 554ba38456da ("uprobes/x86: Move optimized uprobe from nop5 to nop10")
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Acked-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://patch.msgid.link/20260703114917.238144-8-jolsa@kernel.org
---
 tools/lib/bpf/features.c                                | 4 ++--
 tools/testing/selftests/bpf/prog_tests/uprobe_syscall.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/lib/bpf/features.c b/tools/lib/bpf/features.c
index b7e388f..e5641fa 100644
--- a/tools/lib/bpf/features.c
+++ b/tools/lib/bpf/features.c
@@ -577,10 +577,10 @@ static int probe_ldimm64_full_range_off(int token_fd)
 static int probe_uprobe_syscall(int token_fd)
 {
 	/*
-	 * If kernel supports uprobe() syscall, it will return -ENXIO when called
+	 * If kernel supports uprobe() syscall, it will return -EPROTO when called
 	 * from the outside of a kernel-generated uprobe trampoline.
 	 */
-	return syscall(__NR_uprobe) < 0 && errno == ENXIO;
+	return syscall(__NR_uprobe) < 0 && errno == EPROTO;
 }
 #else
 static int probe_uprobe_syscall(int token_fd)
diff --git a/tools/testing/selftests/bpf/prog_tests/uprobe_syscall.c b/tools/testing/selftests/bpf/prog_tests/uprobe_syscall.c
index 955a377..c944136 100644
--- a/tools/testing/selftests/bpf/prog_tests/uprobe_syscall.c
+++ b/tools/testing/selftests/bpf/prog_tests/uprobe_syscall.c
@@ -762,7 +762,7 @@ static void test_uprobe_error(void)
 	long err = syscall(__NR_uprobe);
 
 	ASSERT_EQ(err, -1, "error");
-	ASSERT_EQ(errno, ENXIO, "errno");
+	ASSERT_EQ(errno, EPROTO, "errno");
 }
 
 static void __test_uprobe_syscall(void)