mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-09-04 20:19:47 +08:00
This rename allows us to have a coherent syscall stub naming convention on
64-bit x86 (0xffffffff prefix removed):
810f0af0 t kernel_waitid # common (32/64) kernel helper
<inline> __do_sys_waitid # inlined helper doing actual work
810f0be0 t __se_sys_waitid # C func calling inlined helper
<inline> __do_compat_sys_waitid # inlined helper doing actual work
810f0d80 t __se_compat_sys_waitid # compat C func calling inlined helper
810f2080 T __x64_sys_waitid # x64 64-bit-ptregs -> C stub
810f20b0 T __ia32_sys_waitid # ia32 32-bit-ptregs -> C stub[*]
810f2470 T __ia32_compat_sys_waitid # ia32 32-bit-ptregs -> compat C stub
810f2490 T __x32_compat_sys_waitid # x32 64-bit-ptregs -> compat C stub
[*] This stub is unused, as the syscall table links
__ia32_compat_sys_waitid instead of __ia32_sys_waitid as we need
a compat variant here.
Suggested-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20180409105145.5364-4-linux@dominikbrodowski.net
Signed-off-by: Ingo Molnar <mingo@kernel.org>
82 lines
2.0 KiB
Bash
82 lines
2.0 KiB
Bash
#!/bin/sh
|
|
# SPDX-License-Identifier: GPL-2.0
|
|
|
|
in="$1"
|
|
out="$2"
|
|
|
|
syscall_macro() {
|
|
abi="$1"
|
|
nr="$2"
|
|
entry="$3"
|
|
|
|
# Entry can be either just a function name or "function/qualifier"
|
|
real_entry="${entry%%/*}"
|
|
if [ "$entry" = "$real_entry" ]; then
|
|
qualifier=
|
|
else
|
|
qualifier=${entry#*/}
|
|
fi
|
|
|
|
echo "__SYSCALL_${abi}($nr, $real_entry, $qualifier)"
|
|
}
|
|
|
|
emit() {
|
|
abi="$1"
|
|
nr="$2"
|
|
entry="$3"
|
|
compat="$4"
|
|
umlentry=""
|
|
|
|
if [ "$abi" = "64" -a -n "$compat" ]; then
|
|
echo "a compat entry for a 64-bit syscall makes no sense" >&2
|
|
exit 1
|
|
fi
|
|
|
|
# For CONFIG_UML, we need to strip the __x64_sys prefix
|
|
if [ "$abi" = "64" -a "${entry}" != "${entry#__x64_sys}" ]; then
|
|
umlentry="sys${entry#__x64_sys}"
|
|
fi
|
|
|
|
if [ -z "$compat" ]; then
|
|
if [ -n "$entry" -a -z "$umlentry" ]; then
|
|
syscall_macro "$abi" "$nr" "$entry"
|
|
elif [ -n "$umlentry" ]; then # implies -n "$entry"
|
|
echo "#ifdef CONFIG_X86"
|
|
syscall_macro "$abi" "$nr" "$entry"
|
|
echo "#else /* CONFIG_UML */"
|
|
syscall_macro "$abi" "$nr" "$umlentry"
|
|
echo "#endif"
|
|
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]'`
|
|
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"
|
|
elif [ "$abi" = "X32" ]; then
|
|
# X32 is equivalent to 64 on an X32-compatible kernel.
|
|
echo "#ifdef CONFIG_X86_X32_ABI"
|
|
emit 64 "$nr" "$entry" "$compat"
|
|
echo "#endif"
|
|
elif [ "$abi" = "I386" ]; then
|
|
emit "$abi" "$nr" "$entry" "$compat"
|
|
else
|
|
echo "Unknown abi $abi" >&2
|
|
exit 1
|
|
fi
|
|
done
|
|
) > "$out"
|