Commit 29bf4dbc 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:

   - Enable sampling loads and stores simultaneously in 'perf mem' (Stephane Eranian)

   - 'perf diff' output improvements (Namhyung Kim)

   - Fix error reporting for evsel pgfault constructor (Arnaldo Carvalho de Melo)

   Infrastructure changes:

   - Move debugfs sterrno like method to tools/lib/ so that it may be used by
     other tools, as 'perf probe' will be soon (Arnaldo Carvalho de Melo)

   - Introduce function fro deleting/removing hist_entry to avoid code duplication
     (Arnaldo Carvalho de Melo)

   - Support parsing parameterized events (Cody P Schafer)

   - Add support for IP address formats in libtraceevent (David Ahern)

   - Fix typo in sample-parsing.c 'perf test' entry (Rasmus Villemoes)

   - Remove some unused functions from color.c (Rickard Strandqvist)
"

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

Documentation/ABI/testing/sysfs-bus-event_source-devices-events

+6 −0
Original line number Diff line number Diff line
@@ -52,12 +52,18 @@ Description: Per-pmu performance monitoring events specific to the running syste 
			event=0x2abc

			event=0x423,inv,cmask=0x3

			domain=0x1,offset=0x8,starting_index=0xffff

			domain=0x1,offset=0x8,core=?



		Each of the assignments indicates a value to be assigned to a

		particular set of bits (as defined by the format file

		corresponding to the <term>) in the perf_event structure passed

		to the perf_open syscall.



		In the case of the last example, a value replacing "?" would

		need to be provided by the user selecting the particular event.

		This is referred to as "event parameterization". Event

		parameters have the format 'param=?'.



What: /sys/bus/event_source/devices/<pmu>/events/<event>.unit

Date: 2014/02/24

Contact:	Linux kernel mailing list <linux-kernel@vger.kernel.org>

tools/lib/api/fs/debugfs.c

+43 −0
Original line number Diff line number Diff line 
#define _GNU_SOURCE

#include <errno.h>

#include <stdio.h>

#include <stdlib.h>
@@ -98,3 +99,45 @@ char *debugfs_mount(const char *mountpoint) 
out:

	return debugfs_mountpoint;

}



int debugfs__strerror_open(int err, char *buf, size_t size, const char *filename)

{

	char sbuf[128];



	switch (err) {

	case ENOENT:

		if (debugfs_found) {

			snprintf(buf, size,

				 "Error:\tFile %s/%s not found.\n"

				 "Hint:\tPerhaps this kernel misses some CONFIG_ setting to enable this feature?.\n",

				 debugfs_mountpoint, filename);

			break;

		}

		snprintf(buf, size, "%s",

			 "Error:\tUnable to find debugfs\n"

			 "Hint:\tWas your kernel compiled with debugfs support?\n"

			 "Hint:\tIs the debugfs filesystem mounted?\n"

			 "Hint:\tTry 'sudo mount -t debugfs nodev /sys/kernel/debug'");

		break;

	case EACCES:

		snprintf(buf, size,

			 "Error:\tNo permissions to read %s/%s\n"

			 "Hint:\tTry 'sudo mount -o remount,mode=755 %s'\n",

			 debugfs_mountpoint, filename, debugfs_mountpoint);

		break;

	default:

		snprintf(buf, size, "%s", strerror_r(err, sbuf, sizeof(sbuf)));

		break;

	}



	return 0;

}



int debugfs__strerror_open_tp(int err, char *buf, size_t size, const char *sys, const char *name)

{

	char path[PATH_MAX];



	snprintf(path, PATH_MAX, "tracing/events/%s/%s", sys, name ?: "*");



	return debugfs__strerror_open(err, buf, size, path);

}

tools/lib/api/fs/debugfs.h

+3 −0
Original line number Diff line number Diff line
@@ -26,4 +26,7 @@ char *debugfs_mount(const char *mountpoint); 


extern char debugfs_mountpoint[];



int debugfs__strerror_open(int err, char *buf, size_t size, const char *filename);

int debugfs__strerror_open_tp(int err, char *buf, size_t size, const char *sys, const char *name);



#endif /* __API_DEBUGFS_H__ */

tools/lib/traceevent/event-parse.c

+328 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include <stdint.h>

#include <limits.h>



#include <netinet/ip6.h>

#include "event-parse.h"

#include "event-utils.h"
@@ -4149,6 +4150,324 @@ static void print_mac_arg(struct trace_seq *s, int mac, void *data, int size, 
	trace_seq_printf(s, fmt, buf[0], buf[1], buf[2], buf[3], buf[4], buf[5]);

}



static void print_ip4_addr(struct trace_seq *s, char i, unsigned char *buf)

{

	const char *fmt;



	if (i == 'i')

		fmt = "%03d.%03d.%03d.%03d";

	else

		fmt = "%d.%d.%d.%d";



	trace_seq_printf(s, fmt, buf[0], buf[1], buf[2], buf[3]);

}



static inline bool ipv6_addr_v4mapped(const struct in6_addr *a)

{

	return ((unsigned long)(a->s6_addr32[0] | a->s6_addr32[1]) |

		(unsigned long)(a->s6_addr32[2] ^ htonl(0x0000ffff))) == 0UL;

}



static inline bool ipv6_addr_is_isatap(const struct in6_addr *addr)

{

	return (addr->s6_addr32[2] | htonl(0x02000000)) == htonl(0x02005EFE);

}



static void print_ip6c_addr(struct trace_seq *s, unsigned char *addr)

{

	int i, j, range;

	unsigned char zerolength[8];

	int longest = 1;

	int colonpos = -1;

	uint16_t word;

	uint8_t hi, lo;

	bool needcolon = false;

	bool useIPv4;

	struct in6_addr in6;



	memcpy(&in6, addr, sizeof(struct in6_addr));



	useIPv4 = ipv6_addr_v4mapped(&in6) || ipv6_addr_is_isatap(&in6);



	memset(zerolength, 0, sizeof(zerolength));



	if (useIPv4)

		range = 6;

	else

		range = 8;



	/* find position of longest 0 run */

	for (i = 0; i < range; i++) {

		for (j = i; j < range; j++) {

			if (in6.s6_addr16[j] != 0)

				break;

			zerolength[i]++;

		}

	}

	for (i = 0; i < range; i++) {

		if (zerolength[i] > longest) {

			longest = zerolength[i];

			colonpos = i;

		}

	}

	if (longest == 1)		/* don't compress a single 0 */

		colonpos = -1;



	/* emit address */

	for (i = 0; i < range; i++) {

		if (i == colonpos) {

			if (needcolon || i == 0)

				trace_seq_printf(s, ":");

			trace_seq_printf(s, ":");

			needcolon = false;

			i += longest - 1;

			continue;

		}

		if (needcolon) {

			trace_seq_printf(s, ":");

			needcolon = false;

		}

		/* hex u16 without leading 0s */

		word = ntohs(in6.s6_addr16[i]);

		hi = word >> 8;

		lo = word & 0xff;

		if (hi)

			trace_seq_printf(s, "%x%02x", hi, lo);

		else

			trace_seq_printf(s, "%x", lo);



		needcolon = true;

	}



	if (useIPv4) {

		if (needcolon)

			trace_seq_printf(s, ":");

		print_ip4_addr(s, 'I', &in6.s6_addr[12]);

	}



	return;

}



static void print_ip6_addr(struct trace_seq *s, char i, unsigned char *buf)

{

	int j;



	for (j = 0; j < 16; j += 2) {

		trace_seq_printf(s, "%02x%02x", buf[j], buf[j+1]);

		if (i == 'I' && j < 14)

			trace_seq_printf(s, ":");

	}

}



/*

 * %pi4   print an IPv4 address with leading zeros

 * %pI4   print an IPv4 address without leading zeros

 * %pi6   print an IPv6 address without colons

 * %pI6   print an IPv6 address with colons

 * %pI6c  print an IPv6 address in compressed form with colons

 * %pISpc print an IP address based on sockaddr; p adds port.

 */

static int print_ipv4_arg(struct trace_seq *s, const char *ptr, char i,

			  void *data, int size, struct event_format *event,

			  struct print_arg *arg)

{

	unsigned char *buf;



	if (arg->type == PRINT_FUNC) {

		process_defined_func(s, data, size, event, arg);

		return 0;

	}



	if (arg->type != PRINT_FIELD) {

		trace_seq_printf(s, "ARG TYPE NOT FIELD BUT %d", arg->type);

		return 0;

	}



	if (!arg->field.field) {

		arg->field.field =

			pevent_find_any_field(event, arg->field.name);

		if (!arg->field.field) {

			do_warning("%s: field %s not found",

				   __func__, arg->field.name);

			return 0;

		}

	}



	buf = data + arg->field.field->offset;



	if (arg->field.field->size != 4) {

		trace_seq_printf(s, "INVALIDIPv4");

		return 0;

	}

	print_ip4_addr(s, i, buf);



	return 0;

}



static int print_ipv6_arg(struct trace_seq *s, const char *ptr, char i,

			  void *data, int size, struct event_format *event,

			  struct print_arg *arg)

{

	char have_c = 0;

	unsigned char *buf;

	int rc = 0;



	/* pI6c */

	if (i == 'I' && *ptr == 'c') {

		have_c = 1;

		ptr++;

		rc++;

	}



	if (arg->type == PRINT_FUNC) {

		process_defined_func(s, data, size, event, arg);

		return rc;

	}



	if (arg->type != PRINT_FIELD) {

		trace_seq_printf(s, "ARG TYPE NOT FIELD BUT %d", arg->type);

		return rc;

	}



	if (!arg->field.field) {

		arg->field.field =

			pevent_find_any_field(event, arg->field.name);

		if (!arg->field.field) {

			do_warning("%s: field %s not found",

				   __func__, arg->field.name);

			return rc;

		}

	}



	buf = data + arg->field.field->offset;



	if (arg->field.field->size != 16) {

		trace_seq_printf(s, "INVALIDIPv6");

		return rc;

	}



	if (have_c)

		print_ip6c_addr(s, buf);

	else

		print_ip6_addr(s, i, buf);



	return rc;

}



static int print_ipsa_arg(struct trace_seq *s, const char *ptr, char i,

			  void *data, int size, struct event_format *event,

			  struct print_arg *arg)

{

	char have_c = 0, have_p = 0;

	unsigned char *buf;

	struct sockaddr_storage *sa;

	int rc = 0;



	/* pISpc */

	if (i == 'I') {

		if (*ptr == 'p') {

			have_p = 1;

			ptr++;

			rc++;

		}

		if (*ptr == 'c') {

			have_c = 1;

			ptr++;

			rc++;

		}

	}



	if (arg->type == PRINT_FUNC) {

		process_defined_func(s, data, size, event, arg);

		return rc;

	}



	if (arg->type != PRINT_FIELD) {

		trace_seq_printf(s, "ARG TYPE NOT FIELD BUT %d", arg->type);

		return rc;

	}



	if (!arg->field.field) {

		arg->field.field =

			pevent_find_any_field(event, arg->field.name);

		if (!arg->field.field) {

			do_warning("%s: field %s not found",

				   __func__, arg->field.name);

			return rc;

		}

	}



	sa = (struct sockaddr_storage *) (data + arg->field.field->offset);



	if (sa->ss_family == AF_INET) {

		struct sockaddr_in *sa4 = (struct sockaddr_in *) sa;



		if (arg->field.field->size < sizeof(struct sockaddr_in)) {

			trace_seq_printf(s, "INVALIDIPv4");

			return rc;

		}



		print_ip4_addr(s, i, (unsigned char *) &sa4->sin_addr);

		if (have_p)

			trace_seq_printf(s, ":%d", ntohs(sa4->sin_port));





	} else if (sa->ss_family == AF_INET6) {

		struct sockaddr_in6 *sa6 = (struct sockaddr_in6 *) sa;



		if (arg->field.field->size < sizeof(struct sockaddr_in6)) {

			trace_seq_printf(s, "INVALIDIPv6");

			return rc;

		}



		if (have_p)

			trace_seq_printf(s, "[");



		buf = (unsigned char *) &sa6->sin6_addr;

		if (have_c)

			print_ip6c_addr(s, buf);

		else

			print_ip6_addr(s, i, buf);



		if (have_p)

			trace_seq_printf(s, "]:%d", ntohs(sa6->sin6_port));

	}



	return rc;

}



static int print_ip_arg(struct trace_seq *s, const char *ptr,

			void *data, int size, struct event_format *event,

			struct print_arg *arg)

{

	char i = *ptr;  /* 'i' or 'I' */

	char ver;

	int rc = 0;



	ptr++;

	rc++;



	ver = *ptr;

	ptr++;

	rc++;



	switch (ver) {

	case '4':

		rc += print_ipv4_arg(s, ptr, i, data, size, event, arg);

		break;

	case '6':

		rc += print_ipv6_arg(s, ptr, i, data, size, event, arg);

		break;

	case 'S':

		rc += print_ipsa_arg(s, ptr, i, data, size, event, arg);

		break;

	default:

		return 0;

	}



	return rc;

}



static int is_printable_array(char *p, unsigned int len)

{

	unsigned int i;
@@ -4337,6 +4656,15 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct event 
					ptr++;

					arg = arg->next;

					break;

				} else if (*(ptr+1) == 'I' || *(ptr+1) == 'i') {

					int n;



					n = print_ip_arg(s, ptr+1, data, size, event, arg);

					if (n > 0) {

						ptr += n;

						arg = arg->next;

						break;

					}

				}



				/* fall through */

tools/perf/Documentation/perf-list.txt

+13 −0
Original line number Diff line number Diff line
@@ -89,6 +89,19 @@ raw encoding of 0x1A8 can be used: 
You should refer to the processor specific documentation for getting these

details. Some of them are referenced in the SEE ALSO section below.



PARAMETERIZED EVENTS

--------------------



Some pmu events listed by 'perf-list' will be displayed with '?' in them. For

example:



  hv_gpci/dtbp_ptitc,phys_processor_idx=?/



This means that when provided as an event, a value for '?' must

also be supplied. For example:



  perf stat -C 0 -e 'hv_gpci/dtbp_ptitc,phys_processor_idx=0x2/' ...



OPTIONS

-------

CRA Git | Maintained and supported by SUSTech CRA and CCSE