From nobody Thu Dec 18 20:36:31 2025 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) (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 63E181991C9 for ; Wed, 18 Dec 2024 09:24:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734513900; cv=none; b=orjhFfDpJ57oFp3YVR7QZa+hhk/7sofpXK9yH7m7Nk9Oo0KsfZxHAuBkLZXEQDT+m45TrKyNXfBy21WZP7toduF22TO/vMyuygxGdiHW+Gq2B3pwIHW3bToCGb8GNOV2lj/E0KPa4xOAFzOIrBT7q5Ueq6UzYgAT7YmC24tYQCc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734513900; c=relaxed/simple; bh=8zaNBLsWCcfauluN9i4LFC13erUU3m5MbHaCxvxxTaY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=mHNdUYpsH5VjmNz6g3DjozJktyucPXUvEP/W+6GEeiYUAFP9KhguGDGtKihOWN2PYUPx4sSA7tIxFcgrD2NKWpR+gCAsA711kPYoJdFEHXCnkYB4aOx2JAMkcCsyN7bNBnpnz8Lht6kBrQmFBlohyQu0UTsf9BF7T9f4EshSRyc= 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=OLMpKfX2; arc=none smtp.client-ip=209.85.214.174 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="OLMpKfX2" Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-21631789fcdso3464885ad.1 for ; Wed, 18 Dec 2024 01:24:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1734513898; x=1735118698; 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=e+Q2z3RiH+Cxmha3T/07fxqh9kG8swBDg6SVk5HdbKg=; b=OLMpKfX2XLY6vHCqXeLFTm2xjm7ftZFG2K/wm0mT9FBHC6WzDMj8naUsp7/E0jNpJw 2rycm+Gtc3wi02DCMnkvQTcl07ZBRfmf2fIoMJxMQ77QWEW5B79QAqoDtAEtSSOA7MUz A70lmFG0gifp6uLLLn6enis91PQd6Ptz9ShkSxOAynyS1gJuI4KUhrhR4CGIowo0xOjy dWC8yuA3cPCN/qPGg+bxAVJ8PWxN4EOrnhBbSUlJLMvrG06nQPJoE7oS9+DdXBsE7ONS 6c43HL8FQAlgQK34rfNQN3nXqx4ZexEPBZxEwwTSE/E/yn8Np/yOLGlLbFZE82vRwyZ9 Umhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734513898; x=1735118698; 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=e+Q2z3RiH+Cxmha3T/07fxqh9kG8swBDg6SVk5HdbKg=; b=SurESJafSBV08Y+cc8n38NnGMniGoM5FWC4XB7ctrXq3K5TYpw5HZaDnKiOwm2/Mgq RQQP4huCPo79eYWZG3T48JM8FWULve9KbMdVjGhU8zIe53aeyAS6JwnjgFA+pdOpUF/B aODtsqpIgHLaQCNS7TzO0WBu2Ij+6+60F/wHrK/SiOay47S+N0W22Kq2sfFXb+FqgdMP OedAEBNchWzpsEEwSi3Ntiqny3M4Sanjva/RuiQucx4BufhRoA8cnl2S043Vup+ANomC GKxNwkcYdNnnSDqCWhjKx+HrzuJ2ww+Sn2XKk2WxchFr91BvyyqPNWaIdK1MP8cGfOde f1kQ== X-Gm-Message-State: AOJu0Yz8E52K2bQy5O/r/unHISfji7o2a1sml54rK4XbGQqPUxy7mMOs /WTm/VKHRPh10giJAOvr82131h3ZFM6yudD7RSaqjdg9EYsKUQykDhBY2lpIfyM= X-Gm-Gg: ASbGnctUxWnppaaQSBbZ1vny9CNC6QCgT2wYF4MLbrV9c6FgUSY3aoevAKjtM6NfTDi xVG52+bYs1l6CJNwEc3d/WBaAHQzOwm7QaUEDqCqyL7MgDbU3NdLjYQ5Hs2dJYijs6zg9Z2Y2bJ N668fNz6SqQ/yyKl8IA8fjlu5w/E3BRiJosZlnHyDWBpiG5Y7YEMCO4gFy0d+jAQMdllYUGZ1ax e7/4v6dVnmJCYV8UdcwbmswO75graFZqJvrdnAhrhsWB6SCk2Qz3iBWbcV1Y5Ug0h8GJIIc X-Google-Smtp-Source: AGHT+IHbJHhDW5HIGosLfjTa4TBEb7HdXsptGQd5VzT9LSUe70yM0oJDHxUo2rOfZ2gS0Kvb23LnIQ== X-Received: by 2002:a17:903:2c8:b0:215:8847:4377 with SMTP id d9443c01a7336-218d73b30d6mr32003395ad.15.1734513897636; Wed, 18 Dec 2024 01:24:57 -0800 (PST) Received: from charlie.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-218a1e64f90sm72119995ad.241.2024.12.18.01.24.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Dec 2024 01:24:56 -0800 (PST) From: Charlie Jenkins Date: Wed, 18 Dec 2024 01:24:10 -0800 Subject: [PATCH v4 12/16] perf tools: loongarch: Use syscall table Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20241218-perf_syscalltbl-v4-12-bc8caef2ca8e@rivosinc.com> References: <20241218-perf_syscalltbl-v4-0-bc8caef2ca8e@rivosinc.com> In-Reply-To: <20241218-perf_syscalltbl-v4-0-bc8caef2ca8e@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 , =?utf-8?q?Micka=C3=ABl_Sala=C3=BCn?= , =?utf-8?q?G=C3=BCnther_Noack?= , Christian Brauner , Guo Ren , John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Jonathan Corbet , =?utf-8?q?Bj=C3=B6rn_T=C3=B6pel?= , Arnd Bergmann , Albert Ou 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.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=6453; i=charlie@rivosinc.com; h=from:subject:message-id; bh=8zaNBLsWCcfauluN9i4LFC13erUU3m5MbHaCxvxxTaY=; b=owGbwMvMwCHWx5hUnlvL8Y3xtFoSQ3rSlOMzf5cFKv9RrMqQ95fdUJv36ofcevlN89xOXhA1d igJVv3TUcrCIMbBICumyMJzrYG59Y5+2VHRsgkwc1iZQIYwcHEKwETSnjAy3NB6J731fH2oaGw9 b9s69e57/woeLJ35tjw9rb36S6grL8MfrmNCgXznN6VZVjBuuzgtN+ykW8TR26Z/n274cH+36gN GfgA= X-Developer-Key: i=charlie@rivosinc.com; a=openpgp; fpr=7D834FF11B1D8387E61C776FFB10D1F27D6B1354 loongarch uses a syscall table, use that in perf instead of using unistd.h. Signed-off-by: Charlie Jenkins --- tools/perf/Makefile.config | 3 +- tools/perf/Makefile.perf | 2 +- tools/perf/arch/loongarch/Makefile | 22 ----------- tools/perf/arch/loongarch/entry/syscalls/Kbuild | 2 + .../loongarch/entry/syscalls/Makefile.syscalls | 3 ++ .../arch/loongarch/entry/syscalls/mksyscalltbl | 45 ------------------= ---- tools/perf/arch/loongarch/include/syscall_table.h | 2 + tools/perf/util/syscalltbl.c | 4 -- 8 files changed, 9 insertions(+), 74 deletions(-) diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config index 83ed03f16209b2edff3e81d4e8a79fa058c35a48..dd1a5409e65ef38eb4132cd74c2= e18dd2c8af920 100644 --- a/tools/perf/Makefile.config +++ b/tools/perf/Makefile.config @@ -31,7 +31,7 @@ $(call detected_var,SRCARCH) ifneq ($(NO_SYSCALL_TABLE),1) NO_SYSCALL_TABLE :=3D 1 =20 - ifeq ($(SRCARCH),$(filter $(SRCARCH),powerpc s390 mips loongarch)) + ifeq ($(SRCARCH),$(filter $(SRCARCH),powerpc s390 mips)) NO_SYSCALL_TABLE :=3D 0 endif =20 @@ -85,7 +85,6 @@ ifeq ($(SRCARCH),arm64) endif =20 ifeq ($(SRCARCH),loongarch) - CFLAGS +=3D -I$(OUTPUT)arch/loongarch/include/generated ifndef NO_LIBUNWIND LIBUNWIND_LIBS =3D -lunwind -lunwind-loongarch64 endif diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index bedf58d2a10f1faccb3579c023d5722cfeaae4cf..c85262db770d18828fc3d9dc65e= ca00733645d41 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -311,7 +311,7 @@ FEATURE_TESTS :=3D all endif endif # architectures that use the generic syscall table -generic_syscall_table_archs :=3D riscv arc csky arm sh sparc xtensa x86 al= pha parisc arm64 +generic_syscall_table_archs :=3D riscv arc csky arm sh sparc xtensa x86 al= pha parisc arm64 loongarch ifneq ($(filter $(SRCARCH), $(generic_syscall_table_archs)),) include $(srctree)/tools/perf/scripts/Makefile.syscalls endif diff --git a/tools/perf/arch/loongarch/Makefile b/tools/perf/arch/loongarch= /Makefile index 52544d59245bab5a0fb2baa1e962b2ad4bf25332..087e099fb453a9236db34878077= a51f711881ce0 100644 --- a/tools/perf/arch/loongarch/Makefile +++ b/tools/perf/arch/loongarch/Makefile @@ -1,25 +1,3 @@ # SPDX-License-Identifier: GPL-2.0 PERF_HAVE_JITDUMP :=3D 1 HAVE_KVM_STAT_SUPPORT :=3D 1 - -# -# Syscall table generation for perf -# - -out :=3D $(OUTPUT)arch/loongarch/include/generated/asm -header :=3D $(out)/syscalls.c -incpath :=3D $(srctree)/tools -sysdef :=3D $(srctree)/tools/arch/loongarch/include/uapi/asm/unistd.h -sysprf :=3D $(srctree)/tools/perf/arch/loongarch/entry/syscalls/ -systbl :=3D $(sysprf)/mksyscalltbl - -# Create output directory if not already present -$(shell [ -d '$(out)' ] || mkdir -p '$(out)') - -$(header): $(sysdef) $(systbl) - $(Q)$(SHELL) '$(systbl)' '$(CC)' '$(HOSTCC)' $(incpath) $(sysdef) > $@ - -clean:: - $(call QUIET_CLEAN, loongarch) $(RM) $(header) - -archheaders: $(header) diff --git a/tools/perf/arch/loongarch/entry/syscalls/Kbuild b/tools/perf/a= rch/loongarch/entry/syscalls/Kbuild new file mode 100644 index 0000000000000000000000000000000000000000..9a41e3572c3afd4f202321fd9e4= 92714540e8fd3 --- /dev/null +++ b/tools/perf/arch/loongarch/entry/syscalls/Kbuild @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0 +syscall-y +=3D syscalls_64.h diff --git a/tools/perf/arch/loongarch/entry/syscalls/Makefile.syscalls b/t= ools/perf/arch/loongarch/entry/syscalls/Makefile.syscalls new file mode 100644 index 0000000000000000000000000000000000000000..47d32da2aed8d67a7ac02627160= 0e84723031a6b --- /dev/null +++ b/tools/perf/arch/loongarch/entry/syscalls/Makefile.syscalls @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0 + +syscall_abis_64 +=3D diff --git a/tools/perf/arch/loongarch/entry/syscalls/mksyscalltbl b/tools/= perf/arch/loongarch/entry/syscalls/mksyscalltbl deleted file mode 100755 index c10ad3580aef25e48ff0682eca4217cbafdfa333..000000000000000000000000000= 0000000000000 --- a/tools/perf/arch/loongarch/entry/syscalls/mksyscalltbl +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/sh -# SPDX-License-Identifier: GPL-2.0 -# -# Generate system call table for perf. Derived from -# powerpc script. -# -# Author(s): Ming Wang -# Author(s): Huacai Chen -# Copyright (C) 2020-2023 Loongson Technology Corporation Limited - -gcc=3D$1 -hostcc=3D$2 -incpath=3D$3 -input=3D$4 - -if ! test -r $input; then - echo "Could not read input file" >&2 - exit 1 -fi - -create_sc_table() -{ - local sc nr max_nr - - while read sc nr; do - printf "%s\n" " [$nr] =3D \"$sc\"," - max_nr=3D$nr - done - - echo "#define SYSCALLTBL_LOONGARCH_MAX_ID $max_nr" -} - -create_table() -{ - echo "#include \"$input\"" - echo "static const char *const syscalltbl_loongarch[] =3D {" - create_sc_table - echo "};" -} - -$gcc -E -dM -x c -I $incpath/include/uapi $input \ - |awk '$2 ~ "__NR" && $3 !~ "__NR3264_" { - sub("^#define __NR(3264)?_", ""); - print | "sort -k2 -n"}' \ - |create_table diff --git a/tools/perf/arch/loongarch/include/syscall_table.h b/tools/perf= /arch/loongarch/include/syscall_table.h new file mode 100644 index 0000000000000000000000000000000000000000..9d0646d3455cdaf1a3db8c8565a= f8eba9a8df8c6 --- /dev/null +++ b/tools/perf/arch/loongarch/include/syscall_table.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/tools/perf/util/syscalltbl.c b/tools/perf/util/syscalltbl.c index b7c0a4b9245a94b3b245fea59af79081b1f91081..3001386e13a502be5279aa6e474= 2af0b96202b35 100644 --- a/tools/perf/util/syscalltbl.c +++ b/tools/perf/util/syscalltbl.c @@ -30,10 +30,6 @@ static const char *const *syscalltbl_native =3D syscallt= bl_powerpc_32; #include const int syscalltbl_native_max_id =3D SYSCALLTBL_MIPS_N64_MAX_ID; static const char *const *syscalltbl_native =3D syscalltbl_mips_n64; -#elif defined(__loongarch__) -#include -const int syscalltbl_native_max_id =3D SYSCALLTBL_LOONGARCH_MAX_ID; -static const char *const *syscalltbl_native =3D syscalltbl_loongarch; #elif defined(GENERIC_SYSCALL_TABLE) #include const int syscalltbl_native_max_id =3D SYSCALLTBL_MAX_ID; --=20 2.34.1