Commit 8c1bee68 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull perf fixes from Ingo Molnar:
 "Assorted small fixes"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf python: Properly link with libtraceevent
  perf hists browser: Add back callchain folding symbol
  perf tools: Fix build on sparc.
  perf python: Link with libtraceevent
  perf python: Initialize 'page_size' variable
  tools lib traceevent: Fix missed freeing of subargs in free_arg() in filter
  lib tools traceevent: Add back pevent assignment in __pevent_parse_format()
  perf hists browser: Fix off-by-two bug on the first column
  perf tools: Remove warnings on JIT samples for srcline sort key
  perf tools: Fix segfault when using srcline sort key
  perf: Require exclude_guest to use PEBS - kernel side enforcement
  perf tool: Precise mode requires exclude_guest
parents 37820108 45bff41a

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/Makefile

+13 −11
Original line number Diff line number Diff line
@@ -184,9 +184,22 @@ SCRIPT_SH += perf-archive.sh 
grep-libs = $(filter -l%,$(1))

strip-libs = $(filter-out -l%,$(1))



TRACE_EVENT_DIR = ../lib/traceevent/



ifneq ($(OUTPUT),)

	TE_PATH=$(OUTPUT)

else

	TE_PATH=$(TRACE_EVENT_DIR)

endif



LIBTRACEEVENT = $(TE_PATH)libtraceevent.a

TE_LIB := -L$(TE_PATH) -ltraceevent



PYTHON_EXT_SRCS := $(shell grep -v ^\# util/python-ext-sources)

PYTHON_EXT_DEPS := util/python-ext-sources util/setup.py



export LIBTRACEEVENT



$(OUTPUT)python/perf.so: $(PYTHON_EXT_SRCS) $(PYTHON_EXT_DEPS)

	$(QUIET_GEN)CFLAGS='$(BASIC_CFLAGS)' $(PYTHON_WORD) util/setup.py \

	  --quiet build_ext; \
@@ -198,17 +211,6 @@ $(OUTPUT)python/perf.so: $(PYTHON_EXT_SRCS) $(PYTHON_EXT_DEPS) 


SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH))



TRACE_EVENT_DIR = ../lib/traceevent/



ifneq ($(OUTPUT),)

	TE_PATH=$(OUTPUT)

else

	TE_PATH=$(TRACE_EVENT_DIR)

endif



LIBTRACEEVENT = $(TE_PATH)libtraceevent.a

TE_LIB := -L$(TE_PATH) -ltraceevent



#

# Single 'perf' binary right now:

#

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"

CRA Git | Maintained and supported by SUSTech CRA and CCSE