ARM64: implement functionality for set/get pc and lr

Change-Id: I76f17020adf2cd344e0129cbe0e39de5274b6c32
Signed-off-by: Vyacheslav Cherkashin <v.cherkashin@samsung.com>

diff --git a/kprobe/arch/arm64/swap-asm/swap_kprobes.h b/kprobe/arch/arm64/swap-asm/swap_kprobes.h
index 4222501..a2ee3f1 100644 (file)
--- a/kprobe/arch/arm64/swap-asm/swap_kprobes.h
+++ b/kprobe/arch/arm64/swap-asm/swap_kprobes.h
@@ -97,13 +97,12 @@ static inline unsigned long swap_get_sarg(struct pt_regs *regs,
 
 static inline unsigned long swap_get_kpc(struct pt_regs *regs)
 {
-       WARN(1, "not implemented"); /* FIXME: to implement */
-       return 0xdeadc0de;
+       return regs->pc;
 }
 
 static inline void swap_set_kpc(struct pt_regs *regs, unsigned long val)
 {
-       WARN(1, "not implemented"); /* FIXME: to implement */
+       regs->pc = val;
 }
 
 

diff --git a/uprobe/arch/arm64/swap-asm/swap_uprobes.h b/uprobe/arch/arm64/swap-asm/swap_uprobes.h
index 73032ed..a5fbe63 100644 (file)
--- a/uprobe/arch/arm64/swap-asm/swap_uprobes.h
+++ b/uprobe/arch/arm64/swap-asm/swap_uprobes.h
@@ -156,6 +156,16 @@ static inline u64 swap_get_urp_double(struct pt_regs *regs)
        return swap_get_double(regs, 0);
 }
 
+static inline unsigned long swap_get_upc_arm64(struct pt_regs *regs)
+{
+       return regs->pc;
+}
+
+static inline void swap_set_upc_arm64(struct pt_regs *regs, unsigned long val)
+{
+       regs->pc = val;
+}
+
 static inline unsigned long swap_get_uarg_arm64(struct pt_regs *regs,
                                                unsigned long n)
 {
@@ -183,15 +193,31 @@ static inline void swap_put_uarg_arm64(struct pt_regs *regs, unsigned long n,
        }
 }
 
+static inline unsigned long swap_get_uret_addr_arm64(struct pt_regs *regs)
+{
+       return regs->regs[30];
+}
+
+static inline void swap_set_uret_addr_arm64(struct pt_regs *regs,
+                                           unsigned long val)
+{
+       regs->regs[30] = val;
+}
+
 static inline unsigned long swap_get_upc(struct pt_regs *regs)
 {
-       WARN(1, "not implemented"); /* FIXME: to implement */
-       return 0;
+       if (compat_user_mode(regs))
+               return swap_get_upc_arm(regs);
+       else
+               return swap_get_upc_arm64(regs);
 }
 
 static inline void swap_set_upc(struct pt_regs *regs, unsigned long val)
 {
-       WARN(1, "not implemented"); /* FIXME: to implement */
+       if (compat_user_mode(regs))
+               swap_set_upc_arm(regs, val);
+       else
+               swap_set_upc_arm64(regs, val);
 }
 
 static inline unsigned long swap_get_uarg(struct pt_regs *regs, unsigned long n)
@@ -205,18 +231,26 @@ static inline unsigned long swap_get_uarg(struct pt_regs *regs, unsigned long n)
 static inline void swap_put_uarg(struct pt_regs *regs, unsigned long n,
                                 unsigned long val)
 {
-       WARN(1, "not implemented"); /* FIXME: to implement */
+       if (compat_user_mode(regs))
+               return swap_put_uarg_arm(regs, n, val);
+       else
+               return swap_put_uarg_arm64(regs, n, val);
 }
 
 static inline unsigned long swap_get_uret_addr(struct pt_regs *regs)
 {
-       WARN(1, "not implemented"); /* FIXME: to implement */
-       return 0;
+       if (compat_user_mode(regs))
+               return swap_get_uret_addr_arm(regs);
+       else
+               return swap_get_uret_addr_arm64(regs);
 }
 
 static inline void swap_set_uret_addr(struct pt_regs *regs, unsigned long val)
 {
-       WARN(1, "not implemented"); /* FIXME: to implement */
+       if (compat_user_mode(regs))
+               swap_set_uret_addr_arm(regs, val);
+       else
+               swap_set_uret_addr_arm64(regs, val);
 }
 
 int arch_prepare_uprobe(struct uprobe *p);