* [PATCH v1 0/2] Fix the failure issue of the module_attach test case
@ 2025-12-09 9:34 Chenghao Duan
2025-12-09 9:34 ` [PATCH v1 1/2] LoongArch: Modify the jump logic of the trampoline Chenghao Duan
` (3 more replies)
0 siblings, 4 replies; 12+ messages in thread
From: Chenghao Duan @ 2025-12-09 9:34 UTC (permalink / raw)
To: yangtiezhu, hengqi.chen, chenhuacai
Cc: kernel, zhangtianyang, masahiroy, linux-kernel, loongarch, bpf,
guodongtai, duanchenghao, youling.tang, jianghaoran,
vincent.mc.li
The following test cases under the tools/testing/selftests/bpf/
directory have passed the test：
./test_progs -t module_attach
./test_progs -t module_fentry_shadow
./test_progs -t subprogs
./test_progs -t subprogs_extable
./test_progs -t tailcalls
./test_progs -t struct_ops -d struct_ops_multi_pages
./test_progs -t fexit_bpf2bpf
./test_progs -t fexit_stress
./test_progs -t module_fentry_shadow
./test_progs -t fentry_test/fentry
./test_progs -t fexit_test/fexit
./test_progs -t fentry_fexit
./test_progs -t modify_return
./test_progs -t fexit_sleep
./test_progs -t test_overhead
./test_progs -t trampoline_count
Chenghao Duan (2):
LoongArch: Modify the jump logic of the trampoline
LoongArch: BPF: Enable BPF exception fixup for specific ADE subcode
arch/loongarch/kernel/mcount_dyn.S | 14 +++++---
arch/loongarch/kernel/traps.c | 7 +++-
arch/loongarch/net/bpf_jit.c | 37 +++++++++++++++------
samples/ftrace/ftrace-direct-modify.c | 8 ++---
samples/ftrace/ftrace-direct-multi-modify.c | 8 ++---
samples/ftrace/ftrace-direct-multi.c | 4 +--
samples/ftrace/ftrace-direct-too.c | 4 +--
samples/ftrace/ftrace-direct.c | 4 +--
8 files changed, 56 insertions(+), 30 deletions(-)
--
2.25.1
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v1 1/2] LoongArch: Modify the jump logic of the trampoline
2025-12-09 9:34 [PATCH v1 0/2] Fix the failure issue of the module_attach test case Chenghao Duan
@ 2025-12-09 9:34 ` Chenghao Duan
2025-12-10 0:48 ` Tiezhu Yang
2025-12-10 4:15 ` Hengqi Chen
2025-12-09 9:34 ` [PATCH v1 2/2] LoongArch: Enable BPF exception fixup for specific ADE subcode Chenghao Duan
` (2 subsequent siblings)
3 siblings, 2 replies; 12+ messages in thread
From: Chenghao Duan @ 2025-12-09 9:34 UTC (permalink / raw)
To: yangtiezhu, hengqi.chen, chenhuacai
Cc: kernel, zhangtianyang, masahiroy, linux-kernel, loongarch, bpf,
guodongtai, duanchenghao, youling.tang, jianghaoran,
vincent.mc.li, Youling Tang
There are two methods to jump into the trampoline code for execution:
1. ftrace-managed.
2. Direct call.
Whether ftrace-managed or direct jump, ensure before trampoline entry:
t0=parent func return addr, ra=traced func return addr.
When managed by ftrace, the trampoline code execution flow utilizes
ftrace direct call, and it is required to ensure that the original
data in registers t0 and ra is not modification.
samples/ftrace/ftrace-direct_xxxx.c: update test code for ftrace direct
call (modify together).
Trampoline: adjust jump logic to use t0 (parent func return addr) and
ra (traced func return addr) as jump targets for respective scenarios
Signed-off-by: Youling Tang <tangyouling@kylinos.cn>
Signed-off-by: Chenghao Duan <duanchenghao@kylinos.cn>
---
arch/loongarch/kernel/mcount_dyn.S | 14 +++++---
arch/loongarch/net/bpf_jit.c | 37 +++++++++++++++------
samples/ftrace/ftrace-direct-modify.c | 8 ++---
samples/ftrace/ftrace-direct-multi-modify.c | 8 ++---
samples/ftrace/ftrace-direct-multi.c | 4 +--
samples/ftrace/ftrace-direct-too.c | 4 +--
samples/ftrace/ftrace-direct.c | 4 +--
7 files changed, 50 insertions(+), 29 deletions(-)
diff --git a/arch/loongarch/kernel/mcount_dyn.S b/arch/loongarch/kernel/mcount_dyn.S
index d6b474ad1d5e..5729c20e5b8b 100644
--- a/arch/loongarch/kernel/mcount_dyn.S
+++ b/arch/loongarch/kernel/mcount_dyn.S
@@ -94,7 +94,6 @@ SYM_INNER_LABEL(ftrace_graph_call, SYM_L_GLOBAL)
* at the callsite, so there is no need to restore the T series regs.
*/
ftrace_common_return:
- PTR_L ra, sp, PT_R1
PTR_L a0, sp, PT_R4
PTR_L a1, sp, PT_R5
PTR_L a2, sp, PT_R6
@@ -104,12 +103,17 @@ ftrace_common_return:
PTR_L a6, sp, PT_R10
PTR_L a7, sp, PT_R11
PTR_L fp, sp, PT_R22
- PTR_L t0, sp, PT_ERA
PTR_L t1, sp, PT_R13
- PTR_ADDI sp, sp, PT_SIZE
bnez t1, .Ldirect
+
+ PTR_L ra, sp, PT_R1
+ PTR_L t0, sp, PT_ERA
+ PTR_ADDI sp, sp, PT_SIZE
jr t0
.Ldirect:
+ PTR_L t0, sp, PT_R1
+ PTR_L ra, sp, PT_ERA
+ PTR_ADDI sp, sp, PT_SIZE
jr t1
SYM_CODE_END(ftrace_common)
@@ -161,6 +165,8 @@ SYM_CODE_END(return_to_handler)
#ifdef CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS
SYM_CODE_START(ftrace_stub_direct_tramp)
UNWIND_HINT_UNDEFINED
- jr t0
+ move t1, ra
+ move ra, t0
+ jr t1
SYM_CODE_END(ftrace_stub_direct_tramp)
#endif /* CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS */
diff --git a/arch/loongarch/net/bpf_jit.c b/arch/loongarch/net/bpf_jit.c
index 8dc58781b8eb..d1f5fd5ae847 100644
--- a/arch/loongarch/net/bpf_jit.c
+++ b/arch/loongarch/net/bpf_jit.c
@@ -139,6 +139,7 @@ static void build_prologue(struct jit_ctx *ctx)
stack_adjust = round_up(stack_adjust, 16);
stack_adjust += bpf_stack_adjust;
+ move_reg(ctx, LOONGARCH_GPR_T0, LOONGARCH_GPR_RA);
/* Reserve space for the move_imm + jirl instruction */
for (i = 0; i < LOONGARCH_LONG_JUMP_NINSNS; i++)
emit_insn(ctx, nop);
@@ -238,7 +239,7 @@ static void __build_epilogue(struct jit_ctx *ctx, bool is_tail_call)
* Call the next bpf prog and skip the first instruction
* of TCC initialization.
*/
- emit_insn(ctx, jirl, LOONGARCH_GPR_ZERO, LOONGARCH_GPR_T3, 6);
+ emit_insn(ctx, jirl, LOONGARCH_GPR_ZERO, LOONGARCH_GPR_T3, 7);
}
}
@@ -1265,7 +1266,7 @@ static int emit_jump_or_nops(void *target, void *ip, u32 *insns, bool is_call)
return 0;
}
- return emit_jump_and_link(&ctx, is_call ? LOONGARCH_GPR_T0 : LOONGARCH_GPR_ZERO, (u64)target);
+ return emit_jump_and_link(&ctx, is_call ? LOONGARCH_GPR_RA : LOONGARCH_GPR_ZERO, (u64)target);
}
static int emit_call(struct jit_ctx *ctx, u64 addr)
@@ -1289,6 +1290,10 @@ int bpf_arch_text_poke(void *ip, enum bpf_text_poke_type old_t,
void *new_addr)
{
int ret;
+ unsigned long size = 0;
+ unsigned long offset = 0;
+ char namebuf[KSYM_NAME_LEN];
+ void *image = NULL;
bool is_call;
u32 old_insns[LOONGARCH_LONG_JUMP_NINSNS] = {[0 ... 4] = INSN_NOP};
u32 new_insns[LOONGARCH_LONG_JUMP_NINSNS] = {[0 ... 4] = INSN_NOP};
@@ -1296,9 +1301,18 @@ int bpf_arch_text_poke(void *ip, enum bpf_text_poke_type old_t,
/* Only poking bpf text is supported. Since kernel function entry
* is set up by ftrace, we rely on ftrace to poke kernel functions.
*/
- if (!is_bpf_text_address((unsigned long)ip))
+ if (!__bpf_address_lookup((unsigned long)ip, &size, &offset, namebuf))
return -ENOTSUPP;
+ image = ip - offset;
+ /* zero offset means we're poking bpf prog entry */
+ if (offset == 0)
+ /* skip to the nop instruction in bpf prog entry:
+ * move t0, ra
+ * nop
+ */
+ ip = image + LOONGARCH_INSN_SIZE;
+
is_call = old_t == BPF_MOD_CALL;
ret = emit_jump_or_nops(old_addr, ip, old_insns, is_call);
if (ret)
@@ -1622,14 +1636,11 @@ static int __arch_prepare_bpf_trampoline(struct jit_ctx *ctx, struct bpf_tramp_i
/* To traced function */
/* Ftrace jump skips 2 NOP instructions */
- if (is_kernel_text((unsigned long)orig_call))
+ if (is_kernel_text((unsigned long)orig_call) || is_module_text_address((unsigned long)orig_call))
orig_call += LOONGARCH_FENTRY_NBYTES;
/* Direct jump skips 5 NOP instructions */
else if (is_bpf_text_address((unsigned long)orig_call))
orig_call += LOONGARCH_BPF_FENTRY_NBYTES;
- /* Module tracing not supported - cause kernel lockups */
- else if (is_module_text_address((unsigned long)orig_call))
- return -ENOTSUPP;
if (flags & BPF_TRAMP_F_CALL_ORIG) {
move_addr(ctx, LOONGARCH_GPR_A0, (const u64)im);
@@ -1722,12 +1733,16 @@ static int __arch_prepare_bpf_trampoline(struct jit_ctx *ctx, struct bpf_tramp_i
emit_insn(ctx, ldd, LOONGARCH_GPR_FP, LOONGARCH_GPR_SP, 0);
emit_insn(ctx, addid, LOONGARCH_GPR_SP, LOONGARCH_GPR_SP, 16);
- if (flags & BPF_TRAMP_F_SKIP_FRAME)
+ if (flags & BPF_TRAMP_F_SKIP_FRAME) {
/* return to parent function */
- emit_insn(ctx, jirl, LOONGARCH_GPR_ZERO, LOONGARCH_GPR_RA, 0);
- else
- /* return to traced function */
+ move_reg(ctx, LOONGARCH_GPR_RA, LOONGARCH_GPR_T0);
emit_insn(ctx, jirl, LOONGARCH_GPR_ZERO, LOONGARCH_GPR_T0, 0);
+ } else {
+ /* return to traced function */
+ move_reg(ctx, LOONGARCH_GPR_T1, LOONGARCH_GPR_RA);
+ move_reg(ctx, LOONGARCH_GPR_RA, LOONGARCH_GPR_T0);
+ emit_insn(ctx, jirl, LOONGARCH_GPR_ZERO, LOONGARCH_GPR_T1, 0);
+ }
}
ret = ctx->idx;
diff --git a/samples/ftrace/ftrace-direct-modify.c b/samples/ftrace/ftrace-direct-modify.c
index da3a9f2091f5..1ba1927b548e 100644
--- a/samples/ftrace/ftrace-direct-modify.c
+++ b/samples/ftrace/ftrace-direct-modify.c
@@ -176,8 +176,8 @@ asm (
" st.d $t0, $sp, 0\n"
" st.d $ra, $sp, 8\n"
" bl my_direct_func1\n"
-" ld.d $t0, $sp, 0\n"
-" ld.d $ra, $sp, 8\n"
+" ld.d $ra, $sp, 0\n"
+" ld.d $t0, $sp, 8\n"
" addi.d $sp, $sp, 16\n"
" jr $t0\n"
" .size my_tramp1, .-my_tramp1\n"
@@ -189,8 +189,8 @@ asm (
" st.d $t0, $sp, 0\n"
" st.d $ra, $sp, 8\n"
" bl my_direct_func2\n"
-" ld.d $t0, $sp, 0\n"
-" ld.d $ra, $sp, 8\n"
+" ld.d $ra, $sp, 0\n"
+" ld.d $t0, $sp, 8\n"
" addi.d $sp, $sp, 16\n"
" jr $t0\n"
" .size my_tramp2, .-my_tramp2\n"
diff --git a/samples/ftrace/ftrace-direct-multi-modify.c b/samples/ftrace/ftrace-direct-multi-modify.c
index 8f7986d698d8..7a7822dfeb50 100644
--- a/samples/ftrace/ftrace-direct-multi-modify.c
+++ b/samples/ftrace/ftrace-direct-multi-modify.c
@@ -199,8 +199,8 @@ asm (
" move $a0, $t0\n"
" bl my_direct_func1\n"
" ld.d $a0, $sp, 0\n"
-" ld.d $t0, $sp, 8\n"
-" ld.d $ra, $sp, 16\n"
+" ld.d $ra, $sp, 8\n"
+" ld.d $t0, $sp, 16\n"
" addi.d $sp, $sp, 32\n"
" jr $t0\n"
" .size my_tramp1, .-my_tramp1\n"
@@ -215,8 +215,8 @@ asm (
" move $a0, $t0\n"
" bl my_direct_func2\n"
" ld.d $a0, $sp, 0\n"
-" ld.d $t0, $sp, 8\n"
-" ld.d $ra, $sp, 16\n"
+" ld.d $ra, $sp, 8\n"
+" ld.d $t0, $sp, 16\n"
" addi.d $sp, $sp, 32\n"
" jr $t0\n"
" .size my_tramp2, .-my_tramp2\n"
diff --git a/samples/ftrace/ftrace-direct-multi.c b/samples/ftrace/ftrace-direct-multi.c
index db326c81a27d..3fe6ddaf0b69 100644
--- a/samples/ftrace/ftrace-direct-multi.c
+++ b/samples/ftrace/ftrace-direct-multi.c
@@ -131,8 +131,8 @@ asm (
" move $a0, $t0\n"
" bl my_direct_func\n"
" ld.d $a0, $sp, 0\n"
-" ld.d $t0, $sp, 8\n"
-" ld.d $ra, $sp, 16\n"
+" ld.d $ra, $sp, 8\n"
+" ld.d $t0, $sp, 16\n"
" addi.d $sp, $sp, 32\n"
" jr $t0\n"
" .size my_tramp, .-my_tramp\n"
diff --git a/samples/ftrace/ftrace-direct-too.c b/samples/ftrace/ftrace-direct-too.c
index 3d0fa260332d..bf2411aa6fd7 100644
--- a/samples/ftrace/ftrace-direct-too.c
+++ b/samples/ftrace/ftrace-direct-too.c
@@ -143,8 +143,8 @@ asm (
" ld.d $a0, $sp, 0\n"
" ld.d $a1, $sp, 8\n"
" ld.d $a2, $sp, 16\n"
-" ld.d $t0, $sp, 24\n"
-" ld.d $ra, $sp, 32\n"
+" ld.d $ra, $sp, 24\n"
+" ld.d $t0, $sp, 32\n"
" addi.d $sp, $sp, 48\n"
" jr $t0\n"
" .size my_tramp, .-my_tramp\n"
diff --git a/samples/ftrace/ftrace-direct.c b/samples/ftrace/ftrace-direct.c
index 956834b0d19a..5368c8c39cbb 100644
--- a/samples/ftrace/ftrace-direct.c
+++ b/samples/ftrace/ftrace-direct.c
@@ -124,8 +124,8 @@ asm (
" st.d $ra, $sp, 16\n"
" bl my_direct_func\n"
" ld.d $a0, $sp, 0\n"
-" ld.d $t0, $sp, 8\n"
-" ld.d $ra, $sp, 16\n"
+" ld.d $ra, $sp, 8\n"
+" ld.d $t0, $sp, 16\n"
" addi.d $sp, $sp, 32\n"
" jr $t0\n"
" .size my_tramp, .-my_tramp\n"
--
2.25.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH v1 2/2] LoongArch: Enable BPF exception fixup for specific ADE subcode
2025-12-09 9:34 [PATCH v1 0/2] Fix the failure issue of the module_attach test case Chenghao Duan
2025-12-09 9:34 ` [PATCH v1 1/2] LoongArch: Modify the jump logic of the trampoline Chenghao Duan
@ 2025-12-09 9:34 ` Chenghao Duan
2025-12-10 1:02 ` Tiezhu Yang
2025-12-10 5:20 ` Hengqi Chen
2025-12-10 3:18 ` [PATCH v1 0/2] Fix the failure issue of the module_attach test case Vincent Li
2025-12-10 4:10 ` Hengqi Chen
3 siblings, 2 replies; 12+ messages in thread
From: Chenghao Duan @ 2025-12-09 9:34 UTC (permalink / raw)
To: yangtiezhu, hengqi.chen, chenhuacai
Cc: kernel, zhangtianyang, masahiroy, linux-kernel, loongarch, bpf,
guodongtai, duanchenghao, youling.tang, jianghaoran,
vincent.mc.li
This patch allows the LoongArch BPF JIT to handle recoverable memory
access errors generated by BPF_PROBE_MEM* instructions.
When a BPF program performs memory access operations, the instructions
it executes may trigger ADEM exceptions. The kernel’s built-in BPF
exception table mechanism (EX_TYPE_BPF) will generate corresponding
exception fixup entries in the JIT compilation phase; however, the
architecture-specific trap handling function needs to proactively call
the common fixup routine to achieve exception recovery.
do_ade(): fix EX_TYPE_BPF memory access exceptions for BPF programs,
ensure safe execution.
Signed-off-by: Chenghao Duan <duanchenghao@kylinos.cn>
---
arch/loongarch/kernel/traps.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/arch/loongarch/kernel/traps.c b/arch/loongarch/kernel/traps.c
index da5926fead4a..9ca8aacc82b8 100644
--- a/arch/loongarch/kernel/traps.c
+++ b/arch/loongarch/kernel/traps.c
@@ -534,8 +534,13 @@ asmlinkage void noinstr do_fpe(struct pt_regs *regs, unsigned long fcsr)
asmlinkage void noinstr do_ade(struct pt_regs *regs)
{
- irqentry_state_t state = irqentry_enter(regs);
+ irqentry_state_t state;
+ unsigned int esubcode = FIELD_GET(CSR_ESTAT_ESUBCODE, regs->csr_estat);
+
+ if ((esubcode == 1) && fixup_exception(regs))
+ return;
+ state = irqentry_enter(regs);
die_if_kernel("Kernel ade access", regs);
force_sig_fault(SIGBUS, BUS_ADRERR, (void __user *)regs->csr_badvaddr);
--
2.25.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH v1 1/2] LoongArch: Modify the jump logic of the trampoline
2025-12-09 9:34 ` [PATCH v1 1/2] LoongArch: Modify the jump logic of the trampoline Chenghao Duan
@ 2025-12-10 0:48 ` Tiezhu Yang
2025-12-10 4:15 ` Hengqi Chen
1 sibling, 0 replies; 12+ messages in thread
From: Tiezhu Yang @ 2025-12-10 0:48 UTC (permalink / raw)
To: Chenghao Duan, hengqi.chen, chenhuacai
Cc: kernel, zhangtianyang, masahiroy, linux-kernel, loongarch, bpf,
guodongtai, youling.tang, jianghaoran, vincent.mc.li,
Youling Tang
On 2025/12/9 下午5:34, Chenghao Duan wrote:
> There are two methods to jump into the trampoline code for execution:
> 1. ftrace-managed.
> 2. Direct call.
>
> Whether ftrace-managed or direct jump, ensure before trampoline entry:
> t0=parent func return addr, ra=traced func return addr.
> When managed by ftrace, the trampoline code execution flow utilizes
> ftrace direct call, and it is required to ensure that the original
> data in registers t0 and ra is not modification.
>
> samples/ftrace/ftrace-direct_xxxx.c: update test code for ftrace direct
> call (modify together).
>
> Trampoline: adjust jump logic to use t0 (parent func return addr) and
> ra (traced func return addr) as jump targets for respective scenarios
>
> Signed-off-by: Youling Tang <tangyouling@kylinos.cn>
When several people work on a single patch, please use the tag:
"Co-developed-by", for more info please see:
https://www.kernel.org/doc/html/latest/process/submitting-patches.html#when-to-use-acked-by-cc-and-co-developed-by
> Signed-off-by: Chenghao Duan <duanchenghao@kylinos.cn>
> ---
> arch/loongarch/kernel/mcount_dyn.S | 14 +++++---
> arch/loongarch/net/bpf_jit.c | 37 +++++++++++++++------
> samples/ftrace/ftrace-direct-modify.c | 8 ++---
> samples/ftrace/ftrace-direct-multi-modify.c | 8 ++---
> samples/ftrace/ftrace-direct-multi.c | 4 +--
> samples/ftrace/ftrace-direct-too.c | 4 +--
> samples/ftrace/ftrace-direct.c | 4 +--
> 7 files changed, 50 insertions(+), 29 deletions(-)
Thanks for the patch, it is good news.
Please split this patch into three parts:
(1) ftrace code
(2) sample test
(3) bpf code
and use proper patch subject and commit message for each patch.
Thanks,
Tiezhu
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v1 2/2] LoongArch: Enable BPF exception fixup for specific ADE subcode
2025-12-09 9:34 ` [PATCH v1 2/2] LoongArch: Enable BPF exception fixup for specific ADE subcode Chenghao Duan
@ 2025-12-10 1:02 ` Tiezhu Yang
2025-12-10 5:20 ` Hengqi Chen
1 sibling, 0 replies; 12+ messages in thread
From: Tiezhu Yang @ 2025-12-10 1:02 UTC (permalink / raw)
To: Chenghao Duan, hengqi.chen, chenhuacai
Cc: kernel, zhangtianyang, masahiroy, linux-kernel, loongarch, bpf,
guodongtai, youling.tang, jianghaoran, vincent.mc.li
On 2025/12/9 下午5:34, Chenghao Duan wrote:
> This patch allows the LoongArch BPF JIT to handle recoverable memory
> access errors generated by BPF_PROBE_MEM* instructions.
>
> When a BPF program performs memory access operations, the instructions
> it executes may trigger ADEM exceptions. The kernel’s built-in BPF
> exception table mechanism (EX_TYPE_BPF) will generate corresponding
> exception fixup entries in the JIT compilation phase; however, the
> architecture-specific trap handling function needs to proactively call
> the common fixup routine to achieve exception recovery.
>
> do_ade(): fix EX_TYPE_BPF memory access exceptions for BPF programs,
> ensure safe execution.
>
> Signed-off-by: Chenghao Duan <duanchenghao@kylinos.cn>
> ---
> arch/loongarch/kernel/traps.c | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/arch/loongarch/kernel/traps.c b/arch/loongarch/kernel/traps.c
> index da5926fead4a..9ca8aacc82b8 100644
> --- a/arch/loongarch/kernel/traps.c
> +++ b/arch/loongarch/kernel/traps.c
> @@ -534,8 +534,13 @@ asmlinkage void noinstr do_fpe(struct pt_regs *regs, unsigned long fcsr)
>
> asmlinkage void noinstr do_ade(struct pt_regs *regs)
> {
> - irqentry_state_t state = irqentry_enter(regs);
> + irqentry_state_t state;
> + unsigned int esubcode = FIELD_GET(CSR_ESTAT_ESUBCODE, regs->csr_estat);
> +
> + if ((esubcode == 1) && fixup_exception(regs))
Please use the existing EXSUBCODE_ADEM macro definition instead of
the magic value 1.
Thanks,
Tiezhu
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v1 0/2] Fix the failure issue of the module_attach test case
2025-12-09 9:34 [PATCH v1 0/2] Fix the failure issue of the module_attach test case Chenghao Duan
2025-12-09 9:34 ` [PATCH v1 1/2] LoongArch: Modify the jump logic of the trampoline Chenghao Duan
2025-12-09 9:34 ` [PATCH v1 2/2] LoongArch: Enable BPF exception fixup for specific ADE subcode Chenghao Duan
@ 2025-12-10 3:18 ` Vincent Li
2025-12-10 4:10 ` Hengqi Chen
3 siblings, 0 replies; 12+ messages in thread
From: Vincent Li @ 2025-12-10 3:18 UTC (permalink / raw)
To: Chenghao Duan
Cc: yangtiezhu, hengqi.chen, chenhuacai, kernel, zhangtianyang,
masahiroy, linux-kernel, loongarch, bpf, guodongtai, youling.tang,
jianghaoran
On Tue, Dec 9, 2025 at 1:34 AM Chenghao Duan <duanchenghao@kylinos.cn> wrote:
>
> The following test cases under the tools/testing/selftests/bpf/
> directory have passed the test：
>
> ./test_progs -t module_attach
> ./test_progs -t module_fentry_shadow
> ./test_progs -t subprogs
> ./test_progs -t subprogs_extable
> ./test_progs -t tailcalls
> ./test_progs -t struct_ops -d struct_ops_multi_pages
> ./test_progs -t fexit_bpf2bpf
> ./test_progs -t fexit_stress
> ./test_progs -t module_fentry_shadow
> ./test_progs -t fentry_test/fentry
> ./test_progs -t fexit_test/fexit
> ./test_progs -t fentry_fexit
> ./test_progs -t modify_return
> ./test_progs -t fexit_sleep
> ./test_progs -t test_overhead
> ./test_progs -t trampoline_count
>
Tested-by: Vincent Li <vincent.mc.li@gmail.com>
I tested above and all passed OK, but I could not complete the full
bpf selftests because test_progs core dumped, don't think it is
related to your patch series.
./test_progs --deny=timer_lockup
...SNIP...
test_task_local_data_basic_thread:FAIL:tld_get_data unexpected error: -12
test_task_local_data_basic:PASS:pthread_create 0 nsec
test_task_local_data_basic_thread:FAIL:tld_get_data unexpected error: -12
test_task_local_data_basic:PASS:pthread_create 0 nsec
test_task_local_data_basic_thread:FAIL:tld_get_data unexpected error: -12
test_task_local_data_basic:PASS:pthread_create 0 nsec
test_task_local_data_basic_thread:FAIL:tld_get_data unexpected error: -12
test_task_local_data_basic:PASS:pthread_create 0 nsec
test_task_local_data_basic_thread:FAIL:tld_get_data unexpected error: -12
test_task_local_data_basic:PASS:pthread_create 0 nsec
test_task_local_data_basic_thread:FAIL:tld_get_data unexpected error: -12
test_task_local_data_basic:PASS:pthread_create 0 nsec
test_task_local_data_basic_thread:FAIL:tld_get_data unexpected error: -12
#444/1 task_local_data/task_local_data_basic:FAIL
test_task_local_data_race:PASS:skel_open_and_load 0 nsec
test_task_local_data_race:PASS:calloc tld_keys 0 nsec
test_task_local_data_race:PASS:TLD_DEFINE_KEY 0 nsec
test_task_local_data_race:FAIL:265
#444/2 task_local_data/task_local_data_race:FAIL
#444 task_local_data:FAIL
Caught signal #11!
Stack trace:
./test_progs(crash_handler+0x28)[0x1205b74ac]
linux-vdso.so.1(__vdso_rt_sigreturn+0x0)[0x7ffffffc1084]
./test_progs[0x1204eb064]
./test_progs(test_task_local_data+0x40)[0x1204eb3f8]
./test_progs[0x1205b7bec]
./test_progs(main+0x6c0)[0x1205b9c70]
/lib64/libc.so.6(+0x2882c)[0x7ffff2f6082c]
/lib64/libc.so.6(__libc_start_main+0xa8)[0x7ffff2f60918]
./test_progs(_start+0x48)[0x12013a0c0]
Segmentation fault (core dumped)
> Chenghao Duan (2):
> LoongArch: Modify the jump logic of the trampoline
> LoongArch: BPF: Enable BPF exception fixup for specific ADE subcode
>
> arch/loongarch/kernel/mcount_dyn.S | 14 +++++---
> arch/loongarch/kernel/traps.c | 7 +++-
> arch/loongarch/net/bpf_jit.c | 37 +++++++++++++++------
> samples/ftrace/ftrace-direct-modify.c | 8 ++---
> samples/ftrace/ftrace-direct-multi-modify.c | 8 ++---
> samples/ftrace/ftrace-direct-multi.c | 4 +--
> samples/ftrace/ftrace-direct-too.c | 4 +--
> samples/ftrace/ftrace-direct.c | 4 +--
> 8 files changed, 56 insertions(+), 30 deletions(-)
>
> --
> 2.25.1
>
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v1 0/2] Fix the failure issue of the module_attach test case
2025-12-09 9:34 [PATCH v1 0/2] Fix the failure issue of the module_attach test case Chenghao Duan
` (2 preceding siblings ...)
2025-12-10 3:18 ` [PATCH v1 0/2] Fix the failure issue of the module_attach test case Vincent Li
@ 2025-12-10 4:10 ` Hengqi Chen
2025-12-10 6:08 ` Chenghao Duan
3 siblings, 1 reply; 12+ messages in thread
From: Hengqi Chen @ 2025-12-10 4:10 UTC (permalink / raw)
To: Chenghao Duan
Cc: yangtiezhu, chenhuacai, kernel, zhangtianyang, masahiroy,
linux-kernel, loongarch, bpf, guodongtai, youling.tang,
jianghaoran, vincent.mc.li
One minor question, I wonder how you debug these issues ?
On Tue, Dec 9, 2025 at 5:34 PM Chenghao Duan <duanchenghao@kylinos.cn> wrote:
>
> The following test cases under the tools/testing/selftests/bpf/
> directory have passed the test：
>
> ./test_progs -t module_attach
> ./test_progs -t module_fentry_shadow
> ./test_progs -t subprogs
> ./test_progs -t subprogs_extable
> ./test_progs -t tailcalls
> ./test_progs -t struct_ops -d struct_ops_multi_pages
> ./test_progs -t fexit_bpf2bpf
> ./test_progs -t fexit_stress
> ./test_progs -t module_fentry_shadow
> ./test_progs -t fentry_test/fentry
> ./test_progs -t fexit_test/fexit
> ./test_progs -t fentry_fexit
> ./test_progs -t modify_return
> ./test_progs -t fexit_sleep
> ./test_progs -t test_overhead
> ./test_progs -t trampoline_count
>
> Chenghao Duan (2):
> LoongArch: Modify the jump logic of the trampoline
> LoongArch: BPF: Enable BPF exception fixup for specific ADE subcode
>
> arch/loongarch/kernel/mcount_dyn.S | 14 +++++---
> arch/loongarch/kernel/traps.c | 7 +++-
> arch/loongarch/net/bpf_jit.c | 37 +++++++++++++++------
> samples/ftrace/ftrace-direct-modify.c | 8 ++---
> samples/ftrace/ftrace-direct-multi-modify.c | 8 ++---
> samples/ftrace/ftrace-direct-multi.c | 4 +--
> samples/ftrace/ftrace-direct-too.c | 4 +--
> samples/ftrace/ftrace-direct.c | 4 +--
> 8 files changed, 56 insertions(+), 30 deletions(-)
>
> --
> 2.25.1
>
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v1 1/2] LoongArch: Modify the jump logic of the trampoline
2025-12-09 9:34 ` [PATCH v1 1/2] LoongArch: Modify the jump logic of the trampoline Chenghao Duan
2025-12-10 0:48 ` Tiezhu Yang
@ 2025-12-10 4:15 ` Hengqi Chen
2025-12-10 6:16 ` Chenghao Duan
1 sibling, 1 reply; 12+ messages in thread
From: Hengqi Chen @ 2025-12-10 4:15 UTC (permalink / raw)
To: Chenghao Duan
Cc: yangtiezhu, chenhuacai, kernel, zhangtianyang, masahiroy,
linux-kernel, loongarch, bpf, guodongtai, youling.tang,
jianghaoran, vincent.mc.li, Youling Tang
On Tue, Dec 9, 2025 at 5:34 PM Chenghao Duan <duanchenghao@kylinos.cn> wrote:
>
> There are two methods to jump into the trampoline code for execution:
> 1. ftrace-managed.
> 2. Direct call.
>
> Whether ftrace-managed or direct jump, ensure before trampoline entry:
> t0=parent func return addr, ra=traced func return addr.
> When managed by ftrace, the trampoline code execution flow utilizes
> ftrace direct call, and it is required to ensure that the original
> data in registers t0 and ra is not modification.
>
> samples/ftrace/ftrace-direct_xxxx.c: update test code for ftrace direct
> call (modify together).
>
> Trampoline: adjust jump logic to use t0 (parent func return addr) and
> ra (traced func return addr) as jump targets for respective scenarios
>
> Signed-off-by: Youling Tang <tangyouling@kylinos.cn>
> Signed-off-by: Chenghao Duan <duanchenghao@kylinos.cn>
Please add a Fixes tag.
> ---
> arch/loongarch/kernel/mcount_dyn.S | 14 +++++---
> arch/loongarch/net/bpf_jit.c | 37 +++++++++++++++------
> samples/ftrace/ftrace-direct-modify.c | 8 ++---
> samples/ftrace/ftrace-direct-multi-modify.c | 8 ++---
> samples/ftrace/ftrace-direct-multi.c | 4 +--
> samples/ftrace/ftrace-direct-too.c | 4 +--
> samples/ftrace/ftrace-direct.c | 4 +--
> 7 files changed, 50 insertions(+), 29 deletions(-)
>
> diff --git a/arch/loongarch/kernel/mcount_dyn.S b/arch/loongarch/kernel/mcount_dyn.S
> index d6b474ad1d5e..5729c20e5b8b 100644
> --- a/arch/loongarch/kernel/mcount_dyn.S
> +++ b/arch/loongarch/kernel/mcount_dyn.S
> @@ -94,7 +94,6 @@ SYM_INNER_LABEL(ftrace_graph_call, SYM_L_GLOBAL)
> * at the callsite, so there is no need to restore the T series regs.
> */
> ftrace_common_return:
> - PTR_L ra, sp, PT_R1
> PTR_L a0, sp, PT_R4
> PTR_L a1, sp, PT_R5
> PTR_L a2, sp, PT_R6
> @@ -104,12 +103,17 @@ ftrace_common_return:
> PTR_L a6, sp, PT_R10
> PTR_L a7, sp, PT_R11
> PTR_L fp, sp, PT_R22
> - PTR_L t0, sp, PT_ERA
> PTR_L t1, sp, PT_R13
> - PTR_ADDI sp, sp, PT_SIZE
> bnez t1, .Ldirect
> +
> + PTR_L ra, sp, PT_R1
> + PTR_L t0, sp, PT_ERA
> + PTR_ADDI sp, sp, PT_SIZE
> jr t0
> .Ldirect:
> + PTR_L t0, sp, PT_R1
> + PTR_L ra, sp, PT_ERA
> + PTR_ADDI sp, sp, PT_SIZE
> jr t1
> SYM_CODE_END(ftrace_common)
>
> @@ -161,6 +165,8 @@ SYM_CODE_END(return_to_handler)
> #ifdef CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS
> SYM_CODE_START(ftrace_stub_direct_tramp)
> UNWIND_HINT_UNDEFINED
> - jr t0
> + move t1, ra
> + move ra, t0
> + jr t1
> SYM_CODE_END(ftrace_stub_direct_tramp)
> #endif /* CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS */
> diff --git a/arch/loongarch/net/bpf_jit.c b/arch/loongarch/net/bpf_jit.c
> index 8dc58781b8eb..d1f5fd5ae847 100644
> --- a/arch/loongarch/net/bpf_jit.c
> +++ b/arch/loongarch/net/bpf_jit.c
> @@ -139,6 +139,7 @@ static void build_prologue(struct jit_ctx *ctx)
> stack_adjust = round_up(stack_adjust, 16);
> stack_adjust += bpf_stack_adjust;
>
> + move_reg(ctx, LOONGARCH_GPR_T0, LOONGARCH_GPR_RA);
> /* Reserve space for the move_imm + jirl instruction */
> for (i = 0; i < LOONGARCH_LONG_JUMP_NINSNS; i++)
> emit_insn(ctx, nop);
> @@ -238,7 +239,7 @@ static void __build_epilogue(struct jit_ctx *ctx, bool is_tail_call)
> * Call the next bpf prog and skip the first instruction
> * of TCC initialization.
> */
> - emit_insn(ctx, jirl, LOONGARCH_GPR_ZERO, LOONGARCH_GPR_T3, 6);
> + emit_insn(ctx, jirl, LOONGARCH_GPR_ZERO, LOONGARCH_GPR_T3, 7);
> }
> }
>
> @@ -1265,7 +1266,7 @@ static int emit_jump_or_nops(void *target, void *ip, u32 *insns, bool is_call)
> return 0;
> }
>
> - return emit_jump_and_link(&ctx, is_call ? LOONGARCH_GPR_T0 : LOONGARCH_GPR_ZERO, (u64)target);
> + return emit_jump_and_link(&ctx, is_call ? LOONGARCH_GPR_RA : LOONGARCH_GPR_ZERO, (u64)target);
> }
>
> static int emit_call(struct jit_ctx *ctx, u64 addr)
> @@ -1289,6 +1290,10 @@ int bpf_arch_text_poke(void *ip, enum bpf_text_poke_type old_t,
> void *new_addr)
> {
> int ret;
> + unsigned long size = 0;
> + unsigned long offset = 0;
> + char namebuf[KSYM_NAME_LEN];
> + void *image = NULL;
> bool is_call;
> u32 old_insns[LOONGARCH_LONG_JUMP_NINSNS] = {[0 ... 4] = INSN_NOP};
> u32 new_insns[LOONGARCH_LONG_JUMP_NINSNS] = {[0 ... 4] = INSN_NOP};
> @@ -1296,9 +1301,18 @@ int bpf_arch_text_poke(void *ip, enum bpf_text_poke_type old_t,
> /* Only poking bpf text is supported. Since kernel function entry
> * is set up by ftrace, we rely on ftrace to poke kernel functions.
> */
> - if (!is_bpf_text_address((unsigned long)ip))
> + if (!__bpf_address_lookup((unsigned long)ip, &size, &offset, namebuf))
> return -ENOTSUPP;
>
> + image = ip - offset;
> + /* zero offset means we're poking bpf prog entry */
> + if (offset == 0)
> + /* skip to the nop instruction in bpf prog entry:
> + * move t0, ra
> + * nop
> + */
> + ip = image + LOONGARCH_INSN_SIZE;
> +
> is_call = old_t == BPF_MOD_CALL;
> ret = emit_jump_or_nops(old_addr, ip, old_insns, is_call);
> if (ret)
> @@ -1622,14 +1636,11 @@ static int __arch_prepare_bpf_trampoline(struct jit_ctx *ctx, struct bpf_tramp_i
>
> /* To traced function */
> /* Ftrace jump skips 2 NOP instructions */
> - if (is_kernel_text((unsigned long)orig_call))
> + if (is_kernel_text((unsigned long)orig_call) || is_module_text_address((unsigned long)orig_call))
> orig_call += LOONGARCH_FENTRY_NBYTES;
> /* Direct jump skips 5 NOP instructions */
> else if (is_bpf_text_address((unsigned long)orig_call))
> orig_call += LOONGARCH_BPF_FENTRY_NBYTES;
> - /* Module tracing not supported - cause kernel lockups */
> - else if (is_module_text_address((unsigned long)orig_call))
> - return -ENOTSUPP;
>
> if (flags & BPF_TRAMP_F_CALL_ORIG) {
> move_addr(ctx, LOONGARCH_GPR_A0, (const u64)im);
> @@ -1722,12 +1733,16 @@ static int __arch_prepare_bpf_trampoline(struct jit_ctx *ctx, struct bpf_tramp_i
> emit_insn(ctx, ldd, LOONGARCH_GPR_FP, LOONGARCH_GPR_SP, 0);
> emit_insn(ctx, addid, LOONGARCH_GPR_SP, LOONGARCH_GPR_SP, 16);
>
> - if (flags & BPF_TRAMP_F_SKIP_FRAME)
> + if (flags & BPF_TRAMP_F_SKIP_FRAME) {
> /* return to parent function */
> - emit_insn(ctx, jirl, LOONGARCH_GPR_ZERO, LOONGARCH_GPR_RA, 0);
> - else
> - /* return to traced function */
> + move_reg(ctx, LOONGARCH_GPR_RA, LOONGARCH_GPR_T0);
> emit_insn(ctx, jirl, LOONGARCH_GPR_ZERO, LOONGARCH_GPR_T0, 0);
> + } else {
> + /* return to traced function */
> + move_reg(ctx, LOONGARCH_GPR_T1, LOONGARCH_GPR_RA);
> + move_reg(ctx, LOONGARCH_GPR_RA, LOONGARCH_GPR_T0);
> + emit_insn(ctx, jirl, LOONGARCH_GPR_ZERO, LOONGARCH_GPR_T1, 0);
> + }
> }
>
> ret = ctx->idx;
> diff --git a/samples/ftrace/ftrace-direct-modify.c b/samples/ftrace/ftrace-direct-modify.c
> index da3a9f2091f5..1ba1927b548e 100644
> --- a/samples/ftrace/ftrace-direct-modify.c
> +++ b/samples/ftrace/ftrace-direct-modify.c
> @@ -176,8 +176,8 @@ asm (
> " st.d $t0, $sp, 0\n"
> " st.d $ra, $sp, 8\n"
> " bl my_direct_func1\n"
> -" ld.d $t0, $sp, 0\n"
> -" ld.d $ra, $sp, 8\n"
> +" ld.d $ra, $sp, 0\n"
> +" ld.d $t0, $sp, 8\n"
> " addi.d $sp, $sp, 16\n"
> " jr $t0\n"
> " .size my_tramp1, .-my_tramp1\n"
> @@ -189,8 +189,8 @@ asm (
> " st.d $t0, $sp, 0\n"
> " st.d $ra, $sp, 8\n"
> " bl my_direct_func2\n"
> -" ld.d $t0, $sp, 0\n"
> -" ld.d $ra, $sp, 8\n"
> +" ld.d $ra, $sp, 0\n"
> +" ld.d $t0, $sp, 8\n"
> " addi.d $sp, $sp, 16\n"
> " jr $t0\n"
> " .size my_tramp2, .-my_tramp2\n"
> diff --git a/samples/ftrace/ftrace-direct-multi-modify.c b/samples/ftrace/ftrace-direct-multi-modify.c
> index 8f7986d698d8..7a7822dfeb50 100644
> --- a/samples/ftrace/ftrace-direct-multi-modify.c
> +++ b/samples/ftrace/ftrace-direct-multi-modify.c
> @@ -199,8 +199,8 @@ asm (
> " move $a0, $t0\n"
> " bl my_direct_func1\n"
> " ld.d $a0, $sp, 0\n"
> -" ld.d $t0, $sp, 8\n"
> -" ld.d $ra, $sp, 16\n"
> +" ld.d $ra, $sp, 8\n"
> +" ld.d $t0, $sp, 16\n"
> " addi.d $sp, $sp, 32\n"
> " jr $t0\n"
> " .size my_tramp1, .-my_tramp1\n"
> @@ -215,8 +215,8 @@ asm (
> " move $a0, $t0\n"
> " bl my_direct_func2\n"
> " ld.d $a0, $sp, 0\n"
> -" ld.d $t0, $sp, 8\n"
> -" ld.d $ra, $sp, 16\n"
> +" ld.d $ra, $sp, 8\n"
> +" ld.d $t0, $sp, 16\n"
> " addi.d $sp, $sp, 32\n"
> " jr $t0\n"
> " .size my_tramp2, .-my_tramp2\n"
> diff --git a/samples/ftrace/ftrace-direct-multi.c b/samples/ftrace/ftrace-direct-multi.c
> index db326c81a27d..3fe6ddaf0b69 100644
> --- a/samples/ftrace/ftrace-direct-multi.c
> +++ b/samples/ftrace/ftrace-direct-multi.c
> @@ -131,8 +131,8 @@ asm (
> " move $a0, $t0\n"
> " bl my_direct_func\n"
> " ld.d $a0, $sp, 0\n"
> -" ld.d $t0, $sp, 8\n"
> -" ld.d $ra, $sp, 16\n"
> +" ld.d $ra, $sp, 8\n"
> +" ld.d $t0, $sp, 16\n"
> " addi.d $sp, $sp, 32\n"
> " jr $t0\n"
> " .size my_tramp, .-my_tramp\n"
> diff --git a/samples/ftrace/ftrace-direct-too.c b/samples/ftrace/ftrace-direct-too.c
> index 3d0fa260332d..bf2411aa6fd7 100644
> --- a/samples/ftrace/ftrace-direct-too.c
> +++ b/samples/ftrace/ftrace-direct-too.c
> @@ -143,8 +143,8 @@ asm (
> " ld.d $a0, $sp, 0\n"
> " ld.d $a1, $sp, 8\n"
> " ld.d $a2, $sp, 16\n"
> -" ld.d $t0, $sp, 24\n"
> -" ld.d $ra, $sp, 32\n"
> +" ld.d $ra, $sp, 24\n"
> +" ld.d $t0, $sp, 32\n"
> " addi.d $sp, $sp, 48\n"
> " jr $t0\n"
> " .size my_tramp, .-my_tramp\n"
> diff --git a/samples/ftrace/ftrace-direct.c b/samples/ftrace/ftrace-direct.c
> index 956834b0d19a..5368c8c39cbb 100644
> --- a/samples/ftrace/ftrace-direct.c
> +++ b/samples/ftrace/ftrace-direct.c
> @@ -124,8 +124,8 @@ asm (
> " st.d $ra, $sp, 16\n"
> " bl my_direct_func\n"
> " ld.d $a0, $sp, 0\n"
> -" ld.d $t0, $sp, 8\n"
> -" ld.d $ra, $sp, 16\n"
> +" ld.d $ra, $sp, 8\n"
> +" ld.d $t0, $sp, 16\n"
> " addi.d $sp, $sp, 32\n"
> " jr $t0\n"
> " .size my_tramp, .-my_tramp\n"
> --
> 2.25.1
>
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v1 2/2] LoongArch: Enable BPF exception fixup for specific ADE subcode
2025-12-09 9:34 ` [PATCH v1 2/2] LoongArch: Enable BPF exception fixup for specific ADE subcode Chenghao Duan
2025-12-10 1:02 ` Tiezhu Yang
@ 2025-12-10 5:20 ` Hengqi Chen
2025-12-10 5:43 ` Chenghao Duan
1 sibling, 1 reply; 12+ messages in thread
From: Hengqi Chen @ 2025-12-10 5:20 UTC (permalink / raw)
To: Chenghao Duan
Cc: yangtiezhu, chenhuacai, kernel, zhangtianyang, masahiroy,
linux-kernel, loongarch, bpf, guodongtai, youling.tang,
jianghaoran, vincent.mc.li
On Tue, Dec 9, 2025 at 5:34 PM Chenghao Duan <duanchenghao@kylinos.cn> wrote:
>
> This patch allows the LoongArch BPF JIT to handle recoverable memory
> access errors generated by BPF_PROBE_MEM* instructions.
>
> When a BPF program performs memory access operations, the instructions
> it executes may trigger ADEM exceptions. The kernel’s built-in BPF
> exception table mechanism (EX_TYPE_BPF) will generate corresponding
> exception fixup entries in the JIT compilation phase; however, the
> architecture-specific trap handling function needs to proactively call
> the common fixup routine to achieve exception recovery.
>
> do_ade(): fix EX_TYPE_BPF memory access exceptions for BPF programs,
> ensure safe execution.
>
Which bpf prog triggers this code path ? Why didn't we trigger it before ?
> Signed-off-by: Chenghao Duan <duanchenghao@kylinos.cn>
> ---
> arch/loongarch/kernel/traps.c | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/arch/loongarch/kernel/traps.c b/arch/loongarch/kernel/traps.c
> index da5926fead4a..9ca8aacc82b8 100644
> --- a/arch/loongarch/kernel/traps.c
> +++ b/arch/loongarch/kernel/traps.c
> @@ -534,8 +534,13 @@ asmlinkage void noinstr do_fpe(struct pt_regs *regs, unsigned long fcsr)
>
> asmlinkage void noinstr do_ade(struct pt_regs *regs)
> {
> - irqentry_state_t state = irqentry_enter(regs);
> + irqentry_state_t state;
> + unsigned int esubcode = FIELD_GET(CSR_ESTAT_ESUBCODE, regs->csr_estat);
> +
> + if ((esubcode == 1) && fixup_exception(regs))
> + return;
>
> + state = irqentry_enter(regs);
> die_if_kernel("Kernel ade access", regs);
> force_sig_fault(SIGBUS, BUS_ADRERR, (void __user *)regs->csr_badvaddr);
>
> --
> 2.25.1
>
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v1 2/2] LoongArch: Enable BPF exception fixup for specific ADE subcode
2025-12-10 5:20 ` Hengqi Chen
@ 2025-12-10 5:43 ` Chenghao Duan
0 siblings, 0 replies; 12+ messages in thread
From: Chenghao Duan @ 2025-12-10 5:43 UTC (permalink / raw)
To: Hengqi Chen
Cc: yangtiezhu, chenhuacai, kernel, zhangtianyang, masahiroy,
linux-kernel, loongarch, bpf, guodongtai, youling.tang,
jianghaoran, vincent.mc.li
On Wed, Dec 10, 2025 at 01:20:12PM +0800, Hengqi Chen wrote:
> On Tue, Dec 9, 2025 at 5:34 PM Chenghao Duan <duanchenghao@kylinos.cn> wrote:
> >
> > This patch allows the LoongArch BPF JIT to handle recoverable memory
> > access errors generated by BPF_PROBE_MEM* instructions.
> >
> > When a BPF program performs memory access operations, the instructions
> > it executes may trigger ADEM exceptions. The kernel’s built-in BPF
> > exception table mechanism (EX_TYPE_BPF) will generate corresponding
> > exception fixup entries in the JIT compilation phase; however, the
> > architecture-specific trap handling function needs to proactively call
> > the common fixup routine to achieve exception recovery.
> >
> > do_ade(): fix EX_TYPE_BPF memory access exceptions for BPF programs,
> > ensure safe execution.
> >
>
> Which bpf prog triggers this code path ? Why didn't we trigger it before ?
module_attach and subprogs_extable trigger ADE exception via illegal address
access in BPF programs, leading to kernel panic without this patch.
>
> > Signed-off-by: Chenghao Duan <duanchenghao@kylinos.cn>
> > ---
> > arch/loongarch/kernel/traps.c | 7 ++++++-
> > 1 file changed, 6 insertions(+), 1 deletion(-)
> >
> > diff --git a/arch/loongarch/kernel/traps.c b/arch/loongarch/kernel/traps.c
> > index da5926fead4a..9ca8aacc82b8 100644
> > --- a/arch/loongarch/kernel/traps.c
> > +++ b/arch/loongarch/kernel/traps.c
> > @@ -534,8 +534,13 @@ asmlinkage void noinstr do_fpe(struct pt_regs *regs, unsigned long fcsr)
> >
> > asmlinkage void noinstr do_ade(struct pt_regs *regs)
> > {
> > - irqentry_state_t state = irqentry_enter(regs);
> > + irqentry_state_t state;
> > + unsigned int esubcode = FIELD_GET(CSR_ESTAT_ESUBCODE, regs->csr_estat);
> > +
> > + if ((esubcode == 1) && fixup_exception(regs))
> > + return;
> >
> > + state = irqentry_enter(regs);
> > die_if_kernel("Kernel ade access", regs);
> > force_sig_fault(SIGBUS, BUS_ADRERR, (void __user *)regs->csr_badvaddr);
> >
> > --
> > 2.25.1
> >
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v1 0/2] Fix the failure issue of the module_attach test case
2025-12-10 4:10 ` Hengqi Chen
@ 2025-12-10 6:08 ` Chenghao Duan
0 siblings, 0 replies; 12+ messages in thread
From: Chenghao Duan @ 2025-12-10 6:08 UTC (permalink / raw)
To: Hengqi Chen
Cc: yangtiezhu, chenhuacai, kernel, zhangtianyang, masahiroy,
linux-kernel, loongarch, bpf, guodongtai, youling.tang,
jianghaoran, vincent.mc.li
On Wed, Dec 10, 2025 at 12:10:46PM +0800, Hengqi Chen wrote:
> One minor question, I wonder how you debug these issues ?
>
There were initially two issues:
1. When monitoring the function addresses of kernel modules in the
module_attach test case, kernel panic would occur.
2. Illegal address access in the module_attach and subprogs_extable
test cases would lead to kernel panic.
These two issues were debugged by combining different methods for
different scenarios, including gdb, kgdb, embedding break instructions
in assembly code, and printing stack and register data.
Chenghao
> On Tue, Dec 9, 2025 at 5:34 PM Chenghao Duan <duanchenghao@kylinos.cn> wrote:
> >
> > The following test cases under the tools/testing/selftests/bpf/
> > directory have passed the test：
> >
> > ./test_progs -t module_attach
> > ./test_progs -t module_fentry_shadow
> > ./test_progs -t subprogs
> > ./test_progs -t subprogs_extable
> > ./test_progs -t tailcalls
> > ./test_progs -t struct_ops -d struct_ops_multi_pages
> > ./test_progs -t fexit_bpf2bpf
> > ./test_progs -t fexit_stress
> > ./test_progs -t module_fentry_shadow
> > ./test_progs -t fentry_test/fentry
> > ./test_progs -t fexit_test/fexit
> > ./test_progs -t fentry_fexit
> > ./test_progs -t modify_return
> > ./test_progs -t fexit_sleep
> > ./test_progs -t test_overhead
> > ./test_progs -t trampoline_count
> >
> > Chenghao Duan (2):
> > LoongArch: Modify the jump logic of the trampoline
> > LoongArch: BPF: Enable BPF exception fixup for specific ADE subcode
> >
> > arch/loongarch/kernel/mcount_dyn.S | 14 +++++---
> > arch/loongarch/kernel/traps.c | 7 +++-
> > arch/loongarch/net/bpf_jit.c | 37 +++++++++++++++------
> > samples/ftrace/ftrace-direct-modify.c | 8 ++---
> > samples/ftrace/ftrace-direct-multi-modify.c | 8 ++---
> > samples/ftrace/ftrace-direct-multi.c | 4 +--
> > samples/ftrace/ftrace-direct-too.c | 4 +--
> > samples/ftrace/ftrace-direct.c | 4 +--
> > 8 files changed, 56 insertions(+), 30 deletions(-)
> >
> > --
> > 2.25.1
> >
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v1 1/2] LoongArch: Modify the jump logic of the trampoline
2025-12-10 4:15 ` Hengqi Chen
@ 2025-12-10 6:16 ` Chenghao Duan
0 siblings, 0 replies; 12+ messages in thread
From: Chenghao Duan @ 2025-12-10 6:16 UTC (permalink / raw)
To: Hengqi Chen
Cc: yangtiezhu, chenhuacai, kernel, zhangtianyang, masahiroy,
linux-kernel, loongarch, bpf, guodongtai, youling.tang,
jianghaoran, vincent.mc.li, Youling Tang
On Wed, Dec 10, 2025 at 12:15:28PM +0800, Hengqi Chen wrote:
> On Tue, Dec 9, 2025 at 5:34 PM Chenghao Duan <duanchenghao@kylinos.cn> wrote:
> >
> > There are two methods to jump into the trampoline code for execution:
> > 1. ftrace-managed.
> > 2. Direct call.
> >
> > Whether ftrace-managed or direct jump, ensure before trampoline entry:
> > t0=parent func return addr, ra=traced func return addr.
> > When managed by ftrace, the trampoline code execution flow utilizes
> > ftrace direct call, and it is required to ensure that the original
> > data in registers t0 and ra is not modification.
> >
> > samples/ftrace/ftrace-direct_xxxx.c: update test code for ftrace direct
> > call (modify together).
> >
> > Trampoline: adjust jump logic to use t0 (parent func return addr) and
> > ra (traced func return addr) as jump targets for respective scenarios
> >
> > Signed-off-by: Youling Tang <tangyouling@kylinos.cn>
> > Signed-off-by: Chenghao Duan <duanchenghao@kylinos.cn>
>
> Please add a Fixes tag.
I believe this is an issue introduced by the combination of trampoline and
ftrace. Prior to this, ftrace direct call had not been used by other
technologies. If a fix point is to be selected, it would be the initial
commit of the ftrace direct call technology.
Fixes: 9cdc3b6a299c (LoongArch: ftrace: Add direct call support)
>
> > ---
> > arch/loongarch/kernel/mcount_dyn.S | 14 +++++---
> > arch/loongarch/net/bpf_jit.c | 37 +++++++++++++++------
> > samples/ftrace/ftrace-direct-modify.c | 8 ++---
> > samples/ftrace/ftrace-direct-multi-modify.c | 8 ++---
> > samples/ftrace/ftrace-direct-multi.c | 4 +--
> > samples/ftrace/ftrace-direct-too.c | 4 +--
> > samples/ftrace/ftrace-direct.c | 4 +--
> > 7 files changed, 50 insertions(+), 29 deletions(-)
> >
> > diff --git a/arch/loongarch/kernel/mcount_dyn.S b/arch/loongarch/kernel/mcount_dyn.S
> > index d6b474ad1d5e..5729c20e5b8b 100644
> > --- a/arch/loongarch/kernel/mcount_dyn.S
> > +++ b/arch/loongarch/kernel/mcount_dyn.S
> > @@ -94,7 +94,6 @@ SYM_INNER_LABEL(ftrace_graph_call, SYM_L_GLOBAL)
> > * at the callsite, so there is no need to restore the T series regs.
> > */
> > ftrace_common_return:
> > - PTR_L ra, sp, PT_R1
> > PTR_L a0, sp, PT_R4
> > PTR_L a1, sp, PT_R5
> > PTR_L a2, sp, PT_R6
> > @@ -104,12 +103,17 @@ ftrace_common_return:
> > PTR_L a6, sp, PT_R10
> > PTR_L a7, sp, PT_R11
> > PTR_L fp, sp, PT_R22
> > - PTR_L t0, sp, PT_ERA
> > PTR_L t1, sp, PT_R13
> > - PTR_ADDI sp, sp, PT_SIZE
> > bnez t1, .Ldirect
> > +
> > + PTR_L ra, sp, PT_R1
> > + PTR_L t0, sp, PT_ERA
> > + PTR_ADDI sp, sp, PT_SIZE
> > jr t0
> > .Ldirect:
> > + PTR_L t0, sp, PT_R1
> > + PTR_L ra, sp, PT_ERA
> > + PTR_ADDI sp, sp, PT_SIZE
> > jr t1
> > SYM_CODE_END(ftrace_common)
> >
> > @@ -161,6 +165,8 @@ SYM_CODE_END(return_to_handler)
> > #ifdef CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS
> > SYM_CODE_START(ftrace_stub_direct_tramp)
> > UNWIND_HINT_UNDEFINED
> > - jr t0
> > + move t1, ra
> > + move ra, t0
> > + jr t1
> > SYM_CODE_END(ftrace_stub_direct_tramp)
> > #endif /* CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS */
> > diff --git a/arch/loongarch/net/bpf_jit.c b/arch/loongarch/net/bpf_jit.c
> > index 8dc58781b8eb..d1f5fd5ae847 100644
> > --- a/arch/loongarch/net/bpf_jit.c
> > +++ b/arch/loongarch/net/bpf_jit.c
> > @@ -139,6 +139,7 @@ static void build_prologue(struct jit_ctx *ctx)
> > stack_adjust = round_up(stack_adjust, 16);
> > stack_adjust += bpf_stack_adjust;
> >
> > + move_reg(ctx, LOONGARCH_GPR_T0, LOONGARCH_GPR_RA);
> > /* Reserve space for the move_imm + jirl instruction */
> > for (i = 0; i < LOONGARCH_LONG_JUMP_NINSNS; i++)
> > emit_insn(ctx, nop);
> > @@ -238,7 +239,7 @@ static void __build_epilogue(struct jit_ctx *ctx, bool is_tail_call)
> > * Call the next bpf prog and skip the first instruction
> > * of TCC initialization.
> > */
> > - emit_insn(ctx, jirl, LOONGARCH_GPR_ZERO, LOONGARCH_GPR_T3, 6);
> > + emit_insn(ctx, jirl, LOONGARCH_GPR_ZERO, LOONGARCH_GPR_T3, 7);
> > }
> > }
> >
> > @@ -1265,7 +1266,7 @@ static int emit_jump_or_nops(void *target, void *ip, u32 *insns, bool is_call)
> > return 0;
> > }
> >
> > - return emit_jump_and_link(&ctx, is_call ? LOONGARCH_GPR_T0 : LOONGARCH_GPR_ZERO, (u64)target);
> > + return emit_jump_and_link(&ctx, is_call ? LOONGARCH_GPR_RA : LOONGARCH_GPR_ZERO, (u64)target);
> > }
> >
> > static int emit_call(struct jit_ctx *ctx, u64 addr)
> > @@ -1289,6 +1290,10 @@ int bpf_arch_text_poke(void *ip, enum bpf_text_poke_type old_t,
> > void *new_addr)
> > {
> > int ret;
> > + unsigned long size = 0;
> > + unsigned long offset = 0;
> > + char namebuf[KSYM_NAME_LEN];
> > + void *image = NULL;
> > bool is_call;
> > u32 old_insns[LOONGARCH_LONG_JUMP_NINSNS] = {[0 ... 4] = INSN_NOP};
> > u32 new_insns[LOONGARCH_LONG_JUMP_NINSNS] = {[0 ... 4] = INSN_NOP};
> > @@ -1296,9 +1301,18 @@ int bpf_arch_text_poke(void *ip, enum bpf_text_poke_type old_t,
> > /* Only poking bpf text is supported. Since kernel function entry
> > * is set up by ftrace, we rely on ftrace to poke kernel functions.
> > */
> > - if (!is_bpf_text_address((unsigned long)ip))
> > + if (!__bpf_address_lookup((unsigned long)ip, &size, &offset, namebuf))
> > return -ENOTSUPP;
> >
> > + image = ip - offset;
> > + /* zero offset means we're poking bpf prog entry */
> > + if (offset == 0)
> > + /* skip to the nop instruction in bpf prog entry:
> > + * move t0, ra
> > + * nop
> > + */
> > + ip = image + LOONGARCH_INSN_SIZE;
> > +
> > is_call = old_t == BPF_MOD_CALL;
> > ret = emit_jump_or_nops(old_addr, ip, old_insns, is_call);
> > if (ret)
> > @@ -1622,14 +1636,11 @@ static int __arch_prepare_bpf_trampoline(struct jit_ctx *ctx, struct bpf_tramp_i
> >
> > /* To traced function */
> > /* Ftrace jump skips 2 NOP instructions */
> > - if (is_kernel_text((unsigned long)orig_call))
> > + if (is_kernel_text((unsigned long)orig_call) || is_module_text_address((unsigned long)orig_call))
> > orig_call += LOONGARCH_FENTRY_NBYTES;
> > /* Direct jump skips 5 NOP instructions */
> > else if (is_bpf_text_address((unsigned long)orig_call))
> > orig_call += LOONGARCH_BPF_FENTRY_NBYTES;
> > - /* Module tracing not supported - cause kernel lockups */
> > - else if (is_module_text_address((unsigned long)orig_call))
> > - return -ENOTSUPP;
> >
> > if (flags & BPF_TRAMP_F_CALL_ORIG) {
> > move_addr(ctx, LOONGARCH_GPR_A0, (const u64)im);
> > @@ -1722,12 +1733,16 @@ static int __arch_prepare_bpf_trampoline(struct jit_ctx *ctx, struct bpf_tramp_i
> > emit_insn(ctx, ldd, LOONGARCH_GPR_FP, LOONGARCH_GPR_SP, 0);
> > emit_insn(ctx, addid, LOONGARCH_GPR_SP, LOONGARCH_GPR_SP, 16);
> >
> > - if (flags & BPF_TRAMP_F_SKIP_FRAME)
> > + if (flags & BPF_TRAMP_F_SKIP_FRAME) {
> > /* return to parent function */
> > - emit_insn(ctx, jirl, LOONGARCH_GPR_ZERO, LOONGARCH_GPR_RA, 0);
> > - else
> > - /* return to traced function */
> > + move_reg(ctx, LOONGARCH_GPR_RA, LOONGARCH_GPR_T0);
> > emit_insn(ctx, jirl, LOONGARCH_GPR_ZERO, LOONGARCH_GPR_T0, 0);
> > + } else {
> > + /* return to traced function */
> > + move_reg(ctx, LOONGARCH_GPR_T1, LOONGARCH_GPR_RA);
> > + move_reg(ctx, LOONGARCH_GPR_RA, LOONGARCH_GPR_T0);
> > + emit_insn(ctx, jirl, LOONGARCH_GPR_ZERO, LOONGARCH_GPR_T1, 0);
> > + }
> > }
> >
> > ret = ctx->idx;
> > diff --git a/samples/ftrace/ftrace-direct-modify.c b/samples/ftrace/ftrace-direct-modify.c
> > index da3a9f2091f5..1ba1927b548e 100644
> > --- a/samples/ftrace/ftrace-direct-modify.c
> > +++ b/samples/ftrace/ftrace-direct-modify.c
> > @@ -176,8 +176,8 @@ asm (
> > " st.d $t0, $sp, 0\n"
> > " st.d $ra, $sp, 8\n"
> > " bl my_direct_func1\n"
> > -" ld.d $t0, $sp, 0\n"
> > -" ld.d $ra, $sp, 8\n"
> > +" ld.d $ra, $sp, 0\n"
> > +" ld.d $t0, $sp, 8\n"
> > " addi.d $sp, $sp, 16\n"
> > " jr $t0\n"
> > " .size my_tramp1, .-my_tramp1\n"
> > @@ -189,8 +189,8 @@ asm (
> > " st.d $t0, $sp, 0\n"
> > " st.d $ra, $sp, 8\n"
> > " bl my_direct_func2\n"
> > -" ld.d $t0, $sp, 0\n"
> > -" ld.d $ra, $sp, 8\n"
> > +" ld.d $ra, $sp, 0\n"
> > +" ld.d $t0, $sp, 8\n"
> > " addi.d $sp, $sp, 16\n"
> > " jr $t0\n"
> > " .size my_tramp2, .-my_tramp2\n"
> > diff --git a/samples/ftrace/ftrace-direct-multi-modify.c b/samples/ftrace/ftrace-direct-multi-modify.c
> > index 8f7986d698d8..7a7822dfeb50 100644
> > --- a/samples/ftrace/ftrace-direct-multi-modify.c
> > +++ b/samples/ftrace/ftrace-direct-multi-modify.c
> > @@ -199,8 +199,8 @@ asm (
> > " move $a0, $t0\n"
> > " bl my_direct_func1\n"
> > " ld.d $a0, $sp, 0\n"
> > -" ld.d $t0, $sp, 8\n"
> > -" ld.d $ra, $sp, 16\n"
> > +" ld.d $ra, $sp, 8\n"
> > +" ld.d $t0, $sp, 16\n"
> > " addi.d $sp, $sp, 32\n"
> > " jr $t0\n"
> > " .size my_tramp1, .-my_tramp1\n"
> > @@ -215,8 +215,8 @@ asm (
> > " move $a0, $t0\n"
> > " bl my_direct_func2\n"
> > " ld.d $a0, $sp, 0\n"
> > -" ld.d $t0, $sp, 8\n"
> > -" ld.d $ra, $sp, 16\n"
> > +" ld.d $ra, $sp, 8\n"
> > +" ld.d $t0, $sp, 16\n"
> > " addi.d $sp, $sp, 32\n"
> > " jr $t0\n"
> > " .size my_tramp2, .-my_tramp2\n"
> > diff --git a/samples/ftrace/ftrace-direct-multi.c b/samples/ftrace/ftrace-direct-multi.c
> > index db326c81a27d..3fe6ddaf0b69 100644
> > --- a/samples/ftrace/ftrace-direct-multi.c
> > +++ b/samples/ftrace/ftrace-direct-multi.c
> > @@ -131,8 +131,8 @@ asm (
> > " move $a0, $t0\n"
> > " bl my_direct_func\n"
> > " ld.d $a0, $sp, 0\n"
> > -" ld.d $t0, $sp, 8\n"
> > -" ld.d $ra, $sp, 16\n"
> > +" ld.d $ra, $sp, 8\n"
> > +" ld.d $t0, $sp, 16\n"
> > " addi.d $sp, $sp, 32\n"
> > " jr $t0\n"
> > " .size my_tramp, .-my_tramp\n"
> > diff --git a/samples/ftrace/ftrace-direct-too.c b/samples/ftrace/ftrace-direct-too.c
> > index 3d0fa260332d..bf2411aa6fd7 100644
> > --- a/samples/ftrace/ftrace-direct-too.c
> > +++ b/samples/ftrace/ftrace-direct-too.c
> > @@ -143,8 +143,8 @@ asm (
> > " ld.d $a0, $sp, 0\n"
> > " ld.d $a1, $sp, 8\n"
> > " ld.d $a2, $sp, 16\n"
> > -" ld.d $t0, $sp, 24\n"
> > -" ld.d $ra, $sp, 32\n"
> > +" ld.d $ra, $sp, 24\n"
> > +" ld.d $t0, $sp, 32\n"
> > " addi.d $sp, $sp, 48\n"
> > " jr $t0\n"
> > " .size my_tramp, .-my_tramp\n"
> > diff --git a/samples/ftrace/ftrace-direct.c b/samples/ftrace/ftrace-direct.c
> > index 956834b0d19a..5368c8c39cbb 100644
> > --- a/samples/ftrace/ftrace-direct.c
> > +++ b/samples/ftrace/ftrace-direct.c
> > @@ -124,8 +124,8 @@ asm (
> > " st.d $ra, $sp, 16\n"
> > " bl my_direct_func\n"
> > " ld.d $a0, $sp, 0\n"
> > -" ld.d $t0, $sp, 8\n"
> > -" ld.d $ra, $sp, 16\n"
> > +" ld.d $ra, $sp, 8\n"
> > +" ld.d $t0, $sp, 16\n"
> > " addi.d $sp, $sp, 32\n"
> > " jr $t0\n"
> > " .size my_tramp, .-my_tramp\n"
> > --
> > 2.25.1
> >
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2025-12-10 6:16 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-12-09 9:34 [PATCH v1 0/2] Fix the failure issue of the module_attach test case Chenghao Duan
2025-12-09 9:34 ` [PATCH v1 1/2] LoongArch: Modify the jump logic of the trampoline Chenghao Duan
2025-12-10 0:48 ` Tiezhu Yang
2025-12-10 4:15 ` Hengqi Chen
2025-12-10 6:16 ` Chenghao Duan
2025-12-09 9:34 ` [PATCH v1 2/2] LoongArch: Enable BPF exception fixup for specific ADE subcode Chenghao Duan
2025-12-10 1:02 ` Tiezhu Yang
2025-12-10 5:20 ` Hengqi Chen
2025-12-10 5:43 ` Chenghao Duan
2025-12-10 3:18 ` [PATCH v1 0/2] Fix the failure issue of the module_attach test case Vincent Li
2025-12-10 4:10 ` Hengqi Chen
2025-12-10 6:08 ` Chenghao Duan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).