From nobody Wed Apr 1 09:00:08 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 456F4317150; Tue, 31 Mar 2026 21:06:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774991207; cv=none; b=QThwzmbMsqVPw0s2EhROBrHATjnAPp0YBLKTgBbeHpU0tiAc2TpdRIIpn151A+pYEmdnJxEGsb+NfUAzKSabF4f/eq3RsjAGdNPKsSt6EBf5g13dZJ+onVrG2tDVqMnTOOC65wwO4wJw19QDmHIAX+NBwcJYa0qZNngcrsmbdSo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774991207; c=relaxed/simple; bh=0VgDT/m13pM4gzV29+Nx0vRnBtaPc+jQECY4GfK04u4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IunVWSbqoQ1BUEnJX3hoOT6L8//P+liHktAnZ5UshJOqEyIMzJ7eTLtwEmKqQS75Bua+twI5iRBze/5onIrz+oT/SS+gFmvyXGJDCisphXxI86JOy/UnJvr5IEc7riMpBVXUayNP2kVVj7sD1ATp59Hg1sswUfjRSr5mlXz8tp4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=XQH8OjWK; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="XQH8OjWK" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 041C0C19423; Tue, 31 Mar 2026 21:06:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1774991207; bh=0VgDT/m13pM4gzV29+Nx0vRnBtaPc+jQECY4GfK04u4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XQH8OjWK3r/nZLUXCHqLqOfAsgLbSAkUriwVhCkbzR+J/557hpyfEcwKI1olZKuPB KuubTAeYrWOhaKhyR93Vl7br0z+TzGhIy7ALD+fmaYVuA6GHJdwnizV5KQSHgm9yIj kL649dYJ0Vq4Yttww0H09AzXM5837ucd47LGjyR8nOKtvee1OvYzxeIOj8ztKMK4KJ uUrBrJAVofdR7/m+y+Af1304wTK6Wc0+LnfRx6F44wLspjGKv6MVyZEeqGfA1Pna5N pX7KztPDIj3gfCrGhSQTL/G1shCUp2p2QU0TuF4Y0WBKDWBBLXGKUIb5hPI0fpTFp8 gni4HX8XysUiw== From: Arnaldo Carvalho de Melo To: Namhyung Kim Cc: Ingo Molnar , Thomas Gleixner , James Clark , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo Subject: [PATCH 1/2] tools: Move tools/include/uapi/drm to tools/perf/trace/beauty/include/uapi Date: Tue, 31 Mar 2026 18:06:33 -0300 Message-ID: <20260331210634.2126391-2-acme@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260331210634.2126391-1-acme@kernel.org> References: <20260331210634.2126391-1-acme@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Arnaldo Carvalho de Melo As it is used only to parse ioctl numbers, not to build perf and so far no other tools/ living tool uses it, so to clean up tools/include/ to be used just for building tools, to have access to things available in the kernel and not yet in the system headers, move it to the directory where just the tools/perf/trace/beauty/ scripts can use to generate tables used by perf. Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/Makefile.perf | 2 +- tools/perf/check-headers.sh | 4 ++-- tools/perf/trace/beauty/drm_ioctl.sh | 2 +- tools/{ =3D> perf/trace/beauty}/include/uapi/drm/drm.h | 0 tools/{ =3D> perf/trace/beauty}/include/uapi/drm/i915_drm.h | 0 5 files changed, 4 insertions(+), 4 deletions(-) rename tools/{ =3D> perf/trace/beauty}/include/uapi/drm/drm.h (100%) rename tools/{ =3D> perf/trace/beauty}/include/uapi/drm/i915_drm.h (100%) diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index f7b936deeaa2cd7c..a560fbc847934fad 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -547,7 +547,7 @@ $(clone_flags_array): $(beauty_uapi_linux_dir)/sched.h = $(clone_flags_tbl) $(Q)$(SHELL) '$(clone_flags_tbl)' $(beauty_uapi_linux_dir) > $@ =20 drm_ioctl_array :=3D $(beauty_ioctl_outdir)/drm_ioctl_array.c -drm_hdr_dir :=3D $(srctree)/tools/include/uapi/drm +drm_hdr_dir :=3D $(srctree)/tools/perf/trace/beauty/include/uapi/drm drm_ioctl_tbl :=3D $(srctree)/tools/perf/trace/beauty/drm_ioctl.sh =20 $(drm_ioctl_array): $(drm_hdr_dir)/drm.h $(drm_hdr_dir)/i915_drm.h $(drm_i= octl_tbl) diff --git a/tools/perf/check-headers.sh b/tools/perf/check-headers.sh index 31826621eebdb003..c6b136fe8d13053d 100755 --- a/tools/perf/check-headers.sh +++ b/tools/perf/check-headers.sh @@ -6,8 +6,6 @@ NC=3D'\033[0m' # No Color =20 declare -a FILES=3D( "include/uapi/linux/const.h" - "include/uapi/drm/drm.h" - "include/uapi/drm/i915_drm.h" "include/uapi/linux/bits.h" "include/uapi/linux/fadvise.h" "include/uapi/linux/fscrypt.h" @@ -90,6 +88,8 @@ declare -a SYNC_CHECK_FILES=3D( declare -a BEAUTY_FILES=3D( "arch/x86/include/asm/irq_vectors.h" "arch/x86/include/uapi/asm/prctl.h" + "include/uapi/drm/drm.h" + "include/uapi/drm/i915_drm.h" "include/linux/socket.h" "include/uapi/linux/fcntl.h" "include/uapi/linux/fs.h" diff --git a/tools/perf/trace/beauty/drm_ioctl.sh b/tools/perf/trace/beauty= /drm_ioctl.sh index 9aa94fd523a9c2dd..f2f1a257bac8b41e 100755 --- a/tools/perf/trace/beauty/drm_ioctl.sh +++ b/tools/perf/trace/beauty/drm_ioctl.sh @@ -1,7 +1,7 @@ #!/bin/sh # SPDX-License-Identifier: LGPL-2.1 =20 -[ $# -eq 1 ] && header_dir=3D$1 || header_dir=3Dtools/include/uapi/drm/ +[ $# -eq 1 ] && header_dir=3D$1 || header_dir=3Dtools/perf/trace/beauty/in= clude/uapi/drm/ =20 printf "#ifndef DRM_COMMAND_BASE\n" grep "#define DRM_COMMAND_BASE" $header_dir/drm.h diff --git a/tools/include/uapi/drm/drm.h b/tools/perf/trace/beauty/include= /uapi/drm/drm.h similarity index 100% rename from tools/include/uapi/drm/drm.h rename to tools/perf/trace/beauty/include/uapi/drm/drm.h diff --git a/tools/include/uapi/drm/i915_drm.h b/tools/perf/trace/beauty/in= clude/uapi/drm/i915_drm.h similarity index 100% rename from tools/include/uapi/drm/i915_drm.h rename to tools/perf/trace/beauty/include/uapi/drm/i915_drm.h --=20 2.53.0 From nobody Wed Apr 1 09:00:08 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 25E55317150; Tue, 31 Mar 2026 21:06:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774991213; cv=none; b=go20dyHTqIzI3rK6Ns0XYFhY17SyGelGB55qiYSlwYnlV8YQZ2YelgejjF0nyO387jEQb1evyi4b54Oew/3S+OlKfKwLqrgut59qrRqJG6YiNltgzkv8Snb4q4wqyljurY9gbUptMgW+4jh9LGvy1rzjTDGV7SqnJxEr+FConjY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774991213; c=relaxed/simple; bh=0m4yzpu64MSF3uadEQv4UlSUQ3sULu0Q2sh802UhRos=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UpIYaES1EcaU1UbQm+3btYeXJNtm8Q2kLCvRvtXy5mkuLstIm1rRzAXmxHE+OwRDlYSYlaXmwvUubVBHi5N5bUQipZGFd3v0FOpk6SYfcs/yJWOuPQ03kY2Vu0kxN4I8p2z4Sq5Wwpmot4GnsTSkweHhT2GYaIbEzZLzEdF3dIc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=dvKjnvLD; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="dvKjnvLD" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CB5A5C2BC9E; Tue, 31 Mar 2026 21:06:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1774991212; bh=0m4yzpu64MSF3uadEQv4UlSUQ3sULu0Q2sh802UhRos=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dvKjnvLD8r/3ldv4ytOkskzIBBSLubsM/cI0xciRYnIeqf7z6B+XvVCmdf2k7g+RK yYLdgoup/Deu8zD3451z9J0cG/irHFA7LI+9Wzbl9Zhh28JYkkW2OmfxdtG3UiY6RH DD0j4iC1qQBD14yNntpYGFiXe8flJD7KIc9sg1PFPhwfq6R9AGOO/PdtNcZoEpAbfS 5AwZbV0NyH7UOzrqyMHy2+ZsOjLVzWonMyqQ5Ik6V7IZEgE+m5cvHu4RQ2QXSEdKcb kdS8982nSExU/zUfO5CF2sJ31hXhGXdH3QEuinnU0DK+j3FW/c8buxxReOblmG0Qy0 zz6nPZblOxavA== From: Arnaldo Carvalho de Melo To: Namhyung Kim Cc: Ingo Molnar , Thomas Gleixner , James Clark , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo Subject: [PATCH 2/2] perf beauty: Move copy of fadvise.h from tools/include/ to tools/perf/trace/beauty/include/ Date: Tue, 31 Mar 2026 18:06:34 -0300 Message-ID: <20260331210634.2126391-3-acme@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260331210634.2126391-1-acme@kernel.org> References: <20260331210634.2126391-1-acme@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Arnaldo Carvalho de Melo As it is not really used when compiling anything, just being parsed to collect number->string tables for 'perf trace'. $ git grep fadvise.h tools/ tools/perf/Makefile.perf:$(fadvise_advice_array): $(beauty_uapi_linux_dir= )/fadvise.h $(fadvise_advice_tbl) tools/perf/check-headers.sh: "include/uapi/linux/fadvise.h" tools/perf/trace/beauty/fadvise.sh:grep -E $regex ${header_dir}/fadvise.h= | \ tools/perf/trace/beauty/fadvise.sh:# tools/include/uapi/linux/fadvise.h f= or details. $ Link: https://lore.kernel.org/r/CAP-5=3DfVBNQVF8k3JUQjH1nkP69ZVp8BqP+uwygcx= =3DxO0zC4xrg@mail.gmail.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/Makefile.perf | 4 ++-- tools/perf/check-headers.sh | 2 +- tools/perf/trace/beauty/fadvise.sh | 2 +- tools/{ =3D> perf/trace/beauty}/include/uapi/linux/fadvise.h | 0 4 files changed, 4 insertions(+), 4 deletions(-) rename tools/{ =3D> perf/trace/beauty}/include/uapi/linux/fadvise.h (100%) diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index a560fbc847934fad..cee19c923c0607d2 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -556,8 +556,8 @@ $(drm_ioctl_array): $(drm_hdr_dir)/drm.h $(drm_hdr_dir)= /i915_drm.h $(drm_ioctl_t fadvise_advice_array :=3D $(beauty_outdir)/fadvise_advice_array.c fadvise_advice_tbl :=3D $(srctree)/tools/perf/trace/beauty/fadvise.sh =20 -$(fadvise_advice_array): $(linux_uapi_dir)/in.h $(fadvise_advice_tbl) - $(Q)$(SHELL) '$(fadvise_advice_tbl)' $(linux_uapi_dir) > $@ +$(fadvise_advice_array): $(beauty_uapi_linux_dir)/fadvise.h $(fadvise_advi= ce_tbl) + $(Q)$(SHELL) '$(fadvise_advice_tbl)' $(beauty_uapi_linux_dir) > $@ =20 fsmount_arrays :=3D $(beauty_outdir)/fsmount_arrays.c fsmount_tbls :=3D $(srctree)/tools/perf/trace/beauty/fsmount.sh diff --git a/tools/perf/check-headers.sh b/tools/perf/check-headers.sh index c6b136fe8d13053d..531c0e0e84dfa101 100755 --- a/tools/perf/check-headers.sh +++ b/tools/perf/check-headers.sh @@ -7,7 +7,6 @@ NC=3D'\033[0m' # No Color declare -a FILES=3D( "include/uapi/linux/const.h" "include/uapi/linux/bits.h" - "include/uapi/linux/fadvise.h" "include/uapi/linux/fscrypt.h" "include/uapi/linux/genetlink.h" "include/uapi/linux/if_addr.h" @@ -91,6 +90,7 @@ declare -a BEAUTY_FILES=3D( "include/uapi/drm/drm.h" "include/uapi/drm/i915_drm.h" "include/linux/socket.h" + "include/uapi/linux/fadvise.h" "include/uapi/linux/fcntl.h" "include/uapi/linux/fs.h" "include/uapi/linux/mount.h" diff --git a/tools/perf/trace/beauty/fadvise.sh b/tools/perf/trace/beauty/f= advise.sh index 4d3dd6e56dedc994..e9857112fa51e8e2 100755 --- a/tools/perf/trace/beauty/fadvise.sh +++ b/tools/perf/trace/beauty/fadvise.sh @@ -1,7 +1,7 @@ #!/bin/sh # SPDX-License-Identifier: LGPL-2.1 =20 -[ $# -eq 1 ] && header_dir=3D$1 || header_dir=3Dtools/include/uapi/linux/ +[ $# -eq 1 ] && header_dir=3D$1 || header_dir=3Dtools/perf/trace/beauty/in= clude/uapi/linux/ =20 printf "static const char *fadvise_advices[] =3D {\n" regex=3D'^[[:space:]]*#[[:space:]]*define[[:space:]]+POSIX_FADV_(\w+)[[:sp= ace:]]+([[:digit:]]+)[[:space:]]+.*' diff --git a/tools/include/uapi/linux/fadvise.h b/tools/perf/trace/beauty/i= nclude/uapi/linux/fadvise.h similarity index 100% rename from tools/include/uapi/linux/fadvise.h rename to tools/perf/trace/beauty/include/uapi/linux/fadvise.h --=20 2.53.0