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

Commit 85723885 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf record: Add --all-user/--all-kernel options 



Allow user to easily switch all events to user or kernel space with simple
--all-user or --all-kernel options.

This will be handy within perf mem/c2c wrappers to switch easily monitoring
modes.

Committer note:

Testing it:

  # perf record --all-kernel --all-user -a sleep 2
   Error: option `all-user' cannot be used with all-kernel
   Usage: perf record [<options>] [<command>]
      or: perf record [<options>] -- <command> [<options>]

        --all-user        Configure all used events to run in user space.
        --all-kernel      Configure all used events to run in kernel space.
  # perf record --all-user --all-kernel -a sleep 2
   Error: option `all-kernel' cannot be used with all-user
   Usage: perf record [<options>] [<command>]
      or: perf record [<options>] -- <command> [<options>]

        --all-kernel      Configure all used events to run in kernel space.
        --all-user        Configure all used events to run in user space.
  # perf record --all-user -a sleep 1
  [ perf record: Woken up 1 times to write data ]
  [ perf record: Captured and wrote 1.416 MB perf.data (162 samples) ]
  # perf report | grep '\[k\]'
  # perf record --all-kernel -a sleep 1
  [ perf record: Woken up 1 times to write data ]
  [ perf record: Captured and wrote 1.423 MB perf.data (296 samples) ]
  # perf report | grep '\[\.\]'
  #

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Tested-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1455525293-8671-2-git-send-email-jolsa@kernel.org


[ Made those options to be mutually exclusive ]
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent a55e5663

tools/perf/Documentation/perf-record.txt

+6 −0
Original line number Diff line number Diff line
@@ -341,6 +341,12 @@ Specify vmlinux path which has debuginfo. 
--buildid-all::

Record build-id of all DSOs regardless whether it's actually hit or not.



--all-kernel::

Configure all used events to run in kernel space.



--all-user::

Configure all used events to run in user space.



SEE ALSO

--------

linkperf:perf-stat[1], linkperf:perf-list[1]

tools/perf/builtin-record.c

+6 −0
Original line number Diff line number Diff line
@@ -1140,6 +1140,12 @@ struct option __record_options[] = { 
			"per thread proc mmap processing timeout in ms"),

	OPT_BOOLEAN(0, "switch-events", &record.opts.record_switch_events,

		    "Record context switch events"),

	OPT_BOOLEAN_FLAG(0, "all-kernel", &record.opts.all_kernel,

			 "Configure all used events to run in kernel space.",

			 PARSE_OPT_EXCLUSIVE),

	OPT_BOOLEAN_FLAG(0, "all-user", &record.opts.all_user,

			 "Configure all used events to run in user space.",

			 PARSE_OPT_EXCLUSIVE),

	OPT_STRING(0, "clang-path", &llvm_param.clang_path, "clang path",

		   "clang binary to use for compiling BPF scriptlets"),

	OPT_STRING(0, "clang-opt", &llvm_param.clang_opt, "clang options",

tools/perf/perf.h

+2 −0
Original line number Diff line number Diff line
@@ -58,6 +58,8 @@ struct record_opts { 
	bool	     full_auxtrace;

	bool	     auxtrace_snapshot_mode;

	bool	     record_switch_events;

	bool	     all_kernel;

	bool	     all_user;

	unsigned int freq;

	unsigned int mmap_pages;

	unsigned int auxtrace_mmap_pages;

tools/perf/util/evsel.c

+10 −0
Original line number Diff line number Diff line
@@ -898,6 +898,16 @@ void perf_evsel__config(struct perf_evsel *evsel, struct record_opts *opts) 
	if (evsel->precise_max)

		perf_event_attr__set_max_precise_ip(attr);



	if (opts->all_user) {

		attr->exclude_kernel = 1;

		attr->exclude_user   = 0;

	}



	if (opts->all_kernel) {

		attr->exclude_kernel = 0;

		attr->exclude_user   = 1;

	}



	/*

	 * Apply event specific term settings,

	 * it overloads any global configuration.