bpf: support PTR_TO_MEM{,_OR_NULL} register spilling
Subsystems (6)
PATCH v2 1/2 bpf: support PTR_TO_MEM{,_OR_NULL} register spilling
Add support for pointer to mem register spilling, to allow the verifier to track pointers to valid memory addresses. Such pointers are returned for example by a successful call of the bpf_ringbuf_reserve helper.
The patch was partially contributed by CyberArk Software, Inc.
--- kernel/bpf/verifier.c | 2 ++ 1 file changed, 2 insertions(+)
kernel/bpf/verifier.c +2 -0
@@ -2217,6 +2217,8 @@ static bool is_spillable_regtype(enum bpf_reg_type type)case PTR_TO_RDWR_BUF :case PTR_TO_RDWR_BUF_OR_NULL :case PTR_TO_PERCPU_BTF_ID : +case PTR_TO_MEM : +case PTR_TO_MEM_OR_NULL :return true;default :return false;
Signature · 1 line
2.27.0
PATCH v2 2/2 selftests/bpf: add verifier test for PTR_TO_MEM spill
Add a test to check that the verifier is able to recognize spilling of PTR_TO_MEM registers, by reserving a ringbuf buffer, forcing the spill of a pointer holding the buffer address to the stack, filling it back in from the stack and writing to the memory area pointed by it.
The patch was partially contributed by CyberArk Software, Inc.
--- tools/testing/selftests/bpf/test_verifier.c | 12 +++++++- .../selftests/bpf/verifier/spill_fill.c | 30 +++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-)
tools/testing/selftests/bpf/test_verifier.c +11 -1
@@ -50,7 +50,7 @@#define MAX_INSNS BPF_MAXINSNS#define MAX_TEST_INSNS 1000000#define MAX_FIXUPS 8 -#define MAX_NR_MAPS 20 +#define MAX_NR_MAPS 21#define MAX_TEST_RUNS 8#define POINTER_VALUE 0xcafe4all#define TEST_DATA_LEN 64
@@ -87,6 +87,7 @@ struct bpf_test {int fixup_sk_storage_map[MAX_FIXUPS ];int fixup_map_event_output[MAX_FIXUPS ];int fixup_map_reuseport_array[MAX_FIXUPS ]; +int fixup_map_ringbuf[MAX_FIXUPS ];const char *errstr;const char *errstr_unpriv;uint32_t insn_processed;
@@ -640,6 +641,7 @@ static void do_test_fixup(struct bpf_test *test, enum bpf_prog_type prog_type,int *fixup_sk_storage_map = test->fixup_sk_storage_map;int *fixup_map_event_output = test->fixup_map_event_output;int *fixup_map_reuseport_array = test->fixup_map_reuseport_array; +int *fixup_map_ringbuf = test->fixup_map_ringbuf;if (test->fill_helper) { test->fill_insns =calloc (MAX_TEST_INSNS ,sizeof (struct bpf_insn ));
@@ -817,6 +819,14 @@ static void do_test_fixup(struct bpf_test *test, enum bpf_prog_type prog_type, fixup_map_reuseport_array++; }while (*fixup_map_reuseport_array); } +if (*fixup_map_ringbuf) { + map_fds[20 ] =create_map (BPF_MAP_TYPE_RINGBUF ,0 , +0 ,4096 ); +do { + prog[*fixup_map_ringbuf].imm = map_fds[20 ]; + fixup_map_ringbuf++; + }while (*fixup_map_ringbuf); + } }struct libcap {
tools/testing/selftests/bpf/verifier/spill_fill.c +30 -0
@@ -28,6 +28,36 @@ .result = ACCEPT, .result_unpriv = ACCEPT, }, +{ + "check valid spill/fill, ptr to mem", + .insns = { +/* reserve 8 byte ringbuf memory */ +BPF_ST_MEM (BPF_DW ,BPF_REG_10 ,-8 ,0 ), +BPF_LD_MAP_FD (BPF_REG_1 ,0 ), +BPF_MOV64_IMM (BPF_REG_2 ,8 ), +BPF_MOV64_IMM (BPF_REG_3 ,0 ), +BPF_RAW_INSN (BPF_JMP |BPF_CALL ,0 ,0 ,0 , BPF_FUNC_ringbuf_reserve), +/* store a pointer to the reserved memory in R6 */ +BPF_MOV64_REG (BPF_REG_6 ,BPF_REG_0 ), +/* check whether the reservation was successful */ +BPF_JMP_IMM (BPF_JEQ ,BPF_REG_0 ,0 ,6 ), +/* spill R6(mem) into the stack */ +BPF_STX_MEM (BPF_DW ,BPF_REG_10 ,BPF_REG_6 ,-8 ), +/* fill it back in R7 */ +BPF_LDX_MEM (BPF_DW ,BPF_REG_7 ,BPF_REG_10 ,-8 ), +/* should be able to access *(R7) = 0 */ +BPF_ST_MEM (BPF_DW ,BPF_REG_7 ,0 ,0 ), +/* submit the reserved ringbuf memory */ +BPF_MOV64_REG (BPF_REG_1 ,BPF_REG_7 ), +BPF_MOV64_IMM (BPF_REG_2 ,0 ), +BPF_RAW_INSN (BPF_JMP |BPF_CALL ,0 ,0 ,0 , BPF_FUNC_ringbuf_submit), +BPF_MOV64_IMM (BPF_REG_0 ,0 ), + BPF_EXIT_INSN(), + }, + .fixup_map_ringbuf = { 1 }, + .result = ACCEPT, + .result_unpriv = ACCEPT, +}, {"check corrupted spill/fill" , .insns = {
Signature · 1 line
2.27.0
Re: [PATCH bpf v2 2/2] selftests/bpf: add verifier test for PTR_TO_MEM spill
Quoted 8 lines · Gilad Reti
Add a test to check that the verifier is able to recognize spilling of
PTR_TO_MEMregisters, by reserving a ringbuf buffer, forcing the spill of a pointer holding the buffer address to the stack, filling it back in from the stack and writing to the memory area pointed by it.The patch was partially contributed by CyberArk Software, Inc.
Signed-off-by Gilad Reti <[email protected]>
I didn't verify result_unpriv = ACCEPT part. I think it is correct by checking code.
KP Singh
Acked-byRe: [PATCH bpf v2 2/2] selftests/bpf: add verifier test for PTR_TO_MEM spill
Quoted 9 lines · Yonghong Song
Quoted 5 lines · Gilad Reti
Add a test to check that the verifier is able to recognize spilling of
PTR_TO_MEMregisters, by reserving a ringbuf buffer, forcing the spill of a pointer holding the buffer address to the stack, filling it back in from the stack and writing to the memory area pointed by it.
Quoted 8 lines
Quoted 3 lines
The patch was partially contributed by CyberArk Software, Inc.
Signed-off-by Gilad Reti <[email protected]>I didn't verify
result_unpriv= ACCEPT part. I think it is correct by checking code.Acked-by Yonghong Song <[email protected]>
Thanks for the description!
Quoted 10 lines · Gilad Reti
Add support for pointer to mem register spilling, to allow the verifier to track pointers to valid memory addresses. Such pointers are returned for example by a successful call of the
bpf_ringbuf_reservehelper.The patch was partially contributed by CyberArk Software, Inc.
Fixes 457f44363a88 ("bpf: Implement BPF ring buffer and verifier support for it")Suggested-by Yonghong Song <[email protected]>Signed-off-by Gilad Reti <[email protected]>
Quoted 7 lines · KP Singh
Quoted 5 lines · Gilad Reti
Add support for pointer to mem register spilling, to allow the verifier to track pointers to valid memory addresses. Such pointers are returned for example by a successful call of the
bpf_ringbuf_reservehelper.
Quoted 7 lines
Quoted 5 lines
The patch was partially contributed by CyberArk Software, Inc.
Fixes 457f44363a88 ("bpf: Implement BPF ring buffer and verifier support for it")Suggested-by Yonghong Song <[email protected]>Signed-off-by Gilad Reti <[email protected]>Acked-by KP Singh <[email protected]>
It's a border line feature vs fix.
Since the patch is trivial and it addresses a real problem I've applied to the bpf tree.
Thanks!