Skip to content

Commit

Permalink
selftests/bpf: Fix map_kptr test.
Browse files Browse the repository at this point in the history
The compiler is optimizing out majority of unref_ptr read/writes, so the test
wasn't testing much. For example, one could delete '__kptr' tag from
'struct prog_test_ref_kfunc __kptr *unref_ptr;' and the test would still "pass".

Convert it to volatile stores. Confirmed by comparing bpf asm before/after.

Fixes: 2cbc469 ("selftests/bpf: Add C tests for kptr")
Signed-off-by: Alexei Starovoitov <[email protected]>
Acked-by: Stanislav Fomichev <[email protected]>
Acked-by: Kumar Kartikeya Dwivedi <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Martin KaFai Lau <[email protected]>
  • Loading branch information
Alexei Starovoitov authored and Martin KaFai Lau committed Feb 15, 2023
1 parent 5e53e5c commit 62d101d
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions tools/testing/selftests/bpf/progs/map_kptr.c
Original file line number Diff line number Diff line change
Expand Up @@ -62,21 +62,23 @@ extern struct prog_test_ref_kfunc *
bpf_kfunc_call_test_kptr_get(struct prog_test_ref_kfunc **p, int a, int b) __ksym;
extern void bpf_kfunc_call_test_release(struct prog_test_ref_kfunc *p) __ksym;

#define WRITE_ONCE(x, val) ((*(volatile typeof(x) *) &(x)) = (val))

static void test_kptr_unref(struct map_value *v)
{
struct prog_test_ref_kfunc *p;

p = v->unref_ptr;
/* store untrusted_ptr_or_null_ */
v->unref_ptr = p;
WRITE_ONCE(v->unref_ptr, p);
if (!p)
return;
if (p->a + p->b > 100)
return;
/* store untrusted_ptr_ */
v->unref_ptr = p;
WRITE_ONCE(v->unref_ptr, p);
/* store NULL */
v->unref_ptr = NULL;
WRITE_ONCE(v->unref_ptr, NULL);
}

static void test_kptr_ref(struct map_value *v)
Expand All @@ -85,7 +87,7 @@ static void test_kptr_ref(struct map_value *v)

p = v->ref_ptr;
/* store ptr_or_null_ */
v->unref_ptr = p;
WRITE_ONCE(v->unref_ptr, p);
if (!p)
return;
if (p->a + p->b > 100)
Expand All @@ -99,7 +101,7 @@ static void test_kptr_ref(struct map_value *v)
return;
}
/* store ptr_ */
v->unref_ptr = p;
WRITE_ONCE(v->unref_ptr, p);
bpf_kfunc_call_test_release(p);

p = bpf_kfunc_call_test_acquire(&(unsigned long){0});
Expand Down

0 comments on commit 62d101d

Please sign in to comment.