Skip to contentSkip to conversation

LoongArch: BPF: Fix the offset of stptr.w and stptr.d stores

PATCH Superseded George Guo 2 participants 2 messages Nov 18

Subsystems (4)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

George Guo

author
#0 lore raw

PATCH 1/1 LoongArch: BPF: Fix the offset of stptr.w and stptr.d stores

From: George Guo <[email protected]>

When testing bpf selftests "jit_insns" and "jit_insns_blinded", the "ldst_offsets" subtest fails for word and doubleword stores:

store_offsets:FAIL:stx size=24 base=r9 src=r0: byte at offset -16384 unexpected ... actual 255 != expected 67
...
#197/11 jit_insns_blinded/ldst_offsets:FAIL

This is because the JIT emits stptr.w or stptr.d for store offsets that do not fit a signed 12-bit immediate but fit a signed 14-bit immediate, and passes the byte offset directly to the instruction encoder. However, these instructions scale their signed 14-bit immediate by 4 when calculating the memory address. For example, a store at offset -4096 writes at offset -16384 instead, outside the memory range checked by the verifier.

Pass the offset in units of 4 bytes when emitting stptr.w and stptr.d for both immediate and register stores. Use these instructions only for offsets that are multiples of 4 in the range [-32768, 32764], and keep the register-offset fallback for other offsets that do not fit the signed 12-bit immediate of st.w or st.d.

With this patch, both "ldst_offsets" subtests pass:

  $ sudo ./test_progs -t jit_insns -t jit_insns_blinded
  ...
  #196/26  jit_insns/ldst_offsets:OK
  ...
  #197/11  jit_insns_blinded/ldst_offsets:OK
Fixes 5dc615520c4d ("LoongArch: Add BPF JIT support")
---
 arch/loongarch/net/bpf_jit.c | 16 ++++++++--------
 arch/loongarch/net/bpf_jit.h |  9 +++++++++
 2 files changed, 17 insertions(+), 8 deletions(-)
arch/loongarch/net/bpf_jit.c +8 -8
index 15af1abb5cb6..16e59722620f 100644
@@ -1400,8 +1400,8 @@ static int build_insn(const struct bpf_insn *insn, struct jit_ctx *ctx, bool ext
 			move_imm(ctx, t1, imm);
 			if (is_signed_imm12(off)) {
 				emit_insn(ctx, stw, t1, dst, off);
-			} else if (is_signed_imm14(off)) {
-				emit_insn(ctx, stptrw, t1, dst, off);
+			} else if (is_ptr_off(off)) {
+				emit_insn(ctx, stptrw, t1, dst, off >> 2);
 			} else {
 				move_imm(ctx, t2, off);
 				emit_insn(ctx, stxw, t1, dst, t2);
@@ -1411,8 +1411,8 @@ static int build_insn(const struct bpf_insn *insn, struct jit_ctx *ctx, bool ext
 			move_imm(ctx, t1, imm);
 			if (is_signed_imm12(off)) {
 				emit_insn(ctx, std, t1, dst, off);
-			} else if (is_signed_imm14(off)) {
-				emit_insn(ctx, stptrd, t1, dst, off);
+			} else if (is_ptr_off(off)) {
+				emit_insn(ctx, stptrd, t1, dst, off >> 2);
 			} else {
 				move_imm(ctx, t2, off);
 				emit_insn(ctx, stxd, t1, dst, t2);
@@ -1460,8 +1460,8 @@ static int build_insn(const struct bpf_insn *insn, struct jit_ctx *ctx, bool ext
 		case BPF_W:
 			if (is_signed_imm12(off)) {
 				emit_insn(ctx, stw, src, dst, off);
-			} else if (is_signed_imm14(off)) {
-				emit_insn(ctx, stptrw, src, dst, off);
+			} else if (is_ptr_off(off)) {
+				emit_insn(ctx, stptrw, src, dst, off >> 2);
 			} else {
 				move_imm(ctx, t1, off);
 				emit_insn(ctx, stxw, src, dst, t1);
@@ -1470,8 +1470,8 @@ static int build_insn(const struct bpf_insn *insn, struct jit_ctx *ctx, bool ext
 		case BPF_DW:
 			if (is_signed_imm12(off)) {
 				emit_insn(ctx, std, src, dst, off);
-			} else if (is_signed_imm14(off)) {
-				emit_insn(ctx, stptrd, src, dst, off);
+			} else if (is_ptr_off(off)) {
+				emit_insn(ctx, stptrd, src, dst, off >> 2);
 			} else {
 				move_imm(ctx, t1, off);
 				emit_insn(ctx, stxd, src, dst, t1);
arch/loongarch/net/bpf_jit.h +9 -0
index 2bd0dc5b911c..5207ad30fade 100644
@@ -52,6 +52,15 @@ do {										\
 #define is_signed_imm52(val)	signed_imm_check(val, 52)
 #define is_unsigned_imm12(val)	unsigned_imm_check(val, 12)
 
+/*
+ * ldptr.{w,d} and stptr.{w,d} take a 14-bit signed immediate in units of
+ * 4 bytes: they reach a multiple of 4 in [-32768, 32764], passed as off >> 2.
+ */
+static inline bool is_ptr_off(int off)
+{
+	return !(off & 3) && is_signed_imm16(off);
+}
+
 static inline int bpf2la_offset(int bpf_insn, int off, const struct jit_ctx *ctx)
 {
 	/* BPF JMP offset is relative to the next instruction */

base-commit: aebb7274476403040d582c61478df8f4a7bf9cd3

Signature · 1 line
2.53.0
maintainer
#1 lore raw
Quoted 4 lines · George Guo

From: George Guo <[email protected]>

When testing bpf selftests "jit_insns" and "jit_insns_blinded", the "ldst_offsets" subtest fails for word and doubleword stores:

...

Quoted 7 lines
arch/loongarch/net/bpf_jit.h +0 -0
index 2bd0dc5b911c..5207ad30fade 100644
@@ -52,6 +52,15 @@ do {										\
  #define is_signed_imm52(val)	signed_imm_check(val, 52)
  #define is_unsigned_imm12(val)	unsigned_imm_check(val, 12)

arch/loongarch/net/bpf_jit.h do { \ · line 63

Quoted 10 lines
arch/loongarch/net/bpf_jit.h +9 -0
 
+/*
+ * ldptr.{w,d} and stptr.{w,d} take a 14-bit signed immediate in units of
+ * 4 bytes: they reach a multiple of 4 in [-32768, 32764], passed as off >> 2.
+ */
+static inline bool is_ptr_off(int off)
+{
+	return !(off & 3) && is_signed_imm16(off);
+}
+

Please use a self-documenting function name and remove the redundant comment:

static inline bool is_aligned_signed_imm16(int off)

{
	return !(off & 3) && is_signed_imm16(off);
}

Moreover, please remove the unused is_signed_imm14 macro in bpf_jit.h.

Thanks,
Tiezhu