LoongArch: Fix BPF trampoline related issues
Subsystems (3)
Hengqi Chen
reviewerv3 cover LoongArch: Fix BPF trampoline related issues
The following two selftest cases triggers oops on LoongArch:
$ ./test_progs -a ns_bpf_qdisc -a tracing_struct
This small series tries to fix/workaround these issues. See individual commit for details.
While at it, remove a duplicated flags check in __arch_prepare_bpf_trampoline().
v2 -> v3:
* Simplify sign_extend() implementation as suggested by Jinyang
Hengqi Chen (3):
LoongArch: BPF: Remove duplicated flags check
LoongArch: BPF: Sign extend struct ops return values properly
LoongArch: BPF: No support of struct argument in trampoline programs
arch/loongarch/net/bpf_jit.c | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-)
--
2.43.5
Hengqi Chen
reviewerPATCH v3 1/3 LoongArch: BPF: Remove duplicated flags check
The check for (BPF_TRAMP_F_ORIG_STACK | BPF_TRAMP_F_SHARE_IPMODIFY) is duplicated in __arch_prepare_bpf_trampoline(). Remove it.
--- arch/loongarch/net/bpf_jit.c | 3 --- 1 file changed, 3 deletions(-)
arch/loongarch/net/bpf_jit.c +0 -3
@@ -1462,9 +1462,6 @@ static int __arch_prepare_bpf_trampoline(struct jit_ctx *ctx, struct bpf_tramp_istruct bpf_tramp_links *fmod_ret = &tlinks[BPF_TRAMP_MODIFY_RETURN ];u32 **branches =NULL ; -if (flags & (BPF_TRAMP_F_ORIG_STACK |BPF_TRAMP_F_SHARE_IPMODIFY )) -return -ENOTSUPP ; -/* * FP + 8 [ RA to parent func ] return address to parent * function
Signature · 1 line
2.43.5
Hengqi Chen
reviewerPATCH v3 2/3 LoongArch: BPF: Sign extend struct ops return values properly
In reply to Hengqi ChenThe ns_bpf_qdisc selftest triggers a kernel panic:
CPU 0 Unable to handle kernel paging request at virtual address 0000000000741d58, era == 90000000851b5ac0, ra == 90000000851b5aa4
Oops[#1]:
CPU: 0 UID: 0 PID: 449 Comm: test_progs Tainted: G OE 6.16.0+ #3 PREEMPT(full)
Tainted: [O]=OOT_MODULE, [E]=UNSIGNED_MODULE
Hardware name: QEMU QEMU Virtual Machine, BIOS unknown 2/2/2022
pc 90000000851b5ac0 ra 90000000851b5aa4 tp 90000001076b8000 sp 90000001076bb600
a0 0000000000741ce8 a1 0000000000000001 a2 90000001076bb5c0 a3 0000000000000008
a4 90000001004c4620 a5 9000000100741ce8 a6 0000000000000000 a7 0100000000000000
t0 0000000000000010 t1 0000000000000000 t2 9000000104d24d30 t3 0000000000000001
t4 4f2317da8a7e08c4 t5 fffffefffc002f00 t6 90000001004c4620 t7 ffffffffc61c5b3d
t8 0000000000000000 u0 0000000000000001 s9 0000000000000050 s0 90000001075bc800
s1 0000000000000040 s2 900000010597c400 s3 0000000000000008 s4 90000001075bc880
s5 90000001075bc8f0 s6 0000000000000000 s7 0000000000741ce8 s8 0000000000000000
ra: 90000000851b5aa4 __qdisc_run+0xac/0x8d8
ERA: 90000000851b5ac0 __qdisc_run+0xc8/0x8d8
CRMD: 000000b0 (PLV0 -IE -DA +PG DACF=CC DACM=CC -WE)
PRMD: 00000004 (PPLV0 +PIE -PWE)
EUEN: 00000007 (+FPE +SXE +ASXE -BTE)
ECFG: 00071c1d (LIE=0,2-4,10-12 VS=7)
ESTAT: 00010000 [PIL] (IS= ECode=1 EsubCode=0)
BADV: 0000000000741d58
PRID: 0014c010 (Loongson-64bit, Loongson-3A5000)
Modules linked in: bpf_testmod(OE) [last unloaded: bpf_testmod(OE)]
Process test_progs (pid: 449, threadinfo=000000009af02b3a, task=00000000e9ba4956)
Stack : 0000000000000000 90000001075bc8ac 90000000869524a8 9000000100741ce8
90000001075bc800 9000000100415300 90000001075bc8ac 0000000000000000
900000010597c400 900000008694a000 0000000000000000 9000000105b59000
90000001075bc800 9000000100741ce8 0000000000000050 900000008513000c
9000000086936000 0000000100094d4c fffffff400676208 0000000000000000
9000000105b59000 900000008694a000 9000000086bf0dc0 9000000105b59000
9000000086bf0d68 9000000085147010 90000001075be788 0000000000000000
9000000086bf0f98 0000000000000001 0000000000000010 9000000006015840
0000000000000000 9000000086be6c40 0000000000000000 0000000000000000
0000000000000000 4f2317da8a7e08c4 0000000000000101 4f2317da8a7e08c4
...
Call Trace:
[<90000000851b5ac0>] __qdisc_run+0xc8/0x8d8
[<9000000085130008>] __dev_queue_xmit+0x578/0x10f0
[<90000000853701c0>] ip6_finish_output2+0x2f0/0x950
[<9000000085374bc8>] ip6_finish_output+0x2b8/0x448
[<9000000085370b24>] ip6_xmit+0x304/0x858
[<90000000853c4438>] inet6_csk_xmit+0x100/0x170
[<90000000852b32f0>] __tcp_transmit_skb+0x490/0xdd0
[<90000000852b47fc>] tcp_connect+0xbcc/0x1168
[<90000000853b9088>] tcp_v6_connect+0x580/0x8a0
[<90000000852e7738>] __inet_stream_connect+0x170/0x480
[<90000000852e7a98>] inet_stream_connect+0x50/0x88
[<90000000850f2814>] __sys_connect+0xe4/0x110
[<90000000850f2858>] sys_connect+0x18/0x28
[<9000000085520c94>] do_syscall+0x94/0x1a0
[<9000000083df1fb8>] handle_syscall+0xb8/0x158
Code: 4001ad80 2400873f 2400832d <240073cc> 001137ff 001133ff 6407b41f 001503cc 0280041d
---[ end trace 0000000000000000 ]---The bpf_fifo_dequeue prog returns a skb which is a pointer. The pointer is treated as a 32bit value and sign extend to 64bit in epilogue. This behavior is right for most bpf prog types but wrong for struct ops which requires LoongArch ABI.
So let's sign extend struct ops return values according to the return value spec in function model.
--- arch/loongarch/net/bpf_jit.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+)
arch/loongarch/net/bpf_jit.c +25 -0
@@ -1448,6 +1448,29 @@ void arch_free_bpf_trampoline(void *image, unsigned int size)bpf_prog_pack_free (image, size); } +/* +* Sign-extend the register if necessary +*/ +static void sign_extend (struct jit_ctx *ctx,int rd,int rj,u8 size) +{ +switch (size) { +case 1 : +emit_insn (ctx, extwb, rd, rj); +break ; +case 2 : +emit_insn (ctx, extwh, rd, rj); +break ; +case 4 : +emit_insn (ctx, addiw, rd, rj,0 ); +break ; +case 8 : +move_reg (ctx, rd, rj); +break ; +default : +pr_warn ("bpf_jit: invalid size %d for sign_extend\n" , size); + } +} +static int __arch_prepare_bpf_trampoline (struct jit_ctx *ctx,struct bpf_tramp_image *im,const struct btf_func_model *m,struct bpf_tramp_links *tlinks,void *func_addr,u32 flags)
@@ -1654,6 +1677,8 @@ static int __arch_prepare_bpf_trampoline(struct jit_ctx *ctx, struct bpf_tramp_iif (save_ret) {emit_insn (ctx, ldd,LOONGARCH_GPR_A0 ,LOONGARCH_GPR_FP , -retval_off);emit_insn (ctx, ldd, regmap[BPF_REG_0 ],LOONGARCH_GPR_FP , -(retval_off -8 )); +if (is_struct_ops) +sign_extend (ctx,LOONGARCH_GPR_A0 , regmap[BPF_REG_0 ], m->ret_size); }emit_insn (ctx, ldd,LOONGARCH_GPR_S1 ,LOONGARCH_GPR_FP , -sreg_off);
Signature · 1 line
2.43.5
Tiezhu Yang
maintainerRe: [PATCH v3 2/3] LoongArch: BPF: Sign extend struct ops return values properly
Quoted 1 line · Hengqi Chen
The
ns_bpf_qdiscselftest triggers a kernel panic:
...
Quoted 2 lines
So let's sign extend struct ops return values according to the return value spec in function model.
...
arch/loongarch/net/bpf_jit.c static int __arch_prepare_bpf_trampoline(struct jit_ctx *ctx, struct bpf_tramp_i · line 1678
Quoted 6 lines
static int __arch_prepare_bpf_trampoline(struct
jit_ctx*ctx, structbpf_tramp_image*im,
const structbtf_func_model*m, structbpf_tramp_links*tlinks, void*func_addr, u32 flags)arch/loongarch/net/bpf_jit.c +0
-0@@ -1654,6 +1677,8 @@ static int __arch_prepare_bpf_trampoline(struct jit_ctx *ctx, struct bpf_tramp_iif (save_ret) {emit_insn (ctx, ldd,LOONGARCH_GPR_A0 ,LOONGARCH_GPR_FP , -retval_off);
If is_struct_ops is true, this operation is not necessary, because LOONGARCH_GPR_A0 will be overwrote in the later code ...
arch/loongarch/net/bpf_jit.c static int __arch_prepare_bpf_trampoline(struct jit_ctx *ctx, struct bpf_tramp_i · line 1681
Quoted 3 lines
arch/loongarch/net/bpf_jit.c +2
-0emit_insn (ctx, ldd, regmap[BPF_REG_0 ],LOONGARCH_GPR_FP , -(retval_off -8 )); +if (is_struct_ops) +sign_extend (ctx,LOONGARCH_GPR_A0 , regmap[BPF_REG_0 ], m->ret_size);
... in here, so it is better to write the code like this:
if (is_struct_ops) {
...
} else {
...
}
Maybe Huacai can adjust the code when applying.
Thanks,
Tiezhu
Huacai Chen
maintainerRe: [PATCH v3 2/3] LoongArch: BPF: Sign extend struct ops return values properly
Quoted 26 lines · Tiezhu Yang
Quoted 1 line · Hengqi Chen
The
ns_bpf_qdiscselftest triggers a kernel panic:...
Quoted 2 lines
So let's sign extend struct ops return values according to the return value spec in function model.
...
arch/loongarch/net/bpf_jit.c static int __arch_prepare_bpf_trampoline(struct jit_ctx *ctx, struct bpf_tramp_i · line 1678
Quoted 6 lines
static int __arch_prepare_bpf_trampoline(struct
jit_ctx*ctx, structbpf_tramp_image*im,
const structbtf_func_model*m, structbpf_tramp_links*tlinks, void*func_addr, u32 flags)arch/loongarch/net/bpf_jit.c +0
-0@@ -1654,6 +1677,8 @@ static int __arch_prepare_bpf_trampoline(struct jit_ctx *ctx, struct bpf_tramp_iif (save_ret) {emit_insn (ctx, ldd,LOONGARCH_GPR_A0 ,LOONGARCH_GPR_FP , -retval_off);If
is_struct_opsis true, this operation is not necessary, becauseLOONGARCH_GPR_A0will be overwrote in the later code ...arch/loongarch/net/bpf_jit.c static int __arch_prepare_bpf_trampoline(struct jit_ctx *ctx, struct bpf_tramp_i · line 1681
Quoted 3 lines
arch/loongarch/net/bpf_jit.c +2
-0emit_insn (ctx, ldd, regmap[BPF_REG_0 ],LOONGARCH_GPR_FP , -(retval_off -8 )); +if (is_struct_ops) +sign_extend (ctx,LOONGARCH_GPR_A0 , regmap[BPF_REG_0 ], m->ret_size);... in here, so it is better to write the code like this:
Quoted 7 lines
if (
is_struct_ops) {
...
} else {
...
}Maybe Huacai can adjust the code when applying.
No hurry, I will wait your series (and there is another patch from Jiang Haoran, too), then apply together.
Huacai
Quoted 4 lines
Thanks,
Tiezhu
Tiezhu Yang
maintainerRe: [PATCH v3 2/3] LoongArch: BPF: Sign extend struct ops return values properly
Hi Hengqi,
Quoted 33 lines · Huacai Chen
Quoted 32 lines · Tiezhu Yang
Quoted 1 line · Hengqi Chen
The
ns_bpf_qdiscselftest triggers a kernel panic:...
Quoted 2 lines
So let's sign extend struct ops return values according to the return value spec in function model.
...
arch/loongarch/net/bpf_jit.c static int __arch_prepare_bpf_trampoline(struct jit_ctx *ctx, struct bpf_tramp_i · line 1678
Quoted 6 lines
static int __arch_prepare_bpf_trampoline(struct
jit_ctx*ctx, structbpf_tramp_image*im,
const structbtf_func_model*m, structbpf_tramp_links*tlinks, void*func_addr, u32 flags)arch/loongarch/net/bpf_jit.c +0
-0@@ -1654,6 +1677,8 @@ static int __arch_prepare_bpf_trampoline(struct jit_ctx *ctx, struct bpf_tramp_iif (save_ret) {emit_insn (ctx, ldd,LOONGARCH_GPR_A0 ,LOONGARCH_GPR_FP , -retval_off);If
is_struct_opsis true, this operation is not necessary, becauseLOONGARCH_GPR_A0will be overwrote in the later code ...arch/loongarch/net/bpf_jit.c static int __arch_prepare_bpf_trampoline(struct jit_ctx *ctx, struct bpf_tramp_i · line 1681
Quoted 3 lines
arch/loongarch/net/bpf_jit.c +2
-0emit_insn (ctx, ldd, regmap[BPF_REG_0 ],LOONGARCH_GPR_FP , -(retval_off -8 )); +if (is_struct_ops) +sign_extend (ctx,LOONGARCH_GPR_A0 , regmap[BPF_REG_0 ], m->ret_size);... in here, so it is better to write the code like this:
if (
is_struct_ops) {
...
} else {
...
}
Quoted 3 lines
Quoted 1 line
Maybe Huacai can adjust the code when applying.
No hurry, I will wait your series (and there is another patch from Jiang Haoran, too), then apply together.
If there is a new version for this patch, please consider removing duplicated "stack_size = 0;" in __arch_prepare_bpf_trampoline() in patch #1 while you are at it, probably not worth sending a single patch just for that.
Here is the previous comment for v1:
https://lore.kernel.org/loongarch/[email protected]/
Thanks,
Tiezhu
Hengqi Chen
reviewerRe: [PATCH v3 2/3] LoongArch: BPF: Sign extend struct ops return values properly
In reply to Huacai ChenQuoted 34 lines · Huacai Chen
Quoted 32 lines · Tiezhu Yang
Quoted 1 line · Hengqi Chen
The
ns_bpf_qdiscselftest triggers a kernel panic:...
Quoted 2 lines
So let's sign extend struct ops return values according to the return value spec in function model.
...
arch/loongarch/net/bpf_jit.c static int __arch_prepare_bpf_trampoline(struct jit_ctx *ctx, struct bpf_tramp_i · line 1678
Quoted 6 lines
static int __arch_prepare_bpf_trampoline(struct
jit_ctx*ctx, structbpf_tramp_image*im,
const structbtf_func_model*m, structbpf_tramp_links*tlinks, void*func_addr, u32 flags)arch/loongarch/net/bpf_jit.c +0
-0@@ -1654,6 +1677,8 @@ static int __arch_prepare_bpf_trampoline(struct jit_ctx *ctx, struct bpf_tramp_iif (save_ret) {emit_insn (ctx, ldd,LOONGARCH_GPR_A0 ,LOONGARCH_GPR_FP , -retval_off);If
is_struct_opsis true, this operation is not necessary, becauseLOONGARCH_GPR_A0will be overwrote in the later code ...arch/loongarch/net/bpf_jit.c static int __arch_prepare_bpf_trampoline(struct jit_ctx *ctx, struct bpf_tramp_i · line 1681
Quoted 3 lines
arch/loongarch/net/bpf_jit.c +2
-0emit_insn (ctx, ldd, regmap[BPF_REG_0 ],LOONGARCH_GPR_FP , -(retval_off -8 )); +if (is_struct_ops) +sign_extend (ctx,LOONGARCH_GPR_A0 , regmap[BPF_REG_0 ], m->ret_size);... in here, so it is better to write the code like this:
if (
is_struct_ops) {
...
} else {
...
}
Quoted 4 lines
Quoted 1 line
Maybe Huacai can adjust the code when applying.
No hurry, I will wait your series (and there is another patch from Jiang Haoran, too), then apply together.
Do you mean https://lore.kernel.org/loongarch/[email protected]/
?
Quoted 6 lines
Huacai
Quoted 4 lines
Thanks,
Tiezhu
Huacai Chen
maintainerRe: [PATCH v3 2/3] LoongArch: BPF: Sign extend struct ops return values properly
Quoted 36 lines · Hengqi Chen
Quoted 34 lines · Huacai Chen
Quoted 32 lines · Tiezhu Yang
Quoted 1 line · Hengqi Chen
The
ns_bpf_qdiscselftest triggers a kernel panic:...
Quoted 2 lines
So let's sign extend struct ops return values according to the return value spec in function model.
...
arch/loongarch/net/bpf_jit.c static int __arch_prepare_bpf_trampoline(struct jit_ctx *ctx, struct bpf_tramp_i · line 1678
Quoted 6 lines
static int __arch_prepare_bpf_trampoline(struct
jit_ctx*ctx, structbpf_tramp_image*im,
const structbtf_func_model*m, structbpf_tramp_links*tlinks, void*func_addr, u32 flags)arch/loongarch/net/bpf_jit.c +0
-0@@ -1654,6 +1677,8 @@ static int __arch_prepare_bpf_trampoline(struct jit_ctx *ctx, struct bpf_tramp_iif (save_ret) {emit_insn (ctx, ldd,LOONGARCH_GPR_A0 ,LOONGARCH_GPR_FP , -retval_off);If
is_struct_opsis true, this operation is not necessary, becauseLOONGARCH_GPR_A0will be overwrote in the later code ...arch/loongarch/net/bpf_jit.c static int __arch_prepare_bpf_trampoline(struct jit_ctx *ctx, struct bpf_tramp_i · line 1681
Quoted 3 lines
arch/loongarch/net/bpf_jit.c +2
-0emit_insn (ctx, ldd, regmap[BPF_REG_0 ],LOONGARCH_GPR_FP , -(retval_off -8 )); +if (is_struct_ops) +sign_extend (ctx,LOONGARCH_GPR_A0 , regmap[BPF_REG_0 ], m->ret_size);... in here, so it is better to write the code like this:
if (
is_struct_ops) {
...
} else {
...
}
Quoted 7 lines
Quoted 4 lines
Quoted 1 line
Maybe Huacai can adjust the code when applying.
No hurry, I will wait your series (and there is another patch from Jiang Haoran, too), then apply together.
Do you mean https://lore.kernel.org/loongarch/[email protected]/
?
Yes, is it replaced by your or Tiezhu's patch?
Huacai
Quoted 7 lines
Quoted 7 lines
Huacai
Quoted 4 lines
Thanks,
Tiezhu
Hengqi Chen
reviewerRe: [PATCH v3 2/3] LoongArch: BPF: Sign extend struct ops return values properly
Quoted 38 lines · Huacai Chen
Quoted 36 lines · Hengqi Chen
Quoted 34 lines · Huacai Chen
Quoted 32 lines · Tiezhu Yang
Quoted 1 line · Hengqi Chen
The
ns_bpf_qdiscselftest triggers a kernel panic:...
Quoted 2 lines
So let's sign extend struct ops return values according to the return value spec in function model.
...
arch/loongarch/net/bpf_jit.c static int __arch_prepare_bpf_trampoline(struct jit_ctx *ctx, struct bpf_tramp_i · line 1678
Quoted 6 lines
static int __arch_prepare_bpf_trampoline(struct
jit_ctx*ctx, structbpf_tramp_image*im,
const structbtf_func_model*m, structbpf_tramp_links*tlinks, void*func_addr, u32 flags)arch/loongarch/net/bpf_jit.c +0
-0@@ -1654,6 +1677,8 @@ static int __arch_prepare_bpf_trampoline(struct jit_ctx *ctx, struct bpf_tramp_iif (save_ret) {emit_insn (ctx, ldd,LOONGARCH_GPR_A0 ,LOONGARCH_GPR_FP , -retval_off);If
is_struct_opsis true, this operation is not necessary, becauseLOONGARCH_GPR_A0will be overwrote in the later code ...arch/loongarch/net/bpf_jit.c static int __arch_prepare_bpf_trampoline(struct jit_ctx *ctx, struct bpf_tramp_i · line 1681
Quoted 3 lines
arch/loongarch/net/bpf_jit.c +2
-0emit_insn (ctx, ldd, regmap[BPF_REG_0 ],LOONGARCH_GPR_FP , -(retval_off -8 )); +if (is_struct_ops) +sign_extend (ctx,LOONGARCH_GPR_A0 , regmap[BPF_REG_0 ], m->ret_size);... in here, so it is better to write the code like this:
if (
is_struct_ops) {
...
} else {
...
}
Quoted 9 lines
Quoted 7 lines
Quoted 4 lines
Quoted 1 line
Maybe Huacai can adjust the code when applying.
No hurry, I will wait your series (and there is another patch from Jiang Haoran, too), then apply together.
Do you mean https://lore.kernel.org/loongarch/[email protected]/
?Yes, is it replaced by your or Tiezhu's patch?
The code is not sane (It tries to guess return values of random bpf progs), so the patch should not go in.
Quoted 9 lines
Huacai
Quoted 7 lines
Quoted 7 lines
Huacai
Quoted 4 lines
Thanks,
Tiezhu
Huacai Chen
maintainerRe: [PATCH v3 2/3] LoongArch: BPF: Sign extend struct ops return values properly
Quoted 45 lines · Hengqi Chen
Quoted 43 lines · Huacai Chen
Quoted 41 lines · Hengqi Chen
Quoted 38 lines · Huacai Chen
Quoted 26 lines · Tiezhu Yang
Quoted 1 line · Hengqi Chen
The
ns_bpf_qdiscselftest triggers a kernel panic:...
Quoted 2 lines
So let's sign extend struct ops return values according to the return value spec in function model.
...
arch/loongarch/net/bpf_jit.c static int __arch_prepare_bpf_trampoline(struct jit_ctx *ctx, struct bpf_tramp_i · line 1678
Quoted 6 lines
static int __arch_prepare_bpf_trampoline(struct
jit_ctx*ctx, structbpf_tramp_image*im,
const structbtf_func_model*m, structbpf_tramp_links*tlinks, void*func_addr, u32 flags)arch/loongarch/net/bpf_jit.c +0
-0@@ -1654,6 +1677,8 @@ static int __arch_prepare_bpf_trampoline(struct jit_ctx *ctx, struct bpf_tramp_iif (save_ret) {emit_insn (ctx, ldd,LOONGARCH_GPR_A0 ,LOONGARCH_GPR_FP , -retval_off);If
is_struct_opsis true, this operation is not necessary, becauseLOONGARCH_GPR_A0will be overwrote in the later code ...arch/loongarch/net/bpf_jit.c static int __arch_prepare_bpf_trampoline(struct jit_ctx *ctx, struct bpf_tramp_i · line 1681
Quoted 3 lines
arch/loongarch/net/bpf_jit.c +2
-0emit_insn (ctx, ldd, regmap[BPF_REG_0 ],LOONGARCH_GPR_FP , -(retval_off -8 )); +if (is_struct_ops) +sign_extend (ctx,LOONGARCH_GPR_A0 , regmap[BPF_REG_0 ], m->ret_size);... in here, so it is better to write the code like this:
Quoted 7 lines
if (
is_struct_ops) {
...
} else {
...
}Maybe Huacai can adjust the code when applying.
No hurry, I will wait your series (and there is another patch from Jiang Haoran, too), then apply together.
Quoted 7 lines
Quoted 4 lines
Quoted 2 lines
Do you mean https://lore.kernel.org/loongarch/[email protected]/
?Yes, is it replaced by your or Tiezhu's patch?
The code is not sane (It tries to guess return values of random bpf progs), so the patch should not go in.
I know, but the problem exists. So I hope there will be an updated version.
Huacai
Quoted 10 lines
Quoted 10 lines
Huacai
Quoted 7 lines
Quoted 7 lines
Huacai
Quoted 4 lines
Thanks,
Tiezhu
Re: [PATCH v3 2/3] LoongArch: BPF: Sign extend struct ops return values properly
In reply to Hengqi ChenQuoted 117 lines · Hengqi Chen
The
ns_bpf_qdiscselftest triggers a kernel panic:CPU 0 Unable to handle kernel paging request at virtual address 0000000000741d58, era == 90000000851b5ac0, ra == 90000000851b5aa4 Oops[#1]: CPU: 0 UID: 0 PID: 449 Comm: test_progs Tainted: G OE 6.16.0+ #3 PREEMPT(full) Tainted: [O]=OOT_MODULE, [E]=UNSIGNED_MODULE Hardware name: QEMU QEMU Virtual Machine, BIOS unknown 2/2/2022 pc 90000000851b5ac0 ra 90000000851b5aa4 tp 90000001076b8000 sp 90000001076bb600 a0 0000000000741ce8 a1 0000000000000001 a2 90000001076bb5c0 a3 0000000000000008 a4 90000001004c4620 a5 9000000100741ce8 a6 0000000000000000 a7 0100000000000000 t0 0000000000000010 t1 0000000000000000 t2 9000000104d24d30 t3 0000000000000001 t4 4f2317da8a7e08c4 t5 fffffefffc002f00 t6 90000001004c4620 t7 ffffffffc61c5b3d t8 0000000000000000 u0 0000000000000001 s9 0000000000000050 s0 90000001075bc800 s1 0000000000000040 s2 900000010597c400 s3 0000000000000008 s4 90000001075bc880 s5 90000001075bc8f0 s6 0000000000000000 s7 0000000000741ce8 s8 0000000000000000 ra: 90000000851b5aa4 __qdisc_run+0xac/0x8d8 ERA: 90000000851b5ac0 __qdisc_run+0xc8/0x8d8 CRMD: 000000b0 (PLV0 -IE -DA +PG DACF=CC DACM=CC -WE) PRMD: 00000004 (PPLV0 +PIE -PWE) EUEN: 00000007 (+FPE +SXE +ASXE -BTE) ECFG: 00071c1d (LIE=0,2-4,10-12 VS=7) ESTAT: 00010000 [PIL] (IS= ECode=1 EsubCode=0) BADV: 0000000000741d58 PRID: 0014c010 (Loongson-64bit, Loongson-3A5000) Modules linked in: bpf_testmod(OE) [last unloaded: bpf_testmod(OE)] Process test_progs (pid: 449, threadinfo=000000009af02b3a, task=00000000e9ba4956) Stack : 0000000000000000 90000001075bc8ac 90000000869524a8 9000000100741ce8 90000001075bc800 9000000100415300 90000001075bc8ac 0000000000000000 900000010597c400 900000008694a000 0000000000000000 9000000105b59000 90000001075bc800 9000000100741ce8 0000000000000050 900000008513000c 9000000086936000 0000000100094d4c fffffff400676208 0000000000000000 9000000105b59000 900000008694a000 9000000086bf0dc0 9000000105b59000 9000000086bf0d68 9000000085147010 90000001075be788 0000000000000000 9000000086bf0f98 0000000000000001 0000000000000010 9000000006015840 0000000000000000 9000000086be6c40 0000000000000000 0000000000000000 0000000000000000 4f2317da8a7e08c4 0000000000000101 4f2317da8a7e08c4 ... Call Trace: [<90000000851b5ac0>] __qdisc_run+0xc8/0x8d8 [<9000000085130008>] __dev_queue_xmit+0x578/0x10f0 [<90000000853701c0>] ip6_finish_output2+0x2f0/0x950 [<9000000085374bc8>] ip6_finish_output+0x2b8/0x448 [<9000000085370b24>] ip6_xmit+0x304/0x858 [<90000000853c4438>] inet6_csk_xmit+0x100/0x170 [<90000000852b32f0>] __tcp_transmit_skb+0x490/0xdd0 [<90000000852b47fc>] tcp_connect+0xbcc/0x1168 [<90000000853b9088>] tcp_v6_connect+0x580/0x8a0 [<90000000852e7738>] __inet_stream_connect+0x170/0x480 [<90000000852e7a98>] inet_stream_connect+0x50/0x88 [<90000000850f2814>] __sys_connect+0xe4/0x110 [<90000000850f2858>] sys_connect+0x18/0x28 [<9000000085520c94>] do_syscall+0x94/0x1a0 [<9000000083df1fb8>] handle_syscall+0xb8/0x158 Code: 4001ad80 2400873f 2400832d <240073cc> 001137ff 001133ff 6407b41f 001503cc 0280041d ---[ end trace 0000000000000000 ]---The
bpf_fifo_dequeueprog returns a skb which is a pointer. The pointer is treated as a 32bit value and sign extend to 64bit in epilogue. This behavior is right for most bpf prog types but wrong for struct ops which requires LoongArch ABI.So let's sign extend struct ops return values according to the return value spec in function model.
Fixes 6abf17d690d8 ("LoongArch: BPF: Add struct ops support for trampoline")Signed-off-by Hengqi Chen <[email protected]>--- arch/loongarch/net/bpf_jit.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+)arch/loongarch/net/bpf_jit.c +25
-1@@ -1448,6 +1448,29 @@ void arch_free_bpf_trampoline(void *image, unsigned int size)bpf_prog_pack_free (image, size); } +/* +* Sign-extend the register if necessary +*/ +static void sign_extend (struct jit_ctx *ctx,int rd,int rj,u8 size) +{ +switch (size) { +case 1 : +emit_insn (ctx, extwb, rd, rj); +break ; +case 2 : +emit_insn (ctx, extwh, rd, rj); +break ; +case 4 : +emit_insn (ctx, addiw, rd, rj,0 ); +break ; +case 8 : +move_reg (ctx, rd, rj); +break ; +default : +pr_warn ("bpf_jit: invalid size %d for sign_extend\n" , size); + } +} +static int __arch_prepare_bpf_trampoline (struct jit_ctx *ctx,struct bpf_tramp_image *im,const struct btf_func_model *m,struct bpf_tramp_links *tlinks,void *func_addr,u32 flags)@@ -1654,6 +1677,8 @@ static int __arch_prepare_bpf_trampoline(struct jit_ctx *ctx, struct bpf_tramp_iif (save_ret) {emit_insn (ctx, ldd,LOONGARCH_GPR_A0 ,LOONGARCH_GPR_FP , -retval_off);emit_insn (ctx, ldd, regmap[BPF_REG_0 ],LOONGARCH_GPR_FP , -(retval_off -8 )); +if (is_struct_ops) +sign_extend (ctx,LOONGARCH_GPR_A0 , regmap[BPF_REG_0 ], m->ret_size); }emit_insn (ctx, ldd,LOONGARCH_GPR_S1 ,LOONGARCH_GPR_FP , -sreg_off); --
Quoted 3 lines
2.43.5
Tested OK.
./test_progs \
--deny=module_attach \
--deny=subprogs_extable \
--deny=timer_lockup \
--json-summary="./bpf_selftests.json"
#213/1 ns_bpf_qdisc/fifo:OK #213/2 ns_bpf_qdisc/fq:OK #213/3 ns_bpf_qdisc/attach to mq:OK #213/4 ns_bpf_qdisc/attach to non root:OK #213/5 ns_bpf_qdisc/incompl_ops:OK #213 ns_bpf_qdisc:OK
Hengqi Chen
reviewerPATCH v3 3/3 LoongArch: BPF: No support of struct argument in trampoline programs
In reply to Hengqi ChenThe current implementation does not support struct argument. This cause a oops when running bpf selftest:
$ ./test_progs -a tracing_struct
CPU -1 Unable to handle kernel paging request at virtual address 0000000000000018, era == 90000000845659f4, ra == 90000000845659e8
Oops[#1]:
CPU -1 Unable to handle kernel paging request at virtual address 0000000000000018, era == 9000000085bef268, ra == 90000000844f3938
rcu: INFO: rcu_preempt detected stalls on CPUs/tasks:
rcu: 1-...0: (19 ticks this GP) idle=1094/1/0x4000000000000000 softirq=1380/1382 fqs=801
rcu: (detected by 0, t=5252 jiffies, g=1197, q=52 ncpus=4)
Sending NMI from CPU 0 to CPUs 1:
rcu: rcu_preempt kthread starved for 2495 jiffies! g1197 f0x0 RCU_GP_DOING_FQS(6) ->state=0x0 ->cpu=2
rcu: Unless rcu_preempt kthread gets sufficient CPU time, OOM is now expected behavior.
rcu: RCU grace-period kthread stack dump:
task:rcu_preempt state:I stack:0 pid:15 tgid:15 ppid:2 task_flags:0x208040 flags:0x00000800
Stack : 9000000100423e80 0000000000000402 0000000000000010 90000001003b0680
9000000085d88000 0000000000000000 0000000000000040 9000000087159350
9000000085c2b9b0 0000000000000001 900000008704a000 0000000000000005
00000000ffff355b 00000000ffff355b 0000000000000000 0000000000000004
9000000085d90510 0000000000000000 0000000000000002 7b5d998f8281e86e
00000000ffff355c 7b5d998f8281e86e 000000000000003f 9000000087159350
900000008715bf98 0000000000000005 9000000087036000 900000008704a000
9000000100407c98 90000001003aff80 900000008715c4c0 9000000085c2b9b0
00000000ffff355b 9000000085c33d3c 00000000000000b4 0000000000000000
9000000007002150 00000000ffff355b 9000000084615480 0000000007000002
...
Call Trace:
[<9000000085c2a868>] __schedule+0x410/0x1520
[<9000000085c2b9ac>] schedule+0x34/0x190
[<9000000085c33d38>] schedule_timeout+0x98/0x140
[<90000000845e9120>] rcu_gp_fqs_loop+0x5f8/0x868
[<90000000845ed538>] rcu_gp_kthread+0x260/0x2e0
[<900000008454e8a4>] kthread+0x144/0x238
[<9000000085c26b60>] ret_from_kernel_thread+0x28/0xc8
[<90000000844f20e4>] ret_from_kernel_thread_asm+0xc/0x88 rcu: Stack dump where RCU GP kthread last ran:
Sending NMI from CPU 0 to CPUs 2:
NMI backtrace for cpu 2 skipped: idling at idle_exit+0x0/0x4
Reject it for now.
--- arch/loongarch/net/bpf_jit.c | 6 ++++++ 1 file changed, 6 insertions(+)
arch/loongarch/net/bpf_jit.c +6 -0
@@ -1515,6 +1515,12 @@ static int __arch_prepare_bpf_trampoline(struct jit_ctx *ctx, struct bpf_tramp_iif (m->nr_args >LOONGARCH_MAX_REG_ARGS )return -ENOTSUPP ; +/* don't support struct argument */ +for (i =0 ; i < m->nr_args; i++) { +if (m->arg_flags[i] &BTF_FMODEL_STRUCT_ARG ) +return -ENOTSUPP ; + } +if (flags & (BPF_TRAMP_F_ORIG_STACK |BPF_TRAMP_F_SHARE_IPMODIFY ))return -ENOTSUPP ;
Signature · 1 line
2.43.5
Hengqi Chen
reviewer+ Jinyang
Quoted 23 lines · Hengqi Chen
The following two selftest cases triggers oops on LoongArch:
$ ./test_progs -a ns_bpf_qdisc -a tracing_structThis small series tries to fix/workaround these issues. See individual commit for details.
While at it, remove a duplicated flags check in
__arch_prepare_bpf_trampoline().v2 -> v3:
* Simplifysign_extend()implementation as suggested by JinyangHengqi Chen (3):
LoongArch: BPF: Remove duplicated flags check
LoongArch: BPF: Sign extend struct ops return values properly
LoongArch: BPF: No support of struct argument in trampoline programsarch/loongarch/net/bpf_jit.c | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-)--
2.43.5