Skip to contentSkip to conversation

perf trace: Include copied headers in the beauty directory

PATCH In review Namhyung Kim 3 participants 7 messages May 25 – May 26 perf events

lore
Share & tools
lore

Namhyung Kim

author maintainer
#0 lore raw

PATCH 1/3 perf trace: Include copied headers in the beauty directory

We keep uptodate copied of the kernel headers, let's use it directly and don't worry about missing definitions.

---
 tools/perf/trace/beauty/clone.c           |  7 ++++---
 tools/perf/trace/beauty/fcntl.c           | 19 ++-----------------
 tools/perf/trace/beauty/fs_at_flags.c     | 12 ++----------
 tools/perf/trace/beauty/fsmount.c         | 11 ++---------
 tools/perf/trace/beauty/sched_policy.c    | 10 +---------
 tools/perf/trace/beauty/sync_file_range.c | 12 ++----------
 6 files changed, 13 insertions(+), 58 deletions(-)
tools/perf/trace/beauty/clone.c +4 -3
index c9fa8f7e82b909fb..c80f800a45d04793 100644
@@ -1,15 +1,16 @@
 // SPDX-License-Identifier: LGPL-2.1
 /*
- * trace/beauty/cone.c
+ * trace/beauty/clone.c
  *
  *  Copyright (C) 2017, Red Hat Inc, Arnaldo Carvalho de Melo <[email protected]>
  */
 
-#include "trace/beauty/beauty.h"
 #include <linux/kernel.h>
 #include <linux/log2.h>
 #include <sys/types.h>
-#include <sched.h>
+#include "trace/beauty/beauty.h"
+#include "trace/beauty/include/uapi/linux/sched.h"
+
 
 static size_t clone__scnprintf_flags(unsigned long flags, char *bf, size_t size, bool show_prefix)
 {
tools/perf/trace/beauty/fcntl.c +2 -17
index e1b99b8f55eb0d7c..10fd6a2b75c353c4 100644
@@ -5,25 +5,10 @@
  *  Copyright (C) 2017, Red Hat Inc, Arnaldo Carvalho de Melo <[email protected]>
  */
 
-#include "trace/beauty/beauty.h"
 #include <linux/kernel.h>
-#include <linux/fcntl.h>
-
-#ifndef F_GET_RW_HINT
-#define F_GET_RW_HINT		(F_LINUX_SPECIFIC_BASE + 11)
-#endif
-
-#ifndef F_SET_RW_HINT
-#define F_SET_RW_HINT		(F_LINUX_SPECIFIC_BASE + 12)
-#endif
-
-#ifndef F_GET_FILE_RW_HINT
-#define F_GET_FILE_RW_HINT	(F_LINUX_SPECIFIC_BASE + 13)
-#endif
+#include "trace/beauty/beauty.h"
+#include "trace/beauty/include/uapi/linux/fcntl.h"
 
-#ifndef F_SET_FILE_RW_HINT
-#define F_SET_FILE_RW_HINT	(F_LINUX_SPECIFIC_BASE + 14)
-#endif
 
 static size_t fcntl__scnprintf_getfd(unsigned long val, char *bf, size_t size, bool show_prefix)
 {
tools/perf/trace/beauty/fs_at_flags.c +2 -10
index c200669cb944a417..085a3ba399a41dd4 100644
@@ -5,18 +5,10 @@
  *  Copyright (C) 2017, Red Hat Inc, Arnaldo Carvalho de Melo <[email protected]>
  */
 
-#include "trace/beauty/beauty.h"
 #include <sys/types.h>
-#include <linux/fcntl.h>
 #include <linux/log2.h>
-
-/*
- * uapi/linux/fcntl.h does not keep a copy in tools headers directory,
- * for system with kernel versions before v5.8, need to sync AT_EACCESS macro.
- */
-#ifndef AT_EACCESS
-#define AT_EACCESS 0x200
-#endif
+#include "trace/beauty/beauty.h"
+#include "trace/beauty/include/uapi/linux/fcntl.h"
 
 #include "trace/beauty/generated/fs_at_flags_array.c"
 static DEFINE_STRARRAY(fs_at_flags, "AT_");
tools/perf/trace/beauty/fsmount.c +2 -9
index 179e649fc72a4724..a84e3f9749ca97fc 100644
@@ -5,16 +5,9 @@
  *  Copyright (C) 2019, Red Hat Inc, Arnaldo Carvalho de Melo <[email protected]>
  */
 
-#include "trace/beauty/beauty.h"
 #include <linux/log2.h>
-#include <sys/mount.h>
-
-#ifndef MOUNT_ATTR__ATIME
-#define MOUNT_ATTR__ATIME	0x00000070 /* Setting on how atime should be updated */
-#endif
-#ifndef MOUNT_ATTR_RELATIME
-#define MOUNT_ATTR_RELATIME	0x00000000 /* - Update atime relative to mtime/ctime. */
-#endif
+#include "trace/beauty/beauty.h"
+#include "trace/beauty/include/uapi/linux/mount.h"
 
 
 static size_t fsmount__scnprintf_flags(unsigned long flags, char *bf, size_t size, bool show_prefix)
tools/perf/trace/beauty/sched_policy.c +1 -9
index 3fb6d9e0fae9b4e6..f8c8d297c95fbdd1 100644
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: LGPL-2.1
 #include "trace/beauty/beauty.h"
-
-#include <sched.h>
+#include "trace/beauty/include/uapi/linux/sched.h"
 
 /*
  * Not defined anywhere else, probably, just to make sure we
@@ -9,13 +8,6 @@
  */
 #define SCHED_POLICY_MASK 0xff
 
-#ifndef SCHED_DEADLINE
-#define SCHED_DEADLINE 6
-#endif
-#ifndef SCHED_RESET_ON_FORK
-#define SCHED_RESET_ON_FORK 0x40000000
-#endif
-
 size_t syscall_arg__scnprintf_sched_policy(char *bf, size_t size,
 					   struct syscall_arg *arg)
 {
tools/perf/trace/beauty/sync_file_range.c +2 -10
index 3e8f50ff4fc701f9..50a6c458dff704fa 100644
@@ -5,18 +5,10 @@
  *  Copyright (C) 2019, Red Hat Inc, Arnaldo Carvalho de Melo <[email protected]>
  */
 
-#include "trace/beauty/beauty.h"
 #include <linux/log2.h>
-#include <linux/fs.h>
+#include "trace/beauty/beauty.h"
+#include "trace/beauty/include/uapi/linux/fs.h"
 
-#ifndef SYNC_FILE_RANGE_WRITE_AND_WAIT
-#define SYNC_FILE_RANGE_WAIT_BEFORE     1
-#define SYNC_FILE_RANGE_WRITE           2
-#define SYNC_FILE_RANGE_WAIT_AFTER      4
-#define SYNC_FILE_RANGE_WRITE_AND_WAIT  (SYNC_FILE_RANGE_WRITE | \
-                                         SYNC_FILE_RANGE_WAIT_BEFORE | \
-                                         SYNC_FILE_RANGE_WAIT_AFTER)
-#endif
 
 static size_t sync_file_range__scnprintf_flags(unsigned long flags, char *bf, size_t size, bool show_prefix)
 {
Signature · 1 line
2.54.0.746.g67dd491aae-goog
author maintainer
#1 lore raw

PATCH 2/3 perf trace: Copy uapi/linux/eventfd.h for beautifier

To make sure perf trace will see the latest definitions.

---
 tools/perf/check-headers.sh                          |  1 +
 tools/perf/trace/beauty/eventfd.c                    | 12 +-----------
 tools/perf/trace/beauty/include/uapi/linux/eventfd.h | 11 +++++++++++
 3 files changed, 13 insertions(+), 11 deletions(-)
 create mode 100644 tools/perf/trace/beauty/include/uapi/linux/eventfd.h
tools/perf/check-headers.sh +1 -0
index 531c0e0e84dfa101..24660b2bd45e971f 100755
@@ -90,6 +90,7 @@ declare -a BEAUTY_FILES=(
   "include/uapi/drm/drm.h"
   "include/uapi/drm/i915_drm.h"
   "include/linux/socket.h"
+  "include/uapi/linux/eventfd.h"
   "include/uapi/linux/fadvise.h"
   "include/uapi/linux/fcntl.h"
   "include/uapi/linux/fs.h"
tools/perf/trace/beauty/eventfd.c +1 -11
index 18b661282834b7d9..830a5b7ae455f157 100644
@@ -1,17 +1,7 @@
 // SPDX-License-Identifier: LGPL-2.1
 #include "trace/beauty/beauty.h"
+#include "trace/beauty/include/uapi/linux/eventfd.h"
 
-#ifndef EFD_SEMAPHORE
-#define EFD_SEMAPHORE		1
-#endif
-
-#ifndef EFD_NONBLOCK
-#define EFD_NONBLOCK		00004000
-#endif
-
-#ifndef EFD_CLOEXEC
-#define EFD_CLOEXEC		02000000
-#endif
 
 size_t syscall_arg__scnprintf_eventfd_flags(char *bf, size_t size, struct syscall_arg *arg)
 {
tools/perf/trace/beauty/include/uapi/linux/eventfd.h new file +11 -0
new file mode 100644
index 0000000000000000..2eb9ab6c32f30502
@@ -0,0 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
+#ifndef _UAPI_LINUX_EVENTFD_H
+#define _UAPI_LINUX_EVENTFD_H
+
+#include <linux/fcntl.h>
+
+#define EFD_SEMAPHORE (1 << 0)
+#define EFD_CLOEXEC O_CLOEXEC
+#define EFD_NONBLOCK O_NONBLOCK
+
+#endif /* _UAPI_LINUX_EVENTFD_H */
Signature · 1 line
2.54.0.746.g67dd491aae-goog
author maintainer
#2 lore raw

PATCH 3/3 perf trace: Copy uapi/linux/futex.h for beautifier

In reply to Namhyung Kim

To make sure perf trace will see the latest definitions.

---
 tools/perf/check-headers.sh                   |   1 +
 tools/perf/trace/beauty/futex_op.c            |  17 +-
 tools/perf/trace/beauty/futex_val3.c          |   5 +-
 .../trace/beauty/include/uapi/linux/futex.h   | 212 ++++++++++++++++++
 4 files changed, 215 insertions(+), 20 deletions(-)
 create mode 100644 tools/perf/trace/beauty/include/uapi/linux/futex.h
tools/perf/check-headers.sh +1 -0
index 24660b2bd45e971f..59fe80075c951176 100755
@@ -94,6 +94,7 @@ declare -a BEAUTY_FILES=(
   "include/uapi/linux/fadvise.h"
   "include/uapi/linux/fcntl.h"
   "include/uapi/linux/fs.h"
+  "include/uapi/linux/futex.h"
   "include/uapi/linux/mount.h"
   "include/uapi/linux/prctl.h"
   "include/uapi/linux/sched.h"
tools/perf/trace/beauty/futex_op.c +1 -16
index 05d2111e504b8aad..0ff245dffdb432df 100644
@@ -1,22 +1,7 @@
 // SPDX-License-Identifier: LGPL-2.1
 #include "trace/beauty/beauty.h"
-#include <linux/futex.h>
+#include "trace/beauty/include/uapi/linux/futex.h"
 
-#ifndef FUTEX_WAIT_BITSET
-#define FUTEX_WAIT_BITSET	  9
-#endif
-#ifndef FUTEX_WAKE_BITSET
-#define FUTEX_WAKE_BITSET	 10
-#endif
-#ifndef FUTEX_WAIT_REQUEUE_PI
-#define FUTEX_WAIT_REQUEUE_PI	 11
-#endif
-#ifndef FUTEX_CMP_REQUEUE_PI
-#define FUTEX_CMP_REQUEUE_PI	 12
-#endif
-#ifndef FUTEX_CLOCK_REALTIME
-#define FUTEX_CLOCK_REALTIME	256
-#endif
 
 size_t syscall_arg__scnprintf_futex_op(char *bf, size_t size, struct syscall_arg *arg)
 {
tools/perf/trace/beauty/futex_val3.c +1 -4
index fe4e82741ffc1c8c..848c544ea8f686c0 100644
@@ -1,10 +1,7 @@
 // SPDX-License-Identifier: LGPL-2.1
 #include "trace/beauty/beauty.h"
-#include <linux/futex.h>
+#include "trace/beauty/include/uapi/linux/futex.h"
 
-#ifndef FUTEX_BITSET_MATCH_ANY
-#define FUTEX_BITSET_MATCH_ANY 0xffffffff
-#endif
 
 size_t syscall_arg__scnprintf_futex_val3(char *bf, size_t size, struct syscall_arg *arg)
 {
tools/perf/trace/beauty/include/uapi/linux/futex.h new file +212 -0

212 lines not on this page · raw message

Signature · 1 line
2.54.0.746.g67dd491aae-goog
#3 lore raw
In reply to Namhyung Kim
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider: - [Low] The copied UAPI header `fcntl.h` includes `<linux/openat2.h>`, which was not copied into the…

Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [Low] The copied UAPI header fcntl.h includes <linux/openat2.h>, which was not copied into the tools/include/uapi/linux/ directory, causing build failures on older host systems. --

commit 7bb011deeef80e2496028a3477432fac108a240f
Author: Namhyung Kim <[email protected]>

perf trace: Include copied headers in the beauty directory

This commit updates the trace beauty scripts to use local copies of UAPI kernel headers directly, rather than relying on system headers or manual macro definitions.

Quoted 4 lines
tools/perf/trace/beauty/fcntl.c +0 -0
index e1b99b8f55eb0..10fd6a2b75c35 100644

[ ... ]

Quoted 3 lines
tools/perf/trace/beauty/fcntl.c +0 -2
-#include "trace/beauty/beauty.h"
 #include <linux/kernel.h>
-#include <linux/fcntl.h>

[ ... ]

tools/perf/trace/beauty/fcntl.c

Quoted 2 lines
tools/perf/trace/beauty/fcntl.c +2 -0
+#include "trace/beauty/beauty.h"
+#include "trace/beauty/include/uapi/linux/fcntl.h"

[Severity: Low]
Will this cause a build failure on systems with older kernel headers?

The newly copied uapi/linux/fcntl.h includes <linux/openat2.h>, but it appears openat2.h was not copied into the tools directory. On build environments with kernel headers older than v5.6, the compiler will fall back to the host system's include paths, fail to find linux/openat2.h, and halt the build.

Should linux/openat2.h also be copied into the tools include directory to prevent this?

Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1
#4 lore raw
Quoted 28 lines · On Mon, May 25, 2026 at 01:31:29AM +0000, [email protected] wrote:

Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [Low] The copied UAPI header fcntl.h includes <linux/openat2.h>, which was not copied into the tools/include/uapi/linux/ directory, causing build failures on older host systems. --

commit 7bb011deeef80e2496028a3477432fac108a240f
Author: Namhyung Kim <[email protected]>

perf trace: Include copied headers in the beauty directory

This commit updates the trace beauty scripts to use local copies of UAPI kernel headers directly, rather than relying on system headers or manual macro definitions.

Quoted 4 lines
tools/perf/trace/beauty/fcntl.c +0 -0
index e1b99b8f55eb0..10fd6a2b75c35 100644

[ ... ]

Quoted 3 lines
tools/perf/trace/beauty/fcntl.c +0 -2
-#include "trace/beauty/beauty.h"
 #include <linux/kernel.h>
-#include <linux/fcntl.h>

[ ... ]

tools/perf/trace/beauty/fcntl.c

Quoted 2 lines
tools/perf/trace/beauty/fcntl.c +2 -0
+#include "trace/beauty/beauty.h"
+#include "trace/beauty/include/uapi/linux/fcntl.h"

[Severity: Low]
Will this cause a build failure on systems with older kernel headers?

Quoted 8 lines

The newly copied uapi/linux/fcntl.h includes <linux/openat2.h>, but it appears openat2.h was not copied into the tools directory. On build environments with kernel headers older than v5.6, the compiler will fall back to the host system's include paths, fail to find linux/openat2.h, and halt the build.

Should linux/openat2.h also be copied into the tools include directory to prevent this?

So, this is exactly the kind of dependencies I mentioned in my reply to you :-)

- Arnaldo

#5 lore raw
In reply to Namhyung Kim
Quoted 2 lines · Namhyung Kim

We keep uptodate copied of the kernel headers, let's use it directly and don't worry about missing definitions.

Using it directly with the latest header, when reasonable, is indeed better than having those conditional defines.

Sometimes it is warranted as having the latest headers may involve dragging many files (header dependencies) into the tools/include/ copy of kernel headers we try to keep in sync.

Quoted 4 lines

+++ b/tools/perf/trace/beauty/fcntl.c

(quoted diff) +0 -0
@@ -5,25 +5,10 @@
  *  Copyright (C) 2017, Red Hat Inc, Arnaldo Carvalho de Melo <[email protected]>
  */

<SNIP>

tools/perf/trace/beauty/fcntl.c line 10

Quoted 5 lines
tools/perf/trace/beauty/fcntl.c +2 -3
-#ifndef F_GET_FILE_RW_HINT
-#define F_GET_FILE_RW_HINT	(F_LINUX_SPECIFIC_BASE + 13)
-#endif
+#include "trace/beauty/beauty.h"
+#include "trace/beauty/include/uapi/linux/fcntl.h"

The intention isn't documented anywhere, but files in trace/beauty/include/uapi were not intended to be used in compiling, just scraping, i.e. it didn't need to be compileable, no need to have things it includes in turn nor have defines in Makefiles, it would just be used by the scripts to extract info from it, info that otherwise isn't available as enums (which they should, but that is a digression) or as BTF (which would be even better).

Things for compiling would remain in tools/include/, as other tools may need them and then the maintainainace of these headers would be shared to some degree.

Otherwise each and every tools/ living code that needed copies of header files would end up with its own copy, which seems excessive.

What do you think?

- Arnaldo

Quoted 3 lines
tools/perf/trace/beauty/fcntl.c +0 -3
-#ifndef F_SET_FILE_RW_HINT
-#define F_SET_FILE_RW_HINT	(F_LINUX_SPECIFIC_BASE + 14)
-#endif
author maintainer
#6 lore raw
Quoted 32 lines · Arnaldo Carvalho de Melo
Quoted 2 lines · Namhyung Kim

We keep uptodate copied of the kernel headers, let's use it directly and don't worry about missing definitions.

Using it directly with the latest header, when reasonable, is indeed better than having those conditional defines.

Sometimes it is warranted as having the latest headers may involve dragging many files (header dependencies) into the tools/include/ copy of kernel headers we try to keep in sync.

Quoted 4 lines

+++ b/tools/perf/trace/beauty/fcntl.c

(quoted diff) +0 -0
@@ -5,25 +5,10 @@
  *  Copyright (C) 2017, Red Hat Inc, Arnaldo Carvalho de Melo <[email protected]>
  */

<SNIP>

tools/perf/trace/beauty/fcntl.c line 10

Quoted 5 lines
tools/perf/trace/beauty/fcntl.c +2 -3
-#ifndef F_GET_FILE_RW_HINT
-#define F_GET_FILE_RW_HINT	(F_LINUX_SPECIFIC_BASE + 13)
-#endif
+#include "trace/beauty/beauty.h"
+#include "trace/beauty/include/uapi/linux/fcntl.h"

The intention isn't documented anywhere, but files in trace/beauty/include/uapi were not intended to be used in compiling, just scraping, i.e. it didn't need to be compileable, no need to have things it includes in turn nor have defines in Makefiles, it would just be used by the scripts to extract info from it, info that otherwise isn't available as enums (which they should, but that is a digression) or as BTF (which would be even better).

Quoted 8 lines

Things for compiling would remain in tools/include/, as other tools may need them and then the maintainainace of these headers would be shared to some degree.

Otherwise each and every tools/ living code that needed copies of header files would end up with its own copy, which seems excessive.

What do you think?

Yep, makes sense. I'll try to find a way to use them without including.

Thanks,
Namhyung