summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tools/perf/Makefile.perf12
-rw-r--r--tools/perf/builtin-trace.c2
-rw-r--r--tools/perf/trace/beauty/Build1
-rw-r--r--tools/perf/trace/beauty/beauty.h3
-rw-r--r--tools/perf/trace/beauty/sync_file_range.c31
5 files changed, 47 insertions, 2 deletions
diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
index 326ca5d6a7ef..92b5236c0000 100644
--- a/tools/perf/Makefile.perf
+++ b/tools/perf/Makefile.perf
@@ -549,6 +549,12 @@ arch_errno_tbl := $(srctree)/tools/perf/trace/beauty/arch_errno_names.sh
549$(arch_errno_name_array): $(arch_errno_tbl) 549$(arch_errno_name_array): $(arch_errno_tbl)
550 $(Q)$(SHELL) '$(arch_errno_tbl)' $(CC) $(arch_errno_hdr_dir) > $@ 550 $(Q)$(SHELL) '$(arch_errno_tbl)' $(CC) $(arch_errno_hdr_dir) > $@
551 551
552sync_file_range_arrays := $(beauty_outdir)/sync_file_range_arrays.c
553sync_file_range_tbls := $(srctree)/tools/perf/trace/beauty/sync_file_range.sh
554
555$(sync_file_range_arrays): $(linux_uapi_dir)/fs.h $(sync_file_range_tbls)
556 $(Q)$(SHELL) '$(sync_file_range_tbls)' $(linux_uapi_dir) > $@
557
552all: shell_compatibility_test $(ALL_PROGRAMS) $(LANG_BINDINGS) $(OTHER_PROGRAMS) 558all: shell_compatibility_test $(ALL_PROGRAMS) $(LANG_BINDINGS) $(OTHER_PROGRAMS)
553 559
554# Create python binding output directory if not already present 560# Create python binding output directory if not already present
@@ -671,7 +677,8 @@ prepare: $(OUTPUT)PERF-VERSION-FILE $(OUTPUT)common-cmds.h archheaders $(drm_ioc
671 $(usbdevfs_ioctl_array) \ 677 $(usbdevfs_ioctl_array) \
672 $(x86_arch_prctl_code_array) \ 678 $(x86_arch_prctl_code_array) \
673 $(rename_flags_array) \ 679 $(rename_flags_array) \
674 $(arch_errno_name_array) 680 $(arch_errno_name_array) \
681 $(sync_file_range_arrays)
675 682
676$(OUTPUT)%.o: %.c prepare FORCE 683$(OUTPUT)%.o: %.c prepare FORCE
677 $(Q)$(MAKE) -f $(srctree)/tools/build/Makefile.build dir=$(build-dir) $@ 684 $(Q)$(MAKE) -f $(srctree)/tools/build/Makefile.build dir=$(build-dir) $@
@@ -970,7 +977,8 @@ clean:: $(LIBTRACEEVENT)-clean $(LIBAPI)-clean $(LIBBPF)-clean $(LIBSUBCMD)-clea
970 $(OUTPUT)$(usbdevfs_ioctl_array) \ 977 $(OUTPUT)$(usbdevfs_ioctl_array) \
971 $(OUTPUT)$(x86_arch_prctl_code_array) \ 978 $(OUTPUT)$(x86_arch_prctl_code_array) \
972 $(OUTPUT)$(rename_flags_array) \ 979 $(OUTPUT)$(rename_flags_array) \
973 $(OUTPUT)$(arch_errno_name_array) 980 $(OUTPUT)$(arch_errno_name_array) \
981 $(OUTPUT)$(sync_file_range_arrays)
974 $(QUIET_SUBDIR0)Documentation $(QUIET_SUBDIR1) clean 982 $(QUIET_SUBDIR0)Documentation $(QUIET_SUBDIR1) clean
975 983
976# 984#
diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index 3a2ab68a8b85..54b2d0fd0d02 100644
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -912,6 +912,8 @@ static struct syscall_fmt {
912 .arg = { [0] = { .scnprintf = SCA_FILENAME, /* specialfile */ }, }, }, 912 .arg = { [0] = { .scnprintf = SCA_FILENAME, /* specialfile */ }, }, },
913 { .name = "symlinkat", 913 { .name = "symlinkat",
914 .arg = { [0] = { .scnprintf = SCA_FDAT, /* dfd */ }, }, }, 914 .arg = { [0] = { .scnprintf = SCA_FDAT, /* dfd */ }, }, },
915 { .name = "sync_file_range",
916 .arg = { [3] = { .scnprintf = SCA_SYNC_FILE_RANGE_FLAGS, /* flags */ }, }, },
915 { .name = "tgkill", 917 { .name = "tgkill",
916 .arg = { [2] = { .scnprintf = SCA_SIGNUM, /* sig */ }, }, }, 918 .arg = { [2] = { .scnprintf = SCA_SIGNUM, /* sig */ }, }, },
917 { .name = "tkill", 919 { .name = "tkill",
diff --git a/tools/perf/trace/beauty/Build b/tools/perf/trace/beauty/Build
index 338c61b8ed22..afa75a76f6b8 100644
--- a/tools/perf/trace/beauty/Build
+++ b/tools/perf/trace/beauty/Build
@@ -16,3 +16,4 @@ perf-y += renameat.o
16perf-y += sockaddr.o 16perf-y += sockaddr.o
17perf-y += socket.o 17perf-y += socket.o
18perf-y += statx.o 18perf-y += statx.o
19perf-y += sync_file_range.o
diff --git a/tools/perf/trace/beauty/beauty.h b/tools/perf/trace/beauty/beauty.h
index 9385d1cb121a..7e06605f7c76 100644
--- a/tools/perf/trace/beauty/beauty.h
+++ b/tools/perf/trace/beauty/beauty.h
@@ -201,6 +201,9 @@ size_t syscall_arg__scnprintf_statx_flags(char *bf, size_t size, struct syscall_
201size_t syscall_arg__scnprintf_statx_mask(char *bf, size_t size, struct syscall_arg *arg); 201size_t syscall_arg__scnprintf_statx_mask(char *bf, size_t size, struct syscall_arg *arg);
202#define SCA_STATX_MASK syscall_arg__scnprintf_statx_mask 202#define SCA_STATX_MASK syscall_arg__scnprintf_statx_mask
203 203
204size_t syscall_arg__scnprintf_sync_file_range_flags(char *bf, size_t size, struct syscall_arg *arg);
205#define SCA_SYNC_FILE_RANGE_FLAGS syscall_arg__scnprintf_sync_file_range_flags
206
204size_t open__scnprintf_flags(unsigned long flags, char *bf, size_t size, bool show_prefix); 207size_t open__scnprintf_flags(unsigned long flags, char *bf, size_t size, bool show_prefix);
205 208
206void syscall_arg__set_ret_scnprintf(struct syscall_arg *arg, 209void syscall_arg__set_ret_scnprintf(struct syscall_arg *arg,
diff --git a/tools/perf/trace/beauty/sync_file_range.c b/tools/perf/trace/beauty/sync_file_range.c
new file mode 100644
index 000000000000..1c425f04047d
--- /dev/null
+++ b/tools/perf/trace/beauty/sync_file_range.c
@@ -0,0 +1,31 @@
1// SPDX-License-Identifier: LGPL-2.1
2/*
3 * trace/beauty/sync_file_range.c
4 *
5 * Copyright (C) 2019, Red Hat Inc, Arnaldo Carvalho de Melo <acme@redhat.com>
6 */
7
8#include "trace/beauty/beauty.h"
9#include <linux/log2.h>
10#include <uapi/linux/fs.h>
11
12static size_t sync_file_range__scnprintf_flags(unsigned long flags, char *bf, size_t size, bool show_prefix)
13{
14#include "trace/beauty/generated/sync_file_range_arrays.c"
15 static DEFINE_STRARRAY(sync_file_range_flags, "SYNC_FILE_RANGE_");
16 size_t printed = 0;
17
18 if ((flags & SYNC_FILE_RANGE_WRITE_AND_WAIT) == SYNC_FILE_RANGE_WRITE_AND_WAIT) {
19 printed += scnprintf(bf + printed, size - printed, "%s%s", show_prefix ? "SYNC_FILE_RANGE_" : "", "WRITE_AND_WAIT");
20 flags &= ~SYNC_FILE_RANGE_WRITE_AND_WAIT;
21 }
22
23 return printed + strarray__scnprintf_flags(&strarray__sync_file_range_flags, bf + printed, size - printed, show_prefix, flags);
24}
25
26size_t syscall_arg__scnprintf_sync_file_range_flags(char *bf, size_t size, struct syscall_arg *arg)
27{
28 unsigned long flags = arg->val;
29
30 return sync_file_range__scnprintf_flags(flags, bf, size, arg->show_string_prefix);
31}