From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BA4323EF0DC; Fri, 3 Jul 2026 14:35:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783089313; cv=none; b=T5sfJ3FjwfJ2eRazcj2rbcxVXdsw5lmIL9PaPsu5bABCdEE0cM2V2CcU38d85meTwmgw/RvNxS6qQp4OE9dz1BG6OKDwSY6tmvOY19yi3UiJ29wO7FwCiNGPpgaUiMe9RTLZqbbbTWVmgq8Jk2oDvxgWllz3VA+w1y/VsKmzjQM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783089313; c=relaxed/simple; bh=KyZ5cFBp0MI/j3YoRpzxLuUcpjAHGyuGxxCVkXZ3NhI=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=EKPMpdfJjanYLgtudsvunNBK0WK8yKQRTVWrfb8cnJJlrft+zqZCAL+yKuhbh4ZlnjXT08BYtWWZWvrk4cBHEFyU6Fbss0FoqOoypXE+gdlPQPNNtN3vPO1MMXmCh6BFT5bySQ4v18EOh9av3Y0jWgDFqzopY+T109l4+S2pv2s= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=O5oMaRq/; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=Q96jr+4l; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="O5oMaRq/"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="Q96jr+4l" Date: Fri, 03 Jul 2026 14:35:07 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1783089308; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NIAdurdng2TJFl/6Jk0T1Atu4yL2cCpwzu6zqRXrlvk=; b=O5oMaRq/qad/mv8Ekqre7Ciu8KCvJjnj7ZWpF85objUrPCqYXvWjMngnjOjCt0UvG4G96w 4UggxZMmdNmZQXf1v/b4QdSk3IEg550O7hNxGkNo/SC2NV6fYzT/IqBmTTgFuO4M1kNm7N tesl22v0nYWgkxHMqTLgG96sU9C79XmyUyqL053XtetHgOn2vnbKAMIzDcSkemYUHd2+KV kBNH3QH2lZA1oPKctKMncilA7J3AL6G1kzdKw5K+FnpU7+1STO4rJ9iieoOrEIXv0Pe46j dxjx50DIenR6b+2MC2X56yZ2Gj1AYLJoenm2p2VM9u3ZfrcHViEtN4fPJqLjkQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1783089308; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NIAdurdng2TJFl/6Jk0T1Atu4yL2cCpwzu6zqRXrlvk=; b=Q96jr+4lfg3k5D1kbYDQ8EsFopPCKDVSYfl4RW9XETC6r6+b6IYgU+vqOgFcaW+4ft1nag Ld13w1+i5FNVRPDA== From: "tip-bot2 for Jiri Olsa" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: perf/core] libbpf: Detect uprobe syscall with new error Cc: Jiri Olsa , "Peter Zijlstra (Intel)" , Andrii Nakryiko , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20260703114917.238144-8-jolsa@kernel.org> References: <20260703114917.238144-8-jolsa@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <178308930713.3843924.17768600543732799292.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The following commit has been merged into the perf/core branch of tip: Commit-ID: c450c804b641003e0328e4b2ebf55c05f67e3d08 Gitweb: https://git.kernel.org/tip/c450c804b641003e0328e4b2ebf55c05f67= e3d08 Author: Jiri Olsa AuthorDate: Fri, 03 Jul 2026 13:49:11 +02:00 Committer: Peter Zijlstra 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 Signed-off-by: Peter Zijlstra (Intel) Acked-by: Andrii Nakryiko 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 =3D=3D ENXIO; + return syscall(__NR_uprobe) < 0 && errno =3D=3D 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 =3D syscall(__NR_uprobe); =20 ASSERT_EQ(err, -1, "error"); - ASSERT_EQ(errno, ENXIO, "errno"); + ASSERT_EQ(errno, EPROTO, "errno"); } =20 static void __test_uprobe_syscall(void)