Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cfcbadb4 authored by Andy Lutomirski's avatar Andy Lutomirski Committed by Ingo Molnar
Browse files

x86/syscalls: Add syscall entry qualifiers 



This will let us specify something like 'sys_xyz/foo' instead of
'sys_xyz' in the syscall table, where the 'foo' qualifier conveys
some extra information to the C code.

The intent is to allow things like sys_execve/ptregs to indicate
that sys_execve() touches pt_regs.

Signed-off-by: default avatarAndy Lutomirski <luto@kernel.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: H. Peter Anvin <hpa@zytor.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/2de06e33dce62556b3ec662006fcb295504e296e.1454022279.git.luto@kernel.org


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 3e65654e

arch/x86/entry/syscall_32.c

+2 −2
Original line number Diff line number Diff line
@@ -6,11 +6,11 @@ 
#include <asm/asm-offsets.h>

#include <asm/syscall.h>



#define __SYSCALL_I386(nr, sym) extern asmlinkage long sym(unsigned long, unsigned long, unsigned long, unsigned long, unsigned long, unsigned long) ;

#define __SYSCALL_I386(nr, sym, qual) extern asmlinkage long sym(unsigned long, unsigned long, unsigned long, unsigned long, unsigned long, unsigned long) ;

#include <asm/syscalls_32.h>

#undef __SYSCALL_I386



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

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



extern asmlinkage long sys_ni_syscall(unsigned long, unsigned long, unsigned long, unsigned long, unsigned long, unsigned long);

arch/x86/entry/syscall_64.c

+2 −2
Original line number Diff line number Diff line
@@ -6,11 +6,11 @@ 
#include <asm/asm-offsets.h>

#include <asm/syscall.h>



#define __SYSCALL_64(nr, sym) extern asmlinkage long sym(unsigned long, unsigned long, unsigned long, unsigned long, unsigned long, unsigned long) ;

#define __SYSCALL_64(nr, sym, qual) extern asmlinkage long sym(unsigned long, unsigned long, unsigned long, unsigned long, unsigned long, unsigned long) ;

#include <asm/syscalls_64.h>

#undef __SYSCALL_64



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

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



extern long sys_ni_syscall(unsigned long, unsigned long, unsigned long, unsigned long, unsigned long, unsigned long);

arch/x86/entry/syscalls/syscalltbl.sh

+16 −3
Original line number Diff line number Diff line
@@ -3,6 +3,19 @@ 
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%%/*}"

    qualifier="${entry:${#real_entry}}"		# Strip the function name

    qualifier="${qualifier:1}"			# Strip the slash, if any



    echo "__SYSCALL_${abi}($nr, $real_entry, $qualifier)"

}



emit() {

    abi="$1"

    nr="$2"
@@ -16,15 +29,15 @@ emit() { 


    if [ -z "$compat" ]; then

	if [ -n "$entry" ]; then

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

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

	fi

    else

	echo "#ifdef CONFIG_X86_32"

	if [ -n "$entry" ]; then

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

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

	fi

	echo "#else"

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

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

	echo "#endif"

    fi

}

arch/x86/kernel/asm-offsets_32.c

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
#include <linux/lguest.h>

#include "../../../drivers/lguest/lg.h"



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

#define __SYSCALL_I386(nr, sym, qual) [nr] = 1,

static char syscalls[] = {

#include <asm/syscalls_32.h>

};

arch/x86/kernel/asm-offsets_64.c

+2 −2
Original line number Diff line number Diff line
@@ -4,11 +4,11 @@ 


#include <asm/ia32.h>



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

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

static char syscalls_64[] = {

#include <asm/syscalls_64.h>

};

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

#define __SYSCALL_I386(nr, sym, qual) [nr] = 1,

static char syscalls_ia32[] = {

#include <asm/syscalls_32.h>

};