thread.bad_cause is saved in arch_uprobe_pre_xol(), it should be restored
in arch_uprobe_{post,abort}_xol() accordingly, otherwise the save operation
is meaningless, this change is similar with x86 and powerpc.
Signed-off-by: Tiezhu Yang <[email protected]>
---
arch/riscv/kernel/probes/uprobes.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/riscv/kernel/probes/uprobes.c b/arch/riscv/kernel/probes/uprobes.c
index c976a21..194f166 100644
--- a/arch/riscv/kernel/probes/uprobes.c
+++ b/arch/riscv/kernel/probes/uprobes.c
@@ -67,6 +67,7 @@ int arch_uprobe_post_xol(struct arch_uprobe *auprobe, struct pt_regs *regs)
struct uprobe_task *utask = current->utask;
WARN_ON_ONCE(current->thread.bad_cause != UPROBE_TRAP_NR);
+ current->thread.bad_cause = utask->autask.saved_cause;
instruction_pointer_set(regs, utask->vaddr + auprobe->insn_size);
@@ -102,6 +103,7 @@ void arch_uprobe_abort_xol(struct arch_uprobe *auprobe, struct pt_regs *regs)
{
struct uprobe_task *utask = current->utask;
+ current->thread.bad_cause = utask->autask.saved_cause;
/*
* Task has received a fatal signal, so reset back to probbed
* address.
--
2.1.0
Cc:
Oleg Nesterov <[email protected]>
Srikar Dronamraju <[email protected]>
On 04/23/2023 09:42 AM, Tiezhu Yang wrote:
> thread.bad_cause is saved in arch_uprobe_pre_xol(), it should be restored
> in arch_uprobe_{post,abort}_xol() accordingly, otherwise the save operation
> is meaningless, this change is similar with x86 and powerpc.
>
> Signed-off-by: Tiezhu Yang <[email protected]>
> ---
> arch/riscv/kernel/probes/uprobes.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/arch/riscv/kernel/probes/uprobes.c b/arch/riscv/kernel/probes/uprobes.c
> index c976a21..194f166 100644
> --- a/arch/riscv/kernel/probes/uprobes.c
> +++ b/arch/riscv/kernel/probes/uprobes.c
> @@ -67,6 +67,7 @@ int arch_uprobe_post_xol(struct arch_uprobe *auprobe, struct pt_regs *regs)
> struct uprobe_task *utask = current->utask;
>
> WARN_ON_ONCE(current->thread.bad_cause != UPROBE_TRAP_NR);
> + current->thread.bad_cause = utask->autask.saved_cause;
>
> instruction_pointer_set(regs, utask->vaddr + auprobe->insn_size);
>
> @@ -102,6 +103,7 @@ void arch_uprobe_abort_xol(struct arch_uprobe *auprobe, struct pt_regs *regs)
> {
> struct uprobe_task *utask = current->utask;
>
> + current->thread.bad_cause = utask->autask.saved_cause;
> /*
> * Task has received a fatal signal, so reset back to probbed
> * address.
>
Hi Oleg and Srikar,
Could you please review this patch, thank you.
Thanks,
Tiezhu
On 04/24, Tiezhu Yang wrote:
>
> >diff --git a/arch/riscv/kernel/probes/uprobes.c b/arch/riscv/kernel/probes/uprobes.c
> >index c976a21..194f166 100644
> >--- a/arch/riscv/kernel/probes/uprobes.c
> >+++ b/arch/riscv/kernel/probes/uprobes.c
> >@@ -67,6 +67,7 @@ int arch_uprobe_post_xol(struct arch_uprobe *auprobe, struct pt_regs *regs)
> > struct uprobe_task *utask = current->utask;
> >
> > WARN_ON_ONCE(current->thread.bad_cause != UPROBE_TRAP_NR);
> >+ current->thread.bad_cause = utask->autask.saved_cause;
> >
> > instruction_pointer_set(regs, utask->vaddr + auprobe->insn_size);
> >
> >@@ -102,6 +103,7 @@ void arch_uprobe_abort_xol(struct arch_uprobe *auprobe, struct pt_regs *regs)
> > {
> > struct uprobe_task *utask = current->utask;
> >
> >+ current->thread.bad_cause = utask->autask.saved_cause;
> > /*
> > * Task has received a fatal signal, so reset back to probbed
> > * address.
> >
Acked-by: Oleg Nesterov <[email protected]>
Thx for fixup.
Reviewed-by: Guo Ren <[email protected]>
On Sun, Apr 23, 2023 at 9:42 AM Tiezhu Yang <[email protected]> wrote:
>
> thread.bad_cause is saved in arch_uprobe_pre_xol(), it should be restored
> in arch_uprobe_{post,abort}_xol() accordingly, otherwise the save operation
> is meaningless, this change is similar with x86 and powerpc.
>
> Signed-off-by: Tiezhu Yang <[email protected]>
> ---
> arch/riscv/kernel/probes/uprobes.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/arch/riscv/kernel/probes/uprobes.c b/arch/riscv/kernel/probes/uprobes.c
> index c976a21..194f166 100644
> --- a/arch/riscv/kernel/probes/uprobes.c
> +++ b/arch/riscv/kernel/probes/uprobes.c
> @@ -67,6 +67,7 @@ int arch_uprobe_post_xol(struct arch_uprobe *auprobe, struct pt_regs *regs)
> struct uprobe_task *utask = current->utask;
>
> WARN_ON_ONCE(current->thread.bad_cause != UPROBE_TRAP_NR);
> + current->thread.bad_cause = utask->autask.saved_cause;
>
> instruction_pointer_set(regs, utask->vaddr + auprobe->insn_size);
>
> @@ -102,6 +103,7 @@ void arch_uprobe_abort_xol(struct arch_uprobe *auprobe, struct pt_regs *regs)
> {
> struct uprobe_task *utask = current->utask;
>
> + current->thread.bad_cause = utask->autask.saved_cause;
> /*
> * Task has received a fatal signal, so reset back to probbed
> * address.
> --
> 2.1.0
>
--
Best Regards
Guo Ren
ping, what is the status of this patch which has been received Acked-by
and Reviewed-by:
https://lore.kernel.org/linux-riscv/[email protected]/
Thanks,
Tiezhu
On Sun, 23 Apr 2023 09:42:26 +0800, Tiezhu Yang wrote:
> thread.bad_cause is saved in arch_uprobe_pre_xol(), it should be restored
> in arch_uprobe_{post,abort}_xol() accordingly, otherwise the save operation
> is meaningless, this change is similar with x86 and powerpc.
>
>
Applied, thanks!
[1/1] riscv: uprobes: Restore thread.bad_cause
https://git.kernel.org/palmer/c/58b1294dd1d6
Best regards,
--
Palmer Dabbelt <[email protected]>
Hello:
This patch was applied to riscv/linux.git (for-next)
by Palmer Dabbelt <[email protected]>:
On Sun, 23 Apr 2023 09:42:26 +0800 you wrote:
> thread.bad_cause is saved in arch_uprobe_pre_xol(), it should be restored
> in arch_uprobe_{post,abort}_xol() accordingly, otherwise the save operation
> is meaningless, this change is similar with x86 and powerpc.
>
> Signed-off-by: Tiezhu Yang <[email protected]>
> ---
> arch/riscv/kernel/probes/uprobes.c | 2 ++
> 1 file changed, 2 insertions(+)
Here is the summary with links:
- riscv: uprobes: Restore thread.bad_cause
https://git.kernel.org/riscv/c/58b1294dd1d6
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html