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

Commit 690d22d9 authored by Hendrik Brueckner's avatar Hendrik Brueckner Committed by Arnaldo Carvalho de Melo
Browse files

perf s390: Rework system call table creation by using syscall.tbl 



Recently, s390 uses a syscall.tbl input file to generate its system call
table and unistd uapi header files.  Hence, update mksyscalltbl to use
it as input to create the system table for perf.

Signed-off-by: default avatarHendrik Brueckner <brueckner@linux.vnet.ibm.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Thomas Richter <tmricht@linux.vnet.ibm.com>
Cc: linux-s390@vger.kernel.org
LPU-Reference: 1518090470-2899-4-git-send-email-brueckner@linux.vnet.ibm.com
Link: https://lkml.kernel.org/n/tip-bdyhllhsq1zgxv2qx4m377y6@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent baa67610

tools/perf/arch/s390/Makefile

+7 −3
Original line number Diff line number Diff line
@@ -10,15 +10,19 @@ PERF_HAVE_ARCH_REGS_QUERY_REGISTER_OFFSET := 1 


out    := $(OUTPUT)arch/s390/include/generated/asm

header := $(out)/syscalls_64.c

sysdef := $(srctree)/tools/arch/s390/include/uapi/asm/unistd.h

sysprf := $(srctree)/tools/perf/arch/s390/entry/syscalls/

syskrn := $(srctree)/arch/s390/kernel/syscalls/syscall.tbl

sysprf := $(srctree)/tools/perf/arch/s390/entry/syscalls

sysdef := $(sysprf)/syscall.tbl

systbl := $(sysprf)/mksyscalltbl



# Create output directory if not already present

_dummy := $(shell [ -d '$(out)' ] || mkdir -p '$(out)')



$(header): $(sysdef) $(systbl)

	$(Q)$(SHELL) '$(systbl)' '$(CC)' $(sysdef) > $@

	@(test -d ../../kernel -a -d ../../tools -a -d ../perf && ( \

        (diff -B $(sysdef) $(syskrn) >/dev/null) \

        || echo "Warning: Kernel ABI header at '$(sysdef)' differs from latest version at '$(syskrn)'" >&2 )) || true

	$(Q)$(SHELL) '$(systbl)' $(sysdef) > $@



clean::

	$(call QUIET_CLEAN, s390) $(RM) $(header)

tools/perf/arch/s390/entry/syscalls/mksyscalltbl

+7 −11
Original line number Diff line number Diff line
@@ -3,25 +3,23 @@ 
#

# Generate system call table for perf

#

#

# Copyright IBM Corp. 2017

# Copyright IBM Corp. 2017, 2018

# Author(s):  Hendrik Brueckner <brueckner@linux.vnet.ibm.com>

#



gcc=$1

input=$2

SYSCALL_TBL=$1



if ! test -r $input; then

if ! test -r $SYSCALL_TBL; then

	echo "Could not read input file" >&2

	exit 1

fi



create_table()

{

	local max_nr

	local max_nr nr abi sc discard



	echo 'static const char *syscalltbl_s390_64[] = {'

	while read sc nr; do

	while read nr abi sc discard; do

		printf '\t[%d] = "%s",\n' $nr $sc

		max_nr=$nr

	done
@@ -29,8 +27,6 @@ create_table() 
	echo "#define SYSCALLTBL_S390_64_MAX_ID $max_nr"

}





$gcc -m64 -E -dM -x c  $input	       \

	|sed -ne 's/^#define __NR_//p' \

	|sort -t' ' -k2 -nu	       \

grep -E "^[[:digit:]]+[[:space:]]+(common|64)" $SYSCALL_TBL	\

	|sort -k1 -n					\

	|create_table