Commit adec67d3 authored by Eduard Zingerman's avatar Eduard Zingerman Committed by Alexei Starovoitov
Browse files

selftests/bpf: rename nocsr -> bpf_fastcall in selftests 

Attribute used by LLVM implementation of the feature had been changed
from no_caller_saved_registers to bpf_fastcall (see [1]).
This commit replaces references to nocsr by references to bpf_fastcall
to keep LLVM and selftests parts in sync.

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



Acked-by: default avatarYonghong Song <yonghong.song@linux.dev>
Signed-off-by: default avatarEduard Zingerman <eddyz87@gmail.com>
Link: https://lore.kernel.org/r/20240822084112.3257995-3-eddyz87@gmail.com


Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent ae010757

tools/testing/selftests/bpf/prog_tests/verifier.c

+2 −2
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ 
#include "verifier_movsx.skel.h"

#include "verifier_netfilter_ctx.skel.h"

#include "verifier_netfilter_retcode.skel.h"

#include "verifier_nocsr.skel.h"

#include "verifier_bpf_fastcall.skel.h"

#include "verifier_or_jmp32_k.skel.h"

#include "verifier_precision.skel.h"

#include "verifier_prevent_map_lookup.skel.h"
@@ -177,7 +177,7 @@ void test_verifier_meta_access(void) { RUN(verifier_meta_access); } 
void test_verifier_movsx(void)                 { RUN(verifier_movsx); }

void test_verifier_netfilter_ctx(void)        { RUN(verifier_netfilter_ctx); }

void test_verifier_netfilter_retcode(void)    { RUN(verifier_netfilter_retcode); }

void test_verifier_nocsr(void)                { RUN(verifier_nocsr); }

void test_verifier_bpf_fastcall(void)         { RUN(verifier_bpf_fastcall); }

void test_verifier_or_jmp32_k(void)           { RUN(verifier_or_jmp32_k); }

void test_verifier_precision(void)            { RUN(verifier_precision); }

void test_verifier_prevent_map_lookup(void)   { RUN(verifier_prevent_map_lookup); }

tools/testing/selftests/bpf/progs/verifier_nocsr.c→tools/testing/selftests/bpf/progs/verifier_bpf_fastcall.c

+13 −13
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ __naked void simple(void) 
	: __clobber_all);

}



/* The logic for detecting and verifying nocsr pattern is the same for

/* The logic for detecting and verifying bpf_fastcall pattern is the same for

 * any arch, however x86 differs from arm64 or riscv64 in a way

 * bpf_get_smp_processor_id is rewritten:

 * - on x86 it is done by verifier
@@ -52,7 +52,7 @@ __naked void simple(void) 
 *

 * It is really desirable to check instruction indexes in the xlated

 * patterns, so add this canary test to check that function rewrite by

 * jit is correctly processed by nocsr logic, keep the rest of the

 * jit is correctly processed by bpf_fastcall logic, keep the rest of the

 * tests as x86.

 */

SEC("raw_tp")
@@ -463,7 +463,7 @@ __naked static void bad_write_in_subprog_aux(void) 
{

	asm volatile (

	"r0 = 1;"

	"*(u64 *)(r1 - 0) = r0;"	/* invalidates nocsr contract for caller: */

	"*(u64 *)(r1 - 0) = r0;"	/* invalidates bpf_fastcall contract for caller: */

	"exit;"				/* caller stack at -8 used outside of the pattern */

	::: __clobber_all);

}
@@ -480,7 +480,7 @@ __naked void bad_helper_write(void) 
{

	asm volatile (

	"r1 = 1;"

	/* nocsr pattern with stack offset -8 */

	/* bpf_fastcall pattern with stack offset -8 */

	"*(u64 *)(r10 - 8) = r1;"

	"call %[bpf_get_smp_processor_id];"

	"r1 = *(u64 *)(r10 - 8);"
@@ -488,7 +488,7 @@ __naked void bad_helper_write(void) 
	"r1 += -8;"

	"r2 = 1;"

	"r3 = 42;"

	/* read dst is fp[-8], thus nocsr rewrite not applied */

	/* read dst is fp[-8], thus bpf_fastcall rewrite not applied */

	"call %[bpf_probe_read_kernel];"

	"exit;"

	:
@@ -598,7 +598,7 @@ __arch_x86_64 
__log_level(4) __msg("stack depth 8")

__xlated("2: r0 = &(void __percpu *)(r0)")

__success

__naked void helper_call_does_not_prevent_nocsr(void)

__naked void helper_call_does_not_prevent_bpf_fastcall(void)

{

	asm volatile (

	"r1 = 1;"
@@ -689,7 +689,7 @@ __naked int bpf_loop_interaction1(void) 
{

	asm volatile (

	"r1 = 1;"

	/* nocsr stack region at -16, but could be removed */

	/* bpf_fastcall stack region at -16, but could be removed */

	"*(u64 *)(r10 - 16) = r1;"

	"call %[bpf_get_smp_processor_id];"

	"r1 = *(u64 *)(r10 - 16);"
@@ -729,7 +729,7 @@ __naked int bpf_loop_interaction2(void) 
{

	asm volatile (

	"r1 = 42;"

	/* nocsr stack region at -16, cannot be removed */

	/* bpf_fastcall stack region at -16, cannot be removed */

	"*(u64 *)(r10 - 16) = r1;"

	"call %[bpf_get_smp_processor_id];"

	"r1 = *(u64 *)(r10 - 16);"
@@ -759,8 +759,8 @@ __msg("stack depth 512+0") 
__xlated("r0 = &(void __percpu *)(r0)")

__success

/* cumulative_stack_depth() stack usage is MAX_BPF_STACK,

 * called subprogram uses an additional slot for nocsr spill/fill,

 * since nocsr spill/fill could be removed the program still fits

 * called subprogram uses an additional slot for bpf_fastcall spill/fill,

 * since bpf_fastcall spill/fill could be removed the program still fits

 * in MAX_BPF_STACK and should be accepted.

 */

__naked int cumulative_stack_depth(void)
@@ -798,7 +798,7 @@ __xlated("3: r0 = &(void __percpu *)(r0)") 
__xlated("4: r0 = *(u32 *)(r0 +0)")

__xlated("5: exit")

__success

__naked int nocsr_max_stack_ok(void)

__naked int bpf_fastcall_max_stack_ok(void)

{

	asm volatile(

	"r1 = 42;"
@@ -820,7 +820,7 @@ __arch_x86_64 
__log_level(4)

__msg("stack depth 520")

__failure

__naked int nocsr_max_stack_fail(void)

__naked int bpf_fastcall_max_stack_fail(void)

{

	asm volatile(

	"r1 = 42;"
@@ -828,7 +828,7 @@ __naked int nocsr_max_stack_fail(void) 
	"*(u64 *)(r10 - %[max_bpf_stack_8]) = r1;"

	"call %[bpf_get_smp_processor_id];"

	"r1 = *(u64 *)(r10 - %[max_bpf_stack_8]);"

	/* call to prandom blocks nocsr rewrite */

	/* call to prandom blocks bpf_fastcall rewrite */

	"*(u64 *)(r10 - %[max_bpf_stack_8]) = r1;"

	"call %[bpf_get_prandom_u32];"

	"r1 = *(u64 *)(r10 - %[max_bpf_stack_8]);"