Skip to contentSkip to conversation

bpf: Determine freplace staticness from BTF linkage

PATCH Superseded KaFai Wan 1 participant 1 message Oct 12

Subsystems (4)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

KaFai Wan

author
#0 lore raw

PATCH 1/1 bpf: Determine freplace staticness from BTF linkage

bpf_check_attach_target() rejects a freplace whose target is a static function, using the subprog "unreliable" flag as a proxy for "static". That flag is raised whenever a subprogram's BTF prototype disagrees with the registers at its call site.

147400e9c27c ("bpf: Compute parameters liveness in bpf_compute_live_registers()") made that work for static callees: a static function with an unused argument no longer matches its BTF prototype at the call site and is marked unreliable.

Since LLVM commit 29b36a16f111 ("[BPF] Emit ABI-accurate BTF prototypes for DW_CC_nocall") in 23.1.0 [1] that premise is gone:
BTFDebug may now drop arguments removed by the optimizer, so for

	__noinline static int subprog(struct __sk_buff *ctx)
	{
		return bpf_ktime_get_ns();
	}

compiled with clang 23 the BTF describes subprog() as

	[75] FUNC_PROTO '(anon)' ret_type_id=2 vlen=0
	[76] FUNC 'subprog' type_id=75 linkage=static

There is then no argument left to compare, the subprog stays reliable, and the check in bpf_check_attach_target() is skipped. The freplace is then rejected by the later linkage check instead, reporting "subprog() is not a global function", and the selftest "exceptions" fails.

Determine staticness from the BTF linkage instead, and keep the unreliable check for global functions whose BTF does not match their call site.

There is no functional change: freplacing a static function was rejected before and is still rejected with the same -EINVAL. Selftest "exceptions" is updated to match.

[1] https://github.com/llvm/llvm-project/pull/198426

Fixes 147400e9c27c ("bpf: Compute parameters liveness in bpf_compute_live_registers()")
---
 kernel/bpf/verifier.c                               | 3 ++-
 tools/testing/selftests/bpf/prog_tests/exceptions.c | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
kernel/bpf/verifier.c +2 -1
index 2f190abe3448..e9814e3ac370 100644
@@ -22079,7 +22079,8 @@ int bpf_check_attach_target(struct bpf_verifier_log *log,
 		}
 		conservative = aux->func_info_aux[subprog].unreliable;
 		if (prog_extension) {
-			if (conservative) {
+			if (aux->func_info_aux[subprog].linkage != BTF_FUNC_GLOBAL ||
+			    conservative) {
 				bpf_log(log,
 					"Cannot replace static functions\n");
 				return -EINVAL;
tools/testing/selftests/bpf/prog_tests/exceptions.c +1 -1
index cea01d638f6f..1bd15c4c125b 100644
@@ -333,7 +333,7 @@ static void test_exceptions_success(void)
 				       bpf_program__fd(skel->progs.exception_throw_subprog),
 				       "throwing_subprog"), "set_attach_target"))
 				goto done;
-		}), "throwing_subprog() is not a global function", 0);
+		}), "Cannot replace static functions", 0);
 
 	if (test__start_subtest("non-throwing extension -> non-throwing subprog"))
 		/* non-throwing extension -> non-throwing global subprog : OK */
Signature · 1 line
2.43.0