perfcounters fixes
Subsystems (2)
Linus,
Please pull the latest perfcounters-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git perfcounters-fixes-for-linus
Thanks,
Ingo
------------------>
Arnaldo Carvalho de Melo (6):
perf record: Fix .tid and .pid fill-in when synthesizing events perf report: Show the tid too in -D
perf tools: Fix fallback to cplus_demangle() when bfd_demangle() is not available perf tools: Fix dso__new handle() to handle deleted DSOs
perf list: Fix large list output by using the pager
perf report: Don't show unresolved DSOs and symbols when -S/-d is used
Frederic Weisbecker (2):
perf tools: Add a per tracepoint counter attribute to get raw sample perf tools: Add a general option to enable raw sample records
Ingo Molnar (4):
perf_counter, x86: Fix lapic printk message perf_counter, x86: Fix generic cache events on P6-mobile CPUs perf_counter, x86: Fix/improve apic fallback
perf_counter: Provide hw_perf_counter_setup_online() APIs
Jens Axboe (1):
perf record: Add missing -C option support for specifying profile cpu
Peter Zijlstra (4):
perf_counter: Fix swcounter context invariance
perf: Rework/fix the whole read vs group stuff
perf_counter: Fix an ipi-deadlock
perf_counter: Report the cloning task as parent on perf_counter_fork()
arch/x86/Kconfig | 2 +- arch/x86/kernel/cpu/perf_counter.c | 40 ++++- include/linux/perf_counter.h | 49 ++++-- kernel/perf_counter.c | 338 +++++++++++++++++++++++++----------- tools/perf/Makefile | 29 ++-- tools/perf/builtin-list.c | 3 +- tools/perf/builtin-record.c | 95 ++++++---- tools/perf/builtin-report.c | 12 +- tools/perf/util/parse-events.c | 10 + tools/perf/util/symbol.c | 17 +-- tools/perf/util/symbol.h | 24 +++ 11 files changed, 429 insertions(+), 190 deletions(-)
arch/x86/Kconfig +1 -1
@@ -24,6 +24,7 @@ config X86 select HAVE_UNSTABLE_SCHED_CLOCK select HAVE_IDE select HAVE_OPROFILE + select HAVE_PERF_COUNTERS if (!M386 && !M486) select HAVE_IOREMAP_PROT select HAVE_KPROBES select ARCH_WANT_OPTIONAL_GPIOLIB
@@ -742,7 +743,6 @@ config X86_UP_IOAPIC config X86_LOCAL_APIC def_bool y depends on X86_64 || SMP || X86_32_NON_STANDARD || X86_UP_APIC - select HAVE_PERF_COUNTERS if (!M386 && !M486) config X86_IO_APIC def_bool y
arch/x86/kernel/cpu/perf_counter.c +33 -7
@@ -55,6 +55,7 @@ struct x86_pmu {int num_counters_fixed;int counter_bits;u64 counter_mask; +int apic;u64 max_period;u64 intel_ctrl; };
@@ -72,8 +73,8 @@ static const u64 p6_perfmon_event_map[] = { [PERF_COUNT_HW_CPU_CYCLES] = 0x0079, [PERF_COUNT_HW_INSTRUCTIONS] = 0x00c0, - [PERF_COUNT_HW_CACHE_REFERENCES] = 0x0000, - [PERF_COUNT_HW_CACHE_MISSES] = 0x0000, + [PERF_COUNT_HW_CACHE_REFERENCES] = 0x0f2e, + [PERF_COUNT_HW_CACHE_MISSES] = 0x012e, [PERF_COUNT_HW_BRANCH_INSTRUCTIONS] = 0x00c4, [PERF_COUNT_HW_BRANCH_MISSES] = 0x00c5, [PERF_COUNT_HW_BUS_CYCLES] = 0x0062,
@@ -613,6 +614,7 @@ static DEFINE_MUTEX(pmc_reserve_mutex);static bool reserve_pmc_hardware (void ) { +#ifdef CONFIG_X86_LOCAL_APIC int i;if (nmi_watchdog ==NMI_LOCAL_APIC )
@@ -627,9 +629,11 @@ static bool reserve_pmc_hardware(void)if (!reserve_evntsel_nmi (x86_pmu.eventsel + i)) goto eventsel_fail; } +#endif return true; +#ifdef CONFIG_X86_LOCAL_APIC eventsel_fail:for (i--; i >=0 ; i--)release_evntsel_nmi (x86_pmu.eventsel + i);
@@ -644,10 +648,12 @@ perfctr_fail:enable_lapic_nmi_watchdog ();return false; +#endif }static void release_pmc_hardware (void ) { +#ifdef CONFIG_X86_LOCAL_APIC int i;for (i =0 ; i < x86_pmu.num_counters; i++) {
@@ -657,6 +663,7 @@ static void release_pmc_hardware(void)if (nmi_watchdog ==NMI_LOCAL_APIC )enable_lapic_nmi_watchdog (); +#endif }static void hw_perf_counter_destroy (struct perf_counter *counter)
@@ -748,6 +755,15 @@ static int __hw_perf_counter_init(struct perf_counter *counter) hwc->sample_period = x86_pmu.max_period; hwc->last_period = hwc->sample_period;atomic64_set (&hwc->period_left, hwc->sample_period); + }else { +/* +* If we have a PMU initialized but no APIC +* interrupts, we cannot sample hardware +* counters (user-space has to fall back and +* sample via a hrtimer based software counter): +*/ +if (!x86_pmu.apic) +return -EOPNOTSUPP ; } counter->destroy = hw_perf_counter_destroy;
@@ -1449,18 +1465,22 @@ void smp_perf_pending_interrupt(struct pt_regs *regs)void set_perf_counter_pending (void ) { +#ifdef CONFIG_X86_LOCAL_APIC apic->send_IPI_self (LOCAL_PENDING_VECTOR ); +#endif }void perf_counters_lapic_init (void ) { -if (!x86_pmu_initialized ()) +#ifdef CONFIG_X86_LOCAL_APIC +if (!x86_pmu.apic || !x86_pmu_initialized ())return ;/* * Always use NMI for PMU */ apic_write (APIC_LVTPC ,APIC_DM_NMI ); +#endif } static int __kprobes
@@ -1484,7 +1504,9 @@ perf_counter_nmi_handler(struct notifier_block *self, regs = args->regs; +#ifdef CONFIG_X86_LOCAL_APIC apic_write (APIC_LVTPC ,APIC_DM_NMI ); +#endif /* * Can't rely on the handled return value to say it was our NMI, two * counters could trigger 'simultaneously' raising two back-to-back NMIs.
@@ -1515,6 +1537,7 @@ static struct x86_pmu p6_pmu = { .event_map = p6_pmu_event_map, .raw_event = p6_pmu_raw_event, .max_events = ARRAY_SIZE(p6_perfmon_event_map), + .apic = 1, .max_period = (1ULL << 31) - 1, .version = 0, .num_counters = 2,
@@ -1541,6 +1564,7 @@ static struct x86_pmu intel_pmu = { .event_map = intel_pmu_event_map, .raw_event = intel_pmu_raw_event, .max_events = ARRAY_SIZE(intel_perfmon_event_map), + .apic = 1,/* * Intel PMCs cannot be accessed sanely above 32 bit width, * so we install an artificial 1<<31 period regardless of
@@ -1564,6 +1588,7 @@ static struct x86_pmu amd_pmu = { .num_counters = 4, .counter_bits = 48, .counter_mask = (1ULL << 48) - 1, + .apic = 1, /* use highest bit to detect overflow */ .max_period = (1ULL << 47) - 1, };
@@ -1589,13 +1614,14 @@ static int p6_pmu_init(void)return -ENODEV ; } + x86_pmu = p6_pmu; +if (!cpu_has_apic) { -pr_info ("no Local APIC, try rebooting with lapic" ); -return -ENODEV ; +pr_info ("no APIC, boot with the \"lapic\" boot parameter to force-enable it.\n" ); +pr_info ("no hardware sampling interrupt available.\n" ); + x86_pmu.apic =0 ; } - x86_pmu = p6_pmu; -return 0 ; }
include/linux/perf_counter.h +38 -11
88 lines not on this page · raw message
kernel/perf_counter.c +236 -102
470 lines not on this page · raw message
tools/perf/Makefile +18 -11
@@ -382,22 +382,29 @@ endif ifdef NO_DEMANGLE BASIC_CFLAGS += -DNO_DEMANGLE else - has_bfd := $(shell sh -c "(echo '\#include <bfd.h>'; echo 'int main(void) { bfd_demangle(0, 0, 0); return 0; }') | $(CC) -x c - $(ALL_CFLAGS) -o /dev/null $(ALL_LDFLAGS) -lbfd > /dev/null 2>&1 && echo y") - has_bfd_iberty := $(shell sh -c "(echo '\#include <bfd.h>'; echo 'int main(void) { bfd_demangle(0, 0, 0); return 0; }') | $(CC) -x c - $(ALL_CFLAGS) -o /dev/null $(ALL_LDFLAGS) -lbfd -liberty > /dev/null 2>&1 && echo y") - - has_bfd_iberty_z := $(shell sh -c "(echo '\#include <bfd.h>'; echo 'int main(void) { bfd_demangle(0, 0, 0); return 0; }') | $(CC) -x c - $(ALL_CFLAGS) -o /dev/null $(ALL_LDFLAGS) -lbfd -liberty -lz > /dev/null 2>&1 && echo y") - ifeq ($(has_bfd),y) EXTLIBS += -lbfd - else ifeq ($(has_bfd_iberty),y) - EXTLIBS += -lbfd -liberty - else ifeq ($(has_bfd_iberty_z),y) - EXTLIBS += -lbfd -liberty -lz else - msg := $(warning No bfd.h/libbfd found, install binutils-dev[el] to gain symbol demangling) - BASIC_CFLAGS += -DNO_DEMANGLE + has_bfd_iberty := $(shell sh -c "(echo '\#include <bfd.h>'; echo 'int main(void) { bfd_demangle(0, 0, 0); return 0; }') | $(CC) -x c - $(ALL_CFLAGS) -o /dev/null $(ALL_LDFLAGS) -lbfd -liberty > /dev/null 2>&1 && echo y") + ifeq ($(has_bfd_iberty),y) + EXTLIBS += -lbfd -liberty + else + has_bfd_iberty_z := $(shell sh -c "(echo '\#include <bfd.h>'; echo 'int main(void) { bfd_demangle(0, 0, 0); return 0; }') | $(CC) -x c - $(ALL_CFLAGS) -o /dev/null $(ALL_LDFLAGS) -lbfd -liberty -lz > /dev/null 2>&1 && echo y") + ifeq ($(has_bfd_iberty_z),y) + EXTLIBS += -lbfd -liberty -lz + else + has_cplus_demangle := $(shell sh -c "(echo 'extern char *cplus_demangle(const char *, int);'; echo 'int main(void) { cplus_demangle(0, 0); return 0; }') | $(CC) -x c - $(ALL_CFLAGS) -o /dev/null $(ALL_LDFLAGS) -liberty > /dev/null 2>&1 && echo y") + ifeq ($(has_cplus_demangle),y) + EXTLIBS += -liberty + BASIC_CFLAGS += -DHAVE_CPLUS_DEMANGLE + else + msg := $(warning No bfd.h/libbfd found, install binutils-dev[el] to gain symbol demangling) + BASIC_CFLAGS += -DNO_DEMANGLE + endif + endif + endif endif endif
tools/perf/builtin-list.c +2 -1
@@ -10,11 +10,12 @@#include "perf.h" -#include "util/parse-options.h" #include "util/parse-events.h" +#include "util/cache.h" int cmd_list (int argc__used ,const char **argv__used ,const char *prefix__used ) { +setup_pager ();print_events ();return 0 ; }
tools/perf/builtin-record.c +58 -37
198 lines not on this page · raw message
tools/perf/builtin-report.c +7 -5
@@ -1526,11 +1526,11 @@ process_sample_event(event_t *event, unsigned long offset, unsigned long head) more_data +=sizeof (u64); } -dprintf ("%p [%p]: PERF_EVENT_SAMPLE (IP, %d): %d: %p period: %Ld\n" , +dprintf ("%p [%p]: PERF_EVENT_SAMPLE (IP, %d): %d/%d: %p period: %Ld\n" , (void *)(offset + head), (void *)(long )(event->header.size), event->header.misc, - event->ip.pid, + event->ip.pid, event->ip.tid, (void *)(long )ip, (long long )period);
@@ -1590,10 +1590,11 @@ process_sample_event(event_t *event, unsigned long offset, unsigned long head)if (show & show_mask) {struct symbol *sym =resolve_symbol (thread, &map, &dso, &ip); -if (dso_list && dso && dso->name && !strlist__has_entry (dso_list, dso->name)) +if (dso_list && (!dso || !dso->name || + !strlist__has_entry (dso_list, dso->name)))return 0 ; -if (sym_list && sym && !strlist__has_entry (sym_list, sym->name)) +if (sym_list && (!sym || !strlist__has_entry (sym_list, sym->name)))return 0 ;if (hist_entry__add (thread, map, dso, sym, ip, chain, level, period)) {
@@ -1612,10 +1613,11 @@ process_mmap_event(event_t *event, unsigned long offset, unsigned long head)struct thread *thread =threads__findnew (event->mmap.pid);struct map *map =map__new (&event->mmap); - dprintf("%p [%p]: PERF_EVENT_MMAP %d: [%p(%p) @ %p]: %s\n", + dprintf("%p [%p]: PERF_EVENT_MMAP %d/%d: [%p(%p) @ %p]: %s\n", (void *)(offset + head), (void *)(long)(event->header.size), event->mmap.pid, + event->mmap.tid, (void *)(long)event->mmap.start, (void *)(long)event->mmap.len, (void *)(long)event->mmap.pgoff,
tools/perf/util/parse-events.c +10 -0
@@ -379,6 +379,7 @@ static int parse_tracepoint_event(const char **strp, struct perf_counter_attr *attr) {const char *evt_name; +char *flags;char sys_name[MAX_EVENT_LENGTH ];char id_buf[4 ];int fd;
@@ -400,6 +401,15 @@ static int parse_tracepoint_event(const char **strp,strncpy (sys_name, *strp, sys_length); sys_name[sys_length] ='\0' ; evt_name = evt_name +1 ; + + flags =strchr (evt_name,':' ); +if (flags) { + *flags ='\0' ; + flags++; +if (!strncmp (flags,"record" ,strlen (flags))) + attr->sample_type |=PERF_SAMPLE_RAW ; + } + evt_length =strlen (evt_name);if (evt_length >=MAX_EVENT_LENGTH )return 0 ;
tools/perf/util/symbol.c +2 -15
@@ -7,23 +7,8 @@#include <gelf.h> #include <elf.h> -#ifndef NO_DEMANGLE -#include <bfd.h> -#else -static inline -char *bfd_demangle (void __used *v,const char __used *c,int __used i) -{ -return NULL ; -} -#endif -const char *sym_hist_filter; -#ifndef DMGL_PARAMS -#define DMGL_PARAMS (1 << 0)/* Include function args */ -#define DMGL_ANSI (1 << 1)/* Include const, volatile, etc */ -#endif -enum dso_origin {DSO__ORIG_KERNEL =0 ,DSO__ORIG_JAVA_JIT ,
@@ -816,6 +801,8 @@ more: } out:free (name); +if (ret <0 &&strstr (self->name," (deleted)" ) !=NULL ) +return 0 ;return ret; }
tools/perf/util/symbol.h +24 -0
@@ -7,6 +7,30 @@#include <linux/rbtree.h> #include "module.h" +#ifdef HAVE_CPLUS_DEMANGLE +extern char *cplus_demangle (const char *,int ); + +static inline char *bfd_demangle (void __used *v,const char *c,int i) +{ +return cplus_demangle (c, i); +} +#else +#ifdef NO_DEMANGLE +static inline char *bfd_demangle (void __used *v,const char __used *c, +int __used i) +{ +return NULL ; +} +#else +#include <bfd.h> +#endif +#endif + +#ifndef DMGL_PARAMS +#define DMGL_PARAMS (1 << 0)/* Include function args */ +#define DMGL_ANSI (1 << 1)/* Include const, volatile, etc */ +#endif +struct symbol {struct rb_node rb_node;u64 start;
Quoted 4 lines · Ingo Molnar
Please pull the latest perfcounters-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.gitperfcounters-fixes-for-linus
Is this really generally fixing things that should be fixed after -rc?
I'm getting very tired of the perfcounters tree. It's not calming down in -rc. I've pulled this, but quite frankly, I think there are commits there that you should not have sent me, and I'm getting fed up to the point that I suspect next time around I won't pull even the valid things just because you're not being careful enough.
Linus
Quoted 10 lines · Linus Torvalds
Quoted 5 lines · Ingo Molnar
Please pull the latest perfcounters-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.gitperfcounters-fixes-for-linusIs this really generally fixing things that should be fixed after -rc?
Quoted 6 lines
I'm getting very tired of the perfcounters tree. It's not calming down in -rc. I've pulled this, but quite frankly, I think there are commits there that you should not have sent me, and I'm getting fed up to the point that I suspect next time around I won't pull even the valid things just because you're not being careful enough.
Sorry about that. You are right and i'll cool the tree down (massively) and be much more careful.
Ingo