Commit 6218d0f6 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Thomas Gleixner
Browse files

x86/syscalls: Switch to generic syscalltbl.sh 



Many architectures duplicate similar shell scripts.

Convert x86 and UML to use scripts/syscalltbl.sh. The generic script
generates seperate headers for x86/64 and x86/x32 syscalls, while the x86
specific script coalesced them into one. Adjust the code accordingly.

Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20210517073815.97426-3-masahiroy@kernel.org
parent 2e958a8a

arch/x86/entry/syscall_32.c

+9 −3
Original line number Diff line number Diff line
@@ -8,12 +8,18 @@ 
#include <asm/unistd.h>

#include <asm/syscall.h>



#define __SYSCALL_I386(nr, sym) extern long __ia32_##sym(const struct pt_regs *);

#ifdef CONFIG_IA32_EMULATION

#define __SYSCALL_WITH_COMPAT(nr, native, compat)	__SYSCALL(nr, compat)

#else

#define __SYSCALL_WITH_COMPAT(nr, native, compat)	__SYSCALL(nr, native)

#endif



#define __SYSCALL(nr, sym) extern long __ia32_##sym(const struct pt_regs *);



#include <asm/syscalls_32.h>

#undef __SYSCALL_I386

#undef __SYSCALL



#define __SYSCALL_I386(nr, sym) [nr] = __ia32_##sym,

#define __SYSCALL(nr, sym) [nr] = __ia32_##sym,



__visible const sys_call_ptr_t ia32_sys_call_table[__NR_ia32_syscall_max+1] = {

	/*

arch/x86/entry/syscall_64.c

+3 −6
Original line number Diff line number Diff line
@@ -8,14 +8,11 @@ 
#include <asm/unistd.h>

#include <asm/syscall.h>



#define __SYSCALL_X32(nr, sym)

#define __SYSCALL_COMMON(nr, sym) __SYSCALL_64(nr, sym)



#define __SYSCALL_64(nr, sym) extern long __x64_##sym(const struct pt_regs *);

#define __SYSCALL(nr, sym) extern long __x64_##sym(const struct pt_regs *);

#include <asm/syscalls_64.h>

#undef __SYSCALL_64

#undef __SYSCALL



#define __SYSCALL_64(nr, sym) [nr] = __x64_##sym,

#define __SYSCALL(nr, sym) [nr] = __x64_##sym,



asmlinkage const sys_call_ptr_t sys_call_table[__NR_syscall_max+1] = {

	/*

arch/x86/entry/syscall_x32.c

+5 −10
Original line number Diff line number Diff line
@@ -8,16 +8,11 @@ 
#include <asm/unistd.h>

#include <asm/syscall.h>



#define __SYSCALL_64(nr, sym)

#define __SYSCALL(nr, sym) extern long __x64_##sym(const struct pt_regs *);

#include <asm/syscalls_x32.h>

#undef __SYSCALL



#define __SYSCALL_X32(nr, sym) extern long __x64_##sym(const struct pt_regs *);

#define __SYSCALL_COMMON(nr, sym) extern long __x64_##sym(const struct pt_regs *);

#include <asm/syscalls_64.h>

#undef __SYSCALL_X32

#undef __SYSCALL_COMMON



#define __SYSCALL_X32(nr, sym) [nr] = __x64_##sym,

#define __SYSCALL_COMMON(nr, sym) [nr] = __x64_##sym,

#define __SYSCALL(nr, sym) [nr] = __x64_##sym,



asmlinkage const sys_call_ptr_t x32_sys_call_table[__NR_x32_syscall_max+1] = {

	/*
@@ -25,5 +20,5 @@ asmlinkage const sys_call_ptr_t x32_sys_call_table[__NR_x32_syscall_max+1] = { 
	 * when the & below is removed.

	 */

	[0 ... __NR_x32_syscall_max] = &__x64_sys_ni_syscall,

#include <asm/syscalls_64.h>

#include <asm/syscalls_x32.h>

};

arch/x86/entry/syscalls/Makefile

+8 −2
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ syscall32 := $(src)/syscall_32.tbl 
syscall64 := $(src)/syscall_64.tbl



syshdr := $(srctree)/$(src)/syscallhdr.sh

systbl := $(srctree)/$(src)/syscalltbl.sh

systbl := $(srctree)/scripts/syscalltbl.sh



quiet_cmd_syshdr = SYSHDR  $@

      cmd_syshdr = $(CONFIG_SHELL) '$(syshdr)' '$<' '$@' \
@@ -18,7 +18,7 @@ quiet_cmd_syshdr = SYSHDR $@ 
		   '$(syshdr_pfx_$(basetarget))' \

		   '$(syshdr_offset_$(basetarget))'

quiet_cmd_systbl = SYSTBL  $@

      cmd_systbl = $(CONFIG_SHELL) '$(systbl)' $< $@

      cmd_systbl = $(CONFIG_SHELL) $(systbl) --abis $(abis) $< $@



quiet_cmd_hypercalls = HYPERCALLS $@

      cmd_hypercalls = $(CONFIG_SHELL) '$<' $@ $(filter-out $<, $(real-prereqs))
@@ -46,10 +46,15 @@ syshdr_pfx_unistd_64_x32 := x32_ 
$(out)/unistd_64_x32.h: $(syscall64) $(syshdr) FORCE

	$(call if_changed,syshdr)



$(out)/syscalls_32.h: abis := i386

$(out)/syscalls_32.h: $(syscall32) $(systbl) FORCE

	$(call if_changed,systbl)

$(out)/syscalls_64.h: abis := common,64

$(out)/syscalls_64.h: $(syscall64) $(systbl) FORCE

	$(call if_changed,systbl)

$(out)/syscalls_x32.h: abis := common,x32

$(out)/syscalls_x32.h: $(syscall64) $(systbl) FORCE

	$(call if_changed,systbl)



$(out)/xen-hypercalls.h: $(srctree)/scripts/xen-hypercalls.sh FORCE

	$(call if_changed,hypercalls)
@@ -60,6 +65,7 @@ uapisyshdr-y += unistd_32.h unistd_64.h unistd_x32.h 
syshdr-y			+= syscalls_32.h

syshdr-$(CONFIG_X86_64)		+= unistd_32_ia32.h unistd_64_x32.h

syshdr-$(CONFIG_X86_64)		+= syscalls_64.h

syshdr-$(CONFIG_X86_X32)	+= syscalls_x32.h

syshdr-$(CONFIG_XEN)		+= xen-hypercalls.h



uapisyshdr-y	:= $(addprefix $(uapi)/, $(uapisyshdr-y))

arch/x86/entry/syscalls/syscalltbl.sh

deleted100644 → 0
+0 −46
Original line number Diff line number Diff line 
#!/bin/bash

# SPDX-License-Identifier: GPL-2.0



in="$1"

out="$2"



syscall_macro() {

    local abi="$1"

    local nr="$2"

    local entry="$3"



    echo "__SYSCALL_${abi}($nr, $entry)"

}



emit() {

    local abi="$1"

    local nr="$2"

    local entry="$3"

    local compat="$4"



    if [ "$abi" != "I386" -a -n "$compat" ]; then

	echo "a compat entry ($abi: $compat) for a 64-bit syscall makes no sense" >&2

	exit 1

    fi



    if [ -z "$compat" ]; then

	if [ -n "$entry" ]; then

	    syscall_macro "$abi" "$nr" "$entry"

	fi

    else

	echo "#ifdef CONFIG_X86_32"

	if [ -n "$entry" ]; then

	    syscall_macro "$abi" "$nr" "$entry"

	fi

	echo "#else"

	syscall_macro "$abi" "$nr" "$compat"

	echo "#endif"

    fi

}



grep '^[0-9]' "$in" | sort -n | (

    while read nr abi name entry compat; do

	abi=`echo "$abi" | tr '[a-z]' '[A-Z]'`

	emit "$abi" "$nr" "$entry" "$compat"

    done

) > "$out"