perfcounters fixes
Subsystems (4)
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
Fixes plus make the syscall ABI easier to extend. (this feature is added in an ABI-compatible way)
Thanks,
Ingo
------------------>
Jaswinder Singh Rajput (1):
powerpc, perf_counter: Fix performance counter event types
Mike Frysinger (1):
perf_counter: Start documenting HAVE_PERF_COUNTERS requirements
Peter Zijlstra (4):
perf_counter: PERF_TYPE_HW_CACHE is a hardware counter too
perf_counter: Remove PERF_TYPE_RAW special casing perf record: Explicity program a default counter
perf_counter: Add forward/backward attribute ABI compatibility
Yong Wang (2):
perf_counter tools: Remove one L1-data alias perf_counter/x86: Add a quirk for Atom processors
arch/powerpc/kernel/power7-pmu.c | 12 ++-- arch/x86/kernel/cpu/perf_counter.c | 7 +++ include/linux/perf_counter.h | 22 ++++++-- include/linux/syscalls.h | 2 +- init/Kconfig | 2 + kernel/perf_counter.c | 95 +++++++++++++++++++++++++++++++++--- tools/perf/builtin-record.c | 7 ++- tools/perf/design.txt | 15 ++++++ tools/perf/perf.h | 5 +- tools/perf/util/parse-events.c | 2 +- 10 files changed, 144 insertions(+), 25 deletions(-)
arch/powerpc/kernel/power7-pmu.c +6 -6
@@ -294,12 +294,12 @@ static void power7_disable_pmc(unsigned int pmc, u64 mmcr[]) }static int power7_generic_events[] = { - [PERF_COUNT_CPU_CYCLES ] =0x1e , - [PERF_COUNT_INSTRUCTIONS ] =2 , - [PERF_COUNT_CACHE_REFERENCES ] =0xc880 ,/* LD_REF_L1_LSU */ - [PERF_COUNT_CACHE_MISSES ] =0x400f0 ,/* LD_MISS_L1 */ - [PERF_COUNT_BRANCH_INSTRUCTIONS ] =0x10068 ,/* BRU_FIN */ - [PERF_COUNT_BRANCH_MISSES ] =0x400f6 ,/* BR_MPRED */ + [PERF_COUNT_HW_CPU_CYCLES ] =0x1e , + [PERF_COUNT_HW_INSTRUCTIONS ] =2 , + [PERF_COUNT_HW_CACHE_REFERENCES ] =0xc880 ,/* LD_REF_L1_LSU*/ + [PERF_COUNT_HW_CACHE_MISSES ] =0x400f0 ,/* LD_MISS_L1 */ + [PERF_COUNT_HW_BRANCH_INSTRUCTIONS ] =0x10068 ,/* BRU_FIN */ + [PERF_COUNT_HW_BRANCH_MISSES ] =0x400f6 ,/* BR_MPRED */ };#define C (x) PERF_COUNT_HW_CACHE_##x
arch/x86/kernel/cpu/perf_counter.c +7 -0
@@ -968,6 +968,13 @@ fixed_mode_idx(struct perf_counter *counter, struct hw_perf_counter *hwc)if (!x86_pmu.num_counters_fixed)return -1 ; +/* +* Quirk, IA32_FIXED_CTRs do not work on current Atom processors: +*/ +if (boot_cpu_data.x86_vendor ==X86_VENDOR_INTEL && + boot_cpu_data.x86_model ==28 ) +return -1 ; + event = hwc->config &ARCH_PERFMON_EVENT_MASK ;if (unlikely (event == x86_pmu.event_map (PERF_COUNT_HW_INSTRUCTIONS )))
include/linux/perf_counter.h +17 -5
@@ -120,6 +120,8 @@ enum perf_counter_sample_format {PERF_SAMPLE_ID =1U <<6 ,PERF_SAMPLE_CPU =1U <<7 ,PERF_SAMPLE_PERIOD =1U <<8 , + + PERF_SAMPLE_MAX = 1U << 9, /* non-ABI */ };/*
@@ -131,17 +133,26 @@ enum perf_counter_read_format {PERF_FORMAT_TOTAL_TIME_ENABLED =1U <<0 ,PERF_FORMAT_TOTAL_TIME_RUNNING =1U <<1 ,PERF_FORMAT_ID =1U <<2 , + + PERF_FORMAT_MAX = 1U << 3, /* non-ABI */ }; +#define PERF_ATTR_SIZE_VER0 64/* sizeof first published struct */ +/* * Hardware event to monitor via a performance monitoring counter: */ struct perf_counter_attr { +/* * Major type: hardware/software/tracepoint/etc. */ __u32 type; -__u32 __reserved_1; + +/* +* Size of the attr structure, for fwd/bwd compat. +*/ +__u32 size;/* * Type specific configuration information.
@@ -168,12 +179,12 @@ struct perf_counter_attr { comm : 1, /* include comm data */ freq : 1, /* use freq, not period */ - __reserved_2 : 53; + __reserved_1 : 53;__u32 wakeup_events;/* wakeup every n events */ -__u32 __reserved_3; +__u32 __reserved_2; -__u64 __reserved_4; +__u64 __reserved_3; };/*
@@ -621,7 +632,8 @@ extern int perf_counter_overflow(struct perf_counter *counter, int nmi,static inline int is_software_counter (struct perf_counter *counter) {return (counter->attr.type !=PERF_TYPE_RAW ) && - (counter->attr.type !=PERF_TYPE_HARDWARE ); + (counter->attr.type !=PERF_TYPE_HARDWARE ) && + (counter->attr.type !=PERF_TYPE_HW_CACHE ); }extern void perf_swcounter_event (u32 ,u64 ,int ,struct pt_regs *,u64 );
include/linux/syscalls.h +1 -1
@@ -758,6 +758,6 @@ int kernel_execve(const char *filename, char *const argv[], char *const envp[]);asmlinkage long sys_perf_counter_open ( -const struct perf_counter_attr __user *attr_uptr, +struct perf_counter_attr __user *attr_uptr,pid_t pid,int cpu,int group_fd,unsigned long flags);#endif
init/Kconfig +2 -0
@@ -936,6 +936,8 @@ config AIO config HAVE_PERF_COUNTERS bool + help + See tools/perf/design.txt for details. menu "Performance Counters"
kernel/perf_counter.c +87 -8
126 lines not on this page · raw message
tools/perf/builtin-record.c +5 -2
@@ -568,8 +568,11 @@ int cmd_record(int argc, const char **argv, const char *prefix)if (!argc && target_pid ==-1 && !system_wide)usage_with_options (record_usage, options); -if (!nr_counters) - nr_counters =1 ; +if (!nr_counters) { + nr_counters =1 ; + attrs[0 ].type =PERF_TYPE_HARDWARE ; + attrs[0 ].config =PERF_COUNT_HW_CPU_CYCLES ; + }for (counter =0 ; counter < nr_counters; counter++) {if (attrs[counter].sample_period)
tools/perf/design.txt +15 -0
@@ -440,3 +440,18 @@ by this process or by another, and doesn't affect any counters that this process has created on other processes. It only enables or disables the group leaders, not any other members in the groups. + +Arch requirements +----------------- + +If your architecture does not have hardware performance metrics, you can +still use the generic software counters based on hrtimers for sampling. + +So to start with, in order to add HAVE_PERF_COUNTERS to your Kconfig, you +will need at least this: + - asm/perf_counter.h - a basic stub will suffice at first + - support for atomic64 types (and associated helper functions) + - set_perf_counter_pending() implemented + +If your architecture does have hardware capabilities, you can override the +weak stub hw_perf_counter_init() to register hardware counters.
tools/perf/perf.h +3 -2
@@ -53,11 +53,12 @@ static inline unsigned long long rdclock(void) _min1 < _min2 ? _min1 : _min2; })static inline int -sys_perf_counter_open (struct perf_counter_attr *attr_uptr, +sys_perf_counter_open (struct perf_counter_attr *attr,pid_t pid,int cpu,int group_fd,unsigned long flags) { -return syscall (__NR_perf_counter_open, attr_uptr, pid, cpu, + attr->size =sizeof (*attr); +return syscall (__NR_perf_counter_open, attr, pid, cpu, group_fd, flags); }
tools/perf/util/parse-events.c +1 -1
@@ -75,7 +75,7 @@ static char *sw_event_names[] = {#define MAX_ALIASES 8static char *hw_cache [][MAX_ALIASES ] = { - {"L1-data" ,"l1-d" ,"l1d" ,"l1" }, + {"L1-data" ,"l1-d" ,"l1d" }, {"L1-instruction" ,"l1-i" ,"l1i" }, {"L2" ,"l2" }, {"Data-TLB" ,"dtlb" ,"d-tlb" },