mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-07-24 17:23:29 -04:00
perf trace beauty: Make beauty generated C code standalone .o files
Previously, builtin-trace.c directly included 15 embedded C files
(e.g. trace/beauty/mmap.c and fsconfig_arrays.c), which in turn depend
on dozens of generated beauty script arrays. To satisfy these embedded
inclusions, the global Makefile.perf would define all the generator
variables/rules and include them in the prepare umbrella target, choking
parallel build startup.
Furthermore, tools/perf/util/syscalltbl.c included its own generated mapper,
and util/env.c conditionally included arch_errno_names.c inline, splitting
consumers across directories and preventing clean Make encapsulation.
Refactor the framework to achieve better encapsulation:
1. Move util/syscalltbl.[ch] into trace/beauty/ to co-locate with all
generated code consumers.
2. Create fsconfig.c and flatten embedded beauty .c files to compile as
independent standalone objects via trace/beauty/Build, exporting their
formatting functions via beauty.h and env.h. Switch arch_errno_names.o
and syscalltbl.o assignments directly to perf-util-y and add an
unconditional top-level recursive kbuild hook (perf-util-y += trace/beauty/)
to compile them into libperf-util.a, resolving remote linkage for util/env.c,
util/bpf-trace-summary.c, and standalone python extensions.
3. Bridge private opaque references (struct trace) securely via accessors
trace__show_zeros() and trace__host(), avoiding header entanglements.
4. Consolidate all generator variables, script paths, and array generation
rules entirely out of Makefile.perf and place them directly inside the
exact local Build files where their output objects are compiled
(trace/beauty/Build and trace/beauty/tracepoints/Build), binding
prerequisites locally. Use directly inside
generator recipes to guarantee dynamic directory creation before script
redirection, and append across all rules to print
clean, standardized GEN ... file.c output during compilation.
5. Clean up clean target to recursively remove the generated directory
instead of relying on dozens of individual variables.
This unchokes the "prepare" target parallel barrier, allows make to evaluate
generation scripts purely locally where consumed, and flattens the tracepoint
formatting architecture.
Testing a parallel build (make -j28 all from scratch) shows improvements:
Before:
real 0m28.689s
user 2m38.490s
sys 0m30.148s
After:
real 0m27.642s
user 2m32.356s
sys 0m26.683s
So reclaiming ~9.6 seconds of raw CPU time and over 1 full second off
overall real-world build latency, by overlapping sub-make startup and
avoiding top-level double-parsing overhead.
Reviewed-by: Namhyung Kim <namhyung@kernel.org>
Assisted-by: Gemini:gemini-3.1-pro-preview
Signed-off-by: Ian Rogers <irogers@google.com>
Tested-by: James Clark <james.clark@linaro.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Albert Ou <aou@eecs.berkeley.edu>
Cc: Alexandre Chartre <alexandre.chartre@oracle.com>
Cc: Alexandre Ghiti <alex@ghiti.fr>
Cc: Andrii Nakryiko <andrii@kernel.org>
Cc: Ankur Arora <ankur.a.arora@oracle.com>
Cc: Collin Funk <collin.funk1@gmail.com>
Cc: Costa Shulyupin <costa.shul@redhat.com>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Cc: Dapeng Mi <dapeng1.mi@linux.intel.com>
Cc: David Sterba <dsterba@suse.com>
Cc: Dmitrii Dolgov <9erthalion6@gmail.com>
Cc: Eduard Zingerman <eddyz87@gmail.com>
Cc: Howard Chu <howardchu95@gmail.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kumar Kartikeya Dwivedi <memxor@gmail.com>
Cc: Leo Yan <leo.yan@arm.com>
Cc: Markus Mayer <mmayer@broadcom.com>
Cc: Martin KaFai Lau <martin.lau@linux.dev>
Cc: Nathan Chancellor <nathan@kernel.org>
Cc: Nick Terrell <terrelln@fb.com>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Paul Walmsley <pjw@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Quentin Monnet <qmo@kernel.org>
Cc: Ricky Ringler <ricky.ringler@proton.me>
Cc: Song Liu <song@kernel.org>
Cc: Swapnil Sapkal <swapnil.sapkal@amd.com>
Cc: Thomas Falcon <thomas.falcon@intel.com>
Cc: Tomas Glozar <tglozar@redhat.com>
Cc: Yonghong Song <yonghong.song@linux.dev>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Ian Rogers
committed by
Arnaldo Carvalho de Melo
Arnaldo Carvalho de Melo
parent
35c9fb2200
commit
537609924c
@@ -34,6 +34,8 @@ ifeq ($(CONFIG_LIBTRACEEVENT),y)
|
||||
perf-$(CONFIG_TRACE) += trace/beauty/
|
||||
endif
|
||||
|
||||
perf-util-y += trace/beauty/
|
||||
|
||||
perf-$(CONFIG_LIBELF) += builtin-probe.o
|
||||
|
||||
perf-bench-y += bench/
|
||||
|
||||
@@ -509,225 +509,6 @@ arm64-sysreg-defs-clean:
|
||||
$(Q)$(MAKE) -C $(arm64_gen_sysreg_dir) O=$(arm64_gen_sysreg_outdir) \
|
||||
prefix= subdir= clean > /dev/null
|
||||
|
||||
beauty_linux_dir := $(srctree)/tools/perf/trace/beauty/include/linux/
|
||||
beauty_uapi_linux_dir := $(srctree)/tools/perf/trace/beauty/include/uapi/linux/
|
||||
beauty_uapi_sound_dir := $(srctree)/tools/perf/trace/beauty/include/uapi/sound/
|
||||
beauty_arch_asm_dir := $(srctree)/tools/perf/trace/beauty/arch/x86/include/asm/
|
||||
beauty_x86_arch_asm_uapi_dir := $(srctree)/tools/perf/trace/beauty/arch/x86/include/uapi/asm/
|
||||
|
||||
linux_uapi_dir := $(srctree)/tools/include/uapi/linux
|
||||
asm_generic_uapi_dir := $(srctree)/tools/include/uapi/asm-generic
|
||||
arch_asm_uapi_dir := $(srctree)/tools/arch/$(SRCARCH)/include/uapi/asm/
|
||||
x86_arch_asm_dir := $(srctree)/tools/arch/x86/include/asm/
|
||||
|
||||
beauty_outdir := $(OUTPUT)trace/beauty/generated
|
||||
beauty_ioctl_outdir := $(beauty_outdir)/ioctl
|
||||
|
||||
# Create output directory if not already present
|
||||
$(shell [ -d '$(beauty_ioctl_outdir)' ] || mkdir -p '$(beauty_ioctl_outdir)')
|
||||
|
||||
syscall_array := $(beauty_outdir)/syscalltbl.c
|
||||
syscall_tbl := $(srctree)/tools/perf/trace/beauty/syscalltbl.sh
|
||||
syscall_tbl_data := $(srctree)/tools/scripts/syscall.tbl \
|
||||
$(wildcard $(srctree)/tools/perf/arch/*/entry/syscalls/syscall*.tbl)
|
||||
|
||||
$(syscall_array): $(syscall_tbl) $(syscall_tbl_data)
|
||||
$(Q)$(SHELL) '$(syscall_tbl)' $(srctree)/tools $@
|
||||
|
||||
fs_at_flags_array := $(beauty_outdir)/fs_at_flags_array.c
|
||||
fs_at_flags_tbl := $(srctree)/tools/perf/trace/beauty/fs_at_flags.sh
|
||||
|
||||
$(fs_at_flags_array): $(beauty_uapi_linux_dir)/fcntl.h $(fs_at_flags_tbl)
|
||||
$(Q)$(SHELL) '$(fs_at_flags_tbl)' $(beauty_uapi_linux_dir) > $@
|
||||
|
||||
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/perf/trace/beauty/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) > $@
|
||||
|
||||
fadvise_advice_array := $(beauty_outdir)/fadvise_advice_array.c
|
||||
fadvise_advice_tbl := $(srctree)/tools/perf/trace/beauty/fadvise.sh
|
||||
|
||||
$(fadvise_advice_array): $(beauty_uapi_linux_dir)/fadvise.h $(fadvise_advice_tbl)
|
||||
$(Q)$(SHELL) '$(fadvise_advice_tbl)' $(beauty_uapi_linux_dir) > $@
|
||||
|
||||
fsmount_arrays := $(beauty_outdir)/fsmount_arrays.c
|
||||
fsmount_tbls := $(srctree)/tools/perf/trace/beauty/fsmount.sh
|
||||
|
||||
$(fsmount_arrays): $(beauty_uapi_linux_dir)/mount.h $(fsmount_tbls)
|
||||
$(Q)$(SHELL) '$(fsmount_tbls)' $(beauty_uapi_linux_dir) > $@
|
||||
|
||||
fspick_arrays := $(beauty_outdir)/fspick_arrays.c
|
||||
fspick_tbls := $(srctree)/tools/perf/trace/beauty/fspick.sh
|
||||
|
||||
$(fspick_arrays): $(beauty_uapi_linux_dir)/mount.h $(fspick_tbls)
|
||||
$(Q)$(SHELL) '$(fspick_tbls)' $(beauty_uapi_linux_dir) > $@
|
||||
|
||||
fsconfig_arrays := $(beauty_outdir)/fsconfig_arrays.c
|
||||
fsconfig_tbls := $(srctree)/tools/perf/trace/beauty/fsconfig.sh
|
||||
|
||||
$(fsconfig_arrays): $(beauty_uapi_linux_dir)/mount.h $(fsconfig_tbls)
|
||||
$(Q)$(SHELL) '$(fsconfig_tbls)' $(beauty_uapi_linux_dir) > $@
|
||||
|
||||
pkey_alloc_access_rights_array := $(beauty_outdir)/pkey_alloc_access_rights_array.c
|
||||
asm_generic_hdr_dir := $(srctree)/tools/include/uapi/asm-generic/
|
||||
pkey_alloc_access_rights_tbl := $(srctree)/tools/perf/trace/beauty/pkey_alloc_access_rights.sh
|
||||
|
||||
$(pkey_alloc_access_rights_array): $(asm_generic_hdr_dir)/mman-common.h $(pkey_alloc_access_rights_tbl)
|
||||
$(Q)$(SHELL) '$(pkey_alloc_access_rights_tbl)' $(asm_generic_hdr_dir) > $@
|
||||
|
||||
sndrv_ctl_ioctl_array := $(beauty_ioctl_outdir)/sndrv_ctl_ioctl_array.c
|
||||
sndrv_ctl_hdr_dir := $(srctree)/tools/include/uapi/sound
|
||||
sndrv_ctl_ioctl_tbl := $(srctree)/tools/perf/trace/beauty/sndrv_ctl_ioctl.sh
|
||||
|
||||
$(sndrv_ctl_ioctl_array): $(beauty_uapi_sound_dir)/asound.h $(sndrv_ctl_ioctl_tbl)
|
||||
$(Q)$(SHELL) '$(sndrv_ctl_ioctl_tbl)' $(beauty_uapi_sound_dir) > $@
|
||||
|
||||
sndrv_pcm_ioctl_array := $(beauty_ioctl_outdir)/sndrv_pcm_ioctl_array.c
|
||||
sndrv_pcm_hdr_dir := $(srctree)/tools/include/uapi/sound
|
||||
sndrv_pcm_ioctl_tbl := $(srctree)/tools/perf/trace/beauty/sndrv_pcm_ioctl.sh
|
||||
|
||||
$(sndrv_pcm_ioctl_array): $(beauty_uapi_sound_dir)/asound.h $(sndrv_pcm_ioctl_tbl)
|
||||
$(Q)$(SHELL) '$(sndrv_pcm_ioctl_tbl)' $(beauty_uapi_sound_dir) > $@
|
||||
|
||||
kcmp_type_array := $(beauty_outdir)/kcmp_type_array.c
|
||||
kcmp_hdr_dir := $(srctree)/tools/include/uapi/linux/
|
||||
kcmp_type_tbl := $(srctree)/tools/perf/trace/beauty/kcmp_type.sh
|
||||
|
||||
$(kcmp_type_array): $(kcmp_hdr_dir)/kcmp.h $(kcmp_type_tbl)
|
||||
$(Q)$(SHELL) '$(kcmp_type_tbl)' $(kcmp_hdr_dir) > $@
|
||||
|
||||
kvm_ioctl_array := $(beauty_ioctl_outdir)/kvm_ioctl_array.c
|
||||
kvm_hdr_dir := $(srctree)/tools/include/uapi/linux
|
||||
kvm_ioctl_tbl := $(srctree)/tools/perf/trace/beauty/kvm_ioctl.sh
|
||||
|
||||
$(kvm_ioctl_array): $(kvm_hdr_dir)/kvm.h $(kvm_ioctl_tbl)
|
||||
$(Q)$(SHELL) '$(kvm_ioctl_tbl)' $(kvm_hdr_dir) > $@
|
||||
|
||||
socket_arrays := $(beauty_outdir)/socket.c
|
||||
socket_tbl := $(srctree)/tools/perf/trace/beauty/socket.sh
|
||||
|
||||
$(socket_arrays): $(linux_uapi_dir)/in.h $(beauty_linux_dir)/socket.h $(socket_tbl)
|
||||
$(Q)$(SHELL) '$(socket_tbl)' $(linux_uapi_dir) $(beauty_linux_dir) > $@
|
||||
|
||||
sockaddr_arrays := $(beauty_outdir)/sockaddr.c
|
||||
sockaddr_tbl := $(srctree)/tools/perf/trace/beauty/sockaddr.sh
|
||||
|
||||
$(sockaddr_arrays): $(beauty_linux_dir)/socket.h $(sockaddr_tbl)
|
||||
$(Q)$(SHELL) '$(sockaddr_tbl)' $(beauty_linux_dir) > $@
|
||||
|
||||
vhost_virtio_ioctl_array := $(beauty_ioctl_outdir)/vhost_virtio_ioctl_array.c
|
||||
vhost_virtio_ioctl_tbl := $(srctree)/tools/perf/trace/beauty/vhost_virtio_ioctl.sh
|
||||
|
||||
$(vhost_virtio_ioctl_array): $(beauty_uapi_linux_dir)/vhost.h $(vhost_virtio_ioctl_tbl)
|
||||
$(Q)$(SHELL) '$(vhost_virtio_ioctl_tbl)' $(beauty_uapi_linux_dir) > $@
|
||||
|
||||
perf_ioctl_array := $(beauty_ioctl_outdir)/perf_ioctl_array.c
|
||||
perf_hdr_dir := $(srctree)/tools/include/uapi/linux
|
||||
perf_ioctl_tbl := $(srctree)/tools/perf/trace/beauty/perf_ioctl.sh
|
||||
|
||||
$(perf_ioctl_array): $(perf_hdr_dir)/perf_event.h $(perf_ioctl_tbl)
|
||||
$(Q)$(SHELL) '$(perf_ioctl_tbl)' $(perf_hdr_dir) > $@
|
||||
|
||||
madvise_behavior_array := $(beauty_outdir)/madvise_behavior_array.c
|
||||
madvise_hdr_dir := $(srctree)/tools/include/uapi/asm-generic/
|
||||
madvise_behavior_tbl := $(srctree)/tools/perf/trace/beauty/madvise_behavior.sh
|
||||
|
||||
$(madvise_behavior_array): $(madvise_hdr_dir)/mman-common.h $(madvise_behavior_tbl)
|
||||
$(Q)$(SHELL) '$(madvise_behavior_tbl)' $(madvise_hdr_dir) > $@
|
||||
|
||||
mmap_flags_array := $(beauty_outdir)/mmap_flags_array.c
|
||||
mmap_flags_tbl := $(srctree)/tools/perf/trace/beauty/mmap_flags.sh
|
||||
|
||||
$(mmap_flags_array): $(linux_uapi_dir)/mman.h $(asm_generic_uapi_dir)/mman.h $(asm_generic_uapi_dir)/mman-common.h $(mmap_flags_tbl)
|
||||
$(Q)$(SHELL) '$(mmap_flags_tbl)' $(linux_uapi_dir) $(asm_generic_uapi_dir) $(arch_asm_uapi_dir) > $@
|
||||
|
||||
mremap_flags_array := $(beauty_outdir)/mremap_flags_array.c
|
||||
mremap_flags_tbl := $(srctree)/tools/perf/trace/beauty/mremap_flags.sh
|
||||
|
||||
$(mremap_flags_array): $(linux_uapi_dir)/mman.h $(mremap_flags_tbl)
|
||||
$(Q)$(SHELL) '$(mremap_flags_tbl)' $(linux_uapi_dir) > $@
|
||||
|
||||
mount_flags_array := $(beauty_outdir)/mount_flags_array.c
|
||||
mount_flags_tbl := $(srctree)/tools/perf/trace/beauty/mount_flags.sh
|
||||
|
||||
$(mount_flags_array): $(beauty_uapi_linux_dir)/mount.h $(mount_flags_tbl)
|
||||
$(Q)$(SHELL) '$(mount_flags_tbl)' $(beauty_uapi_linux_dir) > $@
|
||||
|
||||
move_mount_flags_array := $(beauty_outdir)/move_mount_flags_array.c
|
||||
move_mount_flags_tbl := $(srctree)/tools/perf/trace/beauty/move_mount_flags.sh
|
||||
|
||||
$(move_mount_flags_array): $(beauty_uapi_linux_dir)/mount.h $(move_mount_flags_tbl)
|
||||
$(Q)$(SHELL) '$(move_mount_flags_tbl)' $(beauty_uapi_linux_dir) > $@
|
||||
|
||||
mmap_prot_array := $(beauty_outdir)/mmap_prot_array.c
|
||||
mmap_prot_tbl := $(srctree)/tools/perf/trace/beauty/mmap_prot.sh
|
||||
|
||||
$(mmap_prot_array): $(asm_generic_uapi_dir)/mman.h $(asm_generic_uapi_dir)/mman-common.h $(mmap_prot_tbl)
|
||||
$(Q)$(SHELL) '$(mmap_prot_tbl)' $(asm_generic_uapi_dir) $(arch_asm_uapi_dir) > $@
|
||||
|
||||
prctl_option_array := $(beauty_outdir)/prctl_option_array.c
|
||||
prctl_option_tbl := $(srctree)/tools/perf/trace/beauty/prctl_option.sh
|
||||
|
||||
$(prctl_option_array): $(beauty_uapi_linux_dir)/prctl.h $(prctl_option_tbl)
|
||||
$(Q)$(SHELL) '$(prctl_option_tbl)' $(beauty_uapi_linux_dir) > $@
|
||||
|
||||
usbdevfs_ioctl_array := $(beauty_ioctl_outdir)/usbdevfs_ioctl_array.c
|
||||
usbdevfs_ioctl_tbl := $(srctree)/tools/perf/trace/beauty/usbdevfs_ioctl.sh
|
||||
|
||||
$(usbdevfs_ioctl_array): $(beauty_uapi_linux_dir)/usbdevice_fs.h $(usbdevfs_ioctl_tbl)
|
||||
$(Q)$(SHELL) '$(usbdevfs_ioctl_tbl)' $(beauty_uapi_linux_dir) > $@
|
||||
|
||||
x86_arch_prctl_code_array := $(beauty_outdir)/x86_arch_prctl_code_array.c
|
||||
x86_arch_prctl_code_tbl := $(srctree)/tools/perf/trace/beauty/x86_arch_prctl.sh
|
||||
|
||||
$(x86_arch_prctl_code_array): $(beauty_x86_arch_asm_uapi_dir)/prctl.h $(x86_arch_prctl_code_tbl)
|
||||
$(Q)$(SHELL) '$(x86_arch_prctl_code_tbl)' $(beauty_x86_arch_asm_uapi_dir) > $@
|
||||
|
||||
x86_arch_irq_vectors_array := $(beauty_outdir)/x86_arch_irq_vectors_array.c
|
||||
x86_arch_irq_vectors_tbl := $(srctree)/tools/perf/trace/beauty/tracepoints/x86_irq_vectors.sh
|
||||
|
||||
$(x86_arch_irq_vectors_array): $(beauty_arch_asm_dir)/irq_vectors.h $(x86_arch_irq_vectors_tbl)
|
||||
$(Q)$(SHELL) '$(x86_arch_irq_vectors_tbl)' $(beauty_arch_asm_dir) > $@
|
||||
|
||||
x86_arch_MSRs_array := $(beauty_outdir)/x86_arch_MSRs_array.c
|
||||
x86_arch_MSRs_tbl := $(srctree)/tools/perf/trace/beauty/tracepoints/x86_msr.sh
|
||||
|
||||
$(x86_arch_MSRs_array): $(x86_arch_asm_dir)/msr-index.h $(x86_arch_MSRs_tbl)
|
||||
$(Q)$(SHELL) '$(x86_arch_MSRs_tbl)' $(x86_arch_asm_dir) > $@
|
||||
|
||||
rename_flags_array := $(beauty_outdir)/rename_flags_array.c
|
||||
rename_flags_tbl := $(srctree)/tools/perf/trace/beauty/rename_flags.sh
|
||||
|
||||
$(rename_flags_array): $(beauty_uapi_linux_dir)/fs.h $(rename_flags_tbl)
|
||||
$(Q)$(SHELL) '$(rename_flags_tbl)' $(beauty_uapi_linux_dir) > $@
|
||||
|
||||
arch_errno_name_array := $(beauty_outdir)/arch_errno_name_array.c
|
||||
arch_errno_hdr_dir := $(srctree)/tools
|
||||
arch_errno_tbl := $(srctree)/tools/perf/trace/beauty/arch_errno_names.sh
|
||||
|
||||
$(arch_errno_name_array): $(arch_errno_tbl)
|
||||
$(Q)$(SHELL) '$(arch_errno_tbl)' '$(patsubst -%,,$(CC))' $(arch_errno_hdr_dir) > $@
|
||||
|
||||
statx_mask_array := $(beauty_outdir)/statx_mask_array.c
|
||||
statx_mask_tbl := $(srctree)/tools/perf/trace/beauty/statx_mask.sh
|
||||
|
||||
$(statx_mask_array): $(beauty_uapi_linux_dir)/stat.h $(statx_mask_tbl)
|
||||
$(Q)$(SHELL) '$(statx_mask_tbl)' $(beauty_uapi_linux_dir) > $@
|
||||
|
||||
sync_file_range_arrays := $(beauty_outdir)/sync_file_range_arrays.c
|
||||
sync_file_range_tbls := $(srctree)/tools/perf/trace/beauty/sync_file_range.sh
|
||||
|
||||
$(sync_file_range_arrays): $(beauty_uapi_linux_dir)/fs.h $(sync_file_range_tbls)
|
||||
$(Q)$(SHELL) '$(sync_file_range_tbls)' $(beauty_uapi_linux_dir) > $@
|
||||
|
||||
TESTS_CORESIGHT_DIR := $(srctree)/tools/perf/tests/shell/coresight
|
||||
|
||||
@@ -848,38 +629,6 @@ build-dir = $(or $(__build-dir),.)
|
||||
|
||||
prepare: $(OUTPUT)PERF-VERSION-FILE archheaders \
|
||||
arm64-sysreg-defs \
|
||||
$(syscall_array) \
|
||||
$(fs_at_flags_array) \
|
||||
$(clone_flags_array) \
|
||||
$(drm_ioctl_array) \
|
||||
$(fadvise_advice_array) \
|
||||
$(fsconfig_arrays) \
|
||||
$(fsmount_arrays) \
|
||||
$(fspick_arrays) \
|
||||
$(pkey_alloc_access_rights_array) \
|
||||
$(sndrv_pcm_ioctl_array) \
|
||||
$(sndrv_ctl_ioctl_array) \
|
||||
$(kcmp_type_array) \
|
||||
$(kvm_ioctl_array) \
|
||||
$(socket_arrays) \
|
||||
$(sockaddr_arrays) \
|
||||
$(vhost_virtio_ioctl_array) \
|
||||
$(madvise_behavior_array) \
|
||||
$(mmap_flags_array) \
|
||||
$(mmap_prot_array) \
|
||||
$(mremap_flags_array) \
|
||||
$(mount_flags_array) \
|
||||
$(move_mount_flags_array) \
|
||||
$(perf_ioctl_array) \
|
||||
$(prctl_option_array) \
|
||||
$(usbdevfs_ioctl_array) \
|
||||
$(x86_arch_irq_vectors_array) \
|
||||
$(x86_arch_MSRs_array) \
|
||||
$(x86_arch_prctl_code_array) \
|
||||
$(rename_flags_array) \
|
||||
$(arch_errno_name_array) \
|
||||
$(statx_mask_array) \
|
||||
$(sync_file_range_arrays) \
|
||||
$(LIBAPI) \
|
||||
$(LIBPERF) \
|
||||
$(LIBSUBCMD) \
|
||||
@@ -1299,35 +1048,8 @@ clean:: $(LIBAPI)-clean $(LIBBPF)-clean $(LIBSUBCMD)-clean $(LIBSYMBOL)-clean $(
|
||||
TAGS tags cscope* $(OUTPUT)PERF-VERSION-FILE \
|
||||
$(OUTPUT)FEATURE-DUMP $(OUTPUT)util/*-bison* $(OUTPUT)util/*-flex* \
|
||||
$(OUTPUT)util/intel-pt-decoder/inat-tables.c \
|
||||
$(OUTPUT)tests/llvm-src-{base,kbuild,prologue,relocation}.c \
|
||||
$(OUTPUT)$(fadvise_advice_array) \
|
||||
$(OUTPUT)$(fsconfig_arrays) \
|
||||
$(OUTPUT)$(fsmount_arrays) \
|
||||
$(OUTPUT)$(fspick_arrays) \
|
||||
$(OUTPUT)$(madvise_behavior_array) \
|
||||
$(OUTPUT)$(mmap_flags_array) \
|
||||
$(OUTPUT)$(mmap_prot_array) \
|
||||
$(OUTPUT)$(mremap_flags_array) \
|
||||
$(OUTPUT)$(mount_flags_array) \
|
||||
$(OUTPUT)$(move_mount_flags_array) \
|
||||
$(OUTPUT)$(drm_ioctl_array) \
|
||||
$(OUTPUT)$(pkey_alloc_access_rights_array) \
|
||||
$(OUTPUT)$(sndrv_ctl_ioctl_array) \
|
||||
$(OUTPUT)$(sndrv_pcm_ioctl_array) \
|
||||
$(OUTPUT)$(kvm_ioctl_array) \
|
||||
$(OUTPUT)$(kcmp_type_array) \
|
||||
$(OUTPUT)$(socket_arrays) \
|
||||
$(OUTPUT)$(sockaddr_arrays) \
|
||||
$(OUTPUT)$(vhost_virtio_ioctl_array) \
|
||||
$(OUTPUT)$(perf_ioctl_array) \
|
||||
$(OUTPUT)$(prctl_option_array) \
|
||||
$(OUTPUT)$(usbdevfs_ioctl_array) \
|
||||
$(OUTPUT)$(x86_arch_irq_vectors_array) \
|
||||
$(OUTPUT)$(x86_arch_MSRs_array) \
|
||||
$(OUTPUT)$(x86_arch_prctl_code_array) \
|
||||
$(OUTPUT)$(rename_flags_array) \
|
||||
$(OUTPUT)$(arch_errno_name_array) \
|
||||
$(OUTPUT)$(sync_file_range_arrays)
|
||||
$(OUTPUT)tests/llvm-src-{base,kbuild,prologue,relocation}.c
|
||||
$(Q)$(RM) -r $(OUTPUT)trace/beauty/generated
|
||||
$(call QUIET_CLEAN, Documentation) \
|
||||
$(MAKE) -C $(DOC_DIR) O=$(OUTPUT) clean >/dev/null
|
||||
|
||||
|
||||
@@ -60,12 +60,13 @@
|
||||
#include "callchain.h"
|
||||
#include "print_binary.h"
|
||||
#include "string2.h"
|
||||
#include "syscalltbl.h"
|
||||
#include "trace/beauty/syscalltbl.h"
|
||||
#include "../perf.h"
|
||||
#include "trace_augment.h"
|
||||
#include "dwarf-regs.h"
|
||||
|
||||
#include <errno.h>
|
||||
#include <sys/stat.h>
|
||||
#include <inttypes.h>
|
||||
#include <poll.h>
|
||||
#include <signal.h>
|
||||
@@ -235,6 +236,16 @@ struct trace {
|
||||
const char *uid_str;
|
||||
};
|
||||
|
||||
bool trace__show_zeros(const struct trace *trace)
|
||||
{
|
||||
return trace->show_zeros;
|
||||
}
|
||||
|
||||
struct machine *trace__host(const struct trace *trace)
|
||||
{
|
||||
return trace->host;
|
||||
}
|
||||
|
||||
static void trace__load_vmlinux_btf(struct trace *trace __maybe_unused)
|
||||
{
|
||||
#ifdef HAVE_LIBBPF_SUPPORT
|
||||
@@ -777,10 +788,6 @@ static const char *fsmount_flags[] = {
|
||||
};
|
||||
static DEFINE_STRARRAY(fsmount_flags, "FSMOUNT_");
|
||||
|
||||
#include "trace/beauty/generated/fsconfig_arrays.c"
|
||||
|
||||
static DEFINE_STRARRAY(fsconfig_cmds, "FSCONFIG_");
|
||||
|
||||
static const char *epoll_ctl_ops[] = { "ADD", "DEL", "MOD", };
|
||||
static DEFINE_STRARRAY_OFFSET(epoll_ctl_ops, "EPOLL_CTL_", 1);
|
||||
|
||||
@@ -1129,21 +1136,6 @@ static bool syscall_arg__strtoul_btf_type(char *bf __maybe_unused, size_t size _
|
||||
.parm = &strarray__##array, \
|
||||
.show_zero = true, }
|
||||
|
||||
#include "trace/beauty/eventfd.c"
|
||||
#include "trace/beauty/futex_op.c"
|
||||
#include "trace/beauty/futex_val3.c"
|
||||
#include "trace/beauty/mmap.c"
|
||||
#include "trace/beauty/mode_t.c"
|
||||
#include "trace/beauty/msg_flags.c"
|
||||
#include "trace/beauty/open_flags.c"
|
||||
#include "trace/beauty/perf_event_open.c"
|
||||
#include "trace/beauty/pid.c"
|
||||
#include "trace/beauty/sched_policy.c"
|
||||
#include "trace/beauty/seccomp.c"
|
||||
#include "trace/beauty/signum.c"
|
||||
#include "trace/beauty/socket_type.c"
|
||||
#include "trace/beauty/waitid_options.c"
|
||||
|
||||
static const struct syscall_fmt syscall_fmts[] = {
|
||||
{ .name = "access",
|
||||
.arg = { [1] = { .scnprintf = SCA_ACCMODE, /* mode */ }, }, },
|
||||
|
||||
@@ -19,6 +19,23 @@ perf-y += socket.o
|
||||
perf-y += statx.o
|
||||
perf-y += sync_file_range.o
|
||||
perf-y += timespec.o
|
||||
perf-util-y += syscalltbl.o
|
||||
perf-y += fsconfig.o
|
||||
perf-y += eventfd.o
|
||||
perf-y += futex_op.o
|
||||
perf-y += futex_val3.o
|
||||
perf-y += mmap.o
|
||||
perf-y += mode_t.o
|
||||
perf-y += msg_flags.o
|
||||
perf-y += open_flags.o
|
||||
perf-y += perf_event_open.o
|
||||
perf-y += pid.o
|
||||
perf-y += sched_policy.o
|
||||
perf-y += seccomp.o
|
||||
perf-y += signum.o
|
||||
perf-y += socket_type.o
|
||||
perf-y += waitid_options.o
|
||||
perf-util-y += arch_errno_names.o
|
||||
perf-y += tracepoints/
|
||||
|
||||
ifdef SHELLCHECK
|
||||
@@ -34,3 +51,262 @@ $(OUTPUT)%.shellcheck_log: %
|
||||
$(Q)$(call echo-cmd,test)$(SHELLCHECK) "$<" > $@ || (cat $@ && rm $@ && false)
|
||||
|
||||
perf-y += $(SHELL_TEST_LOGS)
|
||||
|
||||
beauty_linux_dir := $(srctree)/tools/perf/trace/beauty/include/linux/
|
||||
beauty_uapi_linux_dir := $(srctree)/tools/perf/trace/beauty/include/uapi/linux/
|
||||
beauty_uapi_sound_dir := $(srctree)/tools/perf/trace/beauty/include/uapi/sound/
|
||||
beauty_arch_asm_dir := $(srctree)/tools/perf/trace/beauty/arch/x86/include/asm/
|
||||
beauty_x86_arch_asm_uapi_dir := $(srctree)/tools/perf/trace/beauty/arch/x86/include/uapi/asm/
|
||||
|
||||
linux_uapi_dir := $(srctree)/tools/include/uapi/linux
|
||||
asm_generic_uapi_dir := $(srctree)/tools/include/uapi/asm-generic
|
||||
arch_asm_uapi_dir := $(srctree)/tools/arch/$(SRCARCH)/include/uapi/asm/
|
||||
x86_arch_asm_dir := $(srctree)/tools/arch/x86/include/asm/
|
||||
|
||||
beauty_outdir := $(OUTPUT)trace/beauty/generated
|
||||
beauty_ioctl_outdir := $(beauty_outdir)/ioctl
|
||||
|
||||
syscall_array := $(beauty_outdir)/syscalltbl.c
|
||||
syscall_tbl := $(srctree)/tools/perf/trace/beauty/syscalltbl.sh
|
||||
syscall_tbl_data := $(srctree)/tools/scripts/syscall.tbl \
|
||||
$(wildcard $(srctree)/tools/perf/arch/*/entry/syscalls/syscall*.tbl)
|
||||
|
||||
$(syscall_array): $(syscall_tbl) $(syscall_tbl_data)
|
||||
$(call rule_mkdir)
|
||||
$(Q)$(call echo-cmd,gen)$(SHELL) '$(syscall_tbl)' $(srctree)/tools $@
|
||||
|
||||
fs_at_flags_array := $(beauty_outdir)/fs_at_flags_array.c
|
||||
fs_at_flags_tbl := $(srctree)/tools/perf/trace/beauty/fs_at_flags.sh
|
||||
|
||||
$(fs_at_flags_array): $(beauty_uapi_linux_dir)/fcntl.h $(fs_at_flags_tbl)
|
||||
$(call rule_mkdir)
|
||||
$(Q)$(call echo-cmd,gen)$(SHELL) '$(fs_at_flags_tbl)' $(beauty_uapi_linux_dir) > $@
|
||||
|
||||
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)
|
||||
$(call rule_mkdir)
|
||||
$(Q)$(call echo-cmd,gen)$(SHELL) '$(clone_flags_tbl)' $(beauty_uapi_linux_dir) > $@
|
||||
|
||||
drm_ioctl_array := $(beauty_ioctl_outdir)/drm_ioctl_array.c
|
||||
drm_hdr_dir := $(srctree)/tools/perf/trace/beauty/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)
|
||||
$(call rule_mkdir)
|
||||
$(Q)$(call echo-cmd,gen)$(SHELL) '$(drm_ioctl_tbl)' $(drm_hdr_dir) > $@
|
||||
|
||||
fadvise_advice_array := $(beauty_outdir)/fadvise_advice_array.c
|
||||
fadvise_advice_tbl := $(srctree)/tools/perf/trace/beauty/fadvise.sh
|
||||
|
||||
$(fadvise_advice_array): $(beauty_uapi_linux_dir)/fadvise.h $(fadvise_advice_tbl)
|
||||
$(call rule_mkdir)
|
||||
$(Q)$(call echo-cmd,gen)$(SHELL) '$(fadvise_advice_tbl)' $(beauty_uapi_linux_dir) > $@
|
||||
|
||||
fsmount_arrays := $(beauty_outdir)/fsmount_arrays.c
|
||||
fsmount_tbls := $(srctree)/tools/perf/trace/beauty/fsmount.sh
|
||||
|
||||
$(fsmount_arrays): $(beauty_uapi_linux_dir)/mount.h $(fsmount_tbls)
|
||||
$(call rule_mkdir)
|
||||
$(Q)$(call echo-cmd,gen)$(SHELL) '$(fsmount_tbls)' $(beauty_uapi_linux_dir) > $@
|
||||
|
||||
fspick_arrays := $(beauty_outdir)/fspick_arrays.c
|
||||
fspick_tbls := $(srctree)/tools/perf/trace/beauty/fspick.sh
|
||||
|
||||
$(fspick_arrays): $(beauty_uapi_linux_dir)/mount.h $(fspick_tbls)
|
||||
$(call rule_mkdir)
|
||||
$(Q)$(call echo-cmd,gen)$(SHELL) '$(fspick_tbls)' $(beauty_uapi_linux_dir) > $@
|
||||
|
||||
fsconfig_arrays := $(beauty_outdir)/fsconfig_arrays.c
|
||||
fsconfig_tbls := $(srctree)/tools/perf/trace/beauty/fsconfig.sh
|
||||
|
||||
$(fsconfig_arrays): $(beauty_uapi_linux_dir)/mount.h $(fsconfig_tbls)
|
||||
$(call rule_mkdir)
|
||||
$(Q)$(call echo-cmd,gen)$(SHELL) '$(fsconfig_tbls)' $(beauty_uapi_linux_dir) > $@
|
||||
|
||||
pkey_alloc_access_rights_array := $(beauty_outdir)/pkey_alloc_access_rights_array.c
|
||||
asm_generic_hdr_dir := $(srctree)/tools/include/uapi/asm-generic/
|
||||
pkey_alloc_access_rights_tbl := $(srctree)/tools/perf/trace/beauty/pkey_alloc_access_rights.sh
|
||||
|
||||
$(pkey_alloc_access_rights_array): $(asm_generic_hdr_dir)/mman-common.h $(pkey_alloc_access_rights_tbl)
|
||||
$(call rule_mkdir)
|
||||
$(Q)$(call echo-cmd,gen)$(SHELL) '$(pkey_alloc_access_rights_tbl)' $(asm_generic_hdr_dir) > $@
|
||||
|
||||
sndrv_ctl_ioctl_array := $(beauty_ioctl_outdir)/sndrv_ctl_ioctl_array.c
|
||||
sndrv_ctl_hdr_dir := $(srctree)/tools/include/uapi/sound
|
||||
sndrv_ctl_ioctl_tbl := $(srctree)/tools/perf/trace/beauty/sndrv_ctl_ioctl.sh
|
||||
|
||||
$(sndrv_ctl_ioctl_array): $(beauty_uapi_sound_dir)/asound.h $(sndrv_ctl_ioctl_tbl)
|
||||
$(call rule_mkdir)
|
||||
$(Q)$(call echo-cmd,gen)$(SHELL) '$(sndrv_ctl_ioctl_tbl)' $(beauty_uapi_sound_dir) > $@
|
||||
|
||||
sndrv_pcm_ioctl_array := $(beauty_ioctl_outdir)/sndrv_pcm_ioctl_array.c
|
||||
sndrv_pcm_hdr_dir := $(srctree)/tools/include/uapi/sound
|
||||
sndrv_pcm_ioctl_tbl := $(srctree)/tools/perf/trace/beauty/sndrv_pcm_ioctl.sh
|
||||
|
||||
$(sndrv_pcm_ioctl_array): $(beauty_uapi_sound_dir)/asound.h $(sndrv_pcm_ioctl_tbl)
|
||||
$(call rule_mkdir)
|
||||
$(Q)$(call echo-cmd,gen)$(SHELL) '$(sndrv_pcm_ioctl_tbl)' $(beauty_uapi_sound_dir) > $@
|
||||
|
||||
kcmp_type_array := $(beauty_outdir)/kcmp_type_array.c
|
||||
kcmp_hdr_dir := $(srctree)/tools/include/uapi/linux/
|
||||
kcmp_type_tbl := $(srctree)/tools/perf/trace/beauty/kcmp_type.sh
|
||||
|
||||
$(kcmp_type_array): $(kcmp_hdr_dir)/kcmp.h $(kcmp_type_tbl)
|
||||
$(call rule_mkdir)
|
||||
$(Q)$(call echo-cmd,gen)$(SHELL) '$(kcmp_type_tbl)' $(kcmp_hdr_dir) > $@
|
||||
|
||||
kvm_ioctl_array := $(beauty_ioctl_outdir)/kvm_ioctl_array.c
|
||||
kvm_hdr_dir := $(srctree)/tools/include/uapi/linux
|
||||
kvm_ioctl_tbl := $(srctree)/tools/perf/trace/beauty/kvm_ioctl.sh
|
||||
|
||||
$(kvm_ioctl_array): $(kvm_hdr_dir)/kvm.h $(kvm_ioctl_tbl)
|
||||
$(call rule_mkdir)
|
||||
$(Q)$(call echo-cmd,gen)$(SHELL) '$(kvm_ioctl_tbl)' $(kvm_hdr_dir) > $@
|
||||
|
||||
socket_arrays := $(beauty_outdir)/socket.c
|
||||
socket_tbl := $(srctree)/tools/perf/trace/beauty/socket.sh
|
||||
|
||||
$(socket_arrays): $(linux_uapi_dir)/in.h $(beauty_linux_dir)/socket.h $(socket_tbl)
|
||||
$(call rule_mkdir)
|
||||
$(Q)$(call echo-cmd,gen)$(SHELL) '$(socket_tbl)' $(linux_uapi_dir) $(beauty_linux_dir) > $@
|
||||
|
||||
sockaddr_arrays := $(beauty_outdir)/sockaddr.c
|
||||
sockaddr_tbl := $(srctree)/tools/perf/trace/beauty/sockaddr.sh
|
||||
|
||||
$(sockaddr_arrays): $(beauty_linux_dir)/socket.h $(sockaddr_tbl)
|
||||
$(call rule_mkdir)
|
||||
$(Q)$(call echo-cmd,gen)$(SHELL) '$(sockaddr_tbl)' $(beauty_linux_dir) > $@
|
||||
|
||||
vhost_virtio_ioctl_array := $(beauty_ioctl_outdir)/vhost_virtio_ioctl_array.c
|
||||
vhost_virtio_ioctl_tbl := $(srctree)/tools/perf/trace/beauty/vhost_virtio_ioctl.sh
|
||||
|
||||
$(vhost_virtio_ioctl_array): $(beauty_uapi_linux_dir)/vhost.h $(vhost_virtio_ioctl_tbl)
|
||||
$(call rule_mkdir)
|
||||
$(Q)$(call echo-cmd,gen)$(SHELL) '$(vhost_virtio_ioctl_tbl)' $(beauty_uapi_linux_dir) > $@
|
||||
|
||||
perf_ioctl_array := $(beauty_ioctl_outdir)/perf_ioctl_array.c
|
||||
perf_hdr_dir := $(srctree)/tools/include/uapi/linux
|
||||
perf_ioctl_tbl := $(srctree)/tools/perf/trace/beauty/perf_ioctl.sh
|
||||
|
||||
$(perf_ioctl_array): $(perf_hdr_dir)/perf_event.h $(perf_ioctl_tbl)
|
||||
$(call rule_mkdir)
|
||||
$(Q)$(call echo-cmd,gen)$(SHELL) '$(perf_ioctl_tbl)' $(perf_hdr_dir) > $@
|
||||
|
||||
madvise_behavior_array := $(beauty_outdir)/madvise_behavior_array.c
|
||||
madvise_hdr_dir := $(srctree)/tools/include/uapi/asm-generic/
|
||||
madvise_behavior_tbl := $(srctree)/tools/perf/trace/beauty/madvise_behavior.sh
|
||||
|
||||
$(madvise_behavior_array): $(madvise_hdr_dir)/mman-common.h $(madvise_behavior_tbl)
|
||||
$(call rule_mkdir)
|
||||
$(Q)$(call echo-cmd,gen)$(SHELL) '$(madvise_behavior_tbl)' $(madvise_hdr_dir) > $@
|
||||
|
||||
mmap_flags_array := $(beauty_outdir)/mmap_flags_array.c
|
||||
mmap_flags_tbl := $(srctree)/tools/perf/trace/beauty/mmap_flags.sh
|
||||
|
||||
$(mmap_flags_array): $(linux_uapi_dir)/mman.h $(asm_generic_uapi_dir)/mman.h $(asm_generic_uapi_dir)/mman-common.h $(mmap_flags_tbl)
|
||||
$(call rule_mkdir)
|
||||
$(Q)$(call echo-cmd,gen)$(SHELL) '$(mmap_flags_tbl)' $(linux_uapi_dir) $(asm_generic_uapi_dir) $(arch_asm_uapi_dir) > $@
|
||||
|
||||
mremap_flags_array := $(beauty_outdir)/mremap_flags_array.c
|
||||
mremap_flags_tbl := $(srctree)/tools/perf/trace/beauty/mremap_flags.sh
|
||||
|
||||
$(mremap_flags_array): $(linux_uapi_dir)/mman.h $(mremap_flags_tbl)
|
||||
$(call rule_mkdir)
|
||||
$(Q)$(call echo-cmd,gen)$(SHELL) '$(mremap_flags_tbl)' $(linux_uapi_dir) > $@
|
||||
|
||||
mount_flags_array := $(beauty_outdir)/mount_flags_array.c
|
||||
mount_flags_tbl := $(srctree)/tools/perf/trace/beauty/mount_flags.sh
|
||||
|
||||
$(mount_flags_array): $(beauty_uapi_linux_dir)/mount.h $(mount_flags_tbl)
|
||||
$(call rule_mkdir)
|
||||
$(Q)$(call echo-cmd,gen)$(SHELL) '$(mount_flags_tbl)' $(beauty_uapi_linux_dir) > $@
|
||||
|
||||
move_mount_flags_array := $(beauty_outdir)/move_mount_flags_array.c
|
||||
move_mount_flags_tbl := $(srctree)/tools/perf/trace/beauty/move_mount_flags.sh
|
||||
|
||||
$(move_mount_flags_array): $(beauty_uapi_linux_dir)/mount.h $(move_mount_flags_tbl)
|
||||
$(call rule_mkdir)
|
||||
$(Q)$(call echo-cmd,gen)$(SHELL) '$(move_mount_flags_tbl)' $(beauty_uapi_linux_dir) > $@
|
||||
|
||||
mmap_prot_array := $(beauty_outdir)/mmap_prot_array.c
|
||||
mmap_prot_tbl := $(srctree)/tools/perf/trace/beauty/mmap_prot.sh
|
||||
|
||||
$(mmap_prot_array): $(asm_generic_uapi_dir)/mman.h $(asm_generic_uapi_dir)/mman-common.h $(mmap_prot_tbl)
|
||||
$(call rule_mkdir)
|
||||
$(Q)$(call echo-cmd,gen)$(SHELL) '$(mmap_prot_tbl)' $(asm_generic_uapi_dir) $(arch_asm_uapi_dir) > $@
|
||||
|
||||
prctl_option_array := $(beauty_outdir)/prctl_option_array.c
|
||||
prctl_option_tbl := $(srctree)/tools/perf/trace/beauty/prctl_option.sh
|
||||
|
||||
$(prctl_option_array): $(beauty_uapi_linux_dir)/prctl.h $(prctl_option_tbl)
|
||||
$(call rule_mkdir)
|
||||
$(Q)$(call echo-cmd,gen)$(SHELL) '$(prctl_option_tbl)' $(beauty_uapi_linux_dir) > $@
|
||||
|
||||
usbdevfs_ioctl_array := $(beauty_ioctl_outdir)/usbdevfs_ioctl_array.c
|
||||
usbdevfs_ioctl_tbl := $(srctree)/tools/perf/trace/beauty/usbdevfs_ioctl.sh
|
||||
|
||||
$(usbdevfs_ioctl_array): $(beauty_uapi_linux_dir)/usbdevice_fs.h $(usbdevfs_ioctl_tbl)
|
||||
$(call rule_mkdir)
|
||||
$(Q)$(call echo-cmd,gen)$(SHELL) '$(usbdevfs_ioctl_tbl)' $(beauty_uapi_linux_dir) > $@
|
||||
|
||||
x86_arch_prctl_code_array := $(beauty_outdir)/x86_arch_prctl_code_array.c
|
||||
x86_arch_prctl_code_tbl := $(srctree)/tools/perf/trace/beauty/x86_arch_prctl.sh
|
||||
|
||||
$(x86_arch_prctl_code_array): $(beauty_x86_arch_asm_uapi_dir)/prctl.h $(x86_arch_prctl_code_tbl)
|
||||
$(call rule_mkdir)
|
||||
$(Q)$(call echo-cmd,gen)$(SHELL) '$(x86_arch_prctl_code_tbl)' $(beauty_x86_arch_asm_uapi_dir) > $@
|
||||
|
||||
|
||||
rename_flags_array := $(beauty_outdir)/rename_flags_array.c
|
||||
rename_flags_tbl := $(srctree)/tools/perf/trace/beauty/rename_flags.sh
|
||||
|
||||
$(rename_flags_array): $(beauty_uapi_linux_dir)/fs.h $(rename_flags_tbl)
|
||||
$(call rule_mkdir)
|
||||
$(Q)$(call echo-cmd,gen)$(SHELL) '$(rename_flags_tbl)' $(beauty_uapi_linux_dir) > $@
|
||||
|
||||
|
||||
statx_mask_array := $(beauty_outdir)/statx_mask_array.c
|
||||
statx_mask_tbl := $(srctree)/tools/perf/trace/beauty/statx_mask.sh
|
||||
|
||||
$(statx_mask_array): $(beauty_uapi_linux_dir)/stat.h $(statx_mask_tbl)
|
||||
$(call rule_mkdir)
|
||||
$(Q)$(call echo-cmd,gen)$(SHELL) '$(statx_mask_tbl)' $(beauty_uapi_linux_dir) > $@
|
||||
|
||||
sync_file_range_arrays := $(beauty_outdir)/sync_file_range_arrays.c
|
||||
sync_file_range_tbls := $(srctree)/tools/perf/trace/beauty/sync_file_range.sh
|
||||
|
||||
$(sync_file_range_arrays): $(beauty_uapi_linux_dir)/fs.h $(sync_file_range_tbls)
|
||||
$(call rule_mkdir)
|
||||
$(Q)$(call echo-cmd,gen)$(SHELL) '$(sync_file_range_tbls)' $(beauty_uapi_linux_dir) > $@
|
||||
|
||||
$(OUTPUT)trace/beauty/syscalltbl.o: $(syscall_array)
|
||||
$(OUTPUT)trace/beauty/fsconfig.o: $(fsconfig_arrays)
|
||||
$(OUTPUT)trace/beauty/clone.o: $(clone_flags_array)
|
||||
$(OUTPUT)trace/beauty/fs_at_flags.o: $(fs_at_flags_array)
|
||||
$(OUTPUT)trace/beauty/fsmount.o: $(fsmount_arrays)
|
||||
$(OUTPUT)trace/beauty/fspick.o: $(fspick_arrays)
|
||||
$(OUTPUT)trace/beauty/ioctl.o: $(drm_ioctl_array) $(sndrv_pcm_ioctl_array) $(sndrv_ctl_ioctl_array) $(kvm_ioctl_array) $(vhost_virtio_ioctl_array) $(perf_ioctl_array) $(usbdevfs_ioctl_array)
|
||||
$(OUTPUT)trace/beauty/kcmp.o: $(kcmp_type_array)
|
||||
$(OUTPUT)trace/beauty/mmap.o: $(mmap_prot_array) $(mmap_flags_array) $(mremap_flags_array) $(madvise_behavior_array)
|
||||
$(OUTPUT)trace/beauty/mount_flags.o: $(mount_flags_array)
|
||||
$(OUTPUT)trace/beauty/move_mount.o: $(move_mount_flags_array)
|
||||
$(OUTPUT)trace/beauty/pkey_alloc.o: $(pkey_alloc_access_rights_array)
|
||||
$(OUTPUT)trace/beauty/prctl.o: $(prctl_option_array)
|
||||
$(OUTPUT)trace/beauty/renameat.o: $(rename_flags_array)
|
||||
$(OUTPUT)trace/beauty/sockaddr.o: $(sockaddr_arrays)
|
||||
$(OUTPUT)trace/beauty/socket.o: $(socket_arrays)
|
||||
$(OUTPUT)trace/beauty/statx.o: $(statx_mask_array)
|
||||
$(OUTPUT)trace/beauty/sync_file_range.o: $(sync_file_range_arrays)
|
||||
$(OUTPUT)trace/beauty/arch_prctl.o: $(x86_arch_prctl_code_array)
|
||||
|
||||
arch_errno_name_array := $(beauty_outdir)/arch_errno_name_array.c
|
||||
arch_errno_hdr_dir := $(srctree)/tools
|
||||
arch_errno_tbl := $(srctree)/tools/perf/trace/beauty/arch_errno_names.sh
|
||||
|
||||
$(arch_errno_name_array): $(arch_errno_tbl)
|
||||
$(call rule_mkdir)
|
||||
$(Q)$(call echo-cmd,gen)$(SHELL) '$(arch_errno_tbl)' '$(patsubst -%,,$(CC))' $(arch_errno_hdr_dir) > $@
|
||||
|
||||
$(OUTPUT)trace/beauty/arch_errno_names.o: $(arch_errno_name_array)
|
||||
|
||||
@@ -1 +1,3 @@
|
||||
// SPDX-License-Identifier: GPL-2.0
|
||||
#include "util/env.h"
|
||||
#include "trace/beauty/generated/arch_errno_name_array.c"
|
||||
|
||||
@@ -57,7 +57,7 @@ create_arch_errno_table_func()
|
||||
archlist="$1"
|
||||
default="$2"
|
||||
|
||||
printf 'static arch_syscalls__strerrno_t *\n'
|
||||
printf 'arch_syscalls__strerrno_t *\n'
|
||||
printf 'arch_syscalls__strerrno_function(const char *arch)\n'
|
||||
printf '{\n'
|
||||
for arch in $archlist; do
|
||||
|
||||
@@ -35,6 +35,8 @@ bool strarray__strtoul(struct strarray *sa, char *bf, size_t size, u64 *ret);
|
||||
bool strarray__strtoul_flags(struct strarray *sa, char *bf, size_t size, u64 *ret);
|
||||
|
||||
struct trace;
|
||||
bool trace__show_zeros(const struct trace *trace);
|
||||
struct machine *trace__host(const struct trace *trace);
|
||||
struct thread;
|
||||
|
||||
struct file {
|
||||
@@ -265,4 +267,62 @@ size_t open__scnprintf_flags(unsigned long flags, char *bf, size_t size, bool sh
|
||||
void syscall_arg__set_ret_scnprintf(struct syscall_arg *arg,
|
||||
size_t (*ret_scnprintf)(char *bf, size_t size, struct syscall_arg *arg));
|
||||
|
||||
extern struct strarray strarray__fsconfig_cmds;
|
||||
|
||||
size_t syscall_arg__scnprintf_eventfd_flags(char *bf, size_t size, struct syscall_arg *arg);
|
||||
#define SCA_EFD_FLAGS syscall_arg__scnprintf_eventfd_flags
|
||||
|
||||
size_t syscall_arg__scnprintf_futex_op(char *bf, size_t size, struct syscall_arg *arg);
|
||||
#define SCA_FUTEX_OP syscall_arg__scnprintf_futex_op
|
||||
|
||||
size_t syscall_arg__scnprintf_futex_val3(char *bf, size_t size, struct syscall_arg *arg);
|
||||
#define SCA_FUTEX_VAL3 syscall_arg__scnprintf_futex_val3
|
||||
|
||||
size_t syscall_arg__scnprintf_mmap_prot(char *bf, size_t size, struct syscall_arg *arg);
|
||||
#define SCA_MMAP_PROT syscall_arg__scnprintf_mmap_prot
|
||||
|
||||
extern struct strarray strarray__mmap_flags;
|
||||
|
||||
size_t syscall_arg__scnprintf_mmap_flags(char *bf, size_t size, struct syscall_arg *arg);
|
||||
#define SCA_MMAP_FLAGS syscall_arg__scnprintf_mmap_flags
|
||||
|
||||
size_t syscall_arg__scnprintf_mremap_flags(char *bf, size_t size, struct syscall_arg *arg);
|
||||
#define SCA_MREMAP_FLAGS syscall_arg__scnprintf_mremap_flags
|
||||
|
||||
size_t syscall_arg__scnprintf_madvise_behavior(char *bf, size_t size, struct syscall_arg *arg);
|
||||
#define SCA_MADV_BHV syscall_arg__scnprintf_madvise_behavior
|
||||
|
||||
size_t syscall_arg__scnprintf_mode_t(char *bf, size_t size, struct syscall_arg *arg);
|
||||
#define SCA_MODE_T syscall_arg__scnprintf_mode_t
|
||||
|
||||
size_t syscall_arg__scnprintf_msg_flags(char *bf, size_t size, struct syscall_arg *arg);
|
||||
#define SCA_MSG_FLAGS syscall_arg__scnprintf_msg_flags
|
||||
|
||||
size_t syscall_arg__scnprintf_perf_flags(char *bf, size_t size, struct syscall_arg *arg);
|
||||
#define SCA_PERF_FLAGS syscall_arg__scnprintf_perf_flags
|
||||
|
||||
size_t syscall_arg__scnprintf_perf_event_attr(char *bf, size_t size, struct syscall_arg *arg);
|
||||
#define SCA_PERF_ATTR syscall_arg__scnprintf_perf_event_attr
|
||||
#define SCA_PERF_ATTR_FROM_USER(argname) \
|
||||
{ .scnprintf = SCA_PERF_ATTR, \
|
||||
.from_user = true, }
|
||||
|
||||
size_t syscall_arg__scnprintf_sched_policy(char *bf, size_t size, struct syscall_arg *arg);
|
||||
#define SCA_SCHED_POLICY syscall_arg__scnprintf_sched_policy
|
||||
|
||||
size_t syscall_arg__scnprintf_seccomp_op(char *bf, size_t size, struct syscall_arg *arg);
|
||||
#define SCA_SECCOMP_OP syscall_arg__scnprintf_seccomp_op
|
||||
|
||||
size_t syscall_arg__scnprintf_seccomp_flags(char *bf, size_t size, struct syscall_arg *arg);
|
||||
#define SCA_SECCOMP_FLAGS syscall_arg__scnprintf_seccomp_flags
|
||||
|
||||
size_t syscall_arg__scnprintf_signum(char *bf, size_t size, struct syscall_arg *arg);
|
||||
#define SCA_SIGNUM syscall_arg__scnprintf_signum
|
||||
|
||||
size_t syscall_arg__scnprintf_socket_type(char *bf, size_t size, struct syscall_arg *arg);
|
||||
#define SCA_SK_TYPE syscall_arg__scnprintf_socket_type
|
||||
|
||||
size_t syscall_arg__scnprintf_waitid_options(char *bf, size_t size, struct syscall_arg *arg);
|
||||
#define SCA_WAITID_OPTIONS syscall_arg__scnprintf_waitid_options
|
||||
|
||||
#endif /* _PERF_TRACE_BEAUTY_H */
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
// SPDX-License-Identifier: LGPL-2.1
|
||||
#include "trace/beauty/beauty.h"
|
||||
|
||||
#ifndef EFD_SEMAPHORE
|
||||
#define EFD_SEMAPHORE 1
|
||||
#endif
|
||||
@@ -11,7 +13,7 @@
|
||||
#define EFD_CLOEXEC 02000000
|
||||
#endif
|
||||
|
||||
static size_t syscall_arg__scnprintf_eventfd_flags(char *bf, size_t size, struct syscall_arg *arg)
|
||||
size_t syscall_arg__scnprintf_eventfd_flags(char *bf, size_t size, struct syscall_arg *arg)
|
||||
{
|
||||
bool show_prefix = arg->show_string_prefix;
|
||||
const char *prefix = "EFD_";
|
||||
@@ -35,5 +37,3 @@ static size_t syscall_arg__scnprintf_eventfd_flags(char *bf, size_t size, struct
|
||||
|
||||
return printed;
|
||||
}
|
||||
|
||||
#define SCA_EFD_FLAGS syscall_arg__scnprintf_eventfd_flags
|
||||
|
||||
5
tools/perf/trace/beauty/fsconfig.c
Normal file
5
tools/perf/trace/beauty/fsconfig.c
Normal file
@@ -0,0 +1,5 @@
|
||||
// SPDX-License-Identifier: LGPL-2.1
|
||||
#include "trace/beauty/beauty.h"
|
||||
#include "trace/beauty/generated/fsconfig_arrays.c"
|
||||
|
||||
DEFINE_STRARRAY(fsconfig_cmds, "FSCONFIG_");
|
||||
@@ -1,4 +1,5 @@
|
||||
// SPDX-License-Identifier: LGPL-2.1
|
||||
#include "trace/beauty/beauty.h"
|
||||
#include <linux/futex.h>
|
||||
|
||||
#ifndef FUTEX_WAIT_BITSET
|
||||
@@ -17,7 +18,7 @@
|
||||
#define FUTEX_CLOCK_REALTIME 256
|
||||
#endif
|
||||
|
||||
static size_t syscall_arg__scnprintf_futex_op(char *bf, size_t size, struct syscall_arg *arg)
|
||||
size_t syscall_arg__scnprintf_futex_op(char *bf, size_t size, struct syscall_arg *arg)
|
||||
{
|
||||
bool show_prefix = arg->show_string_prefix;
|
||||
const char *prefix = "FUTEX_";
|
||||
@@ -59,5 +60,3 @@ static size_t syscall_arg__scnprintf_futex_op(char *bf, size_t size, struct sysc
|
||||
|
||||
return printed;
|
||||
}
|
||||
|
||||
#define SCA_FUTEX_OP syscall_arg__scnprintf_futex_op
|
||||
|
||||
@@ -1,11 +1,12 @@
|
||||
// SPDX-License-Identifier: LGPL-2.1
|
||||
#include "trace/beauty/beauty.h"
|
||||
#include <linux/futex.h>
|
||||
|
||||
#ifndef FUTEX_BITSET_MATCH_ANY
|
||||
#define FUTEX_BITSET_MATCH_ANY 0xffffffff
|
||||
#endif
|
||||
|
||||
static size_t syscall_arg__scnprintf_futex_val3(char *bf, size_t size, struct syscall_arg *arg)
|
||||
size_t syscall_arg__scnprintf_futex_val3(char *bf, size_t size, struct syscall_arg *arg)
|
||||
{
|
||||
const char *prefix = "FUTEX_BITSET_";
|
||||
unsigned int bitset = arg->val;
|
||||
@@ -15,5 +16,3 @@ static size_t syscall_arg__scnprintf_futex_val3(char *bf, size_t size, struct sy
|
||||
|
||||
return scnprintf(bf, size, "%#xd", bitset);
|
||||
}
|
||||
|
||||
#define SCA_FUTEX_VAL3 syscall_arg__scnprintf_futex_val3
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
// SPDX-License-Identifier: LGPL-2.1
|
||||
#include <linux/log2.h>
|
||||
#include "trace/beauty/beauty.h"
|
||||
|
||||
#include "trace/beauty/generated/mmap_prot_array.c"
|
||||
static DEFINE_STRARRAY(mmap_prot, "PROT_");
|
||||
@@ -8,8 +9,7 @@ static size_t mmap__scnprintf_prot(unsigned long prot, char *bf, size_t size, bo
|
||||
{
|
||||
return strarray__scnprintf_flags(&strarray__mmap_prot, bf, size, show_prefix, prot);
|
||||
}
|
||||
|
||||
static size_t syscall_arg__scnprintf_mmap_prot(char *bf, size_t size, struct syscall_arg *arg)
|
||||
size_t syscall_arg__scnprintf_mmap_prot(char *bf, size_t size, struct syscall_arg *arg)
|
||||
{
|
||||
unsigned long prot = arg->val;
|
||||
|
||||
@@ -19,18 +19,18 @@ static size_t syscall_arg__scnprintf_mmap_prot(char *bf, size_t size, struct sys
|
||||
return mmap__scnprintf_prot(prot, bf, size, arg->show_string_prefix);
|
||||
}
|
||||
|
||||
#define SCA_MMAP_PROT syscall_arg__scnprintf_mmap_prot
|
||||
|
||||
|
||||
#include "trace/beauty/generated/mmap_flags_array.c"
|
||||
static DEFINE_STRARRAY(mmap_flags, "MAP_");
|
||||
DEFINE_STRARRAY(mmap_flags, "MAP_");
|
||||
|
||||
static size_t mmap__scnprintf_flags(unsigned long flags, char *bf, size_t size, bool show_prefix)
|
||||
{
|
||||
return strarray__scnprintf_flags(&strarray__mmap_flags, bf, size, show_prefix, flags);
|
||||
}
|
||||
|
||||
static size_t syscall_arg__scnprintf_mmap_flags(char *bf, size_t size,
|
||||
struct syscall_arg *arg)
|
||||
size_t syscall_arg__scnprintf_mmap_flags(char *bf, size_t size,
|
||||
struct syscall_arg *arg)
|
||||
{
|
||||
unsigned long flags = arg->val;
|
||||
|
||||
@@ -40,7 +40,7 @@ static size_t syscall_arg__scnprintf_mmap_flags(char *bf, size_t size,
|
||||
return mmap__scnprintf_flags(flags, bf, size, arg->show_string_prefix);
|
||||
}
|
||||
|
||||
#define SCA_MMAP_FLAGS syscall_arg__scnprintf_mmap_flags
|
||||
|
||||
|
||||
#include "trace/beauty/generated/mremap_flags_array.c"
|
||||
static DEFINE_STRARRAY(mremap_flags, "MREMAP_");
|
||||
@@ -50,7 +50,7 @@ static size_t mremap__scnprintf_flags(unsigned long flags, char *bf, size_t size
|
||||
return strarray__scnprintf_flags(&strarray__mremap_flags, bf, size, show_prefix, flags);
|
||||
}
|
||||
|
||||
static size_t syscall_arg__scnprintf_mremap_flags(char *bf, size_t size, struct syscall_arg *arg)
|
||||
size_t syscall_arg__scnprintf_mremap_flags(char *bf, size_t size, struct syscall_arg *arg)
|
||||
{
|
||||
unsigned long flags = arg->val;
|
||||
|
||||
@@ -60,7 +60,7 @@ static size_t syscall_arg__scnprintf_mremap_flags(char *bf, size_t size, struct
|
||||
return mremap__scnprintf_flags(flags, bf, size, arg->show_string_prefix);
|
||||
}
|
||||
|
||||
#define SCA_MREMAP_FLAGS syscall_arg__scnprintf_mremap_flags
|
||||
|
||||
|
||||
static size_t madvise__scnprintf_behavior(int behavior, char *bf, size_t size)
|
||||
{
|
||||
@@ -73,10 +73,8 @@ static size_t madvise__scnprintf_behavior(int behavior, char *bf, size_t size)
|
||||
return scnprintf(bf, size, "%#", behavior);
|
||||
}
|
||||
|
||||
static size_t syscall_arg__scnprintf_madvise_behavior(char *bf, size_t size,
|
||||
struct syscall_arg *arg)
|
||||
size_t syscall_arg__scnprintf_madvise_behavior(char *bf, size_t size,
|
||||
struct syscall_arg *arg)
|
||||
{
|
||||
return madvise__scnprintf_behavior(arg->val, bf, size);
|
||||
}
|
||||
|
||||
#define SCA_MADV_BHV syscall_arg__scnprintf_madvise_behavior
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
// SPDX-License-Identifier: LGPL-2.1
|
||||
#include "trace/beauty/beauty.h"
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
#include <unistd.h>
|
||||
@@ -20,7 +22,7 @@
|
||||
#define S_IXUGO (S_IXUSR|S_IXGRP|S_IXOTH)
|
||||
#endif
|
||||
|
||||
static size_t syscall_arg__scnprintf_mode_t(char *bf, size_t size, struct syscall_arg *arg)
|
||||
size_t syscall_arg__scnprintf_mode_t(char *bf, size_t size, struct syscall_arg *arg)
|
||||
{
|
||||
bool show_prefix = arg->show_string_prefix;
|
||||
const char *prefix = "S_";
|
||||
@@ -67,5 +69,3 @@ static size_t syscall_arg__scnprintf_mode_t(char *bf, size_t size, struct syscal
|
||||
|
||||
return printed;
|
||||
}
|
||||
|
||||
#define SCA_MODE_T syscall_arg__scnprintf_mode_t
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
// SPDX-License-Identifier: LGPL-2.1
|
||||
#include "trace/beauty/beauty.h"
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/socket.h>
|
||||
|
||||
@@ -27,8 +29,8 @@
|
||||
# define MSG_CMSG_CLOEXEC 0x40000000
|
||||
#endif
|
||||
|
||||
static size_t syscall_arg__scnprintf_msg_flags(char *bf, size_t size,
|
||||
struct syscall_arg *arg)
|
||||
size_t syscall_arg__scnprintf_msg_flags(char *bf, size_t size,
|
||||
struct syscall_arg *arg)
|
||||
{
|
||||
bool show_prefix = arg->show_string_prefix;
|
||||
const char *prefix = "MSG_";
|
||||
@@ -72,5 +74,3 @@ static size_t syscall_arg__scnprintf_msg_flags(char *bf, size_t size,
|
||||
|
||||
return printed;
|
||||
}
|
||||
|
||||
#define SCA_MSG_FLAGS syscall_arg__scnprintf_msg_flags
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
// SPDX-License-Identifier: LGPL-2.1
|
||||
#include "trace/beauty/beauty.h"
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
#include <fcntl.h>
|
||||
|
||||
@@ -1,4 +1,8 @@
|
||||
// SPDX-License-Identifier: LGPL-2.1
|
||||
#include "trace/beauty/beauty.h"
|
||||
#include "util/evsel_fprintf.h"
|
||||
#include <linux/perf_event.h>
|
||||
|
||||
#ifndef PERF_FLAG_FD_NO_GROUP
|
||||
# define PERF_FLAG_FD_NO_GROUP (1UL << 0)
|
||||
#endif
|
||||
@@ -15,8 +19,8 @@
|
||||
# define PERF_FLAG_FD_CLOEXEC (1UL << 3) /* O_CLOEXEC */
|
||||
#endif
|
||||
|
||||
static size_t syscall_arg__scnprintf_perf_flags(char *bf, size_t size,
|
||||
struct syscall_arg *arg)
|
||||
size_t syscall_arg__scnprintf_perf_flags(char *bf, size_t size,
|
||||
struct syscall_arg *arg)
|
||||
{
|
||||
bool show_prefix = arg->show_string_prefix;
|
||||
const char *prefix = "PERF_";
|
||||
@@ -43,7 +47,7 @@ static size_t syscall_arg__scnprintf_perf_flags(char *bf, size_t size,
|
||||
return printed;
|
||||
}
|
||||
|
||||
#define SCA_PERF_FLAGS syscall_arg__scnprintf_perf_flags
|
||||
|
||||
|
||||
struct attr_fprintf_args {
|
||||
size_t size, printed;
|
||||
@@ -76,19 +80,14 @@ static size_t perf_event_attr___scnprintf(struct perf_event_attr *attr, char *bf
|
||||
|
||||
static size_t syscall_arg__scnprintf_augmented_perf_event_attr(struct syscall_arg *arg, char *bf, size_t size)
|
||||
{
|
||||
return perf_event_attr___scnprintf((void *)arg->augmented.args->value, bf, size, arg->trace->show_zeros);
|
||||
return perf_event_attr___scnprintf((void *)arg->augmented.args->value, bf, size,
|
||||
trace__show_zeros(arg->trace));
|
||||
}
|
||||
|
||||
static size_t syscall_arg__scnprintf_perf_event_attr(char *bf, size_t size, struct syscall_arg *arg)
|
||||
size_t syscall_arg__scnprintf_perf_event_attr(char *bf, size_t size, struct syscall_arg *arg)
|
||||
{
|
||||
if (arg->augmented.args)
|
||||
return syscall_arg__scnprintf_augmented_perf_event_attr(arg, bf, size);
|
||||
|
||||
return scnprintf(bf, size, "%#lx", arg->val);
|
||||
}
|
||||
|
||||
#define SCA_PERF_ATTR syscall_arg__scnprintf_perf_event_attr
|
||||
// 'argname' is just documentational at this point, to remove the previous comment with that info
|
||||
#define SCA_PERF_ATTR_FROM_USER(argname) \
|
||||
{ .scnprintf = SCA_PERF_ATTR, \
|
||||
.from_user = true, }
|
||||
|
||||
@@ -1,11 +1,14 @@
|
||||
// SPDX-License-Identifier: LGPL-2.1
|
||||
#include "trace/beauty/beauty.h"
|
||||
#include "util/machine.h"
|
||||
#include "util/thread.h"
|
||||
|
||||
size_t syscall_arg__scnprintf_pid(char *bf, size_t size, struct syscall_arg *arg)
|
||||
{
|
||||
int pid = arg->val;
|
||||
struct trace *trace = arg->trace;
|
||||
size_t printed = scnprintf(bf, size, "%d", pid);
|
||||
struct thread *thread = machine__findnew_thread(trace->host, pid, pid);
|
||||
struct thread *thread = machine__findnew_thread(trace__host(trace), pid, pid);
|
||||
|
||||
if (thread != NULL) {
|
||||
if (!thread__comm_set(thread))
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
// SPDX-License-Identifier: LGPL-2.1
|
||||
#include "trace/beauty/beauty.h"
|
||||
|
||||
#include <sched.h>
|
||||
|
||||
/*
|
||||
@@ -14,8 +16,8 @@
|
||||
#define SCHED_RESET_ON_FORK 0x40000000
|
||||
#endif
|
||||
|
||||
static size_t syscall_arg__scnprintf_sched_policy(char *bf, size_t size,
|
||||
struct syscall_arg *arg)
|
||||
size_t syscall_arg__scnprintf_sched_policy(char *bf, size_t size,
|
||||
struct syscall_arg *arg)
|
||||
{
|
||||
bool show_prefix = arg->show_string_prefix;
|
||||
const char *prefix = "SCHED_";
|
||||
@@ -46,5 +48,3 @@ static size_t syscall_arg__scnprintf_sched_policy(char *bf, size_t size,
|
||||
|
||||
return printed;
|
||||
}
|
||||
|
||||
#define SCA_SCHED_POLICY syscall_arg__scnprintf_sched_policy
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
// SPDX-License-Identifier: LGPL-2.1
|
||||
#include "trace/beauty/beauty.h"
|
||||
|
||||
#ifndef SECCOMP_SET_MODE_STRICT
|
||||
#define SECCOMP_SET_MODE_STRICT 0
|
||||
#endif
|
||||
@@ -6,7 +8,7 @@
|
||||
#define SECCOMP_SET_MODE_FILTER 1
|
||||
#endif
|
||||
|
||||
static size_t syscall_arg__scnprintf_seccomp_op(char *bf, size_t size, struct syscall_arg *arg)
|
||||
size_t syscall_arg__scnprintf_seccomp_op(char *bf, size_t size, struct syscall_arg *arg)
|
||||
{
|
||||
bool show_prefix = arg->show_string_prefix;
|
||||
const char *prefix = "SECCOMP_SET_MODE_";
|
||||
@@ -24,14 +26,14 @@ static size_t syscall_arg__scnprintf_seccomp_op(char *bf, size_t size, struct sy
|
||||
return printed;
|
||||
}
|
||||
|
||||
#define SCA_SECCOMP_OP syscall_arg__scnprintf_seccomp_op
|
||||
|
||||
|
||||
#ifndef SECCOMP_FILTER_FLAG_TSYNC
|
||||
#define SECCOMP_FILTER_FLAG_TSYNC 1
|
||||
#endif
|
||||
|
||||
static size_t syscall_arg__scnprintf_seccomp_flags(char *bf, size_t size,
|
||||
struct syscall_arg *arg)
|
||||
size_t syscall_arg__scnprintf_seccomp_flags(char *bf, size_t size,
|
||||
struct syscall_arg *arg)
|
||||
{
|
||||
bool show_prefix = arg->show_string_prefix;
|
||||
const char *prefix = "SECCOMP_FILTER_FLAG_";
|
||||
@@ -51,5 +53,3 @@ static size_t syscall_arg__scnprintf_seccomp_flags(char *bf, size_t size,
|
||||
|
||||
return printed;
|
||||
}
|
||||
|
||||
#define SCA_SECCOMP_FLAGS syscall_arg__scnprintf_seccomp_flags
|
||||
|
||||
@@ -1,7 +1,9 @@
|
||||
// SPDX-License-Identifier: LGPL-2.1
|
||||
#include "trace/beauty/beauty.h"
|
||||
|
||||
#include <signal.h>
|
||||
|
||||
static size_t syscall_arg__scnprintf_signum(char *bf, size_t size, struct syscall_arg *arg)
|
||||
size_t syscall_arg__scnprintf_signum(char *bf, size_t size, struct syscall_arg *arg)
|
||||
{
|
||||
bool show_prefix = arg->show_string_prefix;
|
||||
const char *prefix = "SIG";
|
||||
@@ -53,5 +55,3 @@ static size_t syscall_arg__scnprintf_signum(char *bf, size_t size, struct syscal
|
||||
|
||||
return scnprintf(bf, size, "%#x", sig);
|
||||
}
|
||||
|
||||
#define SCA_SIGNUM syscall_arg__scnprintf_signum
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
// SPDX-License-Identifier: LGPL-2.1
|
||||
#include "trace/beauty/beauty.h"
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/socket.h>
|
||||
|
||||
@@ -18,7 +20,7 @@
|
||||
#define SOCK_TYPE_MASK 0xf
|
||||
#endif
|
||||
|
||||
static size_t syscall_arg__scnprintf_socket_type(char *bf, size_t size, struct syscall_arg *arg)
|
||||
size_t syscall_arg__scnprintf_socket_type(char *bf, size_t size, struct syscall_arg *arg)
|
||||
{
|
||||
bool show_prefix = arg->show_string_prefix;
|
||||
const char *prefix = "SOCK_";
|
||||
@@ -59,5 +61,3 @@ static size_t syscall_arg__scnprintf_socket_type(char *bf, size_t size, struct s
|
||||
|
||||
return printed;
|
||||
}
|
||||
|
||||
#define SCA_SK_TYPE syscall_arg__scnprintf_socket_type
|
||||
|
||||
@@ -1,2 +1,23 @@
|
||||
perf-y += x86_irq_vectors.o
|
||||
perf-y += x86_msr.o
|
||||
|
||||
beauty_outdir := $(OUTPUT)trace/beauty/generated
|
||||
beauty_arch_asm_dir := $(srctree)/tools/perf/trace/beauty/arch/x86/include/asm/
|
||||
x86_arch_asm_dir := $(srctree)/tools/arch/x86/include/asm/
|
||||
|
||||
x86_arch_irq_vectors_array := $(beauty_outdir)/x86_arch_irq_vectors_array.c
|
||||
x86_arch_irq_vectors_tbl := $(srctree)/tools/perf/trace/beauty/tracepoints/x86_irq_vectors.sh
|
||||
|
||||
$(x86_arch_irq_vectors_array): $(beauty_arch_asm_dir)/irq_vectors.h $(x86_arch_irq_vectors_tbl)
|
||||
$(call rule_mkdir)
|
||||
$(Q)$(call echo-cmd,gen)$(SHELL) '$(x86_arch_irq_vectors_tbl)' $(beauty_arch_asm_dir) > $@
|
||||
|
||||
x86_arch_MSRs_array := $(beauty_outdir)/x86_arch_MSRs_array.c
|
||||
x86_arch_MSRs_tbl := $(srctree)/tools/perf/trace/beauty/tracepoints/x86_msr.sh
|
||||
|
||||
$(x86_arch_MSRs_array): $(x86_arch_asm_dir)/msr-index.h $(x86_arch_MSRs_tbl)
|
||||
$(call rule_mkdir)
|
||||
$(Q)$(call echo-cmd,gen)$(SHELL) '$(x86_arch_MSRs_tbl)' $(x86_arch_asm_dir) > $@
|
||||
|
||||
$(OUTPUT)trace/beauty/tracepoints/x86_irq_vectors.o: $(x86_arch_irq_vectors_array)
|
||||
$(OUTPUT)trace/beauty/tracepoints/x86_msr.o: $(x86_arch_MSRs_array)
|
||||
|
||||
@@ -1,9 +1,11 @@
|
||||
// SPDX-License-Identifier: LGPL-2.1
|
||||
#include "trace/beauty/beauty.h"
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/wait.h>
|
||||
|
||||
static size_t syscall_arg__scnprintf_waitid_options(char *bf, size_t size,
|
||||
struct syscall_arg *arg)
|
||||
size_t syscall_arg__scnprintf_waitid_options(char *bf, size_t size,
|
||||
struct syscall_arg *arg)
|
||||
{
|
||||
bool show_prefix = arg->show_string_prefix;
|
||||
const char *prefix = "W";
|
||||
@@ -25,5 +27,3 @@ static size_t syscall_arg__scnprintf_waitid_options(char *bf, size_t size,
|
||||
|
||||
return printed;
|
||||
}
|
||||
|
||||
#define SCA_WAITID_OPTIONS syscall_arg__scnprintf_waitid_options
|
||||
|
||||
@@ -75,7 +75,7 @@ perf-util-y += sample.o
|
||||
perf-util-y += sample-raw.o
|
||||
perf-util-y += s390-sample-raw.o
|
||||
perf-util-y += amd-sample-raw.o
|
||||
perf-util-$(CONFIG_TRACE) += syscalltbl.o
|
||||
|
||||
perf-util-y += ordered-events.o
|
||||
perf-util-y += namespaces.o
|
||||
perf-util-y += comm.o
|
||||
@@ -440,3 +440,5 @@ $(OUTPUT)%.pylint_log: %
|
||||
$(Q)$(call echo-cmd,test)pylint "$<" > $@ || (cat $@ && rm $@ && false)
|
||||
|
||||
perf-util-y += $(PYLINT_TEST_LOGS)
|
||||
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "dwarf-regs.h" /* for EM_HOST */
|
||||
#include "syscalltbl.h"
|
||||
#include "trace/beauty/syscalltbl.h"
|
||||
#include "util/cgroup.h"
|
||||
#include "util/hashmap.h"
|
||||
#include "util/trace.h"
|
||||
|
||||
@@ -635,10 +635,6 @@ const char *perf_env__arch(struct perf_env *env)
|
||||
return normalize_arch(arch_name);
|
||||
}
|
||||
|
||||
#if defined(HAVE_LIBTRACEEVENT)
|
||||
#include "trace/beauty/arch_errno_names.c"
|
||||
#endif
|
||||
|
||||
const char *perf_env__arch_strerrno(struct perf_env *env __maybe_unused, int err __maybe_unused)
|
||||
{
|
||||
#if defined(HAVE_LIBTRACEEVENT)
|
||||
|
||||
@@ -189,6 +189,7 @@ void cpu_cache_level__free(struct cpu_cache_level *cache);
|
||||
|
||||
const char *perf_env__arch(struct perf_env *env);
|
||||
const char *perf_env__arch_strerrno(struct perf_env *env, int err);
|
||||
arch_syscalls__strerrno_t *arch_syscalls__strerrno_function(const char *arch);
|
||||
const char *perf_env__cpuid(struct perf_env *env);
|
||||
const char *perf_env__raw_arch(struct perf_env *env);
|
||||
int perf_env__nr_cpus_avail(struct perf_env *env);
|
||||
|
||||
Reference in New Issue
Block a user