mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-04-19 04:39:06 +08:00
perf beauty: Introduce scrape script for 'clone' syscall 'flags' argument
It was using the first variation on producing a string representation
for a binary flag, one that used the copy of uapi/linux/sched.h with
preprocessor tricks that had to be updated everytime a new flag was
introduced.
Use the more recent scrape script + strarray + strarray__scnprintf_flags() combo.
$ tools/perf/trace/beauty/clone.sh | head -5
static const char *clone_flags[] = {
[ilog2(0x00000100) + 1] = "VM",
[ilog2(0x00000200) + 1] = "FS",
[ilog2(0x00000400) + 1] = "FILES",
[ilog2(0x00000800) + 1] = "SIGHAND",
$
Now we can move uapi/linux/sched.h from tools/include/, that is used for
building perf to the scrape only directory tools/perf/trace/beauty/include.
Reviewed-by: Ian Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: https://lore.kernel.org/lkml/ZfnULIn3XKDq0bpc@x1
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
@@ -485,13 +485,20 @@ x86_arch_asm_dir := $(srctree)/tools/arch/x86/include/asm/
|
||||
|
||||
beauty_outdir := $(OUTPUT)trace/beauty/generated
|
||||
beauty_ioctl_outdir := $(beauty_outdir)/ioctl
|
||||
drm_ioctl_array := $(beauty_ioctl_outdir)/drm_ioctl_array.c
|
||||
drm_hdr_dir := $(srctree)/tools/include/uapi/drm
|
||||
drm_ioctl_tbl := $(srctree)/tools/perf/trace/beauty/drm_ioctl.sh
|
||||
|
||||
# Create output directory if not already present
|
||||
$(shell [ -d '$(beauty_ioctl_outdir)' ] || mkdir -p '$(beauty_ioctl_outdir)')
|
||||
|
||||
clone_flags_array := $(beauty_outdir)/clone_flags_array.c
|
||||
clone_flags_tbl := $(srctree)/tools/perf/trace/beauty/clone.sh
|
||||
|
||||
$(clone_flags_array): $(beauty_uapi_linux_dir)/sched.h $(clone_flags_tbl)
|
||||
$(Q)$(SHELL) '$(clone_flags_tbl)' $(beauty_uapi_linux_dir) > $@
|
||||
|
||||
drm_ioctl_array := $(beauty_ioctl_outdir)/drm_ioctl_array.c
|
||||
drm_hdr_dir := $(srctree)/tools/include/uapi/drm
|
||||
drm_ioctl_tbl := $(srctree)/tools/perf/trace/beauty/drm_ioctl.sh
|
||||
|
||||
$(drm_ioctl_array): $(drm_hdr_dir)/drm.h $(drm_hdr_dir)/i915_drm.h $(drm_ioctl_tbl)
|
||||
$(Q)$(SHELL) '$(drm_ioctl_tbl)' $(drm_hdr_dir) > $@
|
||||
|
||||
@@ -765,6 +772,7 @@ build-dir = $(or $(__build-dir),.)
|
||||
|
||||
prepare: $(OUTPUT)PERF-VERSION-FILE $(OUTPUT)common-cmds.h archheaders \
|
||||
arm64-sysreg-defs \
|
||||
$(clone_flags_array) \
|
||||
$(drm_ioctl_array) \
|
||||
$(fadvise_advice_array) \
|
||||
$(fsconfig_arrays) \
|
||||
|
||||
@@ -15,7 +15,6 @@ FILES=(
|
||||
"include/uapi/linux/kvm.h"
|
||||
"include/uapi/linux/in.h"
|
||||
"include/uapi/linux/perf_event.h"
|
||||
"include/uapi/linux/sched.h"
|
||||
"include/uapi/linux/seccomp.h"
|
||||
"include/uapi/linux/vhost.h"
|
||||
"include/linux/bits.h"
|
||||
@@ -93,6 +92,7 @@ BEAUTY_FILES=(
|
||||
"include/uapi/linux/fs.h"
|
||||
"include/uapi/linux/mount.h"
|
||||
"include/uapi/linux/prctl.h"
|
||||
"include/uapi/linux/sched.h"
|
||||
"include/uapi/linux/usbdevice_fs.h"
|
||||
"include/uapi/sound/asound.h"
|
||||
)
|
||||
|
||||
@@ -7,52 +7,16 @@
|
||||
|
||||
#include "trace/beauty/beauty.h"
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/log2.h>
|
||||
#include <sys/types.h>
|
||||
#include <uapi/linux/sched.h>
|
||||
#include <sched.h>
|
||||
|
||||
static size_t clone__scnprintf_flags(unsigned long flags, char *bf, size_t size, bool show_prefix)
|
||||
{
|
||||
const char *prefix = "CLONE_";
|
||||
int printed = 0;
|
||||
#include "trace/beauty/generated/clone_flags_array.c"
|
||||
static DEFINE_STRARRAY(clone_flags, "CLONE_");
|
||||
|
||||
#define P_FLAG(n) \
|
||||
if (flags & CLONE_##n) { \
|
||||
printed += scnprintf(bf + printed, size - printed, "%s%s%s", printed ? "|" : "", show_prefix ? prefix : "", #n); \
|
||||
flags &= ~CLONE_##n; \
|
||||
}
|
||||
|
||||
P_FLAG(VM);
|
||||
P_FLAG(FS);
|
||||
P_FLAG(FILES);
|
||||
P_FLAG(SIGHAND);
|
||||
P_FLAG(PIDFD);
|
||||
P_FLAG(PTRACE);
|
||||
P_FLAG(VFORK);
|
||||
P_FLAG(PARENT);
|
||||
P_FLAG(THREAD);
|
||||
P_FLAG(NEWNS);
|
||||
P_FLAG(SYSVSEM);
|
||||
P_FLAG(SETTLS);
|
||||
P_FLAG(PARENT_SETTID);
|
||||
P_FLAG(CHILD_CLEARTID);
|
||||
P_FLAG(DETACHED);
|
||||
P_FLAG(UNTRACED);
|
||||
P_FLAG(CHILD_SETTID);
|
||||
P_FLAG(NEWCGROUP);
|
||||
P_FLAG(NEWUTS);
|
||||
P_FLAG(NEWIPC);
|
||||
P_FLAG(NEWUSER);
|
||||
P_FLAG(NEWPID);
|
||||
P_FLAG(NEWNET);
|
||||
P_FLAG(IO);
|
||||
P_FLAG(CLEAR_SIGHAND);
|
||||
P_FLAG(INTO_CGROUP);
|
||||
#undef P_FLAG
|
||||
|
||||
if (flags)
|
||||
printed += scnprintf(bf + printed, size - printed, "%s%#x", printed ? "|" : "", flags);
|
||||
|
||||
return printed;
|
||||
return strarray__scnprintf_flags(&strarray__clone_flags, bf, size, show_prefix, flags);
|
||||
}
|
||||
|
||||
size_t syscall_arg__scnprintf_clone_flags(char *bf, size_t size, struct syscall_arg *arg)
|
||||
|
||||
17
tools/perf/trace/beauty/clone.sh
Executable file
17
tools/perf/trace/beauty/clone.sh
Executable file
@@ -0,0 +1,17 @@
|
||||
#!/bin/sh
|
||||
# SPDX-License-Identifier: LGPL-2.1
|
||||
|
||||
if [ $# -ne 1 ] ; then
|
||||
beauty_uapi_linux_dir=tools/perf/trace/beauty/include/uapi/linux/
|
||||
else
|
||||
beauty_uapi_linux_dir=$1
|
||||
fi
|
||||
|
||||
linux_sched=${beauty_uapi_linux_dir}/sched.h
|
||||
|
||||
printf "static const char *clone_flags[] = {\n"
|
||||
regex='^[[:space:]]*#[[:space:]]*define[[:space:]]+CLONE_([^_]+[[:alnum:]_]+)[[:space:]]+(0x[[:xdigit:]]+)[[:space:]]*.*'
|
||||
grep -E $regex ${linux_sched} | \
|
||||
sed -r "s/$regex/\2 \1/g" | \
|
||||
xargs printf "\t[ilog2(%s) + 1] = \"%s\",\n"
|
||||
printf "};\n"
|
||||
Reference in New Issue
Block a user