From nobody Mon Oct 6 10:13:26 2025 Received: from out-172.mta0.migadu.com (out-172.mta0.migadu.com [91.218.175.172]) (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 51617278768 for ; Tue, 22 Jul 2025 15:35:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753198530; cv=none; b=RVrsTR90roVWqSIMjpvHQygY8CegrsqlyT7hd1Y6Ae2iGFroTBQ8ECvWfOiG4A5omPDmcb1Yq5Kcr0I2Cyx4Y5UYGCS8xwgn1Z8cdoPEAthZeTjD7FOyz8l0HHlcd16Tb5X1gNqPjs1ySZZkFD1hH80U6fidE9VrVfvn/Qwr2R4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753198530; c=relaxed/simple; bh=6PKQRM+trCUIVCmPY+p17BM5pPiI9HJPMZ/vwSb+rV4=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=U9OWpX+aWiZM3CWuAFKLmlL00cwyQxzXSyCYFhjH/2JPRb2e908I/tohgPpICR365QqsX0ZElkU5ZHrBmWYzQYnPTZQvR3HB8UcEn1Cnw7AUNeZLgTu0R0DMmMkO8IW98NzxSlK0gbsn6av2FN34FVO6shojZWCh2jSZuczLKkI= 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=HmEaddyg; arc=none smtp.client-ip=91.218.175.172 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="HmEaddyg" 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=1753198526; 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=cp6iNzapmusfmxQ0x7rEWLTmm+LPm3BtU19zWn32g3g=; b=HmEaddygsJTd5Ds29vSdfVE1XU8zywgGJa61/WMN15ptIJMjmT9B6ibW5p4CPjikJI0OnZ c1iy+l4C3G6HzGmxHFynmtM6G9cM5zISOIPzCStq9yd/jlheyUUdMrr+9ZsbyFdLLtkrYF zALa/gaoEbnwLeAvHdbmbdUdc15KHm8= 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 v3 1/4] bpf: Show precise rejected function when attaching fexit/fmod_ret to __noreturn functions Date: Tue, 22 Jul 2025 23:34:31 +0800 Message-ID: <20250722153434.20571-2-kafai.wan@linux.dev> In-Reply-To: <20250722153434.20571-1-kafai.wan@linux.dev> References: <20250722153434.20571-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 10:13:26 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 A9AE8278751 for ; Tue, 22 Jul 2025 15:35:34 +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=1753198536; cv=none; b=FD8as3GGGZ2ufWxeghivQ5JGY8/lKlk6n3DHi2DCntUszGaIt4kuYo365NZY4vcBeN26rqaF5RODku0vYWaIkM/AraHZzAMHAj8ECAe/WyD08SsQPHNFPUVeF0J+RNrK/jXviXmNzbbEdz9CQkX5AMCN+aOhnThbxJ7N7lO+Ab8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753198536; c=relaxed/simple; bh=/YWJAaEMKsQpB79XKIShJIz579wQYx3BFktuZTqQQfI=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Ifk5hgEEribBUlWZEA6YOK5lLTwjfB1WKnrkk5Yc3BararDP+PaMvI0KziYe4iup88l55n1AmsEVv4cyaDC8Sjbr/Fy/X4plaHVCo9mGlBrXO25da9UAowS5fTSF/f5ggKpmW3OLpSWaLOwh6HhWYtvDPCZaZ262o2J1z2UKPgc= 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=SupDX+iV; 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="SupDX+iV" 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=1753198532; 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=dvldxwGncKCm2/+TEH6ACEmFzgbPQOhXnryfMQbqEB4=; b=SupDX+iVwPylwkv3MKyyf0LYltqXcPQpnYGCATUZXnuRZtl00RXVELyprfMsqLyb8f4+Cx qcXLSSYW/zfTAxJn8a7e3mIQ17UlJJix28Afh1rsAsLaObkj9WNBljHY6727PsHVBBzh1R O3yn0ZqYKWIxiMFVUqvRFb35YlM2+So= 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 v3 2/4] bpf: Add log for attaching tracing programs to functions in deny list Date: Tue, 22 Jul 2025 23:34:32 +0800 Message-ID: <20250722153434.20571-3-kafai.wan@linux.dev> In-Reply-To: <20250722153434.20571-1-kafai.wan@linux.dev> References: <20250722153434.20571-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 migrate_disable() from log. $ ./fentry libbpf: prog 'migrate_disable': BPF program load failed: -EINVAL libbpf: prog 'migrate_disable': -- BEGIN PROG LOAD LOG -- Attaching tracing programs to function 'migrate_disable' 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 10:13:26 2025 Received: from out-170.mta0.migadu.com (out-170.mta0.migadu.com [91.218.175.170]) (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 0DA0F26980F for ; Tue, 22 Jul 2025 15:35:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753198545; cv=none; b=vA1upjO1O4cJ0FOp8SZkVNSTTdiS96wqduAnWAfubOQu0g4Qr6kaICM85GbWmQYoaStvRi/9A6242iGK9uxdFN4NjZmttPpbSZp3N6kax1o0wmJtR+YAUB95HX4HtAAX3BeSd06BpXy7VxqKSflL1EdnxZzh+Y0w6c+ssLl9Weg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753198545; c=relaxed/simple; bh=9e+XKFTuYCdgCVl3Q/4BvVejCNYn6MdSnw4Hrx+qNv8=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jazysrc7MuZnW8H9VY9VJ5hZ1fBvYd/x6hxXS350TyNk/EODKTWPg+dcksqAwiar9KLH8MLJzGY1QGMC9RW/SzNHZLZkAxMLR0e6HJwT+mO9sVVcN5gDukHhX6Yba5dN5aKk05zBuCb49qD0qotX9kQq4P3q8ivIW79c14RMDzg= 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=bqJBRSpm; arc=none smtp.client-ip=91.218.175.170 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="bqJBRSpm" 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=1753198542; 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=mKvCoJGwfEdOcx6kKVh6JIG3YvhFXp1tkarpnDQix0E=; b=bqJBRSpmZYEXLm8VW24lyyvd4RansGm7NCdEVx+EW6qIO1BFoSjJit0HKXpDMn9CsuWLdz aT7muHovUxe6StfTxt2TStSKJpKoWfnxtuXPHz2c4OXfkb/+ncIor0Mj4To5gOHeS53gGI 61sBQFQ0PhXufvi1J7W1GGLpPsfYRg4= 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 v3 3/4] selftests/bpf: Add selftest for attaching tracing programs to functions in deny list Date: Tue, 22 Jul 2025 23:34:33 +0800 Message-ID: <20250722153434.20571-4-kafai.wan@linux.dev> In-Reply-To: <20250722153434.20571-1-kafai.wan@linux.dev> References: <20250722153434.20571-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..140fb0d175cf 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; + + /* migrate_disable depends on CONFIG_SMP */ + btf_id =3D libbpf_find_vmlinux_btf_id("migrate_disable", 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 'migrate_disable' 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..dfa152e8194e 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/migrate_disable") +int BPF_PROG(tracing_deny) +{ + return 0; +} --=20 2.43.0 From nobody Mon Oct 6 10:13:26 2025 Received: from out-185.mta0.migadu.com (out-185.mta0.migadu.com [91.218.175.185]) (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 983D527932E for ; Tue, 22 Jul 2025 15:35:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.185 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753198555; cv=none; b=Y6ScICNihDpTq60+xHpbUIuyijOMXmPFtw0ZNEUD/x+bJ6e/nIxYKV/NcDK5UVUoCxa5DvnNffcc/LHK7jX/JYh/gIKMHHmyoRC49HpZ95S7xFhnZzkIQg8VhEwqVb8aqi0oBIS3jNEq11epHW7fBHUOX0UHPbjntYp8cqACjpo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753198555; c=relaxed/simple; bh=mCBqL8xjfR57vJvMp9lpkKBV0ktGg7kwsgafi+ri44o=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=l0pvj4WFGvUVgZxR8qEfNTTITWELgcC4twQJZlLhuTn77owCQ6KoV2jdgpeKTD7AO/ROG9ULzM3UOYKdZ9HRc3pO57kfPgEOLt2JvpN3GlcX3hfmk6Edr5M54gO1tmahMa9sU8Dodc8H/UaHzb33vun8xQGoXu1zUydR6Hp+e0w= 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=lGlIGhXR; arc=none smtp.client-ip=91.218.175.185 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="lGlIGhXR" 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=1753198551; 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=I8bpiq7NXE+7ykTDyyrt/AdiHWnh4KywpW8frQH5Gv0=; b=lGlIGhXRq+W2dOq48FTPdLjh7u8bFYIMW5z/rMgW8PB8mmSZYuhxxvNoeWO0ROAQKid6RK xh8i/G/nOGGsAND9EzuZvUdA4tQ2hKsevfV6yVJGIAZQ9okZelPSTm7rwAi3k7NBW4HFEG sPWAnF2X8IDk0m3pOdU0xbMthCttqbQ= 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 v3 4/4] selftests/bpf: Migrate fexit_noreturns case into tracing_failure test suite Date: Tue, 22 Jul 2025 23:34:34 +0800 Message-ID: <20250722153434.20571-5-kafai.wan@linux.dev> In-Reply-To: <20250722153434.20571-1-kafai.wan@linux.dev> References: <20250722153434.20571-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 140fb0d175cf..01c1997b705f 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; - - /* migrate_disable depends on CONFIG_SMP */ - btf_id =3D libbpf_find_vmlinux_btf_id("migrate_disable", 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 'migrate_disable' 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; + + /* migrate_disable depends on CONFIG_SMP */ + btf_id =3D libbpf_find_vmlinux_btf_id("migrate_disable", BPF_TRACE_FENTRY= ); + if (btf_id <=3D 0) { + test__skip(); + return; + } + + test_tracing_fail_prog("tracing_deny", + "Attaching tracing programs to function 'migrate_disable' 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 dfa152e8194e..70a123e8fe9c 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