From bbd47f279def867b79c00e36038277d85eb374c4 Mon Sep 17 00:00:00 2001

From: Pete Swain <swine@google.com>

Date: Fri, 28 Jul 2023 16:34:10 -0700

Subject: [PATCH 102/118] aarch64: kmod: kpatch-syscall.h: add aarch64 helper

Copy from kernel source tree.

Signed-off-by: Misono Tomohiro <misono.tomohiro@jp.fujitsu.com>

Signed-off-by: Pete Swain <swine@google.com>

Signed-off-by: Mihails Strasuns <mstrasun@amazon.com>

Signed-off-by: Joe Lawrence <joe.lawrence@redhat.com>

---

 kmod/patch/kpatch-syscall.h | 29 ++++++++++++++++++++++++++++-

 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/kmod/patch/kpatch-syscall.h b/kmod/patch/kpatch-syscall.h

index 6ecf36f..d93d10d 100644

--- a/kmod/patch/kpatch-syscall.h

+++ b/kmod/patch/kpatch-syscall.h

@@ -210,7 +210,34 @@

 # endif /* LINUX_VERSION_CODE */

-#endif /* CONFIG_X86_64 */

+#elif defined(CONFIG_ARM64)

+

+/* arm64/include/asm/syscall_wrapper.h versions */

+

+#define SC_ARM64_REGS_TO_ARGS(x, ...)       \

+  __MAP(x,__SC_ARGS         \

+        ,,regs->regs[0],,regs->regs[1],,regs->regs[2] \

+        ,,regs->regs[3],,regs->regs[4],,regs->regs[5])

+

+#define __KPATCH_SYSCALL_DEFINEx(x, name, ...)           \

+  asmlinkage long __arm64_sys##name(const struct pt_regs *regs);    \

+  ALLOW_ERROR_INJECTION(__arm64_sys##name, ERRNO);      \

+  static long __se_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__));   \

+  static inline long __kpatch_do_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__));  \

+  asmlinkage long __arm64_sys##name(const struct pt_regs *regs)   \

+  {                 \

+    return __se_sys##name(SC_ARM64_REGS_TO_ARGS(x,__VA_ARGS__));  \

+  }                 \

+  static long __se_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__))    \

+  {                 \

+    long ret = __kpatch_do_sys##name(__MAP(x,__SC_CAST,__VA_ARGS__));  \

+    __MAP(x,__SC_TEST,__VA_ARGS__);         \

+    __PROTECT(x, ret,__MAP(x,__SC_ARGS,__VA_ARGS__));   \

+    return ret;             \

+  }                 \

+  static inline long __kpatch_do_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__))

+

+#endif /* which arch */

 #ifndef __KPATCH_SYSCALL_DEFINEx

-- 

2.48.1