Commit a11c51ac 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:

New features:

  - Allow filtering out of perf's PID via 'perf record --exclude-perf'. (Wang Nan)

  - 'perf trace' now supports syscall groups, like strace, i.e:

      $ trace -e file touch file

    Will expand 'file' into multiple, file related, syscalls. More work needed to
    add extra groups for other syscall groups, and also to complement what was
    added for the 'file' group, included as a proof of concept. (Arnaldo Carvalho de Melo)

  - Add lock_pi stresser to 'perf bench futex', to test the kernel code
    related to FUTEX_(UN)LOCK_PI. (Davidlohr Bueso)

User visible fixes:

  - Apply --filter to all events in a glob matching, not just the last one. (Wang Nan)

Documentation changes:

  - Document setting '-e pmu/period=N/' in the 'perf record' man page. (Kan Liang)

Infrastructure changes:

  - 'perf probe' code simplifications and movements to separate files. (Masami Hiramatsu)

  - Fix makefile generation under 'dash'. (Sergei Trofimovich)

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents f6a74a5e d2f3f5d2

tools/perf/Build

+1 −0
Original line number Original line Diff line number Diff line
@@ -35,6 +35,7 @@ paths += -DPERF_MAN_PATH="BUILD_STR($(mandir_SQ))" 
CFLAGS_builtin-help.o      += $(paths)

CFLAGS_builtin-help.o      += $(paths)

CFLAGS_builtin-timechart.o += $(paths)

CFLAGS_builtin-timechart.o += $(paths)

CFLAGS_perf.o              += -DPERF_HTML_PATH="BUILD_STR($(htmldir_SQ))" -include $(OUTPUT)PERF-VERSION-FILE

CFLAGS_perf.o              += -DPERF_HTML_PATH="BUILD_STR($(htmldir_SQ))" -include $(OUTPUT)PERF-VERSION-FILE

CFLAGS_builtin-trace.o	   += -DSTRACE_GROUPS_DIR="BUILD_STR($(STRACE_GROUPS_DIR_SQ))"





libperf-y += util/

libperf-y += util/

libperf-y += arch/

libperf-y += arch/

tools/perf/Documentation/perf-bench.txt

+4 −0
Original line number Original line Diff line number Diff line
@@ -216,6 +216,10 @@ Suite for evaluating parallel wake calls. 
*requeue*::

*requeue*::

Suite for evaluating requeue calls.

Suite for evaluating requeue calls.





*lock-pi*::

Suite for evaluating futex lock_pi calls.





SEE ALSO

SEE ALSO

--------

--------

linkperf:perf[1]
 
linkperf:perf[1]

tools/perf/Documentation/perf-record.txt

+18 −1
Original line number Original line Diff line number Diff line
@@ -45,6 +45,14 @@ OPTIONS 
          param1 and param2 are defined as formats for the PMU in:

          param1 and param2 are defined as formats for the PMU in:

          /sys/bus/event_sources/devices/<pmu>/format/*

          /sys/bus/event_sources/devices/<pmu>/format/*





	  There are also some params which are not defined in .../<pmu>/format/*.

	  These params can be used to set event defaults.

	  Here is a list of the params.

	  - 'period': Set event sampling period



	  Note: If user explicitly sets options which conflict with the params,

	  the value set by the params will be overridden.



        - a hardware breakpoint event in the form of '\mem:addr[/len][:access]'

        - a hardware breakpoint event in the form of '\mem:addr[/len][:access]'

          where addr is the address in memory you want to break in.

          where addr is the address in memory you want to break in.

          Access is the memory access type (read, write, execute) it can

          Access is the memory access type (read, write, execute) it can
@@ -61,7 +69,16 @@ OPTIONS 
	  "perf report" to view group events together.

	  "perf report" to view group events together.





--filter=<filter>::

--filter=<filter>::

        Event filter.

        Event filter. This option should follow a event selector (-e) which

	selects tracepoint event(s). Multiple '--filter' options are combined

	using '&&'.



--exclude-perf::

	Don't record events issued by perf itself. This option should follow

	a event selector (-e) which selects tracepoint event(s). It adds a

	filter expression 'common_pid != $PERFPID' to filters. If other

	'--filter' exists, the new filter expression will be combined with

	them by '&&'.





-a::

-a::

--all-cpus::

--all-cpus::

tools/perf/Makefile.perf

+5 −0
Original line number Original line Diff line number Diff line
@@ -507,6 +507,11 @@ endif 
		$(INSTALL) $(OUTPUT)perf-archive -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)'

		$(INSTALL) $(OUTPUT)perf-archive -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)'

	$(call QUIET_INSTALL, perf-with-kcore) \

	$(call QUIET_INSTALL, perf-with-kcore) \

		$(INSTALL) $(OUTPUT)perf-with-kcore -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)'

		$(INSTALL) $(OUTPUT)perf-with-kcore -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)'

ifndef NO_LIBAUDIT

	$(call QUIET_INSTALL, strace/groups) \

		$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(STRACE_GROUPS_INSTDIR_SQ)'; \

		$(INSTALL) trace/strace/groups/* -t '$(DESTDIR_SQ)$(STRACE_GROUPS_INSTDIR_SQ)'

endif

ifndef NO_LIBPERL

ifndef NO_LIBPERL

	$(call QUIET_INSTALL, perl-scripts) \

	$(call QUIET_INSTALL, perl-scripts) \

		$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl/Perf-Trace-Util/lib/Perf/Trace'; \

		$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl/Perf-Trace-Util/lib/Perf/Trace'; \

tools/perf/bench/Build

+1 −0
Original line number Original line Diff line number Diff line
@@ -5,6 +5,7 @@ perf-y += futex-hash.o 
perf-y += futex-wake.o

perf-y += futex-wake.o

perf-y += futex-wake-parallel.o

perf-y += futex-wake-parallel.o

perf-y += futex-requeue.o

perf-y += futex-requeue.o

perf-y += futex-lock-pi.o





perf-$(CONFIG_X86_64) += mem-memcpy-x86-64-asm.o

perf-$(CONFIG_X86_64) += mem-memcpy-x86-64-asm.o

perf-$(CONFIG_X86_64) += mem-memset-x86-64-asm.o

perf-$(CONFIG_X86_64) += mem-memset-x86-64-asm.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE