Commit 5a54c2f5 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf trace beauty madvise: Generate 'behavior' string table from kernel headers 

This is one more case where the way that syscall parameter values are
defined in kernel headers are easy to parse using a shell script that
will then generate the string table that gets used by the madvise
'behaviour' argument beautifier.

This way as soon as the header syncronization mechanism in perf's build
system detects a change in a copy of a kernel ABI header and that file
is syncronized, we get 'perf trace' updated automagically.

So, when we syncronize this:

  Warning: Kernel ABI header at 'tools/include/uapi/asm-generic/mman-common.h' differs from latest version at 'include/uapi/asm-generic/mman-common.h'

We'll get these:

  #define MADV_WIPEONFORK 18              /* Zero memory on fork, child only */
  #define MADV_KEEPONFORK 19              /* Undo MADV_WIPEONFORK */

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Rik van Riel <riel@redhat.com>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-dolb0ghds4ui7wc1npgkchvc@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 5c9295bf

tools/perf/Makefile.perf

+9 −0
Original line number Diff line number Diff line
@@ -441,6 +441,13 @@ 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) > $@



all: shell_compatibility_test $(ALL_PROGRAMS) $(LANG_BINDINGS) $(OTHER_PROGRAMS)



$(OUTPUT)python/perf.so: $(PYTHON_EXT_SRCS) $(PYTHON_EXT_DEPS) $(LIBTRACEEVENT_DYNAMIC_LIST)
@@ -541,6 +548,7 @@ prepare: $(OUTPUT)PERF-VERSION-FILE $(OUTPUT)common-cmds.h archheaders $(drm_ioc 
	$(sndrv_ctl_ioctl_array) \

	$(kvm_ioctl_array) \

	$(vhost_virtio_ioctl_array) \

	$(madvise_behavior_array) \

	$(perf_ioctl_array)



$(OUTPUT)%.o: %.c prepare FORCE
@@ -814,6 +822,7 @@ clean:: $(LIBTRACEEVENT)-clean $(LIBAPI)-clean $(LIBBPF)-clean $(LIBSUBCMD)-clea 
		$(OUTPUT)util/intel-pt-decoder/inat-tables.c \

		$(OUTPUT)tests/llvm-src-{base,kbuild,prologue,relocation}.c \

		$(OUTPUT)pmu-events/pmu-events.c \

		$(OUTPUT)$(madvise_behavior_array) \

		$(OUTPUT)$(drm_ioctl_array) \

		$(OUTPUT)$(pkey_alloc_access_rights_array) \

		$(OUTPUT)$(sndrv_ctl_ioctl_array) \

tools/perf/trace/beauty/madvise_behavior.sh

0 → 100755
+10 −0
Original line number Diff line number Diff line 
#!/bin/sh



header_dir=$1



printf "static const char *madvise_advices[] = {\n"

regex='^[[:space:]]*#[[:space:]]*define[[:space:]]+MADV_([[:alnum:]_]+)[[:space:]]+([[:digit:]]+)[[:space:]]*.*'

egrep $regex ${header_dir}/mman-common.h | \

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

	sort -n | xargs printf "\t[%s] = \"%s\",\n"

printf "};\n"

tools/perf/trace/beauty/mmap.c

+12 −26
Original line number Diff line number Diff line
@@ -94,35 +94,21 @@ static size_t syscall_arg__scnprintf_mremap_flags(char *bf, size_t size, 


#define SCA_MREMAP_FLAGS syscall_arg__scnprintf_mremap_flags



static size_t syscall_arg__scnprintf_madvise_behavior(char *bf, size_t size,

						      struct syscall_arg *arg)

static size_t madvise__scnprintf_behavior(int behavior, char *bf, size_t size)

{

	int behavior = arg->val;



	switch (behavior) {

#define	P_MADV_BHV(n) case MADV_##n: return scnprintf(bf, size, #n)

	P_MADV_BHV(NORMAL);

	P_MADV_BHV(RANDOM);

	P_MADV_BHV(SEQUENTIAL);

	P_MADV_BHV(WILLNEED);

	P_MADV_BHV(DONTNEED);

	P_MADV_BHV(FREE);

	P_MADV_BHV(REMOVE);

	P_MADV_BHV(DONTFORK);

	P_MADV_BHV(DOFORK);

	P_MADV_BHV(HWPOISON);

	P_MADV_BHV(SOFT_OFFLINE);

	P_MADV_BHV(MERGEABLE);

	P_MADV_BHV(UNMERGEABLE);

	P_MADV_BHV(HUGEPAGE);

	P_MADV_BHV(NOHUGEPAGE);

	P_MADV_BHV(DONTDUMP);

	P_MADV_BHV(DODUMP);

#undef P_MADV_BHV

	default: break;

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

       static DEFINE_STRARRAY(madvise_advices);



       if (behavior < strarray__madvise_advices.nr_entries && strarray__madvise_advices.entries[behavior] != NULL)

               return scnprintf(bf, size, "MADV_%s", strarray__madvise_advices.entries[behavior]);



       return scnprintf(bf, size, "%#", behavior);

}



	return scnprintf(bf, size, "%#x", behavior);

static 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

CRA Git | Maintained and supported by SUSTech CRA and CCSE