From patchwork Mon Nov 4 21:06:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charlie Jenkins X-Patchwork-Id: 13862036 Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E940A1FBC9E for ; Mon, 4 Nov 2024 21:07:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730754426; cv=none; b=D/30tqos99eQYUpvrLG3jLTfkZQBSWkze3ZjHaCq9hSEaEM99dwoRHzmuEMTEDDVlaOeGbOZfWMTVveDqHCnSK1qNlwlmcw2+nQP9KLnk0K4fkUevac68f1k0QZrCLe3sLUu16Q5m1o9RuwpJIrrtnohelnoW6ruxyA0l1d5eKM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730754426; c=relaxed/simple; bh=GA79hn+wTOFDTjuZiC+96ICiiUr9UEaTALn1R1sk3AU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=K78erM/JDvZJlwQHCq8KA2+VPs1kITzP9pwWTMF4/dzEX3NooHhJpPgJkSBtt8eK282U/6F8aZRi1ROJdru+7QdGn4ij5FpK+o+o9LksNGxtwICggyrffta+yu3oSFg8wZF4og0bQFgw2igRencNmX/I3HFHocCBY6eI42uXAYM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com; spf=pass smtp.mailfrom=rivosinc.com; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b=rERQldnu; arc=none smtp.client-ip=209.85.214.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b="rERQldnu" Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-210e5369b7dso46881215ad.3 for ; Mon, 04 Nov 2024 13:07:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1730754423; x=1731359223; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=stFVcuJt/ZkcL8Otl0cpPXXQXnLpJMcTCPAQMUv2B68=; b=rERQldnuwSwhoSeW30FIHnUcZ3yX3BlcVKRREhlj4iKKcs7WquBar8wmN67VjvmE3u UfAlINXeOw/cJVMjwpkF+us0mvBtVnfZHT/wFnj0ti52DPkpWP+/VAUz3CuUdbRjocSx A92+VmOCdeWzC2CJ0rps7TGY8yya4g2Va3Caf6AnZ0iBsNTlFoVvNpMCohWNGPRQf0ro bS/ra8AN3FgEOMnRnb0IFk7kghTaVr9qFBv2Pyd+0xrQFg3OMVZgLrJmcd5N3A1Zag+Z uyQdK8oQNEjO6/NH2dZ0gTjPFnXCALxuN5Xp2rHe0dY9AVqov9BpU/E/2gF8Po+QNVtl 5xew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730754423; x=1731359223; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=stFVcuJt/ZkcL8Otl0cpPXXQXnLpJMcTCPAQMUv2B68=; b=SWZ/cgUKDGd39eukMDoq/NdTNh5w3kXjVMgM0cnVNy4o+Sl2lN4hxPfrnWQqJKK4XL to2fa4KijVDRHduLxU+AHMQg73ySGjK76yLVFcUHpMhb44qMN6SXQ8Kw6Y3kLTJ4V5if mby5cHkn/4SJH09jePQNT/fwyNpZSQ6fI/9XYQHoXT7H1kpomhevxEFxEZrM8Y13D6nf MeBozOqgYV14L11UUIbSXsDub6hzV7vUVJAfJ5zVUbaFRR3PxlITcA710npuc+b5hrAN OZin1CtXRyYOHngYAzf9ZiohR2jny4VSGAXIreJ/be68cPp0BpBaesNdnpSZrZV2Sf0p 1TIg== X-Forwarded-Encrypted: i=1; AJvYcCUN7SWIaVGjFL0IA3aBBEW2AmSiuuTHGPtydOIPAN/UJXRPGnUOwDZY2zTQZI0okV3MKiixcJ2H60AVo55e7XYFwXbuomw=@vger.kernel.org X-Gm-Message-State: AOJu0YxmTPNZ/MXX0eJkWbOLRG9UkVStsuFuvINO+206cepQ4U9u3ZKm a/jYQuXMRn/jk8kI6q89+GV0j6P8VcTZPdgP87tzJtiWahh/Z4WXUEFC2SrMT3k= X-Google-Smtp-Source: AGHT+IGYwE7Qcp6ard+AxW0xwH8oO4C2P/tenFCGbLvj4DGZFAfX8qIf04CvIEIEIeAi2ohX3NApMw== X-Received: by 2002:a17:902:f541:b0:20c:ab33:f8b8 with SMTP id d9443c01a7336-2111af2f399mr182958135ad.15.1730754423084; Mon, 04 Nov 2024 13:07:03 -0800 (PST) Received: from charlie.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-7ee490e08f4sm7248293a12.40.2024.11.04.13.07.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Nov 2024 13:07:02 -0800 (PST) From: Charlie Jenkins Date: Mon, 04 Nov 2024 13:06:10 -0800 Subject: [PATCH RFT 08/16] perf tools: x86: Use generic syscall scripts Precedence: bulk X-Mailing-List: linux-security-module@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241104-perf_syscalltbl-v1-8-9adae5c761ef@rivosinc.com> References: <20241104-perf_syscalltbl-v1-0-9adae5c761ef@rivosinc.com> In-Reply-To: <20241104-perf_syscalltbl-v1-0-9adae5c761ef@rivosinc.com> To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Paul Walmsley , Palmer Dabbelt , Albert Ou , =?utf-8?q?Micka=C3=ABl_Sala=C3=BCn?= , =?utf-8?q?G=C3=BCnt?= =?utf-8?q?her_Noack?= , Christian Brauner , Guo Ren , John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Jonathan Corbet , Arnd Bergmann Cc: linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-riscv@lists.infradead.org, linux-security-module@vger.kernel.org, bpf@vger.kernel.org, linux-csky@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org, Charlie Jenkins X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=6740; i=charlie@rivosinc.com; h=from:subject:message-id; bh=GA79hn+wTOFDTjuZiC+96ICiiUr9UEaTALn1R1sk3AU=; b=owGbwMvMwCHWx5hUnlvL8Y3xtFoSQ7qmecyeoOvK79/XrmnP/COXtGrhqSVfVTk0vB0v9E/f6 ng/+kxjRykLgxgHg6yYIgvPtQbm1jv6ZUdFyybAzGFlAhnCwMUpABN5Icvwm2VJwgbj9fcYHGew fnt81/39xhYlLY58n7I9Pxt7LVZyyTH8r97+1zbvZZTRMRmdXRzs8d8OX9o0U5WpSf/eafHOwKI IfgA= X-Developer-Key: i=charlie@rivosinc.com; a=openpgp; fpr=7D834FF11B1D8387E61C776FFB10D1F27D6B1354 Use the generic scripts to generate headers from the syscall table for both 32- and 64-bit x86. Signed-off-by: Charlie Jenkins --- tools/perf/Makefile.config | 4 +-- tools/perf/Makefile.perf | 2 +- tools/perf/arch/x86/Build | 1 - tools/perf/arch/x86/Makefile | 25 ------------- tools/perf/arch/x86/entry/syscalls/Kbuild | 3 ++ .../perf/arch/x86/entry/syscalls/Makefile.syscalls | 6 ++++ tools/perf/arch/x86/entry/syscalls/syscalltbl.sh | 42 ---------------------- tools/perf/arch/x86/include/syscall_table.h | 8 +++++ tools/perf/util/syscalltbl.c | 10 +----- 9 files changed, 21 insertions(+), 80 deletions(-) diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config index 1894db7845d4..682354d2d4ec 100644 --- a/tools/perf/Makefile.config +++ b/tools/perf/Makefile.config @@ -31,12 +31,12 @@ $(call detected_var,SRCARCH) ifneq ($(NO_SYSCALL_TABLE),1) NO_SYSCALL_TABLE := 1 - ifeq ($(SRCARCH),$(filter $(SRCARCH),x86 powerpc arm64 s390 mips loongarch)) + ifeq ($(SRCARCH),$(filter $(SRCARCH),powerpc arm64 s390 mips loongarch)) NO_SYSCALL_TABLE := 0 endif # architectures that use the generic syscall table scripts - ifeq ($(SRCARCH),$(filter $(SRCARCH),riscv arc csky arm sh sparc xtensa)) + ifeq ($(SRCARCH),$(filter $(SRCARCH),riscv arc csky arm sh sparc xtensa x86)) NO_SYSCALL_TABLE := 0 CFLAGS += -DGENERIC_SYSCALL_TABLE CFLAGS += -I$(OUTPUT)arch/$(SRCARCH)/include/generated diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index bcbb83e0f9fd..b45e3ec8947b 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -311,7 +311,7 @@ FEATURE_TESTS := all endif endif # architectures that use the generic syscall table -ifeq ($(SRCARCH),$(filter $(SRCARCH),riscv arc csky arm sh sparc xtensa)) +ifeq ($(SRCARCH),$(filter $(SRCARCH),riscv arc csky arm sh sparc xtensa x86)) include $(srctree)/tools/perf/scripts/Makefile.syscalls endif include Makefile.config diff --git a/tools/perf/arch/x86/Build b/tools/perf/arch/x86/Build index 87d057491343..02a1ca780a20 100644 --- a/tools/perf/arch/x86/Build +++ b/tools/perf/arch/x86/Build @@ -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 := diff --git a/tools/perf/arch/x86/Makefile b/tools/perf/arch/x86/Makefile index 67b4969a6738..5277d5aeb079 100644 --- a/tools/perf/arch/x86/Makefile +++ b/tools/perf/arch/x86/Makefile @@ -5,28 +5,3 @@ endif HAVE_KVM_STAT_SUPPORT := 1 PERF_HAVE_ARCH_REGS_QUERY_REGISTER_OFFSET := 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) diff --git a/tools/perf/arch/x86/entry/syscalls/Kbuild b/tools/perf/arch/x86/entry/syscalls/Kbuild new file mode 100644 index 000000000000..84c6599b4ea6 --- /dev/null +++ b/tools/perf/arch/x86/entry/syscalls/Kbuild @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0 +syscall-y += syscalls_32.h +syscall-y += syscalls_64.h diff --git a/tools/perf/arch/x86/entry/syscalls/Makefile.syscalls b/tools/perf/arch/x86/entry/syscalls/Makefile.syscalls new file mode 100644 index 000000000000..db3d5d6d4e56 --- /dev/null +++ b/tools/perf/arch/x86/entry/syscalls/Makefile.syscalls @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0 + +syscall_abis_32 += i386 +syscall_abis_64 += + +syscalltbl = $(srctree)/tools/perf/arch/x86/entry/syscalls/syscall_%.tbl diff --git a/tools/perf/arch/x86/entry/syscalls/syscalltbl.sh b/tools/perf/arch/x86/entry/syscalls/syscalltbl.sh deleted file mode 100755 index 2b71f99933a5..000000000000 --- a/tools/perf/arch/x86/entry/syscalls/syscalltbl.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh -# SPDX-License-Identifier: GPL-2.0 - -in="$1" -arch="$2" - -syscall_macro() { - nr="$1" - name="$2" - - echo " [$nr] = \"$name\"," -} - -emit() { - nr="$1" - entry="$2" - - syscall_macro "$nr" "$entry" -} - -echo "static const char *const syscalltbl_${arch}[] = {" - -sorted_table=$(mktemp /tmp/syscalltbl.XXXXXX) -grep '^[0-9]' "$in" | sort -n > $sorted_table - -max_nr=0 -# the params are: nr abi name entry compat -# use _ for intentionally unused variables according to SC2034 -while read nr _ name _ _; do - if [ $nr -ge 512 ] ; then # discard compat sycalls - break - fi - - emit "$nr" "$name" - max_nr=$nr -done < $sorted_table - -rm -f $sorted_table - -echo "};" - -echo "#define SYSCALLTBL_${arch}_MAX_ID ${max_nr}" diff --git a/tools/perf/arch/x86/include/syscall_table.h b/tools/perf/arch/x86/include/syscall_table.h new file mode 100644 index 000000000000..7ff51b783000 --- /dev/null +++ b/tools/perf/arch/x86/include/syscall_table.h @@ -0,0 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include + +#if __BITS_PER_LONG == 64 +#include +#else +#include +#endif diff --git a/tools/perf/util/syscalltbl.c b/tools/perf/util/syscalltbl.c index 229183e5c55f..094f6d4fffdd 100644 --- a/tools/perf/util/syscalltbl.c +++ b/tools/perf/util/syscalltbl.c @@ -13,15 +13,7 @@ #include #include "string2.h" -#if defined(__x86_64__) -#include -const int syscalltbl_native_max_id = SYSCALLTBL_x86_64_MAX_ID; -static const char *const *syscalltbl_native = syscalltbl_x86_64; -#elif defined(__i386__) -#include -const int syscalltbl_native_max_id = SYSCALLTBL_x86_MAX_ID; -static const char *const *syscalltbl_native = syscalltbl_x86; -#elif defined(__s390x__) +#if defined(__s390x__) #include const int syscalltbl_native_max_id = SYSCALLTBL_S390_64_MAX_ID; static const char *const *syscalltbl_native = syscalltbl_s390_64;