mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "André Almeida" <andrealmeid@igalia.com>
To: Masami Hiramatsu <mhiramat@kernel.org>, Arnd Bergmanon <arnd@arndb.de>
Cc: "Christian Brauner" <brauner@kernel.org>,
	linux-kernel@vger.kernel.org, linux-kbuild@vger.kernel.org,
	kernel-dev@igalia.com,
	"Thomas Bogendoerfer" <tsbogend@alpha.franken.de>,
	linux-alpha@vger.kernel.org, linux-s390@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org, soc@lists.linux.dev,
	linux-mips@vger.kernel.org, sparclinux@vger.kernel.org,
	"Arnaldo Carvalho de Melo" <acme@kernel.org>,
	linux-perf-users@vger.kernel.org,
	"Ingo Molnar" <mingo@redhat.com>,
	"Magnus Lindholm" <linmag7@gmail.com>,
	"André Almeida" <andrealmeid@igalia.com>
Subject: [PATCH v10 15/16] perf: Add an option for common table for build_tables()
Date: Thu, 19 Nov 2026 17:22:05 -0300	[thread overview]
Message-ID: <20261119-tonyk-syscall_table-v10-15-a7c9ebd900f6@igalia.com> (raw)
In-Reply-To: <20261119-tonyk-syscall_table-v10-0-a7c9ebd900f6@igalia.com>

build_tables() parses the syscall table files for perf. Add an argument for
concating a common table to the local arch table. This is useful for
architectures that have moved to the new common syscall table.

While here, add an extra +[[:space:]] for the ABIs parsing to ensure that
it doesn't match substrings.

Signed-off-by: André Almeida <andrealmeid@igalia.com>
---
 tools/perf/trace/beauty/syscalltbl.sh | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/tools/perf/trace/beauty/syscalltbl.sh b/tools/perf/trace/beauty/syscalltbl.sh
index e70a8c79e019..adc29af6e891 100755
--- a/tools/perf/trace/beauty/syscalltbl.sh
+++ b/tools/perf/trace/beauty/syscalltbl.sh
@@ -36,14 +36,24 @@ build_tables() {
 	outfile="$2"
 	abis=$(echo "($3)" | tr ',' '|')
 	e_machine="$4"
+	common_tbl="$5"
 
 	if [ ! -f "$infile" ]
 	then
 		echo "Missing file $infile"
 		exit 1
 	fi
+
+	# if there's a common syscall table, join to the arch table
+	if [ -f "$common_tbl" ]
+	then
+		aux_file=$(mktemp /tmp/syscalltbl.XXXXXX)
+		cat "$common_tbl" "$infile" > "$aux_file"
+		infile="$aux_file"
+	fi
+
 	sorted_table=$(mktemp /tmp/syscalltbl.XXXXXX)
-	grep -E "^[0-9]+[[:space:]]+$abis" "$infile" | sort -n > "$sorted_table"
+	grep -E "^[0-9]+[[:space:]]+$abis+[[:space:]]" "$infile" | sort -n > "$sorted_table"
 
 	echo "static const char *const syscall_num_to_name_${e_machine}[] = {" >> "$outfile"
 	# the params are: nr abi name entry compat
@@ -60,13 +70,15 @@ build_tables() {
 	# those without. This default behavior of sort differs from that of
 	# strcmp used at runtime. Use sed to strip the trailing 0s suffix
 	# afterwards.
-	grep -E "^[0-9]+[[:space:]]+$abis" "$infile" | awk '{printf $3; for (i = length($3); i < 20; i++) { printf "0"; }; print " " $1}'| sort | sed 's/\([a-zA-Z1-9]\+\)0\+ \([0-9]\+\)/\1 \2/' > "$sorted_table"
+	grep -E "^[0-9]+[[:space:]]+$abis+[[:space:]]" "$infile" | awk '{printf $3; for (i = length($3); i < 20; i++) { printf "0"; }; print " " $1}'| sort | sed 's/\([a-zA-Z1-9]\+\)0\+ \([0-9]\+\)/\1 \2/' > "$sorted_table"
 	while read -r name nr; do
 		echo "	$nr,	/* $name */" >> "$outfile"
 	done < "$sorted_table"
 	echo "};" >> "$outfile"
 
 	rm -f "$sorted_table"
+
+	rm -f "$aux_file"
 }
 
 rm -f "$outfile"

-- 
2.56.1


  parent reply	other threads:[~2026-11-19 20:22 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-19 20:21 [PATCH v10 00/16] syscalls: Add a shared table for all archs André Almeida
2026-11-19 20:21 ` [PATCH v10 01/16] syscalls: Make --abis parsing more robust André Almeida
2026-11-19 20:21 ` [PATCH v10 02/16] syscalls: Create unified partial table for all archs André Almeida
2026-11-19 20:21 ` [PATCH v10 03/16] scripts/syscall.tbl: Use the common table André Almeida
2026-11-19 20:21 ` [PATCH v10 04/16] s390: Use the common syscall table André Almeida
2026-11-19 20:21 ` [PATCH v10 05/16] sparc: " André Almeida
2026-11-19 20:21 ` [PATCH v10 06/16] mips: Remove duplicated syscallnr.sh André Almeida
2026-11-19 20:21 ` [PATCH v10 07/16] mips: Get rid of custom mips ABIs for syscall tables André Almeida
2026-11-19 20:21 ` [PATCH v10 08/16] mips: Use the common syscall table André Almeida
2026-11-19 20:21 ` [PATCH v10 09/16] syscalls: Add an option for offsetting the common table André Almeida
2026-11-19 20:22 ` [PATCH v10 10/16] alpha: Define entry point for set_mempolicy_home_node syscall André Almeida
2026-11-19 20:22 ` [PATCH v10 11/16] alpha: Use the common syscall table André Almeida
2026-11-19 20:22 ` [PATCH v10 12/16] syscalls: Avoid matching substrings in the ABI parsing André Almeida
2026-11-19 20:22 ` [PATCH v10 13/16] arm: Reorganize syscall table and separated the ABIs André Almeida
2026-11-19 20:22 ` [PATCH v10 14/16] arm: Use common syscall table André Almeida
2026-11-19 20:22 ` André Almeida [this message]
2026-11-19 20:22 ` [PATCH v10 16/16] perf: Synchronize syscall tables with shared table André Almeida

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20261119-tonyk-syscall_table-v10-15-a7c9ebd900f6@igalia.com \
    --to=andrealmeid@igalia.com \
    --cc=acme@kernel.org \
    --cc=arnd@arndb.de \
    --cc=brauner@kernel.org \
    --cc=kernel-dev@igalia.com \
    --cc=linmag7@gmail.com \
    --cc=linux-alpha@vger.kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kbuild@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mips@vger.kernel.org \
    --cc=linux-perf-users@vger.kernel.org \
    --cc=linux-s390@vger.kernel.org \
    --cc=mhiramat@kernel.org \
    --cc=mingo@redhat.com \
    --cc=soc@lists.linux.dev \
    --cc=sparclinux@vger.kernel.org \
    --cc=tsbogend@alpha.franken.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®