From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) (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 E1DD823774 for ; Wed, 16 Apr 2025 13:26:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.52 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744810019; cv=none; b=W5taBhOf7FcP5XGfS1StcD0GI4PBr+CCUhuNWVX/F5XKsh6se/pOxnp21SRcNnjrEU0hWuVgVx9ZWAdTfZEw0WW9xc6Kifvhr7ORScovL6ctz53KC64rBCZkaNw/NJXClpMbKPRt8N3K/BAW3KlzexgeiW/P2ZKxA+1ICL8iVC8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744810019; c=relaxed/simple; bh=u7tgQKyBQxDpDlv/eeh5XGW8bH99prkZaYli+k8oNIg=; h=Message-ID:Date:MIME-Version:Subject:From:To:Cc:References: In-Reply-To:Content-Type; b=gYOlNidQUMTZiEUtvAS4LYtbrnXqK9KOQ2VhQbM5yivzEEQXCZplYyTgTNmhVFztgosryeZSjOkza5OGCEzYbyCqscJT6+W9R8QS/Wh+//Tq0cCTA87rNl2ClzomKm3RgZsvpIz5mO4SsoBsnzYmdtzOy3ICzULGvW424IQOn3s= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=e4nezjGD; arc=none smtp.client-ip=209.85.128.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="e4nezjGD" Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-43cf034d4abso73166935e9.3 for ; Wed, 16 Apr 2025 06:26:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1744810015; x=1745414815; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:from:subject:user-agent:mime-version:date:message-id:from:to :cc:subject:date:message-id:reply-to; bh=LXUe0iANce6xhwP4QYlP8FMxu/z1y++/7cwAdg0G+Lw=; b=e4nezjGDmWYu/ShAEf+fYUZguqWtnwaNw0FIlPpkvjgSOU/ZC/Qhfw3zKi/vge0HSC 5RqJVgGdVNRfvQiSVLuiAT40wwK2NY8TUL69rj+Q0mCCQ7XbTsloL1dwuEJWDJA37rvL nBS+cq90KLbeJKIUliXlf2BEHCGG1uELLoaQnywvKq9epGTInY4OpUy1v3GUmL+oY8p5 uMt6t1aXg5sc6zAHZ9QNN5CNhl4/tDr1zwxtkdiRAEpumeK68K5AkmPsr5nbOEdHpkNx DqLV9Bsi5GmSiy0XOGpUC0yKLto6oId3fCUF79Fl+3QUYfbt1pYucr8uLAps9RPlNCCH eJRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744810015; x=1745414815; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:from:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=LXUe0iANce6xhwP4QYlP8FMxu/z1y++/7cwAdg0G+Lw=; b=gv/bfqMz5zWQPhKy6cDsUCtzgiBU1ZWtSOtzDnzI632FZm1ZK91pfe1qVQ6CM7bNC1 fEsRy0SnAZeeqN5REOtfHyE2kK70dDx+xIwD0sczAxfYu7ApN/ekPPdU+e44nYxkx8p5 MrfJeRgCnWaMWfZZyk1LCr5PN0bPOIaSyAaj5tA0wED5cgzEL33mwTFt+VgtBLpnxcW0 JgdM0ANziiIId5AHooI1DlSmNOvXr4ogKbOs7CwlN/OfAP4KQ9SflyWraYmSpa8fP8lQ ONkwXbFrzdx8oro4wM2sdfCzsQmj13sCEHytf1F/UT616Q5IjStcXg6SKCP5Q9wxBO8l L6AA== X-Forwarded-Encrypted: i=1; AJvYcCVLxwXM5G2BLE7KoQZOr/RPl7tDyC+s+IEIlLyJroXEFFcybfebPztZh7tkMVossEnclLaw9WT5oLcN@vger.kernel.org X-Gm-Message-State: AOJu0YyWif3wDE7P6jLzEAp8MvZtE9AWLCw6TctFckjqkvaqRQ9/mUsH 55MNpbsHPj4PClbiwbXC+bph16i8TohPd8FFCzX3Lz0U559fAokSRPoFKA04fmg= X-Gm-Gg: ASbGncsaoalOQqBBuh6Un1T4eSu5rAgMHpo462bg/GD2etZRXB0IZXVmW23//6MG/Jh IfI3otH+LmZ4x/AAN2gwZvnbRxMCqZmIQscpKW7RWOOjzYVdpcY2X1NFYhnZrx7ZUrsrFKOIukF TT9C9DH9wuUm0vXN0uvaUjcuJVVZXvOJ1wqNlK8N8pLMZq8EM/rYe79Q2Z1bTuIunwFEis1w2gH DvhXfzt0I4JP4kwU+zDJZGAQpJ5Ys0B4XQqQLH/b6lBtq4Yn+fTO5XtpGuj+fmm/i8lxvxDXSZ9 5OF0Ukxi04ib7ynmGcCjmKTpOCoRtk8+oDw/CboNWLk= X-Google-Smtp-Source: AGHT+IGw46NqRQ8rr3G65OgHPazkLo5CSU52gngWFd673YvxDsgGuzhMGHsuig9f8x6t5NauOdl0Mg== X-Received: by 2002:a05:600c:3b9c:b0:43d:412e:8a81 with SMTP id 5b1f17b1804b1-4405d6cce52mr14393385e9.28.1744810015079; Wed, 16 Apr 2025 06:26:55 -0700 (PDT) Received: from [192.168.1.3] ([77.81.75.81]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4405b4c8216sm21577475e9.7.2025.04.16.06.26.54 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 16 Apr 2025 06:26:54 -0700 (PDT) Message-ID: <95c9bd53-ccef-4a34-b6d2-7203df84db01@linaro.org> Date: Wed, 16 Apr 2025 14:26:53 +0100 Precedence: bulk X-Mailing-List: linux-arch@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 05/10] tools headers: Update the syscall table with the kernel sources From: James Clark To: Namhyung Kim , Arnd Bergmann Cc: Jiri Olsa , Adrian Hunter , Peter Zijlstra , Ingo Molnar , LKML , linux-perf-users@vger.kernel.org, linux-arch@vger.kernel.org, Arnaldo Carvalho de Melo , Ian Rogers , Kan Liang References: <20250410001125.391820-1-namhyung@kernel.org> <20250410001125.391820-6-namhyung@kernel.org> Content-Language: en-US In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 14/04/2025 5:28 pm, James Clark wrote: > > > On 10/04/2025 1:11 am, Namhyung Kim wrote: >> To pick up the changes in: >> >>    c4a16820d9019940 fs: add open_tree_attr() >>    2df1ad0d25803399 x86/arch_prctl: Simplify sys_arch_prctl() >>    e632bca07c8eef1d arm64: generate 64-bit syscall.tbl >> >> This is basically to support the new open_tree_attr syscall.  But it >> also needs to update asm-generic unistd.h header to get the new syscall >> number.  And arm64 unistd.h header was converted to use the generic >> 64-bit header. >> >> Addressing this perf tools build warning: >> >>    Warning: Kernel ABI header differences: >>      diff -u tools/scripts/syscall.tbl scripts/syscall.tbl >>      diff -u tools/perf/arch/x86/entry/syscalls/syscall_32.tbl arch/ >> x86/entry/syscalls/syscall_32.tbl >>      diff -u tools/perf/arch/x86/entry/syscalls/syscall_64.tbl arch/ >> x86/entry/syscalls/syscall_64.tbl >>      diff -u tools/perf/arch/powerpc/entry/syscalls/syscall.tbl arch/ >> powerpc/kernel/syscalls/syscall.tbl >>      diff -u tools/perf/arch/s390/entry/syscalls/syscall.tbl arch/ >> s390/kernel/syscalls/syscall.tbl >>      diff -u tools/perf/arch/mips/entry/syscalls/syscall_n64.tbl arch/ >> mips/kernel/syscalls/syscall_n64.tbl >>      diff -u tools/perf/arch/arm/entry/syscalls/syscall.tbl arch/arm/ >> tools/syscall.tbl >>      diff -u tools/perf/arch/sh/entry/syscalls/syscall.tbl arch/sh/ >> kernel/syscalls/syscall.tbl >>      diff -u tools/perf/arch/sparc/entry/syscalls/syscall.tbl arch/ >> sparc/kernel/syscalls/syscall.tbl >>      diff -u tools/perf/arch/xtensa/entry/syscalls/syscall.tbl arch/ >> xtensa/kernel/syscalls/syscall.tbl >>      diff -u tools/arch/arm64/include/uapi/asm/unistd.h arch/arm64/ >> include/uapi/asm/unistd.h >>      diff -u tools/include/uapi/asm-generic/unistd.h include/uapi/asm- >> generic/unistd.h >> >> Please see tools/include/uapi/README for further details. >> >> Cc: linux-arch@vger.kernel.org >> Signed-off-by: Namhyung Kim >> --- >>   tools/arch/arm64/include/uapi/asm/unistd.h    | 24 +------------------ >>   tools/include/uapi/asm-generic/unistd.h       |  4 +++- >>   .../perf/arch/arm/entry/syscalls/syscall.tbl  |  1 + >>   .../arch/mips/entry/syscalls/syscall_n64.tbl  |  1 + >>   .../arch/powerpc/entry/syscalls/syscall.tbl   |  1 + >>   .../perf/arch/s390/entry/syscalls/syscall.tbl |  1 + >>   tools/perf/arch/sh/entry/syscalls/syscall.tbl |  1 + >>   .../arch/sparc/entry/syscalls/syscall.tbl     |  1 + >>   .../arch/x86/entry/syscalls/syscall_32.tbl    |  3 ++- >>   .../arch/x86/entry/syscalls/syscall_64.tbl    |  1 + >>   .../arch/xtensa/entry/syscalls/syscall.tbl    |  1 + >>   tools/scripts/syscall.tbl                     |  1 + >>   12 files changed, 15 insertions(+), 25 deletions(-) >> >> diff --git a/tools/arch/arm64/include/uapi/asm/unistd.h b/tools/arch/ >> arm64/include/uapi/asm/unistd.h >> index 9306726337fe005e..df36f23876e863ff 100644 >> --- a/tools/arch/arm64/include/uapi/asm/unistd.h >> +++ b/tools/arch/arm64/include/uapi/asm/unistd.h >> @@ -1,24 +1,2 @@ >>   /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ >> -/* >> - * Copyright (C) 2012 ARM Ltd. >> - * >> - * This program is free software; you can redistribute it and/or modify >> - * it under the terms of the GNU General Public License version 2 as >> - * published by the Free Software Foundation. >> - * >> - * This program is distributed in the hope that it will be useful, >> - * but WITHOUT ANY WARRANTY; without even the implied warranty of >> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the >> - * GNU General Public License for more details. >> - * >> - * You should have received a copy of the GNU General Public License >> - * along with this program.  If not, see . >> - */ >> - >> -#define __ARCH_WANT_RENAMEAT >> -#define __ARCH_WANT_NEW_STAT >> -#define __ARCH_WANT_SET_GET_RLIMIT >> -#define __ARCH_WANT_TIME32_SYSCALLS >> -#define __ARCH_WANT_MEMFD_SECRET >> - >> -#include >> +#include > > Hi Namhyung, > > Since we're not including the generic syscalls here anymore we now need > to generate the syscall header file for the Perf build to work (build > error pasted at the end for reference). > > I had a go at adding the rule for it, but I saw that we'd need to pull > in quite a bit from the kernel so it was blurring the lines about the > separation of the tools/ folder. For example this file has the arm64 defs: > >  arch/arm64/kernel/Makefile.syscalls > > To make this common part of the makefile work: > >  scripts/Makefile.asm-headers > > Maybe we can just copy or reimplement Makefile.syscalls, but I'm not > even sure if Makefile.asm-headers will work with the tools/ build > structure so maybe that has to be re-implemented too. Adding Arnd to see > what he thinks. > > As far as I can tell this is a separate issue to the work that Charlie > and Ian did recently to build all arch's syscall numbers into Perf to > use for reporting, as this is requires a single header for the build. > > Thanks > James > > --- > > In file included from /usr/include/aarch64-linux-gnu/sys/syscall.h:24, >                  from evsel.c:4: > /home/jamcla02/workspace/linux/linux/tools/arch/arm64/include/uapi/asm/ > unistd.h:2:10: fatal error: asm/unistd_64.h: No such file or directory >     2 | #include >       |          ^~~~~~~~~~~~~~~~~ > > > Hmmm I see this was also mentioned a while ago here [1]. Maybe I can have another go at adding the makerule to generate the file. I'll probably start by including as much as possible from the existing make rules from the kernel side. I think something similar was already done for generating the sysreg defs in commit 02e85f74668e ("tools: arm64: Add a Makefile for generating sysreg-defs.h") [1]: https://lore.kernel.org/lkml/ZrO5HR9x2xyPKttx@google.com/T/#m269c1d3c64e3e0c96f45102d358d9583c69b722f