Skip to content

Commit

Permalink
selftests/bpf: Add selftests for load-acquire and store-release instr…
Browse files Browse the repository at this point in the history
…uctions

Add several ./test_progs tests:

  - atomics/load_acquire
  - atomics/store_release
  - arena_atomics/load_acquire
  - arena_atomics/store_release
  - verifier_load_acquire/*
  - verifier_store_release/*
  - verifier_precision/bpf_load_acquire
  - verifier_precision/bpf_store_release

The last two tests are added to check if backtrack_insn() handles the
new instructions correctly.

Additionally, the last test also makes sure that the verifier
"remembers" the value (in src_reg) we store-release into e.g. a stack
slot.  For example, if we take a look at the test program:

    #0:  "r1 = 8;"
    #1:  "store_release((u64 *)(r10 - 8), r1);"
    #2:  "r1 = *(u64 *)(r10 - 8);"
    #3:  "r2 = r10;"
    #4:  "r2 += r1;"	/* mark_precise */
    #5:  "r0 = 0;"
    #6:  "exit;"

At #1, if the verifier doesn't remember that we wrote 8 to the stack,
then later at #4 we would be adding an unbounded scalar value to the
stack pointer, which would cause the program to be rejected:

  VERIFIER LOG:
  =============
...
  math between fp pointer and register with unbounded min value is not allowed

All new tests depend on the pre-defined __BPF_FEATURE_LOAD_ACQ_STORE_REL
feature macro, which implies -mcpu>=v4.

Signed-off-by: Peilin Ye <yepeilin@google.com>
  • Loading branch information
peilin-ye authored and Kernel Patches Daemon committed Feb 6, 2025
1 parent c28e2d2 commit cd3287f
Show file tree
Hide file tree
Showing 8 changed files with 524 additions and 6 deletions.
61 changes: 60 additions & 1 deletion tools/testing/selftests/bpf/prog_tests/arena_atomics.c
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,60 @@ static void test_uaf(struct arena_atomics *skel)
ASSERT_EQ(skel->arena->uaf_recovery_fails, 0, "uaf_recovery_fails");
}

static void test_load_acquire(struct arena_atomics *skel)
{
LIBBPF_OPTS(bpf_test_run_opts, topts);
int err, prog_fd;

if (skel->data->skip_lacq_srel_tests) {
printf("%s:SKIP:Clang does not support BPF load-acquire or addr_space_cast\n",
__func__);
test__skip();
return;
}

/* No need to attach it, just run it directly */
prog_fd = bpf_program__fd(skel->progs.load_acquire);
err = bpf_prog_test_run_opts(prog_fd, &topts);
if (!ASSERT_OK(err, "test_run_opts err"))
return;
if (!ASSERT_OK(topts.retval, "test_run_opts retval"))
return;

ASSERT_EQ(skel->arena->load_acquire8_result, 0x12, "load_acquire8_result");
ASSERT_EQ(skel->arena->load_acquire16_result, 0x1234, "load_acquire16_result");
ASSERT_EQ(skel->arena->load_acquire32_result, 0x12345678, "load_acquire32_result");
ASSERT_EQ(skel->arena->load_acquire64_result, 0x1234567890abcdef,
"load_acquire64_result");
}

static void test_store_release(struct arena_atomics *skel)
{
LIBBPF_OPTS(bpf_test_run_opts, topts);
int err, prog_fd;

if (skel->data->skip_lacq_srel_tests) {
printf("%s:SKIP:Clang does not support BPF store-release or addr_space_cast\n",
__func__);
test__skip();
return;
}

/* No need to attach it, just run it directly */
prog_fd = bpf_program__fd(skel->progs.store_release);
err = bpf_prog_test_run_opts(prog_fd, &topts);
if (!ASSERT_OK(err, "test_run_opts err"))
return;
if (!ASSERT_OK(topts.retval, "test_run_opts retval"))
return;

ASSERT_EQ(skel->arena->store_release8_result, 0x12, "store_release8_result");
ASSERT_EQ(skel->arena->store_release16_result, 0x1234, "store_release16_result");
ASSERT_EQ(skel->arena->store_release32_result, 0x12345678, "store_release32_result");
ASSERT_EQ(skel->arena->store_release64_result, 0x1234567890abcdef,
"store_release64_result");
}

void test_arena_atomics(void)
{
struct arena_atomics *skel;
Expand All @@ -171,7 +225,7 @@ void test_arena_atomics(void)
if (!ASSERT_OK_PTR(skel, "arena atomics skeleton open"))
return;

if (skel->data->skip_tests) {
if (skel->data->skip_all_tests) {
printf("%s:SKIP:no ENABLE_ATOMICS_TESTS or no addr_space_cast support in clang",
__func__);
test__skip();
Expand Down Expand Up @@ -199,6 +253,11 @@ void test_arena_atomics(void)
if (test__start_subtest("uaf"))
test_uaf(skel);

if (test__start_subtest("load_acquire"))
test_load_acquire(skel);
if (test__start_subtest("store_release"))
test_store_release(skel);

cleanup:
arena_atomics__destroy(skel);
}
57 changes: 56 additions & 1 deletion tools/testing/selftests/bpf/prog_tests/atomics.c
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,56 @@ static void test_xchg(struct atomics_lskel *skel)
ASSERT_EQ(skel->bss->xchg32_result, 1, "xchg32_result");
}

static void test_load_acquire(struct atomics_lskel *skel)
{
LIBBPF_OPTS(bpf_test_run_opts, topts);
int err, prog_fd;

if (skel->data->skip_lacq_srel_tests) {
printf("%s:SKIP:Clang does not support BPF load-acquire\n", __func__);
test__skip();
return;
}

/* No need to attach it, just run it directly */
prog_fd = skel->progs.load_acquire.prog_fd;
err = bpf_prog_test_run_opts(prog_fd, &topts);
if (!ASSERT_OK(err, "test_run_opts err"))
return;
if (!ASSERT_OK(topts.retval, "test_run_opts retval"))
return;

ASSERT_EQ(skel->bss->load_acquire8_result, 0x12, "load_acquire8_result");
ASSERT_EQ(skel->bss->load_acquire16_result, 0x1234, "load_acquire16_result");
ASSERT_EQ(skel->bss->load_acquire32_result, 0x12345678, "load_acquire32_result");
ASSERT_EQ(skel->bss->load_acquire64_result, 0x1234567890abcdef, "load_acquire64_result");
}

static void test_store_release(struct atomics_lskel *skel)
{
LIBBPF_OPTS(bpf_test_run_opts, topts);
int err, prog_fd;

if (skel->data->skip_lacq_srel_tests) {
printf("%s:SKIP:Clang does not support BPF store-release\n", __func__);
test__skip();
return;
}

/* No need to attach it, just run it directly */
prog_fd = skel->progs.store_release.prog_fd;
err = bpf_prog_test_run_opts(prog_fd, &topts);
if (!ASSERT_OK(err, "test_run_opts err"))
return;
if (!ASSERT_OK(topts.retval, "test_run_opts retval"))
return;

ASSERT_EQ(skel->bss->store_release8_result, 0x12, "store_release8_result");
ASSERT_EQ(skel->bss->store_release16_result, 0x1234, "store_release16_result");
ASSERT_EQ(skel->bss->store_release32_result, 0x12345678, "store_release32_result");
ASSERT_EQ(skel->bss->store_release64_result, 0x1234567890abcdef, "store_release64_result");
}

void test_atomics(void)
{
struct atomics_lskel *skel;
Expand All @@ -170,7 +220,7 @@ void test_atomics(void)
if (!ASSERT_OK_PTR(skel, "atomics skeleton load"))
return;

if (skel->data->skip_tests) {
if (skel->data->skip_all_tests) {
printf("%s:SKIP:no ENABLE_ATOMICS_TESTS (missing Clang BPF atomics support)",
__func__);
test__skip();
Expand All @@ -193,6 +243,11 @@ void test_atomics(void)
if (test__start_subtest("xchg"))
test_xchg(skel);

if (test__start_subtest("load_acquire"))
test_load_acquire(skel);
if (test__start_subtest("store_release"))
test_store_release(skel);

cleanup:
atomics_lskel__destroy(skel);
}
4 changes: 4 additions & 0 deletions tools/testing/selftests/bpf/prog_tests/verifier.c
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
#include "verifier_ldsx.skel.h"
#include "verifier_leak_ptr.skel.h"
#include "verifier_linked_scalars.skel.h"
#include "verifier_load_acquire.skel.h"
#include "verifier_loops1.skel.h"
#include "verifier_lwt.skel.h"
#include "verifier_map_in_map.skel.h"
Expand Down Expand Up @@ -80,6 +81,7 @@
#include "verifier_spill_fill.skel.h"
#include "verifier_spin_lock.skel.h"
#include "verifier_stack_ptr.skel.h"
#include "verifier_store_release.skel.h"
#include "verifier_subprog_precision.skel.h"
#include "verifier_subreg.skel.h"
#include "verifier_tailcall_jit.skel.h"
Expand Down Expand Up @@ -173,6 +175,7 @@ void test_verifier_int_ptr(void) { RUN(verifier_int_ptr); }
void test_verifier_iterating_callbacks(void) { RUN(verifier_iterating_callbacks); }
void test_verifier_jeq_infer_not_null(void) { RUN(verifier_jeq_infer_not_null); }
void test_verifier_jit_convergence(void) { RUN(verifier_jit_convergence); }
void test_verifier_load_acquire(void) { RUN(verifier_load_acquire); }
void test_verifier_ld_ind(void) { RUN(verifier_ld_ind); }
void test_verifier_ldsx(void) { RUN(verifier_ldsx); }
void test_verifier_leak_ptr(void) { RUN(verifier_leak_ptr); }
Expand Down Expand Up @@ -211,6 +214,7 @@ void test_verifier_sockmap_mutate(void) { RUN(verifier_sockmap_mutate); }
void test_verifier_spill_fill(void) { RUN(verifier_spill_fill); }
void test_verifier_spin_lock(void) { RUN(verifier_spin_lock); }
void test_verifier_stack_ptr(void) { RUN(verifier_stack_ptr); }
void test_verifier_store_release(void) { RUN(verifier_store_release); }
void test_verifier_subprog_precision(void) { RUN(verifier_subprog_precision); }
void test_verifier_subreg(void) { RUN(verifier_subreg); }
void test_verifier_tailcall_jit(void) { RUN(verifier_tailcall_jit); }
Expand Down
62 changes: 60 additions & 2 deletions tools/testing/selftests/bpf/progs/arena_atomics.c
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,15 @@ struct {
} arena SEC(".maps");

#if defined(ENABLE_ATOMICS_TESTS) && defined(__BPF_FEATURE_ADDR_SPACE_CAST)
bool skip_tests __attribute((__section__(".data"))) = false;
bool skip_all_tests __attribute((__section__(".data"))) = false;
#else
bool skip_tests = true;
bool skip_all_tests = true;
#endif

#if defined(__BPF_FEATURE_LOAD_ACQ_STORE_REL) && defined(__BPF_FEATURE_ADDR_SPACE_CAST)
bool skip_lacq_srel_tests __attribute((__section__(".data"))) = false;
#else
bool skip_lacq_srel_tests = true;
#endif

__u32 pid = 0;
Expand Down Expand Up @@ -274,4 +280,56 @@ int uaf(const void *ctx)
return 0;
}

__u8 __arena_global load_acquire8_value = 0x12;
__u16 __arena_global load_acquire16_value = 0x1234;
__u32 __arena_global load_acquire32_value = 0x12345678;
__u64 __arena_global load_acquire64_value = 0x1234567890abcdef;

__u8 __arena_global load_acquire8_result = 0;
__u16 __arena_global load_acquire16_result = 0;
__u32 __arena_global load_acquire32_result = 0;
__u64 __arena_global load_acquire64_result = 0;

SEC("raw_tp/sys_enter")
int load_acquire(const void *ctx)
{
if (pid != (bpf_get_current_pid_tgid() >> 32))
return 0;

#ifdef __BPF_FEATURE_LOAD_ACQ_STORE_REL
load_acquire8_result = __atomic_load_n(&load_acquire8_value, __ATOMIC_ACQUIRE);
load_acquire16_result = __atomic_load_n(&load_acquire16_value, __ATOMIC_ACQUIRE);
load_acquire32_result = __atomic_load_n(&load_acquire32_value, __ATOMIC_ACQUIRE);
load_acquire64_result = __atomic_load_n(&load_acquire64_value, __ATOMIC_ACQUIRE);
#endif

return 0;
}

__u8 __arena_global store_release8_result = 0;
__u16 __arena_global store_release16_result = 0;
__u32 __arena_global store_release32_result = 0;
__u64 __arena_global store_release64_result = 0;

SEC("raw_tp/sys_enter")
int store_release(const void *ctx)
{
if (pid != (bpf_get_current_pid_tgid() >> 32))
return 0;

#ifdef __BPF_FEATURE_LOAD_ACQ_STORE_REL
__u8 val8 = 0x12;
__u16 val16 = 0x1234;
__u32 val32 = 0x12345678;
__u64 val64 = 0x1234567890abcdef;

__atomic_store_n(&store_release8_result, val8, __ATOMIC_RELEASE);
__atomic_store_n(&store_release16_result, val16, __ATOMIC_RELEASE);
__atomic_store_n(&store_release32_result, val32, __ATOMIC_RELEASE);
__atomic_store_n(&store_release64_result, val64, __ATOMIC_RELEASE);
#endif

return 0;
}

char _license[] SEC("license") = "GPL";
62 changes: 60 additions & 2 deletions tools/testing/selftests/bpf/progs/atomics.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,15 @@
#include <stdbool.h>

#ifdef ENABLE_ATOMICS_TESTS
bool skip_tests __attribute((__section__(".data"))) = false;
bool skip_all_tests __attribute((__section__(".data"))) = false;
#else
bool skip_tests = true;
bool skip_all_tests = true;
#endif

#ifdef __BPF_FEATURE_LOAD_ACQ_STORE_REL
bool skip_lacq_srel_tests __attribute((__section__(".data"))) = false;
#else
bool skip_lacq_srel_tests = true;
#endif

__u32 pid = 0;
Expand Down Expand Up @@ -168,3 +174,55 @@ int xchg(const void *ctx)

return 0;
}

__u8 load_acquire8_value = 0x12;
__u16 load_acquire16_value = 0x1234;
__u32 load_acquire32_value = 0x12345678;
__u64 load_acquire64_value = 0x1234567890abcdef;

__u8 load_acquire8_result = 0;
__u16 load_acquire16_result = 0;
__u32 load_acquire32_result = 0;
__u64 load_acquire64_result = 0;

SEC("raw_tp/sys_enter")
int load_acquire(const void *ctx)
{
if (pid != (bpf_get_current_pid_tgid() >> 32))
return 0;

#ifdef __BPF_FEATURE_LOAD_ACQ_STORE_REL
load_acquire8_result = __atomic_load_n(&load_acquire8_value, __ATOMIC_ACQUIRE);
load_acquire16_result = __atomic_load_n(&load_acquire16_value, __ATOMIC_ACQUIRE);
load_acquire32_result = __atomic_load_n(&load_acquire32_value, __ATOMIC_ACQUIRE);
load_acquire64_result = __atomic_load_n(&load_acquire64_value, __ATOMIC_ACQUIRE);
#endif

return 0;
}

__u8 store_release8_result = 0;
__u16 store_release16_result = 0;
__u32 store_release32_result = 0;
__u64 store_release64_result = 0;

SEC("raw_tp/sys_enter")
int store_release(const void *ctx)
{
if (pid != (bpf_get_current_pid_tgid() >> 32))
return 0;

#ifdef __BPF_FEATURE_LOAD_ACQ_STORE_REL
__u8 val8 = 0x12;
__u16 val16 = 0x1234;
__u32 val32 = 0x12345678;
__u64 val64 = 0x1234567890abcdef;

__atomic_store_n(&store_release8_result, val8, __ATOMIC_RELEASE);
__atomic_store_n(&store_release16_result, val16, __ATOMIC_RELEASE);
__atomic_store_n(&store_release32_result, val32, __ATOMIC_RELEASE);
__atomic_store_n(&store_release64_result, val64, __ATOMIC_RELEASE);
#endif

return 0;
}
Loading

0 comments on commit cd3287f

Please sign in to comment.