History

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

Linus Torvalds committed 14 years ago

Commit 8c1bee62 parents 3782010 45bff419 files · +56 −17Browse files

Unified · Split

9 files
  1. arch/x86/kernel/cpu/perf_event.c +6 −0
  2. tools/lib/traceevent/event-parse.c +6 −3
  3. tools/lib/traceevent/parse-filter.c +15 −0
  4. tools/perf/Makefile +13 −11
  5. tools/perf/perf.h +1 −1
  6. tools/perf/ui/browsers/hists.c +4 −2
  7. tools/perf/util/parse-events.c +3 −0
  8. tools/perf/util/setup.py +2 −0
  9. tools/perf/util/sort.c +6 −0
arch/x86/kernel/cpu/perf_event.c+6−0
@@ -338,6 +338,9 @@ int x86_setup_perfctr(struct perf_event *event) · 337 unmodified lines
338 /* BTS is currently only allowed for user-mode. */338 /* BTS is currently only allowed for user-mode. */
339 if (!attr->exclude_kernel)339 if (!attr->exclude_kernel)
340 return -EOPNOTSUPP;340 return -EOPNOTSUPP;
341
342 if (!attr->exclude_guest)
343 return -EOPNOTSUPP;
341 }344 }
342 345
343 hwc->config |= config;346 hwc->config |= config;
@@ -380,6 +383,9 @@ int x86_pmu_hw_config(struct perf_event *event) · 36 unmodified lines
380 if (event->attr.precise_ip) {383 if (event->attr.precise_ip) {
381 int precise = 0;384 int precise = 0;
382 385
386 if (!event->attr.exclude_guest)
387 return -EOPNOTSUPP;
388
383 /* Support for constant skid */389 /* Support for constant skid */
384 if (x86_pmu.pebs_active && !x86_pmu.pebs_broken) {390 if (x86_pmu.pebs_active && !x86_pmu.pebs_broken) {
385 precise++;391 precise++;
tools/lib/traceevent/event-parse.c+6−3
@@ -2602,6 +2602,9 @@ find_func_handler(struct pevent *pevent, char *func_name) · 2601 unmodified lines
2602{2602{
2603 struct pevent_function_handler *func;2603 struct pevent_function_handler *func;
2604 2604
2605 if (!pevent)
2606 return NULL;
2607
2605 for (func = pevent->func_handlers; func; func = func->next) {2608 for (func = pevent->func_handlers; func; func = func->next) {
2606 if (strcmp(func->name, func_name) == 0)2609 if (strcmp(func->name, func_name) == 0)
2607 break;2610 break;
@@ -4938,6 +4941,9 @@ enum pevent_errno __pevent_parse_format(struct event_format **eventp, · 2330 unmodified lines
4938 goto event_alloc_failed;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 ret = event_read_format(event);4947 ret = event_read_format(event);
4942 if (ret < 0) {4948 if (ret < 0) {
4943 ret = PEVENT_ERRNO__READ_FORMAT_FAILED;4949 ret = PEVENT_ERRNO__READ_FORMAT_FAILED;
@@ -5041,9 +5047,6 @@ enum pevent_errno pevent_parse_event(struct pevent *pevent, const char *buf, · 97 unmodified lines
5041 if (event == NULL)5047 if (event == NULL)
5042 return ret;5048 return ret;
5043 5049
5044 /* Add pevent to event so that it can be referenced */
5045 event->pevent = pevent;
5046
5047 if (add_event(pevent, event)) {5050 if (add_event(pevent, event)) {
5048 ret = PEVENT_ERRNO__MEM_ALLOC_FAILED;5051 ret = PEVENT_ERRNO__MEM_ALLOC_FAILED;
5049 goto event_add_failed;5052 goto event_add_failed;
tools/lib/traceevent/parse-filter.c+15−0
@@ -209,7 +209,16 @@ static void free_arg(struct filter_arg *arg) · 208 unmodified lines
209 switch (arg->type) {209 switch (arg->type) {
210 case FILTER_ARG_NONE:210 case FILTER_ARG_NONE:
211 case FILTER_ARG_BOOLEAN:211 case FILTER_ARG_BOOLEAN:
212 break;
213
212 case FILTER_ARG_NUM:214 case FILTER_ARG_NUM:
215 free_arg(arg->num.left);
216 free_arg(arg->num.right);
217 break;
218
219 case FILTER_ARG_EXP:
220 free_arg(arg->exp.left);
221 free_arg(arg->exp.right);
213 break;222 break;
214 223
215 case FILTER_ARG_STR:224 case FILTER_ARG_STR:
@@ -218,6 +227,12 @@ static void free_arg(struct filter_arg *arg) · 2 unmodified lines
218 free(arg->str.buffer);227 free(arg->str.buffer);
219 break;228 break;
220 229
230 case FILTER_ARG_VALUE:
231 if (arg->value.type == FILTER_STRING ||
232 arg->value.type == FILTER_CHAR)
233 free(arg->value.str);
234 break;
235
221 case FILTER_ARG_OP:236 case FILTER_ARG_OP:
222 free_arg(arg->op.left);237 free_arg(arg->op.left);
223 free_arg(arg->op.right);238 free_arg(arg->op.right);
tools/perf/Makefile+13−11
@@ -184,9 +184,22 @@ SCRIPT_SH += perf-archive.sh · 183 unmodified lines
184grep-libs = $(filter -l%,$(1))184grep-libs = $(filter -l%,$(1))
185strip-libs = $(filter-out -l%,$(1))185strip-libs = $(filter-out -l%,$(1))
186 186
187TRACE_EVENT_DIR = ../lib/traceevent/
188
189ifneq ($(OUTPUT),)
190 TE_PATH=$(OUTPUT)
191else
192 TE_PATH=$(TRACE_EVENT_DIR)
193endif
194
195LIBTRACEEVENT = $(TE_PATH)libtraceevent.a
196TE_LIB := -L$(TE_PATH) -ltraceevent
197
187PYTHON_EXT_SRCS := $(shell grep -v ^\# util/python-ext-sources)198PYTHON_EXT_SRCS := $(shell grep -v ^\# util/python-ext-sources)
188PYTHON_EXT_DEPS := util/python-ext-sources util/setup.py199PYTHON_EXT_DEPS := util/python-ext-sources util/setup.py
189 200
201export LIBTRACEEVENT
202
190$(OUTPUT)python/perf.so: $(PYTHON_EXT_SRCS) $(PYTHON_EXT_DEPS)203$(OUTPUT)python/perf.so: $(PYTHON_EXT_SRCS) $(PYTHON_EXT_DEPS)
191 $(QUIET_GEN)CFLAGS='$(BASIC_CFLAGS)' $(PYTHON_WORD) util/setup.py \204 $(QUIET_GEN)CFLAGS='$(BASIC_CFLAGS)' $(PYTHON_WORD) util/setup.py \
192 --quiet build_ext; \205 --quiet build_ext; \
@@ -198,17 +211,6 @@ $(OUTPUT)python/perf.so: $(PYTHON_EXT_SRCS) $(PYTHON_EXT_DEPS) · 5 unmodified lines
198 211
199SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH))212SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH))
200 213
201TRACE_EVENT_DIR = ../lib/traceevent/
202
203ifneq ($(OUTPUT),)
204 TE_PATH=$(OUTPUT)
205else
206 TE_PATH=$(TRACE_EVENT_DIR)
207endif
208
209LIBTRACEEVENT = $(TE_PATH)libtraceevent.a
210TE_LIB := -L$(TE_PATH) -ltraceevent
211
212#214#
213# Single 'perf' binary right now:215# Single 'perf' binary right now:
214#216#
tools/perf/perf.h+1−1
@@ -57,7 +57,7 @@ void get_term_dimensions(struct winsize *ws); · 56 unmodified lines
57#endif57#endif
58 58
59#ifdef __sparc__59#ifdef __sparc__
60#include "../../arch/sparc/include/asm/unistd.h"60#include "../../arch/sparc/include/uapi/asm/unistd.h"
61#define rmb() asm volatile("":::"memory")61#define rmb() asm volatile("":::"memory")
62#define cpu_relax() asm volatile("":::"memory")62#define cpu_relax() asm volatile("":::"memory")
63#define CPUINFO_PROC "cpu"63#define CPUINFO_PROC "cpu"
tools/perf/ui/browsers/hists.c+4−2
@@ -610,6 +610,7 @@ static int hist_browser__show_entry(struct hist_browser *browser, · 609 unmodified lines
610 char folded_sign = ' ';610 char folded_sign = ' ';
611 bool current_entry = ui_browser__is_current_entry(&browser->b, row);611 bool current_entry = ui_browser__is_current_entry(&browser->b, row);
612 off_t row_offset = entry->row_offset;612 off_t row_offset = entry->row_offset;
613 bool first = true;
613 614
614 if (current_entry) {615 if (current_entry) {
615 browser->he_selection = entry;616 browser->he_selection = entry;
@@ -633,10 +634,11 @@ static int hist_browser__show_entry(struct hist_browser *browser, · 17 unmodified lines
633 if (!perf_hpp__format[i].cond)634 if (!perf_hpp__format[i].cond)
634 continue;635 continue;
635 636
636 if (i) {637 if (!first) {
637 slsmg_printf(" ");638 slsmg_printf(" ");
638 width -= 2;639 width -= 2;
639 }640 }
641 first = false;
640 642
641 if (perf_hpp__format[i].color) {643 if (perf_hpp__format[i].color) {
642 hpp.ptr = &percent;644 hpp.ptr = &percent;
@@ -645,7 +647,7 @@ static int hist_browser__show_entry(struct hist_browser *browser, · 2 unmodified lines
645 647
646 ui_browser__set_percent_color(&browser->b, percent, current_entry);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 slsmg_printf("%c ", folded_sign);651 slsmg_printf("%c ", folded_sign);
650 width -= 2;652 width -= 2;
651 }653 }
tools/perf/util/parse-events.c+3−0
@@ -690,6 +690,9 @@ static int get_event_modifier(struct event_modifier *mod, char *str, · 689 unmodified lines
690 eH = 0;690 eH = 0;
691 } else if (*str == 'p') {691 } else if (*str == 'p') {
692 precise++;692 precise++;
693 /* use of precise requires exclude_guest */
694 if (!exclude_GH)
695 eG = 1;
693 } else696 } else
694 break;697 break;
695 698
tools/perf/util/setup.py+2−0
@@ -23,6 +23,7 @@ cflags += getenv('CFLAGS', '').split() · 22 unmodified lines
23 23
24build_lib = getenv('PYTHON_EXTBUILD_LIB')24build_lib = getenv('PYTHON_EXTBUILD_LIB')
25build_tmp = getenv('PYTHON_EXTBUILD_TMP')25build_tmp = getenv('PYTHON_EXTBUILD_TMP')
26libtraceevent = getenv('LIBTRACEEVENT')
26 27
27ext_sources = [f.strip() for f in file('util/python-ext-sources')28ext_sources = [f.strip() for f in file('util/python-ext-sources')
28 if len(f.strip()) > 0 and f[0] != '#']29 if len(f.strip()) > 0 and f[0] != '#']
@@ -31,6 +32,7 @@ perf = Extension('perf', · 2 unmodified lines
31 sources = ext_sources,32 sources = ext_sources,
32 include_dirs = ['util/include'],33 include_dirs = ['util/include'],
33 extra_compile_args = cflags,34 extra_compile_args = cflags,
35 extra_objects = [libtraceevent],
34 )36 )
35 37
36setup(name='perf',38setup(name='perf',
tools/perf/util/sort.c+6−0
@@ -260,6 +260,12 @@ static int hist_entry__srcline_snprintf(struct hist_entry *self, char *bf, · 259 unmodified lines
260 if (path != NULL)260 if (path != NULL)
261 goto out_path;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 snprintf(cmd, sizeof(cmd), "addr2line -e %s %016" PRIx64,269 snprintf(cmd, sizeof(cmd), "addr2line -e %s %016" PRIx64,
264 self->ms.map->dso->long_name, self->ip);270 self->ms.map->dso->long_name, self->ip);
265 fp = popen(cmd, "r");271 fp = popen(cmd, "r");

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t