Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ff9ecf7 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-core-for-mingo' of... 

Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

 into perf/core

Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:

  * kcore annotation improvements, including build-id cache support,
    multi map 'call' instruction navigation fixes, kcore address
    validation, objdump workarounds. From Adrian Hunter.

  * 'trace' beautifiers for lots of syscall arguments, from Arnaldo Carvalho de Melo.

  * More compact 'trace' output by suppressing zeroed args, from Arnaldo Carvalho de Melo.

  * Show thread COMM by default in 'trace', from Arnaldo Carvalho de Melo.

  * Show path associated with fd in live sessions, using a 'vfs_getname'
    'perf probe' created dynamic tracepoint or by looking at /proc/pid/fd, from Arnaldo Carvalho de Melo.

  * Memory and mmap leak fixes from Chenggang Qin.

  * Add option to show full timestamp in 'trace', from David Ahern.

  * Add 'record' command in 'trace', to record raw_syscalls:*, from David Ahern.

  * Add summary option to dump syscall statistics in 'trace', from David Ahern.

  * Fix comm resolution in 'trace' when reading events from file, from David Ahern.

  * Improved messages when doing profiling in all or a subset of CPUs
    using a workload as the session delimitator, as in:

     'perf stat --cpu 0,2 sleep 10s'

    from Arnaldo Carvalho de Melo.

  * Add units to nanosec-based counters in 'perf stat', from David Ahern.

  * Assorted build fixes for from David Ahern and Jiri Olsa.

  * 'perf lock' fixes and cleanups, from Davidlohr Bueso.

  * Memory leak fixes in 'perf test', from Felipe Pena.

  * Build system super speedups, from Ingo Molnar.

  * Fix mmap_read event overflow, from Jiri Olsa.

  * Code cleanups from Jiri Olsa.

  * Allow specifying B/K/M/G unit to the --mmap-pages arguments, from Jiri Olsa.

  * Separate the GTK support in a separate libperf-gtk.so DSO, that is
    only loaded when --gtk is specified, from Namhyung Kim.

  * Fixes for some memory leaks, from Namhyumg Kim.

  * Fix srcline sort key behavior, from Namhyung Kim.

  * Fix failing assertions in numa bench, from Petr Holasek.

  * perf bash completion fixes and improvements from Ramkumar Ramachandra.

  * Improve error messages in 'trace', providing hints about system configuration
    steps needed for using it, from Ramkumar Ramachandra.

  * Remove bogus info when using 'perf stat' -e cycles/instructions, from
    Ramkumar Ramachandra.

  * Support for Openembedded/Yocto -dbg packages, from Ricardo Ribalda Delgado.

  * Implement addr2line directly using libbfd, from Roberto Vitillo.

  * Add new option --ignore-vmlinux for perf top, from Willy Tarreau.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 426ee9e3 784f3390

tools/lib/traceevent/Makefile

+9 −9
Original line number Diff line number Diff line
@@ -138,8 +138,8 @@ else 
  print_app_build =		echo '  BUILD    '$(OBJ);

  print_fpic_compile =		echo '  CC FPIC  '$(OBJ);

  print_shared_lib_compile =	echo '  BUILD    SHARED LIB '$(OBJ);

  print_plugin_obj_compile =	echo '  CC PLUGIN OBJ      '$(OBJ);

  print_plugin_build =		echo '  CC PLUGI           '$(OBJ);

  print_plugin_obj_compile =	echo '  BUILD    PLUGIN OBJ '$(OBJ);

  print_plugin_build =		echo '  BUILD    PLUGIN     '$(OBJ);

  print_static_lib_build =	echo '  BUILD    STATIC LIB '$(OBJ);

  print_install =		echo '  INSTALL  '$1'	to	$(DESTDIR_SQ)$2';

endif
@@ -268,7 +268,7 @@ TRACK_CFLAGS = $(subst ','\'',$(CFLAGS)):$(ARCH):$(CROSS_COMPILE) 
TRACEEVENT-CFLAGS: force

	@FLAGS='$(TRACK_CFLAGS)'; \

	    if test x"$$FLAGS" != x"`cat TRACEEVENT-CFLAGS 2>/dev/null`" ; then \

		echo 1>&2 "    * new build flags or cross compiler"; \

		echo 1>&2 "  FLAGS:   * new build flags or cross compiler"; \

		echo "$$FLAGS" >TRACEEVENT-CFLAGS; \

            fi

tools/perf/.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ perf*.html 
common-cmds.h

perf.data

perf.data.old

output.svg

perf-archive

tags

TAGS

tools/perf/Documentation/Makefile

+38 −41
Original line number Diff line number Diff line
@@ -145,16 +145,17 @@ endif 


ifneq ($(findstring $(MAKEFLAGS),s),s)

ifneq ($(V),1)

	QUIET_ASCIIDOC	= @echo '   ' ASCIIDOC $@;

	QUIET_XMLTO	= @echo '   ' XMLTO $@;

	QUIET_DB2TEXI	= @echo '   ' DB2TEXI $@;

	QUIET_MAKEINFO	= @echo '   ' MAKEINFO $@;

	QUIET_DBLATEX	= @echo '   ' DBLATEX $@;

	QUIET_XSLTPROC	= @echo '   ' XSLTPROC $@;

	QUIET_GEN	= @echo '   ' GEN $@;

	QUIET_ASCIIDOC	= @echo '  ASCIIDOC '$@;

	QUIET_XMLTO	= @echo '  XMLTO    '$@;

	QUIET_DB2TEXI	= @echo '  DB2TEXI  '$@;

	QUIET_MAKEINFO	= @echo '  MAKEINFO '$@;

	QUIET_DBLATEX	= @echo '  DBLATEX  '$@;

	QUIET_XSLTPROC	= @echo '  XSLTPROC '$@;

	QUIET_GEN	= @echo '  GEN      '$@;

	QUIET_STDERR	= 2> /dev/null

	QUIET_SUBDIR0	= +@subdir=

	QUIET_SUBDIR1	= ;$(NO_SUBDIR) echo '   ' SUBDIR $$subdir; \

	QUIET_SUBDIR1	= ;$(NO_SUBDIR) \

			   echo '  SUBDIR   ' $$subdir; \

			  $(MAKE) $(PRINT_DIR) -C $$subdir

	export V

endif
@@ -183,25 +184,28 @@ ifdef missing_tools 
endif



do-install-man: man

	$(INSTALL) -d -m 755 $(DESTDIR)$(man1dir)

#	$(INSTALL) -d -m 755 $(DESTDIR)$(man5dir)

#	$(INSTALL) -d -m 755 $(DESTDIR)$(man7dir)

	$(INSTALL) -m 644 $(DOC_MAN1) $(DESTDIR)$(man1dir)

#	$(INSTALL) -m 644 $(DOC_MAN5) $(DESTDIR)$(man5dir)

	$(call QUIET_INSTALL, Documentation-man) \

		$(INSTALL) -d -m 755 $(DESTDIR)$(man1dir); \

#		$(INSTALL) -d -m 755 $(DESTDIR)$(man5dir); \

#		$(INSTALL) -d -m 755 $(DESTDIR)$(man7dir); \

		$(INSTALL) -m 644 $(DOC_MAN1) $(DESTDIR)$(man1dir); \

#		$(INSTALL) -m 644 $(DOC_MAN5) $(DESTDIR)$(man5dir); \

#		$(INSTALL) -m 644 $(DOC_MAN7) $(DESTDIR)$(man7dir)



install-man: check-man-tools man



try-install-man:

ifdef missing_tools

	$(warning Please install $(missing_tools) to have the man pages installed)

  DO_INSTALL_MAN = $(warning Please install $(missing_tools) to have the man pages installed)

else

	$(MAKE) do-install-man

  DO_INSTALL_MAN = do-install-man

endif



try-install-man: $(DO_INSTALL_MAN)



install-info: info

	$(INSTALL) -d -m 755 $(DESTDIR)$(infodir)

	$(INSTALL) -m 644 $(OUTPUT)perf.info $(OUTPUT)perfman.info $(DESTDIR)$(infodir)

	$(call QUIET_INSTALL, Documentation-info) \

		$(INSTALL) -d -m 755 $(DESTDIR)$(infodir); \

		$(INSTALL) -m 644 $(OUTPUT)perf.info $(OUTPUT)perfman.info $(DESTDIR)$(infodir); \

	if test -r $(DESTDIR)$(infodir)/dir; then \

		$(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) perf.info ;\

		$(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) perfman.info ;\
@@ -210,20 +214,13 @@ install-info: info 
	fi



install-pdf: pdf

	$(INSTALL) -d -m 755 $(DESTDIR)$(pdfdir)

	$(call QUIET_INSTALL, Documentation-pdf) \

		$(INSTALL) -d -m 755 $(DESTDIR)$(pdfdir); \

		$(INSTALL) -m 644 $(OUTPUT)user-manual.pdf $(DESTDIR)$(pdfdir)



#install-html: html

#	'$(SHELL_PATH_SQ)' ./install-webdoc.sh $(DESTDIR)$(htmldir)



ifneq ($(MAKECMDGOALS),clean)

ifneq ($(MAKECMDGOALS),tags)

$(OUTPUT)PERF-VERSION-FILE: .FORCE-PERF-VERSION-FILE

	$(QUIET_SUBDIR0)../ $(QUIET_SUBDIR1) $(OUTPUT)PERF-VERSION-FILE



-include $(OUTPUT)PERF-VERSION-FILE

endif

endif



#

# Determine "include::" file references in asciidoc files.
@@ -253,15 +250,17 @@ $(OUTPUT)cmd-list.made: cmd-list.perl ../command-list.txt $(MAN1_TXT) 
	$(PERL_PATH) ./cmd-list.perl ../command-list.txt $(QUIET_STDERR) && \

	date >$@



CLEAN_FILES =									\

	$(MAN_XML) $(addsuffix +,$(MAN_XML))					\

	$(MAN_HTML) $(addsuffix +,$(MAN_HTML))					\

	$(DOC_HTML) $(DOC_MAN1) $(DOC_MAN5) $(DOC_MAN7)				\

	$(OUTPUT)*.texi $(OUTPUT)*.texi+ $(OUTPUT)*.texi++			\

	$(OUTPUT)perf.info $(OUTPUT)perfman.info				\

	$(OUTPUT)howto-index.txt $(OUTPUT)howto/*.html $(OUTPUT)doc.dep		\

	$(OUTPUT)technical/api-*.html $(OUTPUT)technical/api-index.txt		\

	$(cmds_txt) $(OUTPUT)*.made

clean:

	$(RM) $(MAN_XML) $(addsuffix +,$(MAN_XML))

	$(RM) $(MAN_HTML) $(addsuffix +,$(MAN_HTML))

	$(RM) $(DOC_HTML) $(DOC_MAN1) $(DOC_MAN5) $(DOC_MAN7)

	$(RM) $(OUTPUT)*.texi $(OUTPUT)*.texi+ $(OUTPUT)*.texi++

	$(RM) $(OUTPUT)perf.info $(OUTPUT)perfman.info

	$(RM) $(OUTPUT)howto-index.txt $(OUTPUT)howto/*.html $(OUTPUT)doc.dep

	$(RM) $(OUTPUT)technical/api-*.html $(OUTPUT)technical/api-index.txt

	$(RM) $(cmds_txt) $(OUTPUT)*.made

	$(call QUIET_CLEAN, Documentation) $(RM) $(CLEAN_FILES)



$(MAN_HTML): $(OUTPUT)%.html : %.txt

	$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
@@ -342,5 +341,3 @@ $(patsubst %.txt,%.html,$(wildcard howto/*.txt)): %.html : %.txt 


#quick-install-html:

#	'$(SHELL_PATH_SQ)' ./install-doc-quick.sh $(HTML_REF) $(DESTDIR)$(htmldir)
 


.PHONY: .FORCE-PERF-VERSION-FILE

tools/perf/Documentation/perf-buildid-cache.txt

+13 −0
Original line number Diff line number Diff line
@@ -21,6 +21,19 @@ OPTIONS 
-a::

--add=::

        Add specified file to the cache.

-k::

--kcore::

        Add specified kcore file to the cache. For the current host that is

        /proc/kcore which requires root permissions to read. Be aware that

        running 'perf buildid-cache' as root may update root's build-id cache

        not the user's. Use the -v option to see where the file is created.

        Note that the copied file contains only code sections not the whole core

        image. Note also that files "kallsyms" and "modules" must also be in the

        same directory and are also copied.  All 3 files are created with read

        permissions for root only. kcore will not be added if there is already a

        kcore in the cache (with the same build-id) that has the same modules at

        the same addresses. Use the -v option to see if a copy of kcore is

        actually made.

-r::

--remove=::

        Remove specified file from the cache.

tools/perf/Documentation/perf-kvm.txt

+3 −1
Original line number Diff line number Diff line
@@ -109,7 +109,9 @@ STAT LIVE OPTIONS 


-m::

--mmap-pages=::

    Number of mmap data pages. Must be a power of two.

    Number of mmap data pages (must be a power of two) or size

    specification with appended unit character - B/K/M/G. The

    size is rounded up to have nearest pages power of two value.



-a::

--all-cpus::