Commit 51ab7155 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:

User visible changes:

  - Teach 'perf record' about perf_event_attr.clockid (Peter Zijlstra)

  - Improve 'perf sched replay' on high CPU core count machines (Yunlong Song)

  - Consider PERF_RECORD_ events with cpumode == 0 in 'perf top', removing one
    cause of long term memory usage buildup, i.e. not processing PERF_RECORD_EXIT
    events (Arnaldo Carvalho de Melo)

  - Add 'I' event modifier for perf_event_attr.exclude_idle bit (Jiri Olsa)

  - Respect -i option 'in perf kmem' (Jiri Olsa)

Infrastructure changes:

  - Honor operator priority in libtraceevent (Namhyung Kim)

  - Merge all perf_event_attr print functions (Peter Zijlstra)

  - Check kmaps access to make code more robust (Wang Nan)

  - Fix inverted logic in perf_mmap__empty() (He Kuang)

  - Fix ARM 32 'perf probe' building error (Wang Nan)

  - Fix perf_event_attr tests (Jiri Olsa)

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

tools/lib/traceevent/event-parse.c

+16 −1
Original line number Diff line number Diff line
@@ -1939,7 +1939,22 @@ process_op(struct event_format *event, struct print_arg *arg, char **tok) 
			goto out_warn_free;



		type = process_arg_token(event, right, tok, type);



		if (right->type == PRINT_OP &&

		    get_op_prio(arg->op.op) < get_op_prio(right->op.op)) {

			struct print_arg tmp;



			/* rotate ops according to the priority */

			arg->op.right = right->op.left;



			tmp = *arg;

			*arg = *right;

			*right = tmp;



			arg->op.left = right;

		} else {

			arg->op.right = right;

		}



	} else if (strcmp(token, "[") == 0) {

tools/perf/Documentation/perf-list.txt

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ counted. The following modifiers exist: 
 u - user-space counting

 k - kernel counting

 h - hypervisor counting

 I - non idle counting

 G - guest counting (in KVM guests)

 H - host counting (not in KVM guests)

 p - precise level

tools/perf/Documentation/perf-record.txt

+7 −0
Original line number Diff line number Diff line
@@ -250,6 +250,13 @@ is off by default. 
--running-time::

Record running and enabled time for read events (:S)



-k::

--clockid::

Sets the clock id to use for the various time fields in the perf_event_type

records. See clock_gettime(). In particular CLOCK_MONOTONIC and

CLOCK_MONOTONIC_RAW are supported, some events might also allow

CLOCK_BOOTTIME, CLOCK_REALTIME and CLOCK_TAI.



SEE ALSO

--------

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

tools/perf/builtin-kmem.c

+2 −1
Original line number Diff line number Diff line
@@ -663,7 +663,6 @@ int cmd_kmem(int argc, const char **argv, const char *prefix __maybe_unused) 
{

	const char * const default_sort_order = "frag,hit,bytes";

	struct perf_data_file file = {

		.path = input_name,

		.mode = PERF_DATA_MODE_READ,

	};

	const struct option kmem_options[] = {
@@ -701,6 +700,8 @@ int cmd_kmem(int argc, const char **argv, const char *prefix __maybe_unused) 
		return __cmd_record(argc, argv);

	}



	file.path = input_name;



	session = perf_session__new(&file, false, &perf_kmem);

	if (session == NULL)

		return -1;

tools/perf/builtin-record.c

+87 −0
Original line number Diff line number Diff line
@@ -711,6 +711,90 @@ static int perf_record_config(const char *var, const char *value, void *cb) 
	return perf_default_config(var, value, cb);

}



struct clockid_map {

	const char *name;

	int clockid;

};



#define CLOCKID_MAP(n, c)	\

	{ .name = n, .clockid = (c), }



#define CLOCKID_END	{ .name = NULL, }





/*

 * Add the missing ones, we need to build on many distros...

 */

#ifndef CLOCK_MONOTONIC_RAW

#define CLOCK_MONOTONIC_RAW 4

#endif

#ifndef CLOCK_BOOTTIME

#define CLOCK_BOOTTIME 7

#endif

#ifndef CLOCK_TAI

#define CLOCK_TAI 11

#endif



static const struct clockid_map clockids[] = {

	/* available for all events, NMI safe */

	CLOCKID_MAP("monotonic", CLOCK_MONOTONIC),

	CLOCKID_MAP("monotonic_raw", CLOCK_MONOTONIC_RAW),



	/* available for some events */

	CLOCKID_MAP("realtime", CLOCK_REALTIME),

	CLOCKID_MAP("boottime", CLOCK_BOOTTIME),

	CLOCKID_MAP("tai", CLOCK_TAI),



	/* available for the lazy */

	CLOCKID_MAP("mono", CLOCK_MONOTONIC),

	CLOCKID_MAP("raw", CLOCK_MONOTONIC_RAW),

	CLOCKID_MAP("real", CLOCK_REALTIME),

	CLOCKID_MAP("boot", CLOCK_BOOTTIME),



	CLOCKID_END,

};



static int parse_clockid(const struct option *opt, const char *str, int unset)

{

	struct record_opts *opts = (struct record_opts *)opt->value;

	const struct clockid_map *cm;

	const char *ostr = str;



	if (unset) {

		opts->use_clockid = 0;

		return 0;

	}



	/* no arg passed */

	if (!str)

		return 0;



	/* no setting it twice */

	if (opts->use_clockid)

		return -1;



	opts->use_clockid = true;



	/* if its a number, we're done */

	if (sscanf(str, "%d", &opts->clockid) == 1)

		return 0;



	/* allow a "CLOCK_" prefix to the name */

	if (!strncasecmp(str, "CLOCK_", 6))

		str += 6;



	for (cm = clockids; cm->name; cm++) {

		if (!strcasecmp(str, cm->name)) {

			opts->clockid = cm->clockid;

			return 0;

		}

	}



	opts->use_clockid = false;

	ui__warning("unknown clockid %s, check man page\n", ostr);

	return -1;

}



static const char * const __record_usage[] = {

	"perf record [<options>] [<command>]",

	"perf record [<options>] -- <command> [<options>]",
@@ -842,6 +926,9 @@ struct option __record_options[] = { 
		    "Sample machine registers on interrupt"),

	OPT_BOOLEAN(0, "running-time", &record.opts.running_time,

		    "Record running/enabled time of read (:S) events"),

	OPT_CALLBACK('k', "clockid", &record.opts,

	"clockid", "clockid to use for events, see clock_gettime()",

	parse_clockid),

	OPT_END()

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE