From nobody Mon Oct 6 04:55:27 2025 Received: from out-182.mta0.migadu.com (out-182.mta0.migadu.com [91.218.175.182]) (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 BE2222E9ECA for ; Thu, 24 Jul 2025 15:15:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753370123; cv=none; b=PkwlKTsfL0gbldOrf6t3dUsjP6OvcWcfsASK9Y2yQMg8As+QLLFMjbcrSSEYh9l+4Ebt5CjpQjL0q6zrluX+uQfuANE4GSxUdm5ZsW+2LwUbh+YXoSDlaKOQnIZmdmj6OHGQt0rCDYIYJr3GdkHwiyX0OP+QvT9wyahFZC27oL8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753370123; c=relaxed/simple; bh=EOcAPAX1vQ4XIk2/UrVWTxL9MCVWE5oN9MT9W2II56I=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JF1N1ECE8IsPHheTthWvxRzMz8YZxn/6cYqDUhfy183PGA3wqA+oq7x4ZpHwO0GsfZDLLRIeES/6Xcr/PYiIxzmrjMyNIzXXcxlXAz61RYJCh67FZ96dgFpBr6QvonEJBdIF9LByeXojSm2uw2VA6NY/ixPt/dpM9R1LsMxzwIM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=A4798Up0; arc=none smtp.client-ip=91.218.175.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="A4798Up0" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1753370118; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ElR9Dd4bdnPHpZLYz3QLh/uZus9GLW0mgy218VPlreM=; b=A4798Up0BsBRUIgT7YPu1ixF9//13jLsBK4Y5pNRMwPKvbMj7qRSx8FNQ+w4Z4G/eb8LqQ sigTBLrPYKGJ4/VOkhEl7oJJucqgYPaDuP96d3utXvj1PcnkvrgtrmL2ppaqlkUQIkRBz9 iZWZNTfmDzOmtOsh60GS7n7OzlPm1OQ= From: KaFai Wan To: ast@kernel.org, daniel@iogearbox.net, john.fastabend@gmail.com, andrii@kernel.org, martin.lau@linux.dev, eddyz87@gmail.com, song@kernel.org, yonghong.song@linux.dev, kpsingh@kernel.org, sdf@fomichev.me, haoluo@google.com, jolsa@kernel.org, mykolal@fb.com, shuah@kernel.org, kafai.wan@linux.dev, laoar.shao@gmail.com, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, linux-kselftest@vger.kernel.org, leon.hwang@linux.dev Subject: [PATCH bpf-next v4 1/4] bpf: Show precise rejected function when attaching fexit/fmod_ret to __noreturn functions Date: Thu, 24 Jul 2025 23:14:51 +0800 Message-ID: <20250724151454.499040-2-kafai.wan@linux.dev> In-Reply-To: <20250724151454.499040-1-kafai.wan@linux.dev> References: <20250724151454.499040-1-kafai.wan@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" With this change, we know the precise rejected function name when attaching fexit/fmod_ret to __noreturn functions from log. $ ./fexit libbpf: prog 'fexit': BPF program load failed: -EINVAL libbpf: prog 'fexit': -- BEGIN PROG LOAD LOG -- Attaching fexit/fmod_ret to __noreturn function 'do_exit' is rejected. Suggested-by: Leon Hwang Signed-off-by: KaFai Wan Acked-by: Yafang Shao Acked-by: Yonghong Song --- kernel/bpf/verifier.c | 3 ++- tools/testing/selftests/bpf/progs/fexit_noreturns.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index e2fcea860755..00d287814f12 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -23946,7 +23946,8 @@ static int check_attach_btf_id(struct bpf_verifier_= env *env) } else if ((prog->expected_attach_type =3D=3D BPF_TRACE_FEXIT || prog->expected_attach_type =3D=3D BPF_MODIFY_RETURN) && btf_id_set_contains(&noreturn_deny, btf_id)) { - verbose(env, "Attaching fexit/fmod_ret to __noreturn functions is reject= ed.\n"); + verbose(env, "Attaching fexit/fmod_ret to __noreturn function '%s' is re= jected.\n", + tgt_info.tgt_name); return -EINVAL; } =20 diff --git a/tools/testing/selftests/bpf/progs/fexit_noreturns.c b/tools/te= sting/selftests/bpf/progs/fexit_noreturns.c index 54654539f550..b1c33d958ae2 100644 --- a/tools/testing/selftests/bpf/progs/fexit_noreturns.c +++ b/tools/testing/selftests/bpf/progs/fexit_noreturns.c @@ -8,7 +8,7 @@ char _license[] SEC("license") =3D "GPL"; =20 SEC("fexit/do_exit") -__failure __msg("Attaching fexit/fmod_ret to __noreturn functions is rejec= ted.") +__failure __msg("Attaching fexit/fmod_ret to __noreturn function 'do_exit'= is rejected.") int BPF_PROG(noreturns) { return 0; --=20 2.43.0 From nobody Mon Oct 6 04:55:27 2025 Received: from out-179.mta0.migadu.com (out-179.mta0.migadu.com [91.218.175.179]) (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 9080D19D88F for ; Thu, 24 Jul 2025 15:15:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753370130; cv=none; b=QQQuOURPAAH1P3hCQ5NWu9KoFYgSqAC1hGQVHohkt2nxcrksZ5IBhH2kkAp+nUzlLe90H1F+OEuXYfC8+4qUWMTfCPL2Qx1zLJmHhc4yMCvJI5ll6RFnz3/BvuTa9IjSTszHXlyS9TYPCBNU5w4fbaJ5IzUPUzvuPbyTTY2Oog0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753370130; c=relaxed/simple; bh=Rp6QB38jGHbwBhBe9EF3FxRJm3xchbnZjDcQFcC5nRg=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pmE3l57YI+RcTqxwWMDuJfGvuDPBfOUbYSjkn6x9uR51FuKjoJ3AbX/qJ9RK+3r/BudTRWgrXZ+amgIFhubXLoJm4GRTjpdN6Zg+d0BQMbuFCYxlHnhcJR50n/4lJ+/fB47H6QZSu3P0rzeSzXxlaNwxxVPzzs1C7HY2yxA38Zw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=WDvgmDkW; arc=none smtp.client-ip=91.218.175.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="WDvgmDkW" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1753370126; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gYH+7OzFGHpSlM/+cXLObejEneebIcCwpxyqa2mfSxA=; b=WDvgmDkWbWWZB+va1kleq5YoDlhqFpAyuQOneXTCrd996ZnRls2+16q6oEP5AyohBbMYMF N9fa4P/DJ46622uBfltSO9fQgr6LyvbLeoV1dYJrPOgeRr2Gngi71xOItfbevOPCl6rKcq +Wj2Tj5r6pe41Lq8jOX4vWGDeawxGu0= From: KaFai Wan To: ast@kernel.org, daniel@iogearbox.net, john.fastabend@gmail.com, andrii@kernel.org, martin.lau@linux.dev, eddyz87@gmail.com, song@kernel.org, yonghong.song@linux.dev, kpsingh@kernel.org, sdf@fomichev.me, haoluo@google.com, jolsa@kernel.org, mykolal@fb.com, shuah@kernel.org, kafai.wan@linux.dev, laoar.shao@gmail.com, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, linux-kselftest@vger.kernel.org, leon.hwang@linux.dev Subject: [PATCH bpf-next v4 2/4] bpf: Add log for attaching tracing programs to functions in deny list Date: Thu, 24 Jul 2025 23:14:52 +0800 Message-ID: <20250724151454.499040-3-kafai.wan@linux.dev> In-Reply-To: <20250724151454.499040-1-kafai.wan@linux.dev> References: <20250724151454.499040-1-kafai.wan@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" Show the rejected function name when attaching tracing programs to functions in deny list. With this change, we know why tracing programs can't attach to functions like __rcu_read_lock() from log. $ ./fentry libbpf: prog '__rcu_read_lock': BPF program load failed: -EINVAL libbpf: prog '__rcu_read_lock': -- BEGIN PROG LOAD LOG -- Attaching tracing programs to function '__rcu_read_lock' is rejected. Suggested-by: Leon Hwang Signed-off-by: KaFai Wan Acked-by: Yafang Shao Acked-by: Yonghong Song --- kernel/bpf/verifier.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index 00d287814f12..c24c0d57e595 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -23942,6 +23942,8 @@ static int check_attach_btf_id(struct bpf_verifier_= env *env) return ret; } else if (prog->type =3D=3D BPF_PROG_TYPE_TRACING && btf_id_set_contains(&btf_id_deny, btf_id)) { + verbose(env, "Attaching tracing programs to function '%s' is rejected.\n= ", + tgt_info.tgt_name); return -EINVAL; } else if ((prog->expected_attach_type =3D=3D BPF_TRACE_FEXIT || prog->expected_attach_type =3D=3D BPF_MODIFY_RETURN) && --=20 2.43.0 From nobody Mon Oct 6 04:55:27 2025 Received: from out-177.mta0.migadu.com (out-177.mta0.migadu.com [91.218.175.177]) (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 4FBE12E9EB0 for ; Thu, 24 Jul 2025 15:15:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753370139; cv=none; b=SGmkXI7YxnNX2ykAvZXH1GBJJTKsE5FIQqh5FcGlw2G4os4WLXzfbpIAZYWaM/zyyrro+kkuAuDuluoWO9SGG9K4vfjC6JBdPZxSIuke6g0OsQPnEIjGnV9u24Vy7yRHPajqUHB9wySDb2Pp9XjL5MA4xL1d9ZDiaytB1lXbmaQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753370139; c=relaxed/simple; bh=7EsDP/Fm9RStnbVDQxKJFKXsDu1UwZfNu5wEoQXfbNk=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GowUjcBa6zR8ZMUm3TV6ACk9WA27pdYBBWMFC6Xm7wq3f6Lx1FnoRORMdOljya4CEn25W+f2h24M01tSe43thx1XmZQRUA8SNy1jKEi3F8Riz9XXHMJtoTHOW93ejbgUUZkMegFf6Cjmq6oKLIA/daN2QsTytRpWRchVKPM3oWA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=gTh4jrgI; arc=none smtp.client-ip=91.218.175.177 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="gTh4jrgI" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1753370135; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gB/b4dExKC5RzJhSjSIUjOlVRtfW8Hfg6IyEFR+9/TA=; b=gTh4jrgIYcgHC2Sj0/xMTM5uelqaEmG24T3lDSDU5/oqyGEHxQWBezCqljCKYUfJE9oTn+ EO6GIHtz+hwIay6h3Mkt1jvd2u/i/Uk9frmd3X0l8CSOG7jy7DpoLiclzZ+r4omXWi6rLp T5oMR7QTWmBx/te9PaTwm2bcfckDkk0= From: KaFai Wan To: ast@kernel.org, daniel@iogearbox.net, john.fastabend@gmail.com, andrii@kernel.org, martin.lau@linux.dev, eddyz87@gmail.com, song@kernel.org, yonghong.song@linux.dev, kpsingh@kernel.org, sdf@fomichev.me, haoluo@google.com, jolsa@kernel.org, mykolal@fb.com, shuah@kernel.org, kafai.wan@linux.dev, laoar.shao@gmail.com, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, linux-kselftest@vger.kernel.org, leon.hwang@linux.dev Subject: [PATCH bpf-next v4 3/4] selftests/bpf: Add selftest for attaching tracing programs to functions in deny list Date: Thu, 24 Jul 2025 23:14:53 +0800 Message-ID: <20250724151454.499040-4-kafai.wan@linux.dev> In-Reply-To: <20250724151454.499040-1-kafai.wan@linux.dev> References: <20250724151454.499040-1-kafai.wan@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" The result: $ tools/testing/selftests/bpf/test_progs -t tracing_failure/tracing_deny #468/3 tracing_failure/tracing_deny:OK #468 tracing_failure:OK Summary: 1/1 PASSED, 0 SKIPPED, 0 FAILED Signed-off-by: KaFai Wan Acked-by: Yonghong Song --- .../bpf/prog_tests/tracing_failure.c | 33 +++++++++++++++++++ .../selftests/bpf/progs/tracing_failure.c | 6 ++++ 2 files changed, 39 insertions(+) diff --git a/tools/testing/selftests/bpf/prog_tests/tracing_failure.c b/too= ls/testing/selftests/bpf/prog_tests/tracing_failure.c index a222df765bc3..39b59276884a 100644 --- a/tools/testing/selftests/bpf/prog_tests/tracing_failure.c +++ b/tools/testing/selftests/bpf/prog_tests/tracing_failure.c @@ -28,10 +28,43 @@ static void test_bpf_spin_lock(bool is_spin_lock) tracing_failure__destroy(skel); } =20 +static void test_tracing_deny(void) +{ + struct tracing_failure *skel; + char log_buf[256]; + int btf_id, err; + + /* __rcu_read_lock depends on CONFIG_PREEMPT_RCU */ + btf_id =3D libbpf_find_vmlinux_btf_id("__rcu_read_lock", BPF_TRACE_FENTRY= ); + if (btf_id <=3D 0) { + test__skip(); + return; + } + + skel =3D tracing_failure__open(); + if (!ASSERT_OK_PTR(skel, "tracing_failure__open")) + return; + + bpf_program__set_autoload(skel->progs.tracing_deny, true); + bpf_program__set_log_buf(skel->progs.tracing_deny, log_buf, sizeof(log_bu= f)); + + err =3D tracing_failure__load(skel); + if (!ASSERT_ERR(err, "tracing_failure__load")) + goto out; + + ASSERT_HAS_SUBSTR(log_buf, + "Attaching tracing programs to function '__rcu_read_lock' is rejected= .", + "log_buf"); +out: + tracing_failure__destroy(skel); +} + void test_tracing_failure(void) { if (test__start_subtest("bpf_spin_lock")) test_bpf_spin_lock(true); if (test__start_subtest("bpf_spin_unlock")) test_bpf_spin_lock(false); + if (test__start_subtest("tracing_deny")) + test_tracing_deny(); } diff --git a/tools/testing/selftests/bpf/progs/tracing_failure.c b/tools/te= sting/selftests/bpf/progs/tracing_failure.c index d41665d2ec8c..58d2777014e1 100644 --- a/tools/testing/selftests/bpf/progs/tracing_failure.c +++ b/tools/testing/selftests/bpf/progs/tracing_failure.c @@ -18,3 +18,9 @@ int BPF_PROG(test_spin_unlock, struct bpf_spin_lock *lock) { return 0; } + +SEC("?fentry/__rcu_read_lock") +int BPF_PROG(tracing_deny) +{ + return 0; +} --=20 2.43.0 From nobody Mon Oct 6 04:55:27 2025 Received: from out-184.mta0.migadu.com (out-184.mta0.migadu.com [91.218.175.184]) (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 73DDF2EA466 for ; Thu, 24 Jul 2025 15:15:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.184 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753370147; cv=none; b=BeKqc8DhYWDF0nd96foWuRZr+QV5C9p5qMuWEUTRoeP6p70ShKFWJApea0ePMW1+yi0a0Nj97MvWxU6K/HwSmTLst0fSZWiPA93XMppNb0MJ6ajtXqE0d7elY+wfigoVhUxlnjXOAm+Slx6STk6GFR1vn12JEAdAbGAaQni4FQ8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753370147; c=relaxed/simple; bh=/NIRHWCCXgHb6aCTb4kYm2MLzgHd2qEAvK78b5KJlcg=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AnnbW/9VzC6Vedu5f+EYvF+InadetvcWlpjzuIkjb7afQHX8J9Zm3owZsStLc2pWmopOr0xWDo5/iyaP1uQqF+gskmlFcGdzWKgwLFtb7YlEmLqvQ5tdTMBeTOnlkCevEuJOIyBtkPzH4qzd8OkqG8AcIqhDsOKg6UwMDmxoW68= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=insiUJUl; arc=none smtp.client-ip=91.218.175.184 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="insiUJUl" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1753370143; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xQOXoKnEuHVbdjAAxYfHbNY7Gd7B6m6xthVMZFBbn+E=; b=insiUJUlANvhT46WT0RRVZjCoIp6wtsl6wok61NrYqCzlurvQrIn5iy+w1JHkY+ZZ+S/T6 3XNGEgNVmJUCXUo6Pi9tBucr7grNcVthaE6jWqsRUsIHMctKwI8RYgQiPTousymUhdkFba P9LW3y+kJsgJFhwKejF80kVVD9WrWUY= From: KaFai Wan To: ast@kernel.org, daniel@iogearbox.net, john.fastabend@gmail.com, andrii@kernel.org, martin.lau@linux.dev, eddyz87@gmail.com, song@kernel.org, yonghong.song@linux.dev, kpsingh@kernel.org, sdf@fomichev.me, haoluo@google.com, jolsa@kernel.org, mykolal@fb.com, shuah@kernel.org, kafai.wan@linux.dev, laoar.shao@gmail.com, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, linux-kselftest@vger.kernel.org, leon.hwang@linux.dev Subject: [PATCH bpf-next v4 4/4] selftests/bpf: Migrate fexit_noreturns case into tracing_failure test suite Date: Thu, 24 Jul 2025 23:14:54 +0800 Message-ID: <20250724151454.499040-5-kafai.wan@linux.dev> In-Reply-To: <20250724151454.499040-1-kafai.wan@linux.dev> References: <20250724151454.499040-1-kafai.wan@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" Delete fexit_noreturns.c files and migrate the cases into tracing_failure.c files. The result: $ tools/testing/selftests/bpf/test_progs -t tracing_failure/fexit_noreturns #467/4 tracing_failure/fexit_noreturns:OK #467 tracing_failure:OK Summary: 1/1 PASSED, 0 SKIPPED, 0 FAILED Signed-off-by: KaFai Wan Acked-by: Yonghong Song --- .../bpf/prog_tests/fexit_noreturns.c | 9 ---- .../bpf/prog_tests/tracing_failure.c | 47 +++++++++++++------ .../selftests/bpf/progs/fexit_noreturns.c | 15 ------ .../selftests/bpf/progs/tracing_failure.c | 6 +++ 4 files changed, 39 insertions(+), 38 deletions(-) delete mode 100644 tools/testing/selftests/bpf/prog_tests/fexit_noreturns.c delete mode 100644 tools/testing/selftests/bpf/progs/fexit_noreturns.c diff --git a/tools/testing/selftests/bpf/prog_tests/fexit_noreturns.c b/too= ls/testing/selftests/bpf/prog_tests/fexit_noreturns.c deleted file mode 100644 index 568d3aa48a78..000000000000 --- a/tools/testing/selftests/bpf/prog_tests/fexit_noreturns.c +++ /dev/null @@ -1,9 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 - -#include -#include "fexit_noreturns.skel.h" - -void test_fexit_noreturns(void) -{ - RUN_TESTS(fexit_noreturns); -} diff --git a/tools/testing/selftests/bpf/prog_tests/tracing_failure.c b/too= ls/testing/selftests/bpf/prog_tests/tracing_failure.c index 39b59276884a..10e231965589 100644 --- a/tools/testing/selftests/bpf/prog_tests/tracing_failure.c +++ b/tools/testing/selftests/bpf/prog_tests/tracing_failure.c @@ -28,37 +28,54 @@ static void test_bpf_spin_lock(bool is_spin_lock) tracing_failure__destroy(skel); } =20 -static void test_tracing_deny(void) +static void test_tracing_fail_prog(const char *prog_name, const char *exp_= msg) { struct tracing_failure *skel; + struct bpf_program *prog; char log_buf[256]; - int btf_id, err; - - /* __rcu_read_lock depends on CONFIG_PREEMPT_RCU */ - btf_id =3D libbpf_find_vmlinux_btf_id("__rcu_read_lock", BPF_TRACE_FENTRY= ); - if (btf_id <=3D 0) { - test__skip(); - return; - } + int err; =20 skel =3D tracing_failure__open(); if (!ASSERT_OK_PTR(skel, "tracing_failure__open")) return; =20 - bpf_program__set_autoload(skel->progs.tracing_deny, true); - bpf_program__set_log_buf(skel->progs.tracing_deny, log_buf, sizeof(log_bu= f)); + prog =3D bpf_object__find_program_by_name(skel->obj, prog_name); + if (!ASSERT_OK_PTR(prog, "bpf_object__find_program_by_name")) + goto out; + + bpf_program__set_autoload(prog, true); + bpf_program__set_log_buf(prog, log_buf, sizeof(log_buf)); =20 err =3D tracing_failure__load(skel); if (!ASSERT_ERR(err, "tracing_failure__load")) goto out; =20 - ASSERT_HAS_SUBSTR(log_buf, - "Attaching tracing programs to function '__rcu_read_lock' is rejected= .", - "log_buf"); + ASSERT_HAS_SUBSTR(log_buf, exp_msg, "log_buf"); out: tracing_failure__destroy(skel); } =20 +static void test_tracing_deny(void) +{ + int btf_id; + + /* __rcu_read_lock depends on CONFIG_PREEMPT_RCU */ + btf_id =3D libbpf_find_vmlinux_btf_id("__rcu_read_lock", BPF_TRACE_FENTRY= ); + if (btf_id <=3D 0) { + test__skip(); + return; + } + + test_tracing_fail_prog("tracing_deny", + "Attaching tracing programs to function '__rcu_read_lock' is rej= ected."); +} + +static void test_fexit_noreturns(void) +{ + test_tracing_fail_prog("fexit_noreturns", + "Attaching fexit/fmod_ret to __noreturn function 'do_exit' is re= jected."); +} + void test_tracing_failure(void) { if (test__start_subtest("bpf_spin_lock")) @@ -67,4 +84,6 @@ void test_tracing_failure(void) test_bpf_spin_lock(false); if (test__start_subtest("tracing_deny")) test_tracing_deny(); + if (test__start_subtest("fexit_noreturns")) + test_fexit_noreturns(); } diff --git a/tools/testing/selftests/bpf/progs/fexit_noreturns.c b/tools/te= sting/selftests/bpf/progs/fexit_noreturns.c deleted file mode 100644 index b1c33d958ae2..000000000000 --- a/tools/testing/selftests/bpf/progs/fexit_noreturns.c +++ /dev/null @@ -1,15 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 - -#include -#include -#include -#include "bpf_misc.h" - -char _license[] SEC("license") =3D "GPL"; - -SEC("fexit/do_exit") -__failure __msg("Attaching fexit/fmod_ret to __noreturn function 'do_exit'= is rejected.") -int BPF_PROG(noreturns) -{ - return 0; -} diff --git a/tools/testing/selftests/bpf/progs/tracing_failure.c b/tools/te= sting/selftests/bpf/progs/tracing_failure.c index 58d2777014e1..65e485c4468c 100644 --- a/tools/testing/selftests/bpf/progs/tracing_failure.c +++ b/tools/testing/selftests/bpf/progs/tracing_failure.c @@ -24,3 +24,9 @@ int BPF_PROG(tracing_deny) { return 0; } + +SEC("?fexit/do_exit") +int BPF_PROG(fexit_noreturns) +{ + return 0; +} --=20 2.43.0