[PATCH OLK-6.6 v2 06/31] arm64: rename functions that reference compat term

29 Nov 2023

From: Xiongfeng Wang wangxiongfeng2@huawei.com
maillist inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I8JVJ3
CVE: NA
Reference: https://github.com/norov/linux/commits/ilp32-5.2
--------------------------------
The ILP32 for ARM64 patch series introduces another 'compat' mode additionally
to aarch32_el0. So to avoid confusing, aarch32-only functions renamed in
according to it.
Signed-off-by: Yury Norov ynorov@caviumnetworks.com
Signed-off-by: Yury Norov ynorov@marvell.com
Signed-off-by: Xiongfeng Wang wangxiongfeng2@huawei.com
Acked-by: Xie XiuQi xiexiuqi@huawei.com
Signed-off-by: Chen Jun chenjun102@huawei.com
Signed-off-by: Chen Jiahao chenjiahao16@huawei.com
Signed-off-by: Jinjie Ruan ruanjinjie@huawei.com
---
 arch/arm64/include/asm/ptrace.h      | 10 ++--
 arch/arm64/include/asm/signal32.h    | 27 +++++-----
 arch/arm64/include/asm/syscall.h     |  2 +-
 arch/arm64/kernel/armv8_deprecated.c | 14 +++---
 arch/arm64/kernel/asm-offsets.c      |  4 +-
 arch/arm64/kernel/compat_alignment.c |  2 +-
 arch/arm64/kernel/cpufeature.c       | 10 ++--
 arch/arm64/kernel/debug-monitors.c   |  4 +-
 arch/arm64/kernel/perf_callchain.c   | 22 ++++-----
 arch/arm64/kernel/perf_regs.c        |  2 +-
 arch/arm64/kernel/process.c          |  4 +-
 arch/arm64/kernel/proton-pack.c      |  2 +-
 arch/arm64/kernel/signal.c           |  8 +--
 arch/arm64/kernel/signal32.c         | 74 ++++++++++++++--------------
 arch/arm64/kernel/sys32.c            |  2 +-
 arch/arm64/kernel/sys_compat.c       | 12 ++---
 arch/arm64/kernel/syscall.c          |  6 +--
 arch/arm64/kernel/traps.c            |  4 +-
 arch/arm64/mm/fault.c                |  2 +-
 19 files changed, 106 insertions(+), 105 deletions(-)

diff --git a/arch/arm64/include/asm/ptrace.h b/arch/arm64/include/asm/ptrace.h
index 1ff9909e5169..992b04efe7f8 100644
--- a/arch/arm64/include/asm/ptrace.h
+++ b/arch/arm64/include/asm/ptrace.h
@@ -218,16 +218,16 @@ static inline void forget_syscall(struct pt_regs *regs)
 #define arch_has_single_step()	(1)
#ifdef CONFIG_AARCH32_EL0
-#define compat_thumb_mode(regs) \
+#define a32_thumb_mode(regs) \
    (((regs)->pstate & PSR_AA32_T_BIT))
 #else
-#define compat_thumb_mode(regs) (0)
+#define a32_thumb_mode(regs) (0)
 #endif
#define user_mode(regs)	\
    (((regs)->pstate & PSR_MODE_MASK) == PSR_MODE_EL0t)
-#define compat_user_mode(regs)	\
+#define a32_user_mode(regs)	\
    (((regs)->pstate & (PSR_MODE32_BIT | PSR_MODE_MASK)) == \
     (PSR_MODE32_BIT | PSR_MODE_EL0t))
@@ -247,7 +247,7 @@ static inline void forget_syscall(struct pt_regs *regs)
static inline unsigned long user_stack_pointer(struct pt_regs *regs)
 {
-	if (compat_user_mode(regs))
+	if (a32_user_mode(regs))
    	return regs->compat_sp;
    return regs->sp;
 }
@@ -327,7 +327,7 @@ static inline unsigned long regs_return_value(struct pt_regs *regs)
     * syscall_get_return_value(). Apply the same sign-extension here until
     * audit is updated to use syscall_get_return_value().
     */
-	if (compat_user_mode(regs))
+	if (a32_user_mode(regs))
    	val = sign_extend64(val, 31);
return val;
diff --git a/arch/arm64/include/asm/signal32.h b/arch/arm64/include/asm/signal32.h
index 48ba6c7ab53e..dbffee2b4414 100644
--- a/arch/arm64/include/asm/signal32.h
+++ b/arch/arm64/include/asm/signal32.h
@@ -8,7 +8,7 @@
 #ifdef CONFIG_AARCH32_EL0
 #include <linux/compat.h>
-struct compat_sigcontext {
+struct a32_sigcontext {
    /* We always set these two fields to 0 */
    compat_ulong_t			trap_no;
    compat_ulong_t			error_code;
@@ -34,47 +34,48 @@ struct compat_sigcontext {
    compat_ulong_t			fault_address;
 };
-struct compat_ucontext {
+struct a32_ucontext {
    compat_ulong_t			uc_flags;
    compat_uptr_t			uc_link;
    compat_stack_t			uc_stack;
-	struct compat_sigcontext	uc_mcontext;
+	struct a32_sigcontext	uc_mcontext;
    compat_sigset_t			uc_sigmask;
    int 				__unused[32 - (sizeof(compat_sigset_t) / sizeof(int))];
    compat_ulong_t			uc_regspace[128] __attribute__((__aligned__(8)));
 };
-struct compat_sigframe {
-	struct compat_ucontext	uc;
+struct a32_sigframe {
+	struct a32_ucontext	uc;
    compat_ulong_t		retcode[2];
 };
-struct compat_rt_sigframe {
+struct a32_rt_sigframe {
    struct compat_siginfo info;
-	struct compat_sigframe sig;
+	struct a32_sigframe sig;
 };
-int compat_setup_frame(int usig, struct ksignal *ksig, sigset_t *set,
+int a32_setup_frame(int usig, struct ksignal *ksig, sigset_t *set,
    	       struct pt_regs *regs);
-int compat_setup_rt_frame(int usig, struct ksignal *ksig, sigset_t *set,
+
+int a32_setup_rt_frame(int usig, struct ksignal *ksig, sigset_t *set,
    		  struct pt_regs *regs);
-void compat_setup_restart_syscall(struct pt_regs *regs);
+void a32_setup_restart_syscall(struct pt_regs *regs);
 #else
-static inline int compat_setup_frame(int usid, struct ksignal *ksig,
+static inline int a32_setup_frame(int usid, struct ksignal *ksig,
    			     sigset_t *set, struct pt_regs *regs)
 {
    return -ENOSYS;
 }
-static inline int compat_setup_rt_frame(int usig, struct ksignal *ksig, sigset_t *set,
+static inline int a32_setup_rt_frame(int usig, struct ksignal *ksig, sigset_t *set,
    				struct pt_regs *regs)
 {
    return -ENOSYS;
 }
-static inline void compat_setup_restart_syscall(struct pt_regs *regs)
+static inline void a32_setup_restart_syscall(struct pt_regs *regs)
 {
 }
 #endif /* CONFIG_AARCH32_EL0 */
diff --git a/arch/arm64/include/asm/syscall.h b/arch/arm64/include/asm/syscall.h
index d40b854705db..4974c19def43 100644
--- a/arch/arm64/include/asm/syscall.h
+++ b/arch/arm64/include/asm/syscall.h
@@ -14,7 +14,7 @@ typedef long (*syscall_fn_t)(const struct pt_regs *regs);
 extern const syscall_fn_t sys_call_table[];
#ifdef CONFIG_AARCH32_EL0
-extern const syscall_fn_t compat_sys_call_table[];
+extern const syscall_fn_t a32_sys_call_table[];
 #endif
static inline int syscall_get_nr(struct task_struct *task,
diff --git a/arch/arm64/kernel/armv8_deprecated.c b/arch/arm64/kernel/armv8_deprecated.c
index e459cfd33711..fd0f291e215e 100644
--- a/arch/arm64/kernel/armv8_deprecated.c
+++ b/arch/arm64/kernel/armv8_deprecated.c
@@ -233,7 +233,7 @@ static int swp_handler(struct pt_regs *regs, u32 instr)
 static bool try_emulate_swp(struct pt_regs *regs, u32 insn)
 {
    /* SWP{B} only exists in ARM state and does not exist in Thumb */
-	if (!compat_user_mode(regs) || compat_thumb_mode(regs))
+	if (!a32_user_mode(regs) || a32_thumb_mode(regs))
    	return false;
if ((insn & 0x0fb00ff0) != 0x01000090)
@@ -315,7 +315,7 @@ static int cp15_barrier_set_hw_mode(bool enable)
static bool try_emulate_cp15_barrier(struct pt_regs *regs, u32 insn)
 {
-	if (!compat_user_mode(regs) || compat_thumb_mode(regs))
+	if (!a32_user_mode(regs) || a32_thumb_mode(regs))
    	return false;
if ((insn & 0x0fff0fdf) == 0x0e070f9a)
@@ -348,7 +348,7 @@ static int setend_set_hw_mode(bool enable)
    return 0;
 }
-static int compat_setend_handler(struct pt_regs *regs, u32 big_endian)
+static int __a32_setend_handler(struct pt_regs *regs, u32 big_endian)
 {
    char *insn;
@@ -371,25 +371,25 @@ static int compat_setend_handler(struct pt_regs *regs, u32 big_endian)
static int a32_setend_handler(struct pt_regs *regs, u32 instr)
 {
-	int rc = compat_setend_handler(regs, (instr >> 9) & 1);
+	int rc = __a32_setend_handler(regs, (instr >> 9) & 1);
    arm64_skip_faulting_instruction(regs, 4);
    return rc;
 }
static int t16_setend_handler(struct pt_regs *regs, u32 instr)
 {
-	int rc = compat_setend_handler(regs, (instr >> 3) & 1);
+	int rc = __a32_setend_handler(regs, (instr >> 3) & 1);
    arm64_skip_faulting_instruction(regs, 2);
    return rc;
 }
static bool try_emulate_setend(struct pt_regs *regs, u32 insn)
 {
-	if (compat_thumb_mode(regs) &&
+	if (a32_thumb_mode(regs) &&
        (insn & 0xfffffff7) == 0x0000b650)
    	return t16_setend_handler(regs, insn) == 0;
-	if (compat_user_mode(regs) &&
+	if (a32_user_mode(regs) &&
        (insn & 0xfffffdff) == 0xf1010000)
    	return a32_setend_handler(regs, insn) == 0;
diff --git a/arch/arm64/kernel/asm-offsets.c b/arch/arm64/kernel/asm-offsets.c
index ccb5c28697e9..acf922704a41 100644
--- a/arch/arm64/kernel/asm-offsets.c
+++ b/arch/arm64/kernel/asm-offsets.c
@@ -100,8 +100,8 @@ int main(void)
   BLANK();
 #endif
 #ifdef CONFIG_AARCH32_EL0
-  DEFINE(COMPAT_SIGFRAME_REGS_OFFSET,		offsetof(struct compat_sigframe, uc.uc_mcontext.arm_r0));
-  DEFINE(COMPAT_RT_SIGFRAME_REGS_OFFSET,	offsetof(struct compat_rt_sigframe, sig.uc.uc_mcontext.arm_r0));
+  DEFINE(COMPAT_SIGFRAME_REGS_OFFSET,		offsetof(struct a32_sigframe, uc.uc_mcontext.arm_r0));
+  DEFINE(COMPAT_RT_SIGFRAME_REGS_OFFSET,	offsetof(struct a32_rt_sigframe, sig.uc.uc_mcontext.arm_r0));
   BLANK();
 #endif
   DEFINE(MM_CONTEXT_ID,		offsetof(struct mm_struct, context.id.counter));
diff --git a/arch/arm64/kernel/compat_alignment.c b/arch/arm64/kernel/compat_alignment.c
index deff21bfa680..934cea87cfd5 100644
--- a/arch/arm64/kernel/compat_alignment.c
+++ b/arch/arm64/kernel/compat_alignment.c
@@ -319,7 +319,7 @@ int do_compat_alignment_fixup(unsigned long addr, struct pt_regs *regs)
instrptr = instruction_pointer(regs);
-	if (compat_thumb_mode(regs)) {
+	if (a32_thumb_mode(regs)) {
    	__le16 __user *ptr = (__le16 __user *)(instrptr & ~1);
    	u16 tinstr, tinst2;
diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c
index a4aa453fed4b..374ead145a8a 100644
--- a/arch/arm64/kernel/cpufeature.c
+++ b/arch/arm64/kernel/cpufeature.c
@@ -2890,7 +2890,7 @@ static bool compat_has_neon(const struct arm64_cpu_capabilities *cap, int scope)
 }
 #endif
-static const struct arm64_cpu_capabilities compat_elf_hwcaps[] = {
+static const struct arm64_cpu_capabilities a32_elf_hwcaps[] = {
 #ifdef CONFIG_AARCH32_EL0
    HWCAP_CAP_MATCH(compat_has_neon, CAP_COMPAT_HWCAP, COMPAT_HWCAP_NEON),
    HWCAP_CAP(MVFR1_EL1, SIMDFMAC, IMP, CAP_COMPAT_HWCAP, COMPAT_HWCAP_VFPv4),
@@ -3148,7 +3148,7 @@ static void verify_local_elf_hwcaps(void)
    __verify_local_elf_hwcaps(arm64_elf_hwcaps);
if (id_aa64pfr0_32bit_el0(read_cpuid(ID_AA64PFR0_EL1)))
-		__verify_local_elf_hwcaps(compat_elf_hwcaps);
+		__verify_local_elf_hwcaps(a32_elf_hwcaps);
 }
static void verify_sve_features(void)
@@ -3348,7 +3348,7 @@ void __init setup_cpu_features(void)
    setup_elf_hwcaps(arm64_elf_hwcaps);
if (system_supports_32bit_el0()) {
-		setup_elf_hwcaps(compat_elf_hwcaps);
+		setup_elf_hwcaps(a32_elf_hwcaps);
    	elf_hwcap_fixup();
    }
@@ -3399,7 +3399,7 @@ static int enable_mismatched_32bit_el0(unsigned int cpu)
    lucky_winner = cpu_32bit ? cpu : cpumask_any_and(cpu_32bit_el0_mask,
    						 cpu_active_mask);
    get_cpu_device(lucky_winner)->offline_disabled = true;
-	setup_elf_hwcaps(compat_elf_hwcaps);
+	setup_elf_hwcaps(a32_elf_hwcaps);
    elf_hwcap_fixup();
    pr_info("Asymmetric 32-bit EL0 support detected on CPU %u; CPU hot-unplug disabled on CPU %u\n",
    	cpu, lucky_winner);
@@ -3503,7 +3503,7 @@ bool try_emulate_mrs(struct pt_regs *regs, u32 insn)
 {
    u32 sys_reg, rt;
-	if (compat_user_mode(regs) || !aarch64_insn_is_mrs(insn))
+	if (a32_user_mode(regs) || !aarch64_insn_is_mrs(insn))
    	return false;
/*
diff --git a/arch/arm64/kernel/debug-monitors.c b/arch/arm64/kernel/debug-monitors.c
index 64f2ecbdfe5c..745aefddd9a3 100644
--- a/arch/arm64/kernel/debug-monitors.c
+++ b/arch/arm64/kernel/debug-monitors.c
@@ -346,10 +346,10 @@ int aarch32_break_handler(struct pt_regs *regs)
    bool bp = false;
    void __user *pc = (void __user *)instruction_pointer(regs);
-	if (!compat_user_mode(regs))
+	if (!a32_user_mode(regs))
    	return -EFAULT;
-	if (compat_thumb_mode(regs)) {
+	if (a32_thumb_mode(regs)) {
    	/* get 16-bit Thumb instruction */
    	__le16 instr;
    	get_user(instr, (__le16 __user *)pc);
diff --git a/arch/arm64/kernel/perf_callchain.c b/arch/arm64/kernel/perf_callchain.c
index d5cddb150d39..aad6190e03ca 100644
--- a/arch/arm64/kernel/perf_callchain.c
+++ b/arch/arm64/kernel/perf_callchain.c
@@ -57,21 +57,21 @@ user_backtrace(struct frame_tail __user *tail,
  * The registers we're interested in are at the end of the variable
  * length saved register structure. The fp points at the end of this
  * structure so the address of this struct is:
- * (struct compat_frame_tail *)(xxx->fp)-1
+ * (struct a32_frame_tail *)(xxx->fp)-1
  *
  * This code has been adapted from the ARM OProfile support.
  */
-struct compat_frame_tail {
-	compat_uptr_t	fp; /* a (struct compat_frame_tail *) in compat mode */
+struct a32_frame_tail {
+	compat_uptr_t	fp; /* a (struct a32_frame_tail *) in compat mode */
    u32		sp;
    u32		lr;
 } __attribute__((packed));
-static struct compat_frame_tail __user *
-compat_user_backtrace(struct compat_frame_tail __user *tail,
+static struct a32_frame_tail __user *
+compat_user_backtrace(struct a32_frame_tail __user *tail,
    	      struct perf_callchain_entry_ctx *entry)
 {
-	struct compat_frame_tail buftail;
+	struct a32_frame_tail buftail;
    unsigned long err;
/* Also check accessibility of one struct frame_tail beyond */
@@ -91,11 +91,11 @@ compat_user_backtrace(struct compat_frame_tail __user *tail,
     * Frame pointers should strictly progress back up the stack
     * (towards higher addresses).
     */
-	if (tail + 1 >= (struct compat_frame_tail __user *)
+	if (tail + 1 >= (struct a32_frame_tail __user *)
    		compat_ptr(buftail.fp))
    	return NULL;
-	return (struct compat_frame_tail __user *)compat_ptr(buftail.fp) - 1;
+	return (struct a32_frame_tail __user *)compat_ptr(buftail.fp) - 1;
 }
 #endif /* CONFIG_AARCH32_EL0 */
@@ -109,7 +109,7 @@ void perf_callchain_user(struct perf_callchain_entry_ctx *entry,
perf_callchain_store(entry, regs->pc);
-	if (!compat_user_mode(regs)) {
+	if (!a32_user_mode(regs)) {
    	/* AARCH64 mode */
    	struct frame_tail __user *tail;
@@ -121,9 +121,9 @@ void perf_callchain_user(struct perf_callchain_entry_ctx *entry,
    } else {
 #ifdef CONFIG_AARCH32_EL0
    	/* AARCH32 compat mode */
-		struct compat_frame_tail __user *tail;
+		struct a32_frame_tail __user *tail;
-		tail = (struct compat_frame_tail __user *)regs->compat_fp - 1;
+		tail = (struct a32_frame_tail __user *)regs->compat_fp - 1;
while ((entry->nr < entry->max_stack) &&
    		tail && !((unsigned long)tail & 0x3))
diff --git a/arch/arm64/kernel/perf_regs.c b/arch/arm64/kernel/perf_regs.c
index b4eece3eb17d..1497f1b3e2fb 100644
--- a/arch/arm64/kernel/perf_regs.c
+++ b/arch/arm64/kernel/perf_regs.c
@@ -54,7 +54,7 @@ u64 perf_reg_value(struct pt_regs *regs, int idx)
     * At the time we make a sample, we don't know whether the consumer is
     * 32-bit or 64-bit, so we have to cater for both possibilities.
     */
-	if (compat_user_mode(regs)) {
+	if (a32_user_mode(regs)) {
    	if ((u32)idx == PERF_REG_ARM64_SP)
    		return regs->compat_sp;
    	if ((u32)idx == PERF_REG_ARM64_LR)
diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c
index 0fcc4eb1a7ab..a48d2f596c07 100644
--- a/arch/arm64/kernel/process.c
+++ b/arch/arm64/kernel/process.c
@@ -159,7 +159,7 @@ static void print_pstate(struct pt_regs *regs)
 {
    u64 pstate = regs->pstate;
-	if (compat_user_mode(regs)) {
+	if (a32_user_mode(regs)) {
    	printk("pstate: %08llx (%c%c%c%c %c %s %s %c%c%c %cDIT %cSSBS)\n",
    		pstate,
    		pstate & PSR_AA32_N_BIT ? 'N' : 'n',
@@ -202,7 +202,7 @@ void __show_regs(struct pt_regs *regs)
    int i, top_reg;
    u64 lr, sp;
-	if (compat_user_mode(regs)) {
+	if (a32_user_mode(regs)) {
    	lr = regs->compat_lr;
    	sp = regs->compat_sp;
    	top_reg = 12;
diff --git a/arch/arm64/kernel/proton-pack.c b/arch/arm64/kernel/proton-pack.c
index 05f40c4e18fd..58a97861bfc5 100644
--- a/arch/arm64/kernel/proton-pack.c
+++ b/arch/arm64/kernel/proton-pack.c
@@ -643,7 +643,7 @@ void spectre_v4_enable_mitigation(const struct arm64_cpu_capabilities *__unused)
static void __update_pstate_ssbs(struct pt_regs *regs, bool state)
 {
-	u64 bit = compat_user_mode(regs) ? PSR_AA32_SSBS_BIT : PSR_SSBS_BIT;
+	u64 bit = a32_user_mode(regs) ? PSR_AA32_SSBS_BIT : PSR_SSBS_BIT;
if (state)
    	regs->pstate |= bit;
diff --git a/arch/arm64/kernel/signal.c b/arch/arm64/kernel/signal.c
index bbd316f7bef6..06c5d2e66f6d 100644
--- a/arch/arm64/kernel/signal.c
+++ b/arch/arm64/kernel/signal.c
@@ -1164,7 +1164,7 @@ static int setup_rt_frame(int usig, struct ksignal *ksig, sigset_t *set,
 static void setup_restart_syscall(struct pt_regs *regs)
 {
    if (is_compat_task())
-		compat_setup_restart_syscall(regs);
+		a32_setup_restart_syscall(regs);
    else
    	regs->regs[8] = __NR_restart_syscall;
 }
@@ -1185,9 +1185,9 @@ static void handle_signal(struct ksignal *ksig, struct pt_regs *regs)
     */
    if (is_compat_task()) {
    	if (ksig->ka.sa.sa_flags & SA_SIGINFO)
-			ret = compat_setup_rt_frame(usig, ksig, oldset, regs);
+			ret = a32_setup_rt_frame(usig, ksig, oldset, regs);
    	else
-			ret = compat_setup_frame(usig, ksig, oldset, regs);
+			ret = a32_setup_frame(usig, ksig, oldset, regs);
    } else {
    	ret = setup_rt_frame(usig, ksig, oldset, regs);
    }
@@ -1222,7 +1222,7 @@ static void do_signal(struct pt_regs *regs)
     */
    if (syscall) {
    	continue_addr = regs->pc;
-		restart_addr = continue_addr - (compat_thumb_mode(regs) ? 2 : 4);
+		restart_addr = continue_addr - (a32_thumb_mode(regs) ? 2 : 4);
    	retval = regs->regs[0];
/*
diff --git a/arch/arm64/kernel/signal32.c b/arch/arm64/kernel/signal32.c
index bbd542704730..3853a62ab839 100644
--- a/arch/arm64/kernel/signal32.c
+++ b/arch/arm64/kernel/signal32.c
@@ -20,7 +20,7 @@
 #include <asm/unistd.h>
 #include <asm/vdso.h>
-struct compat_vfp_sigframe {
+struct a32_vfp_sigframe {
    compat_ulong_t	magic;
    compat_ulong_t	size;
    struct compat_user_vfp {
@@ -35,12 +35,12 @@ struct compat_vfp_sigframe {
 } __attribute__((__aligned__(8)));
#define VFP_MAGIC		0x56465001
-#define VFP_STORAGE_SIZE	sizeof(struct compat_vfp_sigframe)
+#define VFP_STORAGE_SIZE	sizeof(struct a32_vfp_sigframe)
#define FSR_WRITE_SHIFT		(11)
-struct compat_aux_sigframe {
-	struct compat_vfp_sigframe	vfp;
+struct a32_aux_sigframe {
+	struct a32_vfp_sigframe	vfp;
/* Something that isn't a valid magic number for any coprocessor.  */
    unsigned long			end_magic;
@@ -72,7 +72,7 @@ static inline int get_sigset_t(sigset_t *set,
  * VFP save/restore code.
  *
  * We have to be careful with endianness, since the fpsimd context-switch
- * code operates on 128-bit (Q) register values whereas the compat ABI
+ * code operates on 128-bit (Q) register values whereas the a32 ABI
  * uses an array of 64-bit (D) registers. Consequently, we need to swap
  * the two halves of each Q register when running on a big-endian CPU.
  */
@@ -89,7 +89,7 @@ union __fpsimd_vreg {
    };
 };
-static int compat_preserve_vfp_context(struct compat_vfp_sigframe __user *frame)
+static int a32_preserve_vfp_context(struct a32_vfp_sigframe __user *frame)
 {
    struct user_fpsimd_state const *fpsimd =
    	&current->thread.uw.fpsimd_state;
@@ -139,7 +139,7 @@ static int compat_preserve_vfp_context(struct compat_vfp_sigframe __user *frame)
    return err ? -EFAULT : 0;
 }
-static int compat_restore_vfp_context(struct compat_vfp_sigframe __user *frame)
+static int a32_restore_vfp_context(struct a32_vfp_sigframe __user *frame)
 {
    struct user_fpsimd_state fpsimd;
    compat_ulong_t magic = VFP_MAGIC;
@@ -179,12 +179,12 @@ static int compat_restore_vfp_context(struct compat_vfp_sigframe __user *frame)
    return err ? -EFAULT : 0;
 }
-static int compat_restore_sigframe(struct pt_regs *regs,
-				   struct compat_sigframe __user *sf)
+static int a32_restore_sigframe(struct pt_regs *regs,
+				   struct a32_sigframe __user *sf)
 {
    int err;
    sigset_t set;
-	struct compat_aux_sigframe __user *aux;
+	struct a32_aux_sigframe __user *aux;
    unsigned long psr;
err = get_sigset_t(&set, &sf->uc.uc_sigmask);
@@ -218,9 +218,9 @@ static int compat_restore_sigframe(struct pt_regs *regs,
err |= !valid_user_regs(&regs->user_regs, current);
-	aux = (struct compat_aux_sigframe __user *) sf->uc.uc_regspace;
+	aux = (struct a32_aux_sigframe __user *) sf->uc.uc_regspace;
    if (err == 0 && system_supports_fpsimd())
-		err |= compat_restore_vfp_context(&aux->vfp);
+		err |= a32_restore_vfp_context(&aux->vfp);
return err;
 }
@@ -228,7 +228,7 @@ static int compat_restore_sigframe(struct pt_regs *regs,
 COMPAT_SYSCALL_DEFINE0(sigreturn)
 {
    struct pt_regs *regs = current_pt_regs();
-	struct compat_sigframe __user *frame;
+	struct a32_sigframe __user *frame;
/* Always make any pending restarted system calls return -EINTR */
    current->restart_block.fn = do_no_restart_syscall;
@@ -241,12 +241,12 @@ COMPAT_SYSCALL_DEFINE0(sigreturn)
    if (regs->compat_sp & 7)
    	goto badframe;
-	frame = (struct compat_sigframe __user *)regs->compat_sp;
+	frame = (struct a32_sigframe __user *)regs->compat_sp;
if (!access_ok(frame, sizeof (*frame)))
    	goto badframe;
-	if (compat_restore_sigframe(regs, frame))
+	if (a32_restore_sigframe(regs, frame))
    	goto badframe;
return regs->regs[0];
@@ -259,7 +259,7 @@ COMPAT_SYSCALL_DEFINE0(sigreturn)
 COMPAT_SYSCALL_DEFINE0(rt_sigreturn)
 {
    struct pt_regs *regs = current_pt_regs();
-	struct compat_rt_sigframe __user *frame;
+	struct a32_rt_sigframe __user *frame;
/* Always make any pending restarted system calls return -EINTR */
    current->restart_block.fn = do_no_restart_syscall;
@@ -272,12 +272,12 @@ COMPAT_SYSCALL_DEFINE0(rt_sigreturn)
    if (regs->compat_sp & 7)
    	goto badframe;
-	frame = (struct compat_rt_sigframe __user *)regs->compat_sp;
+	frame = (struct a32_rt_sigframe __user *)regs->compat_sp;
if (!access_ok(frame, sizeof (*frame)))
    	goto badframe;
-	if (compat_restore_sigframe(regs, &frame->sig))
+	if (a32_restore_sigframe(regs, &frame->sig))
    	goto badframe;
if (compat_restore_altstack(&frame->sig.uc.uc_stack))
@@ -290,7 +290,7 @@ COMPAT_SYSCALL_DEFINE0(rt_sigreturn)
    return 0;
 }
-static void __user *compat_get_sigframe(struct ksignal *ksig,
+static void __user *a32_get_sigframe(struct ksignal *ksig,
    				struct pt_regs *regs,
    				int framesize)
 {
@@ -311,7 +311,7 @@ static void __user *compat_get_sigframe(struct ksignal *ksig,
    return frame;
 }
-static void compat_setup_return(struct pt_regs *regs, struct k_sigaction *ka,
+static void a32_setup_return(struct pt_regs *regs, struct k_sigaction *ka,
    			compat_ulong_t __user *rc, void __user *frame,
    			int usig)
 {
@@ -354,10 +354,10 @@ static void compat_setup_return(struct pt_regs *regs, struct k_sigaction *ka,
    regs->pstate	= spsr;
 }
-static int compat_setup_sigframe(struct compat_sigframe __user *sf,
+static int a32_setup_sigframe(struct a32_sigframe __user *sf,
    			 struct pt_regs *regs, sigset_t *set)
 {
-	struct compat_aux_sigframe __user *aux;
+	struct a32_aux_sigframe __user *aux;
    unsigned long psr = pstate_to_compat_psr(regs->pstate);
    int err = 0;
@@ -380,7 +380,7 @@ static int compat_setup_sigframe(struct compat_sigframe __user *sf,
    __put_user_error(psr, &sf->uc.uc_mcontext.arm_cpsr, err);
__put_user_error((compat_ulong_t)0, &sf->uc.uc_mcontext.trap_no, err);
-	/* set the compat FSR WnR */
+	/* set the aarch32 FSR WnR */
    __put_user_error(!!(current->thread.fault_code & ESR_ELx_WNR) <<
    		 FSR_WRITE_SHIFT, &sf->uc.uc_mcontext.error_code, err);
    __put_user_error(current->thread.fault_address, &sf->uc.uc_mcontext.fault_address, err);
@@ -388,25 +388,25 @@ static int compat_setup_sigframe(struct compat_sigframe __user *sf,
err |= put_sigset_t(&sf->uc.uc_sigmask, set);
-	aux = (struct compat_aux_sigframe __user *) sf->uc.uc_regspace;
+	aux = (struct a32_aux_sigframe __user *) sf->uc.uc_regspace;
if (err == 0 && system_supports_fpsimd())
-		err |= compat_preserve_vfp_context(&aux->vfp);
+		err |= a32_preserve_vfp_context(&aux->vfp);
    __put_user_error(0, &aux->end_magic, err);
return err;
 }
/*
- * 32-bit signal handling routines called from signal.c
+ * aarch32-bit signal handling routines called from signal.c
  */
-int compat_setup_rt_frame(int usig, struct ksignal *ksig,
+int a32_setup_rt_frame(int usig, struct ksignal *ksig,
    		  sigset_t *set, struct pt_regs *regs)
 {
-	struct compat_rt_sigframe __user *frame;
+	struct a32_rt_sigframe __user *frame;
    int err = 0;
-	frame = compat_get_sigframe(ksig, regs, sizeof(*frame));
+	frame = a32_get_sigframe(ksig, regs, sizeof(*frame));
if (!frame)
    	return 1;
@@ -418,10 +418,10 @@ int compat_setup_rt_frame(int usig, struct ksignal *ksig,
err |= __compat_save_altstack(&frame->sig.uc.uc_stack, regs->compat_sp);
-	err |= compat_setup_sigframe(&frame->sig, regs, set);
+	err |= a32_setup_sigframe(&frame->sig, regs, set);
if (err == 0) {
-		compat_setup_return(regs, &ksig->ka, frame->sig.retcode, frame, usig);
+		a32_setup_return(regs, &ksig->ka, frame->sig.retcode, frame, usig);
    	regs->regs[1] = (compat_ulong_t)(unsigned long)&frame->info;
    	regs->regs[2] = (compat_ulong_t)(unsigned long)&frame->sig.uc;
    }
@@ -429,27 +429,27 @@ int compat_setup_rt_frame(int usig, struct ksignal *ksig,
    return err;
 }
-int compat_setup_frame(int usig, struct ksignal *ksig, sigset_t *set,
+int a32_setup_frame(int usig, struct ksignal *ksig, sigset_t *set,
    	       struct pt_regs *regs)
 {
-	struct compat_sigframe __user *frame;
+	struct a32_sigframe __user *frame;
    int err = 0;
-	frame = compat_get_sigframe(ksig, regs, sizeof(*frame));
+	frame = a32_get_sigframe(ksig, regs, sizeof(*frame));
if (!frame)
    	return 1;
__put_user_error(0x5ac3c35a, &frame->uc.uc_flags, err);
-	err |= compat_setup_sigframe(frame, regs, set);
+	err |= a32_setup_sigframe(frame, regs, set);
    if (err == 0)
-		compat_setup_return(regs, &ksig->ka, frame->retcode, frame, usig);
+		a32_setup_return(regs, &ksig->ka, frame->retcode, frame, usig);
return err;
 }
-void compat_setup_restart_syscall(struct pt_regs *regs)
+void a32_setup_restart_syscall(struct pt_regs *regs)
 {
        regs->regs[7] = __NR_compat_restart_syscall;
 }
diff --git a/arch/arm64/kernel/sys32.c b/arch/arm64/kernel/sys32.c
index fc40386afb1b..3c3c13a9dde3 100644
--- a/arch/arm64/kernel/sys32.c
+++ b/arch/arm64/kernel/sys32.c
@@ -129,7 +129,7 @@ COMPAT_SYSCALL_DEFINE6(aarch32_fallocate, int, fd, int, mode,
 #undef __SYSCALL
 #define __SYSCALL(nr, sym)	[nr] = __arm64_##sym,
-const syscall_fn_t compat_sys_call_table[__NR_compat_syscalls] = {
+const syscall_fn_t a32_sys_call_table[__NR_compat_syscalls] = {
    [0 ... __NR_compat_syscalls - 1] = __arm64_sys_ni_syscall,
 #include <asm/unistd32.h>
 };
diff --git a/arch/arm64/kernel/sys_compat.c b/arch/arm64/kernel/sys_compat.c
index df14336c3a29..62022c403bec 100644
--- a/arch/arm64/kernel/sys_compat.c
+++ b/arch/arm64/kernel/sys_compat.c
@@ -21,7 +21,7 @@
 #include <asm/unistd.h>
static long
-__do_compat_cache_op(unsigned long start, unsigned long end)
+__do_a32_cache_op(unsigned long start, unsigned long end)
 {
    long ret;
@@ -52,7 +52,7 @@ __do_compat_cache_op(unsigned long start, unsigned long end)
 }
static inline long
-do_compat_cache_op(unsigned long start, unsigned long end, int flags)
+do_a32_cache_op(unsigned long start, unsigned long end, int flags)
 {
    if (end < start || flags)
    	return -EINVAL;
@@ -60,12 +60,12 @@ do_compat_cache_op(unsigned long start, unsigned long end, int flags)
    if (!access_ok((const void __user *)start, end - start))
    	return -EFAULT;
-	return __do_compat_cache_op(start, end);
+	return __do_a32_cache_op(start, end);
 }
 /*
  * Handle all unrecognised system calls.
  */
-long compat_arm_syscall(struct pt_regs *regs, int scno)
+long a32_arm_syscall(struct pt_regs *regs, int scno)
 {
    unsigned long addr;
@@ -85,7 +85,7 @@ long compat_arm_syscall(struct pt_regs *regs, int scno)
     * the specified region).
     */
    case __ARM_NR_compat_cacheflush:
-		return do_compat_cache_op(regs->regs[0], regs->regs[1], regs->regs[2]);
+		return do_a32_cache_op(regs->regs[0], regs->regs[1], regs->regs[2]);
case __ARM_NR_compat_set_tls:
    	current->thread.uw.tp_value = regs->regs[0];
@@ -110,7 +110,7 @@ long compat_arm_syscall(struct pt_regs *regs, int scno)
    	break;
    }
-	addr = instruction_pointer(regs) - (compat_thumb_mode(regs) ? 2 : 4);
+	addr = instruction_pointer(regs) - (a32_thumb_mode(regs) ? 2 : 4);
arm64_notify_die("Oops - bad compat syscall(2)", regs,
    		 SIGILL, ILL_ILLTRP, addr, 0);
diff --git a/arch/arm64/kernel/syscall.c b/arch/arm64/kernel/syscall.c
index 9e760784426b..f6da6b0afcf7 100644
--- a/arch/arm64/kernel/syscall.c
+++ b/arch/arm64/kernel/syscall.c
@@ -15,7 +15,7 @@
 #include <asm/thread_info.h>
 #include <asm/unistd.h>
-long compat_arm_syscall(struct pt_regs *regs, int scno);
+long a32_arm_syscall(struct pt_regs *regs, int scno);
 long sys_ni_syscall(void);
static long do_ni_syscall(struct pt_regs *regs, int scno)
@@ -23,7 +23,7 @@ static long do_ni_syscall(struct pt_regs *regs, int scno)
 #ifdef CONFIG_AARCH32_EL0
    long ret;
    if (is_compat_task()) {
-		ret = compat_arm_syscall(regs, scno);
+		ret = a32_arm_syscall(regs, scno);
    	if (ret != -ENOSYS)
    		return ret;
    }
@@ -159,6 +159,6 @@ void do_el0_svc(struct pt_regs *regs)
 void do_el0_svc_compat(struct pt_regs *regs)
 {
    el0_svc_common(regs, regs->regs[7], __NR_compat_syscalls,
-		       compat_sys_call_table);
+		       a32_sys_call_table);
 }
 #endif
diff --git a/arch/arm64/kernel/traps.c b/arch/arm64/kernel/traps.c
index 8b70759cdbb9..dad89b667c29 100644
--- a/arch/arm64/kernel/traps.c
+++ b/arch/arm64/kernel/traps.c
@@ -368,7 +368,7 @@ void arm64_skip_faulting_instruction(struct pt_regs *regs, unsigned long size)
    if (user_mode(regs))
    	user_fastforward_single_step(current);
-	if (compat_user_mode(regs))
+	if (a32_user_mode(regs))
    	advance_itstate(regs);
    else
    	regs->pstate &= ~PSR_BTYPE_MASK;
@@ -379,7 +379,7 @@ static int user_insn_read(struct pt_regs *regs, u32 *insnp)
    u32 instr;
    unsigned long pc = instruction_pointer(regs);
-	if (compat_thumb_mode(regs)) {
+	if (a32_thumb_mode(regs)) {
    	/* 16-bit Thumb instruction */
    	__le16 instr_le;
    	if (get_user(instr_le, (__le16 __user *)pc))
diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c
index 2e5d1e238af9..2b6dda379b4c 100644
--- a/arch/arm64/mm/fault.c
+++ b/arch/arm64/mm/fault.c
@@ -717,7 +717,7 @@ static int do_alignment_fault(unsigned long far, unsigned long esr,
    		      struct pt_regs *regs)
 {
    if (IS_ENABLED(CONFIG_COMPAT_ALIGNMENT_FIXUPS) &&
-	    compat_user_mode(regs))
+	    a32_user_mode(regs))
    	return do_compat_alignment_fixup(far, regs);
    do_bad_area(far, esr, regs);
    return 0;
-- 
2.34.1


    

2024

2023

2022

2021

2020

2019

[PATCH OLK-6.6 v2 06/31] arm64: rename functions that reference compat term