Commit 9a424b62 authored by Namhyung Kim's avatar Namhyung Kim
Browse files

Merge branch 'perf-upstream'

parents 5200f5f4 5a433107

tools/perf/Makefile

+4 −1
Original line number Diff line number Diff line
@@ -111,6 +111,9 @@ build-test: 
build-test-tarball:

	@$(MAKE) -f tests/make REUSE_FEATURES_DUMP=1 MK=Makefile SET_PARALLEL=1 --no-print-directory out



check-headers:

	@./check-headers.sh



#

# All other targets get passed through:

#
@@ -118,4 +121,4 @@ build-test-tarball: 
	$(print_msg)

	$(make)



.PHONY: tags TAGS FORCE Makefile
 
.PHONY: tags TAGS FORCE Makefile build-test build-test-tarball check-headers

tools/perf/Makefile.perf

+8 −1
Original line number Diff line number Diff line
@@ -285,7 +285,6 @@ goals := $(filter-out all sub-make, $(MAKECMDGOALS)) 
$(goals) all: sub-make



sub-make: fixdep

	@./check-headers.sh

	$(Q)$(MAKE) FIXDEP_BUILT=1 -f Makefile.perf $(goals)



else # force_fixdep
@@ -565,6 +564,12 @@ 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) > $@



fsmount_attr_arrays := $(beauty_outdir)/fsmount_attr_arrays.c

fsmount_attr_tbls := $(srctree)/tools/perf/trace/beauty/fsmount_attr.sh



$(fsmount_attr_arrays): $(beauty_uapi_linux_dir)/mount.h $(fsmount_attr_tbls)

	$(Q)$(SHELL) '$(fsmount_attr_tbls)' $(beauty_uapi_linux_dir) > $@



fspick_arrays := $(beauty_outdir)/fspick_arrays.c

fspick_tbls := $(srctree)/tools/perf/trace/beauty/fspick.sh
@@ -855,6 +860,7 @@ prepare: $(OUTPUT)PERF-VERSION-FILE archheaders \ 
	$(fadvise_advice_array) \

	$(fsconfig_arrays) \

	$(fsmount_arrays) \

	$(fsmount_attr_arrays) \

	$(fspick_arrays) \

	$(pkey_alloc_access_rights_array) \

	$(sndrv_pcm_ioctl_array) \
@@ -1302,6 +1308,7 @@ clean:: $(LIBAPI)-clean $(LIBBPF)-clean $(LIBSUBCMD)-clean $(LIBSYMBOL)-clean $( 
		$(OUTPUT)$(fadvise_advice_array) \

		$(OUTPUT)$(fsconfig_arrays) \

		$(OUTPUT)$(fsmount_arrays) \

		$(OUTPUT)$(fsmount_attr_arrays) \

		$(OUTPUT)$(fspick_arrays) \

		$(OUTPUT)$(madvise_behavior_array) \

		$(OUTPUT)$(mmap_flags_array) \

tools/perf/builtin-trace.c

+3 −6
Original line number Diff line number Diff line
@@ -771,11 +771,6 @@ static const char *bpf_cmd[] = { 
};

static DEFINE_STRARRAY(bpf_cmd, "BPF_");



static const char *fsmount_flags[] = {

	[1] = "CLOEXEC",

};

static DEFINE_STRARRAY(fsmount_flags, "FSMOUNT_");



#include "trace/beauty/generated/fsconfig_arrays.c"



static DEFINE_STRARRAY(fsconfig_cmds, "FSCONFIG_");
@@ -1202,7 +1197,9 @@ static const struct syscall_fmt syscall_fmts[] = { 
	{ .name     = "fsconfig",

	  .arg = { [1] = STRARRAY(cmd, fsconfig_cmds), }, },

	{ .name     = "fsmount",

	  .arg = { [1] = STRARRAY_FLAGS(flags, fsmount_flags),

	  .arg = { [1] = { .scnprintf = SCA_FSMOUNT_FLAGS, /* fsmount_flags */

			   .strtoul   = STUL_STRARRAYS,

			   .show_zero = true, },

		   [2] = { .scnprintf = SCA_FSMOUNT_ATTR_FLAGS, /* attr_flags */ }, }, },

	{ .name     = "fspick",

	  .arg = { [0] = { .scnprintf = SCA_FDAT,	  /* dfd */ },

tools/perf/trace/beauty/beauty.h

+3 −0
Original line number Diff line number Diff line
@@ -179,6 +179,9 @@ size_t syscall_arg__scnprintf_fcntl_arg(char *bf, size_t size, struct syscall_ar 
size_t syscall_arg__scnprintf_flock(char *bf, size_t size, struct syscall_arg *arg);

#define SCA_FLOCK syscall_arg__scnprintf_flock



size_t syscall_arg__scnprintf_fsmount_flags(char *bf, size_t size, struct syscall_arg *arg);

#define SCA_FSMOUNT_FLAGS syscall_arg__scnprintf_fsmount_flags



size_t syscall_arg__scnprintf_fsmount_attr_flags(char *bf, size_t size, struct syscall_arg *arg);

#define SCA_FSMOUNT_ATTR_FLAGS syscall_arg__scnprintf_fsmount_attr_flags

tools/perf/trace/beauty/clone.sh

+4 −0
Original line number Diff line number Diff line
@@ -14,4 +14,8 @@ regex='^[[:space:]]*#[[:space:]]*define[[:space:]]+CLONE_([^_]+[[:alnum:]_]+)[[: 
grep -E $regex ${linux_sched} | \

	sed -r "s/$regex/\2 \1/g"	| \

	xargs printf "\t[ilog2(%s) + 1] = \"%s\",\n"

regex='^[[:space:]]*#[[:space:]]*define[[:space:]]+CLONE_([^_]+[[:alnum:]_]+)[[:space:]]+\(1ULL[[:space:]]*<<[[:space:]]*([[:digit:]]+)\)[[:space:]]*.*'

grep -E $regex ${linux_sched} | \

	sed -r "s/$regex/\2 \1/g"	| \

	xargs printf "\t[%s + 1] = \"%s\",\n"

printf "};\n"