Merge branch 'x86-entry-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (e0d60a1e) · Commits · e / devices / android_kernel_fairphone_FP5

arch/x86/entry/common.c

+7 −6

Original line number	Original line	Diff line number	Diff line
	@@ -285,15 +285,16 @@ __visible void do_syscall_64(unsigned long nr, struct pt_regs *regs)
	if (READ_ONCE(ti->flags) & _TIF_WORK_SYSCALL_ENTRY)		if (READ_ONCE(ti->flags) & _TIF_WORK_SYSCALL_ENTRY)
	nr = syscall_trace_enter(regs);		nr = syscall_trace_enter(regs);

	/*
	* NB: Native and x32 syscalls are dispatched from the same
	* table. The only functional difference is the x32 bit in
	* regs->orig_ax, which changes the behavior of some syscalls.
	*/
	nr &= __SYSCALL_MASK;
	if (likely(nr < NR_syscalls)) {		if (likely(nr < NR_syscalls)) {
	nr = array_index_nospec(nr, NR_syscalls);		nr = array_index_nospec(nr, NR_syscalls);
	regs->ax = sys_call_table[nr](regs);		regs->ax = sys_call_table[nr](regs);
			#ifdef CONFIG_X86_X32_ABI
			} else if (likely((nr & __X32_SYSCALL_BIT) &&
			(nr & ~__X32_SYSCALL_BIT) < X32_NR_syscalls)) {
			nr = array_index_nospec(nr & ~__X32_SYSCALL_BIT,
			X32_NR_syscalls);
			regs->ax = x32_sys_call_table[nr](regs);
			#endif
	}		}

	syscall_return_slowpath(regs);		syscall_return_slowpath(regs);

arch/x86/entry/syscall_64.c

+25 −0

Original line number	Original line	Diff line number	Diff line
	@@ -10,10 +10,13 @@
	/* this is a lie, but it does not hurt as sys_ni_syscall just returns -EINVAL */		/* this is a lie, but it does not hurt as sys_ni_syscall just returns -EINVAL */
	extern asmlinkage long sys_ni_syscall(const struct pt_regs *);		extern asmlinkage long sys_ni_syscall(const struct pt_regs *);
	#define __SYSCALL_64(nr, sym, qual) extern asmlinkage long sym(const struct pt_regs *);		#define __SYSCALL_64(nr, sym, qual) extern asmlinkage long sym(const struct pt_regs *);
			#define __SYSCALL_X32(nr, sym, qual) __SYSCALL_64(nr, sym, qual)
	#include <asm/syscalls_64.h>		#include <asm/syscalls_64.h>
	#undef __SYSCALL_64		#undef __SYSCALL_64
			#undef __SYSCALL_X32

	#define __SYSCALL_64(nr, sym, qual) [nr] = sym,		#define __SYSCALL_64(nr, sym, qual) [nr] = sym,
			#define __SYSCALL_X32(nr, sym, qual)

	asmlinkage const sys_call_ptr_t sys_call_table[__NR_syscall_max+1] = {		asmlinkage const sys_call_ptr_t sys_call_table[__NR_syscall_max+1] = {
	/*		/*
	@@ -23,3 +26,25 @@ asmlinkage const sys_call_ptr_t sys_call_table[__NR_syscall_max+1] = {
	[0 ... __NR_syscall_max] = &sys_ni_syscall,		[0 ... __NR_syscall_max] = &sys_ni_syscall,
	#include <asm/syscalls_64.h>		#include <asm/syscalls_64.h>
	};		};

			#undef __SYSCALL_64
			#undef __SYSCALL_X32

			#ifdef CONFIG_X86_X32_ABI

			#define __SYSCALL_64(nr, sym, qual)
			#define __SYSCALL_X32(nr, sym, qual) [nr] = sym,

			asmlinkage const sys_call_ptr_t x32_sys_call_table[__NR_syscall_x32_max+1] = {
			/*
			* Smells like a compiler bug -- it doesn't work
			* when the & below is removed.
			*/
			[0 ... __NR_syscall_x32_max] = &sys_ni_syscall,
			#include <asm/syscalls_64.h>
			};

			#undef __SYSCALL_64
			#undef __SYSCALL_X32

			#endif

arch/x86/entry/syscalls/syscall_32.tbl

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -186,11 +186,11 @@
	172 i386 prctl sys_prctl __ia32_sys_prctl		172 i386 prctl sys_prctl __ia32_sys_prctl
	173 i386 rt_sigreturn sys_rt_sigreturn sys32_rt_sigreturn		173 i386 rt_sigreturn sys_rt_sigreturn sys32_rt_sigreturn
	174 i386 rt_sigaction sys_rt_sigaction __ia32_compat_sys_rt_sigaction		174 i386 rt_sigaction sys_rt_sigaction __ia32_compat_sys_rt_sigaction
	175 i386 rt_sigprocmask sys_rt_sigprocmask __ia32_sys_rt_sigprocmask		175 i386 rt_sigprocmask sys_rt_sigprocmask __ia32_compat_sys_rt_sigprocmask
	176 i386 rt_sigpending sys_rt_sigpending __ia32_compat_sys_rt_sigpending		176 i386 rt_sigpending sys_rt_sigpending __ia32_compat_sys_rt_sigpending
	177 i386 rt_sigtimedwait sys_rt_sigtimedwait_time32 __ia32_compat_sys_rt_sigtimedwait_time32		177 i386 rt_sigtimedwait sys_rt_sigtimedwait_time32 __ia32_compat_sys_rt_sigtimedwait_time32
	178 i386 rt_sigqueueinfo sys_rt_sigqueueinfo __ia32_compat_sys_rt_sigqueueinfo		178 i386 rt_sigqueueinfo sys_rt_sigqueueinfo __ia32_compat_sys_rt_sigqueueinfo
	179 i386 rt_sigsuspend sys_rt_sigsuspend __ia32_sys_rt_sigsuspend		179 i386 rt_sigsuspend sys_rt_sigsuspend __ia32_compat_sys_rt_sigsuspend
	180 i386 pread64 sys_pread64 __ia32_compat_sys_x86_pread		180 i386 pread64 sys_pread64 __ia32_compat_sys_x86_pread
	181 i386 pwrite64 sys_pwrite64 __ia32_compat_sys_x86_pwrite		181 i386 pwrite64 sys_pwrite64 __ia32_compat_sys_x86_pwrite
	182 i386 chown sys_chown16 __ia32_sys_chown16		182 i386 chown sys_chown16 __ia32_sys_chown16

arch/x86/entry/syscalls/syscalltbl.sh

+19 −16

Original line number	Original line	Diff line number	Diff line
	#!/bin/sh		#!/bin/bash
	# SPDX-License-Identifier: GPL-2.0		# SPDX-License-Identifier: GPL-2.0

	in="$1"		in="$1"
	out="$2"		out="$2"

	syscall_macro() {		syscall_macro() {
	abi="$1"		local abi="$1"
	nr="$2"		local nr="$2"
	entry="$3"		local entry="$3"

	# Entry can be either just a function name or "function/qualifier"		# Entry can be either just a function name or "function/qualifier"
	real_entry="${entry%%/*}"		real_entry="${entry%%/*}"
	@@ -21,14 +21,14 @@ syscall_macro() {
	}		}

	emit() {		emit() {
	abi="$1"		local abi="$1"
	nr="$2"		local nr="$2"
	entry="$3"		local entry="$3"
	compat="$4"		local compat="$4"
	umlentry=""		local umlentry=""

	if [ "$abi" = "64" -a -n "$compat" ]; then		if [ "$abi" != "I386" -a -n "$compat" ]; then
	echo "a compat entry for a 64-bit syscall makes no sense" >&2		echo "a compat entry ($abi: $compat) for a 64-bit syscall makes no sense" >&2
	exit 1		exit 1
	fi		fi

	@@ -62,14 +62,17 @@ grep '^[0-9]' "$in" \| sort -n \| (
	while read nr abi name entry compat; do		while read nr abi name entry compat; do
	abi=`echo "$abi" \| tr '[a-z]' '[A-Z]'`		abi=`echo "$abi" \| tr '[a-z]' '[A-Z]'`
	if [ "$abi" = "COMMON" -o "$abi" = "64" ]; then		if [ "$abi" = "COMMON" -o "$abi" = "64" ]; then
	# COMMON is the same as 64, except that we don't expect X32
	# programs to use it. Our expectation has nothing to do with
	# any generated code, so treat them the same.
	emit 64 "$nr" "$entry" "$compat"		emit 64 "$nr" "$entry" "$compat"
			if [ "$abi" = "COMMON" ]; then
			# COMMON means that this syscall exists in the same form for
			# 64-bit and X32.
			echo "#ifdef CONFIG_X86_X32_ABI"
			emit X32 "$nr" "$entry" "$compat"
			echo "#endif"
			fi
	elif [ "$abi" = "X32" ]; then		elif [ "$abi" = "X32" ]; then
	# X32 is equivalent to 64 on an X32-compatible kernel.
	echo "#ifdef CONFIG_X86_X32_ABI"		echo "#ifdef CONFIG_X86_X32_ABI"
	emit 64 "$nr" "$entry" "$compat"		emit X32 "$nr" "$entry" "$compat"
	echo "#endif"		echo "#endif"
	elif [ "$abi" = "I386" ]; then		elif [ "$abi" = "I386" ]; then
	emit "$abi" "$nr" "$entry" "$compat"		emit "$abi" "$nr" "$entry" "$compat"

arch/x86/include/asm/syscall.h

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -36,6 +36,10 @@ extern const sys_call_ptr_t sys_call_table[];
	extern const sys_call_ptr_t ia32_sys_call_table[];		extern const sys_call_ptr_t ia32_sys_call_table[];
	#endif		#endif

			#ifdef CONFIG_X86_X32_ABI
			extern const sys_call_ptr_t x32_sys_call_table[];
			#endif

	/*		/*
	* Only the low 32 bits of orig_ax are meaningful, so we return int.		* Only the low 32 bits of orig_ax are meaningful, so we return int.
	* This importantly ignores the high bits on 64-bit, so comparisons		* This importantly ignores the high bits on 64-bit, so comparisons