Commit 2b588243 authored Jul 06, 2018 by Kim Phillips Committed by Arnaldo Carvalho de Melo Jul 24, 2018

perf arm64: Generate system call table from asm/unistd.h



This should speed up accessing new system calls introduced with the
kernel rather than waiting for libaudit updates to include them.

Using the existing other arch scripts resulted in this error:

  tools/perf/arch/arm64/entry/syscalls//mksyscalltbl: 25: printf: __NR3264_ftruncate: expected numeric value

because, unlike other arches, asm-generic's unistd.h does things like:

  #define __NR_ftruncate __NR3264_ftruncate

Turning the scripts printf's %d into a %s resulted in this in the
generated syscalls.c file:

    static const char *syscalltbl_arm64[] = {
            [__NR3264_ftruncate] = "ftruncate",

So we use the host C compiler to fold the macros, and print them out
from within a temporary C program, in order to get the correct output:

    static const char *syscalltbl_arm64[] = {
            [46] = "ftruncate",

Committer notes:

Testing this with a container with an old toolchain breaks because it
ends up using the system's /usr/include/asm-generic/unistd.h, included
from tools/arch/arm64/include/uapi/asm/unistd.h when what is desired is
for it to include tools/include/uapi/asm-generic/unistd.h.

Since all that tools/arch/arm64/include/uapi/asm/unistd.h is to set a
define and then include asm-generic/unistd.h, do that directly and use
tools/include/uapi/asm-generic/unistd.h as the file to get the syscall
definitions to expand.

Testing it:

   tools/perf/arch/arm64/entry/syscalls/mksyscalltbl /gcc-linaro-5.4.1-2017.05-x86_64_aarch64-linux-gnu/bin/aarch64-linux-gnu-gcc gcc tools/include/uapi/asm-generic/unistd.h

Now works and generates in the syscall string table.

Before it ended up as:

  $ tools/perf/arch/arm64/entry/syscalls/mksyscalltbl /gcc-linaro-5.4.1-2017.05-x86_64_aarch64-linux-gnu/bin/aarch64-linux-gnu-gcc gcc tools/arch/arm64/include/uapi/asm/unistd.h
  static const char *syscalltbl_arm64[] = {
  <stdin>: In function 'main':
  <stdin>:257:38: error: '__NR_getrandom' undeclared (first use in this function)
  <stdin>:257:38: note: each undeclared identifier is reported only once for each function it appears in
  <stdin>:258:41: error: '__NR_memfd_create' undeclared (first use in this function)
  <stdin>:259:32: error: '__NR_bpf' undeclared (first use in this function)
  <stdin>:260:37: error: '__NR_execveat' undeclared (first use in this function)
  tools/perf/arch/arm64/entry/syscalls/mksyscalltbl: 47: tools/perf/arch/arm64/entry/syscalls/mksyscalltbl: /tmp/create-table-60liya: Permission denied
  };
  $

Signed-off-by: Kim Phillips <kim.phillips@arm.com>
Reviewed-by: Hendrik Brueckner <brueckner@linux.ibm.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ravi Bangoria <ravi.bangoria@linux.vnet.ibm.com>
Cc: Thomas Richter <tmricht@linux.vnet.ibm.com>
Link: http://lkml.kernel.org/r/20180706163443.22626f5e9e10e5bab5e5c662@arm.com


Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent 34b009cf

tools/perf/arch/arm64/Makefile

+21 −0

Original line number	Original line	Diff line number	Diff line
	@@ -4,3 +4,24 @@ PERF_HAVE_DWARF_REGS := 1
	endif		endif
	PERF_HAVE_JITDUMP := 1		PERF_HAVE_JITDUMP := 1
	PERF_HAVE_ARCH_REGS_QUERY_REGISTER_OFFSET := 1		PERF_HAVE_ARCH_REGS_QUERY_REGISTER_OFFSET := 1

			#
			# Syscall table generation for perf
			#

			out := $(OUTPUT)arch/arm64/include/generated/asm
			header := $(out)/syscalls.c
			sysdef := $(srctree)/tools/include/uapi/asm-generic/unistd.h
			sysprf := $(srctree)/tools/perf/arch/arm64/entry/syscalls/
			systbl := $(sysprf)/mksyscalltbl

			# Create output directory if not already present
			_dummy := $(shell [ -d '$(out)' ] \|\| mkdir -p '$(out)')

			$(header): $(sysdef) $(systbl)
			$(Q)$(SHELL) '$(systbl)' '$(CC)' '$(HOSTCC)' $(sysdef) > $@

			clean::
			$(call QUIET_CLEAN, arm64) $(RM) $(header)

			archheaders: $(header)

tools/perf/arch/arm64/entry/syscalls/mksyscalltbl

0 → 100755

+62 −0

Original line number	Original line	Diff line number	Diff line
			#!/bin/sh
			# SPDX-License-Identifier: GPL-2.0
			#
			# Generate system call table for perf. Derived from
			# powerpc script.
			#
			# Copyright IBM Corp. 2017
			# Author(s): Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
			# Changed by: Ravi Bangoria <ravi.bangoria@linux.vnet.ibm.com>
			# Changed by: Kim Phillips <kim.phillips@arm.com>

			gcc=$1
			hostcc=$2
			input=$3

			if ! test -r $input; then
			echo "Could not read input file" >&2
			exit 1
			fi

			create_table_from_c()
			{
			local sc nr last_sc

			create_table_exe=`mktemp /tmp/create-table-XXXXXX`

			{

			cat <<-_EoHEADER
			#include <stdio.h>
			#define __ARCH_WANT_RENAMEAT
			#include "$input"
			int main(int argc, char *argv[])
			{
			_EoHEADER

			while read sc nr; do
			printf "%s\n" " printf(\"\\t[%d] = \\\"$sc\\\",\\n\", __NR_$sc);"
			last_sc=$sc
			done

			printf "%s\n" " printf(\"#define SYSCALLTBL_ARM64_MAX_ID %d\\n\", __NR_$last_sc);"
			printf "}\n"

			} \| $hostcc -o $create_table_exe -x c -

			$create_table_exe

			rm -f $create_table_exe
			}

			create_table()
			{
			echo "static const char *syscalltbl_arm64[] = {"
			create_table_from_c
			echo "};"
			}

			$gcc -E -dM -x c $input \
			\|sed -ne 's/^#define __NR_//p' \
			\|sort -t' ' -k2 -nu \
			\|create_table