Commit d109269f authored by Yury Norov's avatar Yury Norov Committed by Yang Yingliang
Browse files

arm64: introduce is_a32_compat_{task, thread} for AArch32 compat 



hulk inclusion
category: feature
bugzilla: NA
CVE: NA
---------------------------

Based on patch of Andrew Pinski.

This patch introduces is_a32_compat_task and is_a32_thread so it is
easier to say this is a a32 specific thread or a generic compat
thread/task. Corresponding functions are located in <asm/is_compat.h>
to avoid mess in headers.

Some files include both <linux/compat.h> and <asm/compat.h>,
and this is wrong because <linux/compat.h> has <asm/compat.h> already
included. It was fixed too.

Signed-off-by: default avatarYury Norov <ynorov@caviumnetworks.com>
Signed-off-by: default avatarAndrew Pinski <Andrew.Pinski@caviumnetworks.com>
Signed-off-by: default avatarBamvor Jian Zhang <bamv2005@gmail.com>

 Conflicts:
	arch/arm64/include/asm/processor.h
	arch/arm64/kernel/process.c
	arch/arm64/kernel/syscall.c
[wangxiongfeng: fix conflicts in arch/arm64/include/asm/processor.h
because of the following commits:
2f26fc4e0 arm64: compat: Reduce address limit
2a1d3f8a9 arm64: ptrace: Override SPSR.SS when single-stepping is enabled]

Signed-off-by: default avatarXiongfeng Wang <wangxiongfeng2@huawei.com>
Reviewed-by: default avatarHanjun Guo &lt;guohanjun@huawei.com <mailto:guohanjun@huawei.com&gt;>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parent 18580abb

arch/arm64/include/asm/compat.h

+2 −17
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ 
#include <linux/sched.h>

#include <linux/sched/task_stack.h>



#include <asm/is_compat.h>



#define COMPAT_USER_HZ		100

#ifdef __AARCH64EB__

#define COMPAT_UTS_MACHINE	"armv8b\0\0"
@@ -224,23 +226,6 @@ struct compat_shmid64_ds { 
	compat_ulong_t __unused5;

};



static inline int is_compat_task(void)

{

	return test_thread_flag(TIF_32BIT);

}



static inline int is_compat_thread(struct thread_info *thread)

{

	return test_ti_thread_flag(thread, TIF_32BIT);

}



#else /* !CONFIG_COMPAT */



static inline int is_compat_thread(struct thread_info *thread)

{

	return 0;

}



#endif /* CONFIG_COMPAT */

#endif /* __KERNEL__ */

#endif /* __ASM_COMPAT_H */

arch/arm64/include/asm/elf.h

+5 −5
Original line number Diff line number Diff line
@@ -16,6 +16,10 @@ 
#ifndef __ASM_ELF_H

#define __ASM_ELF_H



#ifndef __ASSEMBLY__

#include <linux/compat.h>

#endif



#include <asm/hwcap.h>



/*
@@ -169,13 +173,9 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm, 
				       int uses_interp);



/* 1GB of VA */

#ifdef CONFIG_COMPAT

#define STACK_RND_MASK			(test_thread_flag(TIF_32BIT) ? \

#define STACK_RND_MASK			(is_compat_task() ? \

						0x7ff >> (PAGE_SHIFT - 12) : \

						0x3ffff >> (PAGE_SHIFT - 12))

#else

#define STACK_RND_MASK			(0x3ffff >> (PAGE_SHIFT - 12))

#endif



#ifdef __AARCH64EB__

#define COMPAT_ELF_PLATFORM		("v8b")

arch/arm64/include/asm/ftrace.h

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ static inline unsigned long ftrace_call_adjust(unsigned long addr) 
#define ARCH_TRACE_IGNORE_COMPAT_SYSCALLS

static inline bool arch_trace_is_compat_syscall(struct pt_regs *regs)

{

	return is_compat_task();

	return is_a32_compat_task();

}



#define ARCH_HAS_SYSCALL_MATCH_SYM_NAME

arch/arm64/include/asm/is_compat.h

0 → 100644
+52 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0+ */



#ifndef __ASM_IS_COMPAT_H

#define __ASM_IS_COMPAT_H

#ifndef __ASSEMBLY__



#include <linux/thread_bits.h>



#ifdef CONFIG_AARCH32_EL0



static inline int is_a32_compat_task(void)

{

	return test_thread_flag(TIF_32BIT);

}



static inline int is_a32_compat_thread(struct thread_info *thread)

{

	return test_ti_thread_flag(thread, TIF_32BIT);

}



#else



static inline int is_a32_compat_task(void)



{

	return 0;

}



static inline int is_a32_compat_thread(struct thread_info *thread)

{

	return 0;

}



#endif /* CONFIG_AARCH32_EL0 */



#ifdef CONFIG_COMPAT



static inline int is_compat_task(void)

{

	return is_a32_compat_task();

}



#endif /* CONFIG_COMPAT */



static inline int is_compat_thread(struct thread_info *thread)

{

	return is_a32_compat_thread(thread);

}





#endif /* !__ASSEMBLY__ */

#endif /* __ASM_IS_COMPAT_H */

arch/arm64/include/asm/processor.h

+5 −4
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 


#include <asm/alternative.h>

#include <asm/cpufeature.h>

#include <asm/is_compat.h>

#include <asm/hw_breakpoint.h>

#include <asm/lse.h>

#include <asm/pgtable-hwdef.h>
@@ -62,9 +63,9 @@ 
#else

#define TASK_SIZE_32		(UL(0x100000000) - PAGE_SIZE)

#endif /* CONFIG_ARM64_64K_PAGES */

#define TASK_SIZE		(test_thread_flag(TIF_32BIT) ? \

#define TASK_SIZE		(is_compat_task() ?		\

				TASK_SIZE_32 : TASK_SIZE_64)

#define TASK_SIZE_OF(tsk)	(test_tsk_thread_flag(tsk, TIF_32BIT) ? \

#define TASK_SIZE_OF(tsk)	(is_compat_thread(tsk) ? \

				TASK_SIZE_32 : TASK_SIZE_64)

#else

#define TASK_SIZE		TASK_SIZE_64
@@ -75,7 +76,7 @@ 
#define STACK_TOP_MAX		TASK_SIZE_64

#ifdef CONFIG_COMPAT

#define AARCH32_VECTORS_BASE	0xffff0000

#define STACK_TOP		(test_thread_flag(TIF_32BIT) ? \

#define STACK_TOP		(is_compat_task() ? \

				AARCH32_VECTORS_BASE : STACK_TOP_MAX)

#else

#define STACK_TOP		STACK_TOP_MAX
@@ -153,7 +154,7 @@ static inline void arch_thread_struct_whitelist(unsigned long *offset, 
#define task_user_tls(t)						\

({									\

	unsigned long *__tls;						\

	if (is_compat_thread(task_thread_info(t)))			\

	if (is_a32_compat_thread(task_thread_info(t)))			\

		__tls = &(t)->thread.uw.tp2_value;			\

	else								\

		__tls = &(t)->thread.uw.tp_value;			\