Skip to contentSkip to conversation

bpf: Allow terminal gotox instructions

PATCH Superseded Siddharth Chintamaneni 3 participants 5 messages Sep 1 – Sep 2

Subsystems (4)

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/2 bpf: Allow terminal gotox instructions

check_subprogs() treats gotox as a direct jump and validates its reserved zero offset. When gotox is the final instruction, this produces a synthetic successor one instruction past the end of the subprogram and rejects an otherwise valid program.

Skip direct-offset validation for gotox and accept it as a non-fallthrough terminal instruction. Its actual targets remain validated from the instruction-array jump table during CFG construction.

Fixes 493d9e0d6083 ("bpf, x86: add support for indirect jumps")
---
 kernel/bpf/verifier.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
kernel/bpf/verifier.c +4 -1
index 8f585ceb2cd5..483473df7746 100644
@@ -3088,6 +3088,8 @@ static int check_subprogs(struct bpf_verifier_env *env)
 			subprog[cur_subprog].exit_idx = i;
 			goto next;
 		}
+		if (insn_is_gotox(&insn[i]))
+			goto next;
 		off = i + bpf_jmp_offset(&insn[i]) + 1;
 		if (off < subprog_start || off >= subprog_end) {
 			verbose(env, "jump out of range from insn %d to %d\n", i, off);
@@ -3107,7 +3109,8 @@ static int check_subprogs(struct bpf_verifier_env *env)
 			 */
 			if (code != (BPF_JMP | BPF_EXIT) &&
 			    code != (BPF_JMP32 | BPF_JA) &&
-			    code != (BPF_JMP | BPF_JA)) {
+			    code != (BPF_JMP | BPF_JA) &&
+			    !insn_is_gotox(&insn[i])) {
 				verbose(env, "last insn is not an exit or jmp\n");
 				bpf_diag_program_structure(
 					env, i, "subprogram can fall through",

base-commit: d761934c9483ecde93fe99d8705282f716dfee50

Signature · 1 line
2.43.0
#1 lore raw

PATCH v3 2/2 selftests/bpf: Test terminal gotox instructions

Add tests that place gotox at the end of the main program and a subprogram, with each jump-table target preceding the gotox instruction. This tests gotox as a valid non-fallthrough terminal instruction.

---
 .../selftests/bpf/progs/verifier_gotox.c      | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)
tools/testing/selftests/bpf/progs/verifier_gotox.c +42 -0
index 5b18c9a27717..cfb5b648891f 100644
@@ -47,6 +47,48 @@ DEFINE_SIMPLE_JUMP_TABLE_PROG(reserved_field_src_reg,      BPF_REG_1, 0, 0, __fa
 DEFINE_SIMPLE_JUMP_TABLE_PROG(reserved_field_non_zero_off, BPF_REG_0, 1, 0, __failure __msg("BPF_JA|BPF_X uses reserved fields"))
 DEFINE_SIMPLE_JUMP_TABLE_PROG(reserved_field_non_zero_imm, BPF_REG_0, 0, 1, __failure __msg("BPF_JA|BPF_X uses reserved fields"))
 
+#define DEFINE_TERMINAL_GOTOX_PROG(NAME, BASE)			\
+	__naked void NAME(void)					\
+	{							\
+	asm volatile ("						\
+	.pushsection .jumptables,\"\",@progbits;		\
+jt0_%=:							\
+	.quad ret0_%= - " BASE ";				\
+	.size jt0_%=, 8;					\
+	.global jt0_%=;						\
+	.popsection;						\
+								\
+	r0 = jt0_%= ll;						\
+	r0 = *(u64 *)(r0 + 0);					\
+	goto end_%=;						\
+ret0_%=:							\
+	r0 = 0;							\
+	exit;							\
+end_%=:							\
+	.8byte %[gotox_r0];					\
+"	:							\
+	: __imm_insn(gotox_r0, BPF_RAW_INSN(BPF_JMP | BPF_JA | BPF_X,	\
+					    BPF_REG_0, 0, 0, 0))	\
+	: __clobber_all);					\
+	}
+
+SEC("socket")
+__success __retval(0)
+DEFINE_TERMINAL_GOTOX_PROG(jump_table_terminal_gotox, "socket")
+
+static __noinline __used
+DEFINE_TERMINAL_GOTOX_PROG(terminal_gotox_subprog, ".text")
+
+SEC("socket")
+__success __retval(0)
+__naked void jump_table_terminal_gotox_subprog(void)
+{
+	asm volatile ("						\
+	call terminal_gotox_subprog;				\
+	exit;							\
+"	::: __clobber_all);
+}
+
 /*
  * Gotox is forbidden when there is no jump table loaded
  * which points to the sub-function where the gotox is used
Signature · 1 line
2.43.0
#2 lore raw

Re: [PATCH bpf-next v3 2/2] selftests/bpf: Test terminal gotox instructions

Quoted 45 lines · Siddharth Chintamaneni

Add tests that place gotox at the end of the main program and a subprogram, with each jump-table target preceding the gotox instruction. This tests gotox as a valid non-fallthrough terminal instruction.

---
 .../selftests/bpf/progs/verifier_gotox.c      | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)
tools/testing/selftests/bpf/progs/verifier_gotox.c +28 -0
index 5b18c9a27717..cfb5b648891f 100644
@@ -47,6 +47,48 @@ DEFINE_SIMPLE_JUMP_TABLE_PROG(reserved_field_src_reg,      BPF_REG_1, 0, 0, __fa
 DEFINE_SIMPLE_JUMP_TABLE_PROG(reserved_field_non_zero_off, BPF_REG_0, 1, 0, __failure __msg("BPF_JA|BPF_X uses reserved fields"))
 DEFINE_SIMPLE_JUMP_TABLE_PROG(reserved_field_non_zero_imm, BPF_REG_0, 0, 1, __failure __msg("BPF_JA|BPF_X uses reserved fields"))
 
+#define DEFINE_TERMINAL_GOTOX_PROG(NAME, BASE)			\
+	__naked void NAME(void)					\
+	{							\
+	asm volatile ("						\
+	.pushsection .jumptables,\"\",@progbits;		\
+jt0_%=:							\
+	.quad ret0_%= - " BASE ";				\
+	.size jt0_%=, 8;					\
+	.global jt0_%=;						\
+	.popsection;						\
+								\
+	r0 = jt0_%= ll;						\
+	r0 = *(u64 *)(r0 + 0);					\
+	goto end_%=;						\
+ret0_%=:							\
+	r0 = 0;							\
+	exit;							\
+end_%=:							\
+	.8byte %[gotox_r0];					\
+"	:							\
+	: __imm_insn(gotox_r0, BPF_RAW_INSN(BPF_JMP | BPF_JA | BPF_X,	\
+					    BPF_REG_0, 0, 0, 0))	\
+	: __clobber_all);					\
+	}
+
+SEC("socket")
+__success __retval(0)
+DEFINE_TERMINAL_GOTOX_PROG(jump_table_terminal_gotox, "socket")

tools/testing/selftests/bpf/progs/verifier_gotox.c DEFINE_SIMPLE_JUMP_TABLE_PROG(reserved_field_src_reg, BPF_REG_1, 0, 0, __fa · line 87

Quoted 10 lines
tools/testing/selftests/bpf/progs/verifier_gotox.c +10 -0
+
+static __noinline __used
+DEFINE_TERMINAL_GOTOX_PROG(terminal_gotox_subprog, ".text")
+
+SEC("socket")
+__success __retval(0)
+__naked void jump_table_terminal_gotox_subprog(void)
+{
+	asm volatile ("						\
+	call terminal_gotox_subprog;				\

I wonder if robot will reply the same as for v2.

The suggestion was to do

call terminal_gotox_subprog1
call terminal_gotox_subprog2

such that subprog1 is not the last piece of loaded prog...

Quoted 10 lines
tools/testing/selftests/bpf/progs/verifier_gotox.c +4 -0
+	exit;							\
+"	::: __clobber_all);
+}
+
 /*
  * Gotox is forbidden when there is no jump table loaded
  * which points to the sub-function where the gotox is used
Signature · 1 line
2.43.0
#3 lore raw

Re: [PATCH bpf-next v3 2/2] selftests/bpf: Test terminal gotox instructions

Quoted 60 lines · Anton Protopopov
Quoted 45 lines · Siddharth Chintamaneni

Add tests that place gotox at the end of the main program and a subprogram, with each jump-table target preceding the gotox instruction. This tests gotox as a valid non-fallthrough terminal instruction.

---
 .../selftests/bpf/progs/verifier_gotox.c      | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)
tools/testing/selftests/bpf/progs/verifier_gotox.c +28 -0
index 5b18c9a27717..cfb5b648891f 100644
@@ -47,6 +47,48 @@ DEFINE_SIMPLE_JUMP_TABLE_PROG(reserved_field_src_reg,      BPF_REG_1, 0, 0, __fa
 DEFINE_SIMPLE_JUMP_TABLE_PROG(reserved_field_non_zero_off, BPF_REG_0, 1, 0, __failure __msg("BPF_JA|BPF_X uses reserved fields"))
 DEFINE_SIMPLE_JUMP_TABLE_PROG(reserved_field_non_zero_imm, BPF_REG_0, 0, 1, __failure __msg("BPF_JA|BPF_X uses reserved fields"))
 
+#define DEFINE_TERMINAL_GOTOX_PROG(NAME, BASE)                       \
+     __naked void NAME(void)                                 \
+     {                                                       \
+     asm volatile ("                                         \
+     .pushsection .jumptables,\"\",@progbits;                \
+jt0_%=:                                                      \
+     .quad ret0_%= - " BASE ";                               \
+     .size jt0_%=, 8;                                        \
+     .global jt0_%=;                                         \
+     .popsection;                                            \
+                                                             \
+     r0 = jt0_%= ll;                                         \
+     r0 = *(u64 *)(r0 + 0);                                  \
+     goto end_%=;                                            \
+ret0_%=:                                                     \
+     r0 = 0;                                                 \
+     exit;                                                   \
+end_%=:                                                      \
+     .8byte %[gotox_r0];                                     \
+"    :                                                       \
+     : __imm_insn(gotox_r0, BPF_RAW_INSN(BPF_JMP | BPF_JA | BPF_X,   \
+                                         BPF_REG_0, 0, 0, 0))        \
+     : __clobber_all);                                       \
+     }
+
+SEC("socket")
+__success __retval(0)
+DEFINE_TERMINAL_GOTOX_PROG(jump_table_terminal_gotox, "socket")

tools/testing/selftests/bpf/progs/verifier_gotox.c DEFINE_SIMPLE_JUMP_TABLE_PROG(reserved_field_src_reg, BPF_REG_1, 0, 0, __fa · line 87

Quoted 10 lines
tools/testing/selftests/bpf/progs/verifier_gotox.c +10 -0
+
+static __noinline __used
+DEFINE_TERMINAL_GOTOX_PROG(terminal_gotox_subprog, ".text")
+
+SEC("socket")
+__success __retval(0)
+__naked void jump_table_terminal_gotox_subprog(void)
+{
+     asm volatile ("                                         \
+     call terminal_gotox_subprog;                            \

I wonder if robot will reply the same as for v2.

Quoted 7 lines

The suggestion was to do

call terminal_gotox_subprog1
call terminal_gotox_subprog2

such that subprog1 is not the last piece of loaded prog...

I missed this part! Can I reply the diff to this thread? or does it require a new revision?

Quoted 10 lines
Quoted 10 lines
tools/testing/selftests/bpf/progs/verifier_gotox.c +4 -1
+     exit;                                                   \
+"    ::: __clobber_all);
+}
+
 /*
  * Gotox is forbidden when there is no jump table loaded
  * which points to the sub-function where the gotox is used
--

2.43.0

maintainer
#4 lore raw

Re: [PATCH bpf-next v3 2/2] selftests/bpf: Test terminal gotox instructions

Quoted 62 lines · Siddharth Chintamaneni
Quoted 61 lines · Anton Protopopov
Quoted 45 lines · Siddharth Chintamaneni

Add tests that place gotox at the end of the main program and a subprogram, with each jump-table target preceding the gotox instruction. This tests gotox as a valid non-fallthrough terminal instruction.

---
  .../selftests/bpf/progs/verifier_gotox.c      | 42 +++++++++++++++++++
  1 file changed, 42 insertions(+)
tools/testing/selftests/bpf/progs/verifier_gotox.c +28 -0
index 5b18c9a27717..cfb5b648891f 100644
@@ -47,6 +47,48 @@ DEFINE_SIMPLE_JUMP_TABLE_PROG(reserved_field_src_reg,      BPF_REG_1, 0, 0, __fa
  DEFINE_SIMPLE_JUMP_TABLE_PROG(reserved_field_non_zero_off, BPF_REG_0, 1, 0, __failure __msg("BPF_JA|BPF_X uses reserved fields"))
  DEFINE_SIMPLE_JUMP_TABLE_PROG(reserved_field_non_zero_imm, BPF_REG_0, 0, 1, __failure __msg("BPF_JA|BPF_X uses reserved fields"))
 
+#define DEFINE_TERMINAL_GOTOX_PROG(NAME, BASE)                       \
+     __naked void NAME(void)                                 \
+     {                                                       \
+     asm volatile ("                                         \
+     .pushsection .jumptables,\"\",@progbits;                \
+jt0_%=:                                                      \
+     .quad ret0_%= - " BASE ";                               \
+     .size jt0_%=, 8;                                        \
+     .global jt0_%=;                                         \
+     .popsection;                                            \
+                                                             \
+     r0 = jt0_%= ll;                                         \
+     r0 = *(u64 *)(r0 + 0);                                  \
+     goto end_%=;                                            \
+ret0_%=:                                                     \
+     r0 = 0;                                                 \
+     exit;                                                   \
+end_%=:                                                      \
+     .8byte %[gotox_r0];                                     \
+"    :                                                       \
+     : __imm_insn(gotox_r0, BPF_RAW_INSN(BPF_JMP | BPF_JA | BPF_X,   \
+                                         BPF_REG_0, 0, 0, 0))        \
+     : __clobber_all);                                       \
+     }
+
+SEC("socket")
+__success __retval(0)
+DEFINE_TERMINAL_GOTOX_PROG(jump_table_terminal_gotox, "socket")

tools/testing/selftests/bpf/progs/verifier_gotox.c DEFINE_SIMPLE_JUMP_TABLE_PROG(reserved_field_src_reg, BPF_REG_1, 0, 0, __fa · line 87

Quoted 10 lines
tools/testing/selftests/bpf/progs/verifier_gotox.c +10 -0
+
+static __noinline __used
+DEFINE_TERMINAL_GOTOX_PROG(terminal_gotox_subprog, ".text")
+
+SEC("socket")
+__success __retval(0)
+__naked void jump_table_terminal_gotox_subprog(void)
+{
+     asm volatile ("                                         \
+     call terminal_gotox_subprog;                            \

I wonder if robot will reply the same as for v2.

The suggestion was to do

Quoted 7 lines
Quoted 4 lines

call terminal_gotox_subprog1
call terminal_gotox_subprog2

such that subprog1 is not the last piece of loaded prog...

I missed this part! Can I reply the diff to this thread? or does it require a new revision?

Please send a v4 given this needs to go through BPF CI.