Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/g…

…it/acme/linux into perf/urgent Pull perf/urgent fixes from Arnaldo Carvalho de Melo: * The python binding needs to link with libtraceevent and to initialize the 'page_size' variable so that mmaping works again. * The callchain folding character that appears on the TUI just before the overhead had disappeared due to recent changes, add it back. * Intel PEBS in VT-x context uses the DS address as a guest linear address, even though its programmed by the host as a host linear address. This either results in guest memory corruption and or the hardware faulting and 'crashing' the virtual machine. Therefore we have to disable PEBS on VT-x enter and re-enable on VT-x exit, enforcing a strict exclude_guest. Kernel side enforcement fix by Peter Zijlstra, tooling side fix by David Ahern. * Fix build on sparc due to UAPI, fix from David Miller. * Fixes for the srclike sort key for unresolved symbols and when processing samples in JITted code, where we don't have an ELF file, just an special symbol table, fixes from Namhyung Kim. * Fix some leaks in libtraceevent, from Steven Rostedt. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: Ingo Molnar <mingo@kernel.org>

Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/g…
…it/acme/linux into perf/urgent Pull perf/urgent fixes from Arnaldo Carvalho de Melo: * The python binding needs to link with libtraceevent and to initialize the 'page_size' variable so that mmaping works again. * The callchain folding character that appears on the TUI just before the overhead had disappeared due to recent changes, add it back. * Intel PEBS in VT-x context uses the DS address as a guest linear address, even though its programmed by the host as a host linear address. This either results in guest memory corruption and or the hardware faulting and 'crashing' the virtual machine. Therefore we have to disable PEBS on VT-x enter and re-enable on VT-x exit, enforcing a strict exclude_guest. Kernel side enforcement fix by Peter Zijlstra, tooling side fix by David Ahern. * Fix build on sparc due to UAPI, fix from David Miller. * Fixes for the srclike sort key for unresolved symbols and when processing samples in JITted code, where we don't have an ELF file, just an special symbol table, fixes from Namhyung Kim. * Fix some leaks in libtraceevent, from Steven Rostedt. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: Ingo Molnar <mingo@kernel.org>
Ingo Molnar
2 parents c9623de4fc 88a21d2f07
Showing 9 changed files Side-by-side Diff
arch/x86/kernel/cpu/perf_event.c
tools/lib/traceevent/event-parse.c
tools/lib/traceevent/parse-filter.c
tools/perf/perf.h
tools/perf/ui/browsers/hists.c
tools/perf/util/parse-events.c
tools/perf/util/python.c
tools/perf/util/setup.py
tools/perf/util/sort.c
@@ -338,6 +338,9 @@
 		/* BTS is currently only allowed for user-mode. */
 		if (!attr->exclude_kernel)
 			return -EOPNOTSUPP;
+
+		if (!attr->exclude_guest)
+			return -EOPNOTSUPP;
 	}
  
 	hwc->config |= config;
@@ -379,6 +382,9 @@
 {
 	if (event->attr.precise_ip) {
 		int precise = 0;
+
+		if (!event->attr.exclude_guest)
+			return -EOPNOTSUPP;
  
 		/* Support for constant skid */
 		if (x86_pmu.pebs_active && !x86_pmu.pebs_broken) {
@@ -2602,6 +2602,9 @@
 {
 	struct pevent_function_handler *func;
  
+	if (!pevent)
+		return NULL;
+
 	for (func = pevent->func_handlers; func; func = func->next) {
 		if (strcmp(func->name, func_name) == 0)
 			break;
@@ -4938,6 +4941,9 @@
 		goto event_alloc_failed;
 	}
  
+	/* Add pevent to event so that it can be referenced */
+	event->pevent = pevent;
+
 	ret = event_read_format(event);
 	if (ret < 0) {
 		ret = PEVENT_ERRNO__READ_FORMAT_FAILED;
@@ -5040,9 +5046,6 @@
  
 	if (event == NULL)
 		return ret;
-
-	/* Add pevent to event so that it can be referenced */
-	event->pevent = pevent;
  
 	if (add_event(pevent, event)) {
 		ret = PEVENT_ERRNO__MEM_ALLOC_FAILED;
@@ -209,13 +209,28 @@
 	switch (arg->type) {
 	case FILTER_ARG_NONE:
 	case FILTER_ARG_BOOLEAN:
+		break;
+
 	case FILTER_ARG_NUM:
+		free_arg(arg->num.left);
+		free_arg(arg->num.right);
 		break;
  
+	case FILTER_ARG_EXP:
+		free_arg(arg->exp.left);
+		free_arg(arg->exp.right);
+		break;
+
 	case FILTER_ARG_STR:
 		free(arg->str.val);
 		regfree(&arg->str.reg);
 		free(arg->str.buffer);
+		break;
+
+	case FILTER_ARG_VALUE:
+		if (arg->value.type == FILTER_STRING ||
+		    arg->value.type == FILTER_CHAR)
+			free(arg->value.str);
 		break;
  
 	case FILTER_ARG_OP:
@@ -57,7 +57,7 @@
 #endif
  
 #ifdef __sparc__
-#include "../../arch/sparc/include/asm/unistd.h"
+#include "../../arch/sparc/include/uapi/asm/unistd.h"
 #define rmb()		asm volatile("":::"memory")
 #define cpu_relax()	asm volatile("":::"memory")
 #define CPUINFO_PROC	"cpu"
@@ -610,6 +610,7 @@
 	char folded_sign = ' ';
 	bool current_entry = ui_browser__is_current_entry(&browser->b, row);
 	off_t row_offset = entry->row_offset;
+	bool first = true;
  
 	if (current_entry) {
 		browser->he_selection = entry;
  
@@ -633,10 +634,11 @@
 			if (!perf_hpp__format[i].cond)
 				continue;
  
-			if (i) {
+			if (!first) {
 				slsmg_printf("  ");
 				width -= 2;
 			}
+			first = false;
  
 			if (perf_hpp__format[i].color) {
 				hpp.ptr = &percent;
@@ -645,7 +647,7 @@
  
 				ui_browser__set_percent_color(&browser->b, percent, current_entry);
  
-				if (i == 0 && symbol_conf.use_callchain) {
+				if (i == PERF_HPP__OVERHEAD && symbol_conf.use_callchain) {
 					slsmg_printf("%c ", folded_sign);
 					width -= 2;
 				}
@@ -690,6 +690,9 @@
 			eH = 0;
 		} else if (*str == 'p') {
 			precise++;
+			/* use of precise requires exclude_guest */
+			if (!exclude_GH)
+				eG = 1;
 		} else
 			break;
  
@@ -1015,6 +1015,8 @@
 	    pyrf_cpu_map__setup_types() < 0)
 		return;
  
+	page_size = sysconf(_SC_PAGE_SIZE);
+
 	Py_INCREF(&pyrf_evlist__type);
 	PyModule_AddObject(module, "evlist", (PyObject*)&pyrf_evlist__type);
  
@@ -31,6 +31,7 @@
 		  sources = ext_sources,
 		  include_dirs = ['util/include'],
 		  extra_compile_args = cflags,
+		  extra_objects = [build_tmp + '/../../libtraceevent.a'],
                  )
  
 setup(name='perf',
@@ -260,6 +260,12 @@
 	if (path != NULL)
 		goto out_path;
  
+	if (!self->ms.map)
+		goto out_ip;
+
+	if (!strncmp(self->ms.map->dso->long_name, "/tmp/perf-", 10))
+		goto out_ip;
+
 	snprintf(cmd, sizeof(cmd), "addr2line -e %s %016" PRIx64,
 		 self->ms.map->dso->long_name, self->ip);
 	fp = popen(cmd, "r");
...	...	@@ -338,6 +338,9 @@
338	338	/* BTS is currently only allowed for user-mode. */
339	339	if (!attr->exclude_kernel)
340	340	return -EOPNOTSUPP;
	341	+
	342	+ if (!attr->exclude_guest)
	343	+ return -EOPNOTSUPP;
341	344	}
342	345
343	346	hwc->config \|= config;
...	...	@@ -379,6 +382,9 @@
379	382	{
380	383	if (event->attr.precise_ip) {
381	384	int precise = 0;
	385	+
	386	+ if (!event->attr.exclude_guest)
	387	+ return -EOPNOTSUPP;
382	388
383	389	/* Support for constant skid */
384	390	if (x86_pmu.pebs_active && !x86_pmu.pebs_broken) {
...	...	@@ -2602,6 +2602,9 @@
2602	2602	{
2603	2603	struct pevent_function_handler *func;
2604	2604
	2605	+ if (!pevent)
	2606	+ return NULL;
	2607	+
2605	2608	for (func = pevent->func_handlers; func; func = func->next) {
2606	2609	if (strcmp(func->name, func_name) == 0)
2607	2610	break;
...	...	@@ -4938,6 +4941,9 @@
4938	4941	goto event_alloc_failed;
4939	4942	}
4940	4943
	4944	+ /* Add pevent to event so that it can be referenced */
	4945	+ event->pevent = pevent;
	4946	+
4941	4947	ret = event_read_format(event);
4942	4948	if (ret < 0) {
4943	4949	ret = PEVENT_ERRNO__READ_FORMAT_FAILED;
...	...	@@ -5040,9 +5046,6 @@
5040	5046
5041	5047	if (event == NULL)
5042	5048	return ret;
5043		-
5044		- /* Add pevent to event so that it can be referenced */
5045		- event->pevent = pevent;
5046	5049
5047	5050	if (add_event(pevent, event)) {
5048	5051	ret = PEVENT_ERRNO__MEM_ALLOC_FAILED;
...	...	@@ -209,13 +209,28 @@
209	209	switch (arg->type) {
210	210	case FILTER_ARG_NONE:
211	211	case FILTER_ARG_BOOLEAN:
	212	+ break;
	213	+
212	214	case FILTER_ARG_NUM:
	215	+ free_arg(arg->num.left);
	216	+ free_arg(arg->num.right);
213	217	break;
214	218
	219	+ case FILTER_ARG_EXP:
	220	+ free_arg(arg->exp.left);
	221	+ free_arg(arg->exp.right);
	222	+ break;
	223	+
215	224	case FILTER_ARG_STR:
216	225	free(arg->str.val);
217	226	regfree(&arg->str.reg);
218	227	free(arg->str.buffer);
	228	+ break;
	229	+
	230	+ case FILTER_ARG_VALUE:
	231	+ if (arg->value.type == FILTER_STRING \|\|
	232	+ arg->value.type == FILTER_CHAR)
	233	+ free(arg->value.str);
219	234	break;
220	235
221	236	case FILTER_ARG_OP:
...	...	@@ -57,7 +57,7 @@
57	57	#endif
58	58
59	59	#ifdef __sparc__
60		-#include "../../arch/sparc/include/asm/unistd.h"
	60	+#include "../../arch/sparc/include/uapi/asm/unistd.h"
61	61	#define rmb() asm volatile("":::"memory")
62	62	#define cpu_relax() asm volatile("":::"memory")
63	63	#define CPUINFO_PROC "cpu"
...	...	@@ -610,6 +610,7 @@
610	610	char folded_sign = ' ';
611	611	bool current_entry = ui_browser__is_current_entry(&browser->b, row);
612	612	off_t row_offset = entry->row_offset;
	613	+ bool first = true;
613	614
614	615	if (current_entry) {
615	616	browser->he_selection = entry;
616	617
...	...	@@ -633,10 +634,11 @@
633	634	if (!perf_hpp__format[i].cond)
634	635	continue;
635	636
636		- if (i) {
	637	+ if (!first) {
637	638	slsmg_printf(" ");
638	639	width -= 2;
639	640	}
	641	+ first = false;
640	642
641	643	if (perf_hpp__format[i].color) {
642	644	hpp.ptr = &percent;
...	...	@@ -645,7 +647,7 @@
645	647
646	648	ui_browser__set_percent_color(&browser->b, percent, current_entry);
647	649
648		- if (i == 0 && symbol_conf.use_callchain) {
	650	+ if (i == PERF_HPP__OVERHEAD && symbol_conf.use_callchain) {
649	651	slsmg_printf("%c ", folded_sign);
650	652	width -= 2;
651	653	}
...	...	@@ -690,6 +690,9 @@
690	690	eH = 0;
691	691	} else if (*str == 'p') {
692	692	precise++;
	693	+ /* use of precise requires exclude_guest */
	694	+ if (!exclude_GH)
	695	+ eG = 1;
693	696	} else
694	697	break;
695	698
...	...	@@ -1015,6 +1015,8 @@
1015	1015	pyrf_cpu_map__setup_types() < 0)
1016	1016	return;
1017	1017
	1018	+ page_size = sysconf(_SC_PAGE_SIZE);
	1019	+
1018	1020	Py_INCREF(&pyrf_evlist__type);
1019	1021	PyModule_AddObject(module, "evlist", (PyObject*)&pyrf_evlist__type);
1020	1022
...	...	@@ -31,6 +31,7 @@
31	31	sources = ext_sources,
32	32	include_dirs = ['util/include'],
33	33	extra_compile_args = cflags,
	34	+ extra_objects = [build_tmp + '/../../libtraceevent.a'],
34	35	)
35	36
36	37	setup(name='perf',
...	...	@@ -260,6 +260,12 @@
260	260	if (path != NULL)
261	261	goto out_path;
262	262
	263	+ if (!self->ms.map)
	264	+ goto out_ip;
	265	+
	266	+ if (!strncmp(self->ms.map->dso->long_name, "/tmp/perf-", 10))
	267	+ goto out_ip;
	268	+
263	269	snprintf(cmd, sizeof(cmd), "addr2line -e %s %016" PRIx64,
264	270	self->ms.map->dso->long_name, self->ip);
265	271	fp = popen(cmd, "r");