Commit a874d1f6 authored by Charlie Jenkins's avatar Charlie Jenkins Committed by Arnaldo Carvalho de Melo
Browse files

perf tools x86: Use generic syscall scripts 



Use the generic scripts to generate headers from the syscall table for
both 32- and 64-bit x86.

Signed-off-by: default avatarCharlie Jenkins <charlie@rivosinc.com>
Tested-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Christian Brauner <brauner@kernel.org>
Cc: Guo Ren <guoren@kernel.org>
Cc: Günther Noack <gnoack@google.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@linaro.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: John Garry <john.g.garry@oracle.com>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Leo Yan <leo.yan@linux.dev>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Mickaël Salaün <mic@digikod.net>
Cc: Mike Leach <mike.leach@linaro.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Paul Walmsley <paul.walmsley@sifive.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Will Deacon <will@kernel.org>
Link: https://lore.kernel.org/r/20250108-perf_syscalltbl-v6-8-7543b5293098@rivosinc.com


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

tools/perf/Makefile.config

+1 −2
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ $(call detected_var,SRCARCH) 
ifneq ($(NO_SYSCALL_TABLE),1)

  NO_SYSCALL_TABLE := 1



  ifeq ($(SRCARCH),$(filter $(SRCARCH),x86 powerpc arm64 s390 mips loongarch riscv))

  ifeq ($(SRCARCH),$(filter $(SRCARCH),powerpc arm64 s390 mips loongarch))

    NO_SYSCALL_TABLE := 0

  endif
@@ -58,7 +58,6 @@ endif 
# Additional ARCH settings for x86

ifeq ($(SRCARCH),x86)

  $(call detected,CONFIG_X86)

  CFLAGS += -I$(OUTPUT)arch/x86/include/generated

  ifeq (${IS_64_BIT}, 1)

    CFLAGS += -DHAVE_ARCH_X86_64_SUPPORT

    ARCH_INCLUDE = ../../arch/x86/lib/memcpy_64.S ../../arch/x86/lib/memset_64.S

tools/perf/Makefile.perf

+1 −1
Original line number Diff line number Diff line
@@ -311,7 +311,7 @@ FEATURE_TESTS := all 
endif

endif

# architectures that use the generic syscall table

generic_syscall_table_archs := riscv arc csky arm sh sparc xtensa

generic_syscall_table_archs := riscv arc csky arm sh sparc xtensa x86

ifneq ($(filter $(SRCARCH), $(generic_syscall_table_archs)),)

include $(srctree)/tools/perf/scripts/Makefile.syscalls

endif

tools/perf/arch/x86/Build

+0 −1
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ perf-util-y += util/ 
perf-test-y += tests/



ifdef SHELLCHECK

  SHELL_TESTS := entry/syscalls/syscalltbl.sh

  TEST_LOGS := $(SHELL_TESTS:%=%.shellcheck_log)

else

  SHELL_TESTS :=

tools/perf/arch/x86/Makefile

+0 −25
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

HAVE_KVM_STAT_SUPPORT := 1

PERF_HAVE_JITDUMP := 1
 


###

# Syscall table generation

#



generated := $(OUTPUT)arch/x86/include/generated

out       := $(generated)/asm

header    := $(out)/syscalls_64.c

header_32 := $(out)/syscalls_32.c

sys       := $(srctree)/tools/perf/arch/x86/entry/syscalls

systbl    := $(sys)/syscalltbl.sh



# Create output directory if not already present

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



$(header): $(sys)/syscall_64.tbl $(systbl)

	$(Q)$(SHELL) '$(systbl)' $(sys)/syscall_64.tbl 'x86_64' > $@



$(header_32): $(sys)/syscall_32.tbl $(systbl)

	$(Q)$(SHELL) '$(systbl)' $(sys)/syscall_32.tbl 'x86' > $@



clean::

	$(call QUIET_CLEAN, x86) $(RM) -r $(header) $(generated)



archheaders: $(header) $(header_32)

tools/perf/arch/x86/entry/syscalls/Kbuild

0 → 100644
+3 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

syscall-y += syscalls_32.h

syscall-y += syscalls_64.h