Commit a448a031 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-urgent-for-mingo' of... 

Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents c9623de4 88a21d2f

arch/x86/kernel/cpu/perf_event.c

+6 −0
Original line number Diff line number Diff line
@@ -338,6 +338,9 @@ int x86_setup_perfctr(struct perf_event *event) 
		/* BTS is currently only allowed for user-mode. */

		if (!attr->exclude_kernel)

			return -EOPNOTSUPP;



		if (!attr->exclude_guest)

			return -EOPNOTSUPP;

	}



	hwc->config |= config;
@@ -380,6 +383,9 @@ int x86_pmu_hw_config(struct perf_event *event) 
	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) {

			precise++;

tools/lib/traceevent/event-parse.c

+6 −3
Original line number Diff line number Diff line
@@ -2602,6 +2602,9 @@ find_func_handler(struct pevent *pevent, char *func_name) 
{

	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 @@ enum pevent_errno __pevent_parse_format(struct event_format **eventp, 
		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;
@@ -5041,9 +5047,6 @@ enum pevent_errno pevent_parse_event(struct pevent *pevent, const char *buf, 
	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;

		goto event_add_failed;

tools/lib/traceevent/parse-filter.c

+15 −0
Original line number Diff line number Diff line
@@ -209,7 +209,16 @@ static void free_arg(struct filter_arg *arg) 
	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:
@@ -218,6 +227,12 @@ static void free_arg(struct filter_arg *arg) 
		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:

		free_arg(arg->op.left);

		free_arg(arg->op.right);

tools/perf/perf.h

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ void get_term_dimensions(struct winsize *ws); 
#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"

tools/perf/ui/browsers/hists.c

+4 −2
Original line number Diff line number Diff line
@@ -610,6 +610,7 @@ static int hist_browser__show_entry(struct hist_browser *browser, 
	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 @@ static int hist_browser__show_entry(struct hist_browser *browser, 
			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 @@ static int hist_browser__show_entry(struct hist_browser *browser, 


				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;

				}

CRA Git | Maintained and supported by SUSTech CRA and CCSE