[PATCH] powerpc/kprobes: Don't save/restore DAR/DSISR to/from pt_regs for optprobes

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

[PATCH] powerpc/kprobes: Don't save/restore DAR/DSISR to/from pt_regs for optprobes

Naveen N. Rao
We don't save/restore these across a trap, or with KPROBES_ON_FTRACE.

Signed-off-by: Naveen N. Rao <[hidden email]>
---
 arch/powerpc/kernel/optprobes_head.S | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/arch/powerpc/kernel/optprobes_head.S b/arch/powerpc/kernel/optprobes_head.S
index 4937bef7652f..52fc864cdec4 100644
--- a/arch/powerpc/kernel/optprobes_head.S
+++ b/arch/powerpc/kernel/optprobes_head.S
@@ -60,10 +60,6 @@ optprobe_template_entry:
  std r5,_CCR(r1)
  lbz     r5,PACASOFTIRQEN(r13)
  std     r5,SOFTE(r1)
- mfdar r5
- std r5,_DAR(r1)
- mfdsisr r5
- std r5,_DSISR(r1)
 
  /*
  * We may get here from a module, so load the kernel TOC in r2.
@@ -122,10 +118,6 @@ optprobe_template_call_emulate:
  mtxer r5
  ld r5,_CCR(r1)
  mtcr r5
- ld r5,_DAR(r1)
- mtdar r5
- ld r5,_DSISR(r1)
- mtdsisr r5
  REST_GPR(0,r1)
  REST_10GPRS(2,r1)
  REST_10GPRS(12,r1)
--
2.12.2

Reply | Threaded
Open this post in threaded view
|

Re: powerpc/kprobes: Don't save/restore DAR/DSISR to/from pt_regs for optprobes

Michael Ellerman-3
On Thu, 2017-06-08 at 19:16:55 UTC, "Naveen N. Rao" wrote:
> We don't save/restore these across a trap, or with KPROBES_ON_FTRACE.
>
> Signed-off-by: Naveen N. Rao <[hidden email]>

Applied to powerpc next, thanks.

https://git.kernel.org/powerpc/c/ec4189c4e8eea0c5e7c9b71cb1502c

cheers