perf_counter, x86: make x86_pmu data a static struct
[cascardo/linux.git] / arch / x86 / kernel / cpu / perf_counter.c
index 8bb2133..68597d7 100644 (file)
@@ -3,6 +3,8 @@
  *
  *  Copyright(C) 2008 Thomas Gleixner <tglx@linutronix.de>
  *  Copyright(C) 2008 Red Hat, Inc., Ingo Molnar
+ *  Copyright(C) 2009 Jaswinder Singh Rajput
+ *  Copyright(C) 2009 Advanced Micro Devices, Inc., Robert Richter
  *
  *  For licencing details see kernel-base/COPYING
  */
 #include <linux/module.h>
 #include <linux/kdebug.h>
 #include <linux/sched.h>
+#include <linux/uaccess.h>
 
-#include <asm/perf_counter.h>
 #include <asm/apic.h>
+#include <asm/stacktrace.h>
+#include <asm/nmi.h>
 
 static bool perf_counters_initialized __read_mostly;
 
@@ -27,6 +31,7 @@ static bool perf_counters_initialized __read_mostly;
 static int nr_counters_generic __read_mostly;
 static u64 perf_counter_mask __read_mostly;
 static u64 counter_value_mask __read_mostly;
+static int counter_value_bits __read_mostly;
 
 static int nr_counters_fixed __read_mostly;
 
@@ -34,15 +39,39 @@ struct cpu_hw_counters {
        struct perf_counter     *counters[X86_PMC_IDX_MAX];
        unsigned long           used[BITS_TO_LONGS(X86_PMC_IDX_MAX)];
        unsigned long           interrupts;
-       u64                     global_enable;
+       u64                     throttle_ctrl;
+       unsigned long           active_mask[BITS_TO_LONGS(X86_PMC_IDX_MAX)];
+       int                     enabled;
 };
 
 /*
- * Intel PerfMon v3. Used on Core2 and later.
+ * struct x86_pmu - generic x86 pmu
  */
-static DEFINE_PER_CPU(struct cpu_hw_counters, cpu_hw_counters);
+struct x86_pmu {
+       int             (*handle_irq)(struct pt_regs *, int);
+       u64             (*save_disable_all)(void);
+       void            (*restore_all)(u64);
+       void            (*enable)(int, u64);
+       void            (*disable)(int, u64);
+       unsigned        eventsel;
+       unsigned        perfctr;
+       u64             (*event_map)(int);
+       u64             (*raw_event)(u64);
+       int             max_events;
+};
+
+static struct x86_pmu x86_pmu __read_mostly;
+
+static DEFINE_PER_CPU(struct cpu_hw_counters, cpu_hw_counters) = {
+       .enabled = 1,
+};
+
+static __read_mostly int intel_perfmon_version;
 
-static const int intel_perfmon_event_map[] =
+/*
+ * Intel PerfMon v3. Used on Core2 and later.
+ */
+static const u64 intel_perfmon_event_map[] =
 {
   [PERF_COUNT_CPU_CYCLES]              = 0x003c,
   [PERF_COUNT_INSTRUCTIONS]            = 0x00c0,
@@ -53,7 +82,56 @@ static const int intel_perfmon_event_map[] =
   [PERF_COUNT_BUS_CYCLES]              = 0x013c,
 };
 
-static const int max_intel_perfmon_events = ARRAY_SIZE(intel_perfmon_event_map);
+static u64 intel_pmu_event_map(int event)
+{
+       return intel_perfmon_event_map[event];
+}
+
+static u64 intel_pmu_raw_event(u64 event)
+{
+#define CORE_EVNTSEL_EVENT_MASK                0x000000FFULL
+#define CORE_EVNTSEL_UNIT_MASK         0x0000FF00ULL
+#define CORE_EVNTSEL_COUNTER_MASK      0xFF000000ULL
+
+#define CORE_EVNTSEL_MASK              \
+       (CORE_EVNTSEL_EVENT_MASK |      \
+        CORE_EVNTSEL_UNIT_MASK  |      \
+        CORE_EVNTSEL_COUNTER_MASK)
+
+       return event & CORE_EVNTSEL_MASK;
+}
+
+/*
+ * AMD Performance Monitor K7 and later.
+ */
+static const u64 amd_perfmon_event_map[] =
+{
+  [PERF_COUNT_CPU_CYCLES]              = 0x0076,
+  [PERF_COUNT_INSTRUCTIONS]            = 0x00c0,
+  [PERF_COUNT_CACHE_REFERENCES]                = 0x0080,
+  [PERF_COUNT_CACHE_MISSES]            = 0x0081,
+  [PERF_COUNT_BRANCH_INSTRUCTIONS]     = 0x00c4,
+  [PERF_COUNT_BRANCH_MISSES]           = 0x00c5,
+};
+
+static u64 amd_pmu_event_map(int event)
+{
+       return amd_perfmon_event_map[event];
+}
+
+static u64 amd_pmu_raw_event(u64 event)
+{
+#define K7_EVNTSEL_EVENT_MASK  0x7000000FFULL
+#define K7_EVNTSEL_UNIT_MASK   0x00000FF00ULL
+#define K7_EVNTSEL_COUNTER_MASK        0x0FF000000ULL
+
+#define K7_EVNTSEL_MASK                        \
+       (K7_EVNTSEL_EVENT_MASK |        \
+        K7_EVNTSEL_UNIT_MASK  |        \
+        K7_EVNTSEL_COUNTER_MASK)
+
+       return event & K7_EVNTSEL_MASK;
+}
 
 /*
  * Propagate counter elapsed time into the generic counter.
@@ -95,6 +173,65 @@ again:
        atomic64_sub(delta, &hwc->period_left);
 }
 
+static atomic_t num_counters;
+static DEFINE_MUTEX(pmc_reserve_mutex);
+
+static bool reserve_pmc_hardware(void)
+{
+       int i;
+
+       if (nmi_watchdog == NMI_LOCAL_APIC)
+               disable_lapic_nmi_watchdog();
+
+       for (i = 0; i < nr_counters_generic; i++) {
+               if (!reserve_perfctr_nmi(x86_pmu.perfctr + i))
+                       goto perfctr_fail;
+       }
+
+       for (i = 0; i < nr_counters_generic; i++) {
+               if (!reserve_evntsel_nmi(x86_pmu.eventsel + i))
+                       goto eventsel_fail;
+       }
+
+       return true;
+
+eventsel_fail:
+       for (i--; i >= 0; i--)
+               release_evntsel_nmi(x86_pmu.eventsel + i);
+
+       i = nr_counters_generic;
+
+perfctr_fail:
+       for (i--; i >= 0; i--)
+               release_perfctr_nmi(x86_pmu.perfctr + i);
+
+       if (nmi_watchdog == NMI_LOCAL_APIC)
+               enable_lapic_nmi_watchdog();
+
+       return false;
+}
+
+static void release_pmc_hardware(void)
+{
+       int i;
+
+       for (i = 0; i < nr_counters_generic; i++) {
+               release_perfctr_nmi(x86_pmu.perfctr + i);
+               release_evntsel_nmi(x86_pmu.eventsel + i);
+       }
+
+       if (nmi_watchdog == NMI_LOCAL_APIC)
+               enable_lapic_nmi_watchdog();
+}
+
+static void hw_perf_counter_destroy(struct perf_counter *counter)
+{
+       if (atomic_dec_and_mutex_lock(&num_counters, &pmc_reserve_mutex)) {
+               release_pmc_hardware();
+               mutex_unlock(&pmc_reserve_mutex);
+       }
+}
+
 /*
  * Setup the hardware configuration for a given hw_event_type
  */
@@ -102,26 +239,47 @@ static int __hw_perf_counter_init(struct perf_counter *counter)
 {
        struct perf_counter_hw_event *hw_event = &counter->hw_event;
        struct hw_perf_counter *hwc = &counter->hw;
+       int err;
+
+       /* disable temporarily */
+       if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD)
+               return -ENOSYS;
 
        if (unlikely(!perf_counters_initialized))
                return -EINVAL;
 
+       err = 0;
+       if (atomic_inc_not_zero(&num_counters)) {
+               mutex_lock(&pmc_reserve_mutex);
+               if (atomic_read(&num_counters) == 0 && !reserve_pmc_hardware())
+                       err = -EBUSY;
+               else
+                       atomic_inc(&num_counters);
+               mutex_unlock(&pmc_reserve_mutex);
+       }
+       if (err)
+               return err;
+
        /*
-        * Count user events, and generate PMC IRQs:
+        * Generate PMC IRQs:
         * (keep 'enabled' bit clear for now)
         */
-       hwc->config = ARCH_PERFMON_EVENTSEL_USR | ARCH_PERFMON_EVENTSEL_INT;
+       hwc->config = ARCH_PERFMON_EVENTSEL_INT;
 
        /*
-        * If privileged enough, count OS events too, and allow
-        * NMI events as well:
+        * Count user and OS events unless requested not to.
         */
-       hwc->nmi = 0;
-       if (capable(CAP_SYS_ADMIN)) {
+       if (!hw_event->exclude_user)
+               hwc->config |= ARCH_PERFMON_EVENTSEL_USR;
+       if (!hw_event->exclude_kernel)
                hwc->config |= ARCH_PERFMON_EVENTSEL_OS;
-               if (hw_event->nmi)
-                       hwc->nmi = 1;
-       }
+
+       /*
+        * If privileged enough, allow NMI events:
+        */
+       hwc->nmi = 0;
+       if (capable(CAP_SYS_ADMIN) && hw_event->nmi)
+               hwc->nmi = 1;
 
        hwc->irq_period         = hw_event->irq_period;
        /*
@@ -129,52 +287,185 @@ static int __hw_perf_counter_init(struct perf_counter *counter)
         * so we install an artificial 1<<31 period regardless of
         * the generic counter period:
         */
-       if ((s64)hwc->irq_period <= 0 || hwc->irq_period > 0x7FFFFFFF)
-               hwc->irq_period = 0x7FFFFFFF;
+       if (boot_cpu_data.x86_vendor == X86_VENDOR_INTEL)
+               if ((s64)hwc->irq_period <= 0 || hwc->irq_period > 0x7FFFFFFF)
+                       hwc->irq_period = 0x7FFFFFFF;
 
        atomic64_set(&hwc->period_left, hwc->irq_period);
 
        /*
         * Raw event type provide the config in the event structure
         */
-       if (hw_event->raw) {
-               hwc->config |= hw_event->type;
+       if (perf_event_raw(hw_event)) {
+               hwc->config |= x86_pmu.raw_event(perf_event_config(hw_event));
        } else {
-               if (hw_event->type >= max_intel_perfmon_events)
+               if (perf_event_id(hw_event) >= x86_pmu.max_events)
                        return -EINVAL;
                /*
                 * The generic map:
                 */
-               hwc->config |= intel_perfmon_event_map[hw_event->type];
+               hwc->config |= x86_pmu.event_map(perf_event_id(hw_event));
        }
-       counter->wakeup_pending = 0;
+
+       counter->destroy = hw_perf_counter_destroy;
 
        return 0;
 }
 
-u64 hw_perf_save_disable(void)
+static u64 intel_pmu_save_disable_all(void)
 {
        u64 ctrl;
 
-       if (unlikely(!perf_counters_initialized))
-               return 0;
-
        rdmsrl(MSR_CORE_PERF_GLOBAL_CTRL, ctrl);
        wrmsrl(MSR_CORE_PERF_GLOBAL_CTRL, 0);
 
        return ctrl;
 }
+
+static u64 amd_pmu_save_disable_all(void)
+{
+       struct cpu_hw_counters *cpuc = &__get_cpu_var(cpu_hw_counters);
+       int enabled, idx;
+
+       enabled = cpuc->enabled;
+       cpuc->enabled = 0;
+       /*
+        * ensure we write the disable before we start disabling the
+        * counters proper, so that amd_pmu_enable_counter() does the
+        * right thing.
+        */
+       barrier();
+
+       for (idx = 0; idx < nr_counters_generic; idx++) {
+               u64 val;
+
+               if (!test_bit(idx, cpuc->active_mask))
+                       continue;
+               rdmsrl(MSR_K7_EVNTSEL0 + idx, val);
+               if (!(val & ARCH_PERFMON_EVENTSEL0_ENABLE))
+                       continue;
+               val &= ~ARCH_PERFMON_EVENTSEL0_ENABLE;
+               wrmsrl(MSR_K7_EVNTSEL0 + idx, val);
+       }
+
+       return enabled;
+}
+
+u64 hw_perf_save_disable(void)
+{
+       if (unlikely(!perf_counters_initialized))
+               return 0;
+
+       return x86_pmu.save_disable_all();
+}
+/*
+ * Exported because of ACPI idle
+ */
 EXPORT_SYMBOL_GPL(hw_perf_save_disable);
 
+static void intel_pmu_restore_all(u64 ctrl)
+{
+       wrmsrl(MSR_CORE_PERF_GLOBAL_CTRL, ctrl);
+}
+
+static void amd_pmu_restore_all(u64 ctrl)
+{
+       struct cpu_hw_counters *cpuc = &__get_cpu_var(cpu_hw_counters);
+       int idx;
+
+       cpuc->enabled = ctrl;
+       barrier();
+       if (!ctrl)
+               return;
+
+       for (idx = 0; idx < nr_counters_generic; idx++) {
+               u64 val;
+
+               if (!test_bit(idx, cpuc->active_mask))
+                       continue;
+               rdmsrl(MSR_K7_EVNTSEL0 + idx, val);
+               if (val & ARCH_PERFMON_EVENTSEL0_ENABLE)
+                       continue;
+               val |= ARCH_PERFMON_EVENTSEL0_ENABLE;
+               wrmsrl(MSR_K7_EVNTSEL0 + idx, val);
+       }
+}
+
 void hw_perf_restore(u64 ctrl)
 {
        if (unlikely(!perf_counters_initialized))
                return;
 
-       wrmsrl(MSR_CORE_PERF_GLOBAL_CTRL, ctrl);
+       x86_pmu.restore_all(ctrl);
 }
+/*
+ * Exported because of ACPI idle
+ */
 EXPORT_SYMBOL_GPL(hw_perf_restore);
 
+static inline u64 intel_pmu_get_status(u64 mask)
+{
+       u64 status;
+
+       if (unlikely(!perf_counters_initialized))
+               return 0;
+       rdmsrl(MSR_CORE_PERF_GLOBAL_STATUS, status);
+
+       return status;
+}
+
+static inline void intel_pmu_ack_status(u64 ack)
+{
+       wrmsrl(MSR_CORE_PERF_GLOBAL_OVF_CTRL, ack);
+}
+
+static void intel_pmu_enable_counter(int idx, u64 config)
+{
+       wrmsrl(MSR_ARCH_PERFMON_EVENTSEL0 + idx,
+                       config | ARCH_PERFMON_EVENTSEL0_ENABLE);
+}
+
+static void amd_pmu_enable_counter(int idx, u64 config)
+{
+       struct cpu_hw_counters *cpuc = &__get_cpu_var(cpu_hw_counters);
+
+       set_bit(idx, cpuc->active_mask);
+       if (cpuc->enabled)
+               config |= ARCH_PERFMON_EVENTSEL0_ENABLE;
+
+       wrmsrl(MSR_K7_EVNTSEL0 + idx, config);
+}
+
+static void hw_perf_enable(int idx, u64 config)
+{
+       if (unlikely(!perf_counters_initialized))
+               return;
+
+       x86_pmu.enable(idx, config);
+}
+
+static void intel_pmu_disable_counter(int idx, u64 config)
+{
+       wrmsrl(MSR_ARCH_PERFMON_EVENTSEL0 + idx, config);
+}
+
+static void amd_pmu_disable_counter(int idx, u64 config)
+{
+       struct cpu_hw_counters *cpuc = &__get_cpu_var(cpu_hw_counters);
+
+       clear_bit(idx, cpuc->active_mask);
+       wrmsrl(MSR_K7_EVNTSEL0 + idx, config);
+
+}
+
+static void hw_perf_disable(int idx, u64 config)
+{
+       if (unlikely(!perf_counters_initialized))
+               return;
+
+       x86_pmu.disable(idx, config);
+}
+
 static inline void
 __pmc_fixed_disable(struct perf_counter *counter,
                    struct hw_perf_counter *hwc, unsigned int __idx)
@@ -191,13 +482,13 @@ __pmc_fixed_disable(struct perf_counter *counter,
 }
 
 static inline void
-__pmc_generic_disable(struct perf_counter *counter,
-                          struct hw_perf_counter *hwc, unsigned int idx)
+__x86_pmu_disable(struct perf_counter *counter,
+                 struct hw_perf_counter *hwc, unsigned int idx)
 {
        if (unlikely(hwc->config_base == MSR_ARCH_PERFMON_FIXED_CTR_CTRL))
                __pmc_fixed_disable(counter, hwc, idx);
        else
-               wrmsr_safe(hwc->config_base + idx, hwc->config, 0);
+               hw_perf_disable(idx, hwc->config);
 }
 
 static DEFINE_PER_CPU(u64, prev_left[X86_PMC_IDX_MAX]);
@@ -207,11 +498,11 @@ static DEFINE_PER_CPU(u64, prev_left[X86_PMC_IDX_MAX]);
  * To be called with the counter disabled in hw:
  */
 static void
-__hw_perf_counter_set_period(struct perf_counter *counter,
+x86_perf_counter_set_period(struct perf_counter *counter,
                             struct hw_perf_counter *hwc, int idx)
 {
        s64 left = atomic64_read(&hwc->period_left);
-       s32 period = hwc->irq_period;
+       s64 period = hwc->irq_period;
        int err;
 
        /*
@@ -248,10 +539,13 @@ __pmc_fixed_enable(struct perf_counter *counter,
        int err;
 
        /*
-        * Enable IRQ generation (0x8) and ring-3 counting (0x2),
-        * and enable ring-0 counting if allowed:
+        * Enable IRQ generation (0x8),
+        * and enable ring-3 counting (0x2) and ring-0 counting (0x1)
+        * if requested:
         */
-       bits = 0x8ULL | 0x2ULL;
+       bits = 0x8ULL;
+       if (hwc->config & ARCH_PERFMON_EVENTSEL_USR)
+               bits |= 0x2;
        if (hwc->config & ARCH_PERFMON_EVENTSEL_OS)
                bits |= 0x1;
        bits <<= (idx * 4);
@@ -264,14 +558,13 @@ __pmc_fixed_enable(struct perf_counter *counter,
 }
 
 static void
-__pmc_generic_enable(struct perf_counter *counter,
-                         struct hw_perf_counter *hwc, int idx)
+__x86_pmu_enable(struct perf_counter *counter,
+                struct hw_perf_counter *hwc, int idx)
 {
        if (unlikely(hwc->config_base == MSR_ARCH_PERFMON_FIXED_CTR_CTRL))
                __pmc_fixed_enable(counter, hwc, idx);
        else
-               wrmsr(hwc->config_base + idx,
-                     hwc->config | ARCH_PERFMON_EVENTSEL0_ENABLE, 0);
+               hw_perf_enable(idx, hwc->config);
 }
 
 static int
@@ -279,16 +572,19 @@ fixed_mode_idx(struct perf_counter *counter, struct hw_perf_counter *hwc)
 {
        unsigned int event;
 
+       if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD)
+               return -1;
+
        if (unlikely(hwc->nmi))
                return -1;
 
        event = hwc->config & ARCH_PERFMON_EVENT_MASK;
 
-       if (unlikely(event == intel_perfmon_event_map[PERF_COUNT_INSTRUCTIONS]))
+       if (unlikely(event == x86_pmu.event_map(PERF_COUNT_INSTRUCTIONS)))
                return X86_PMC_IDX_FIXED_INSTRUCTIONS;
-       if (unlikely(event == intel_perfmon_event_map[PERF_COUNT_CPU_CYCLES]))
+       if (unlikely(event == x86_pmu.event_map(PERF_COUNT_CPU_CYCLES)))
                return X86_PMC_IDX_FIXED_CPU_CYCLES;
-       if (unlikely(event == intel_perfmon_event_map[PERF_COUNT_BUS_CYCLES]))
+       if (unlikely(event == x86_pmu.event_map(PERF_COUNT_BUS_CYCLES)))
                return X86_PMC_IDX_FIXED_BUS_CYCLES;
 
        return -1;
@@ -297,7 +593,7 @@ fixed_mode_idx(struct perf_counter *counter, struct hw_perf_counter *hwc)
 /*
  * Find a PMC slot for the freshly enabled / scheduled in counter:
  */
-static int pmc_generic_enable(struct perf_counter *counter)
+static int x86_pmu_enable(struct perf_counter *counter)
 {
        struct cpu_hw_counters *cpuc = &__get_cpu_var(cpu_hw_counters);
        struct hw_perf_counter *hwc = &counter->hw;
@@ -332,22 +628,22 @@ try_generic:
                        set_bit(idx, cpuc->used);
                        hwc->idx = idx;
                }
-               hwc->config_base  = MSR_ARCH_PERFMON_EVENTSEL0;
-               hwc->counter_base = MSR_ARCH_PERFMON_PERFCTR0;
+               hwc->config_base  = x86_pmu.eventsel;
+               hwc->counter_base = x86_pmu.perfctr;
        }
 
        perf_counters_lapic_init(hwc->nmi);
 
-       __pmc_generic_disable(counter, hwc, idx);
+       __x86_pmu_disable(counter, hwc, idx);
 
        cpuc->counters[idx] = counter;
        /*
         * Make it visible before enabling the hw:
         */
-       smp_wmb();
+       barrier();
 
-       __hw_perf_counter_set_period(counter, hwc, idx);
-       __pmc_generic_enable(counter, hwc, idx);
+       x86_perf_counter_set_period(counter, hwc, idx);
+       __x86_pmu_enable(counter, hwc, idx);
 
        return 0;
 }
@@ -366,47 +662,49 @@ void perf_counter_print_debug(void)
        cpu = smp_processor_id();
        cpuc = &per_cpu(cpu_hw_counters, cpu);
 
-       rdmsrl(MSR_CORE_PERF_GLOBAL_CTRL, ctrl);
-       rdmsrl(MSR_CORE_PERF_GLOBAL_STATUS, status);
-       rdmsrl(MSR_CORE_PERF_GLOBAL_OVF_CTRL, overflow);
-       rdmsrl(MSR_ARCH_PERFMON_FIXED_CTR_CTRL, fixed);
-
-       printk(KERN_INFO "\n");
-       printk(KERN_INFO "CPU#%d: ctrl:       %016llx\n", cpu, ctrl);
-       printk(KERN_INFO "CPU#%d: status:     %016llx\n", cpu, status);
-       printk(KERN_INFO "CPU#%d: overflow:   %016llx\n", cpu, overflow);
-       printk(KERN_INFO "CPU#%d: fixed:      %016llx\n", cpu, fixed);
-       printk(KERN_INFO "CPU#%d: used:       %016llx\n", cpu, *(u64 *)cpuc->used);
+       if (intel_perfmon_version >= 2) {
+               rdmsrl(MSR_CORE_PERF_GLOBAL_CTRL, ctrl);
+               rdmsrl(MSR_CORE_PERF_GLOBAL_STATUS, status);
+               rdmsrl(MSR_CORE_PERF_GLOBAL_OVF_CTRL, overflow);
+               rdmsrl(MSR_ARCH_PERFMON_FIXED_CTR_CTRL, fixed);
+
+               pr_info("\n");
+               pr_info("CPU#%d: ctrl:       %016llx\n", cpu, ctrl);
+               pr_info("CPU#%d: status:     %016llx\n", cpu, status);
+               pr_info("CPU#%d: overflow:   %016llx\n", cpu, overflow);
+               pr_info("CPU#%d: fixed:      %016llx\n", cpu, fixed);
+       }
+       pr_info("CPU#%d: used:       %016llx\n", cpu, *(u64 *)cpuc->used);
 
        for (idx = 0; idx < nr_counters_generic; idx++) {
-               rdmsrl(MSR_ARCH_PERFMON_EVENTSEL0 + idx, pmc_ctrl);
-               rdmsrl(MSR_ARCH_PERFMON_PERFCTR0  + idx, pmc_count);
+               rdmsrl(x86_pmu.eventsel + idx, pmc_ctrl);
+               rdmsrl(x86_pmu.perfctr  + idx, pmc_count);
 
                prev_left = per_cpu(prev_left[idx], cpu);
 
-               printk(KERN_INFO "CPU#%d:   gen-PMC%d ctrl:  %016llx\n",
+               pr_info("CPU#%d:   gen-PMC%d ctrl:  %016llx\n",
                        cpu, idx, pmc_ctrl);
-               printk(KERN_INFO "CPU#%d:   gen-PMC%d count: %016llx\n",
+               pr_info("CPU#%d:   gen-PMC%d count: %016llx\n",
                        cpu, idx, pmc_count);
-               printk(KERN_INFO "CPU#%d:   gen-PMC%d left:  %016llx\n",
+               pr_info("CPU#%d:   gen-PMC%d left:  %016llx\n",
                        cpu, idx, prev_left);
        }
        for (idx = 0; idx < nr_counters_fixed; idx++) {
                rdmsrl(MSR_ARCH_PERFMON_FIXED_CTR0 + idx, pmc_count);
 
-               printk(KERN_INFO "CPU#%d: fixed-PMC%d count: %016llx\n",
+               pr_info("CPU#%d: fixed-PMC%d count: %016llx\n",
                        cpu, idx, pmc_count);
        }
        local_irq_enable();
 }
 
-static void pmc_generic_disable(struct perf_counter *counter)
+static void x86_pmu_disable(struct perf_counter *counter)
 {
        struct cpu_hw_counters *cpuc = &__get_cpu_var(cpu_hw_counters);
        struct hw_perf_counter *hwc = &counter->hw;
        unsigned int idx = hwc->idx;
 
-       __pmc_generic_disable(counter, hwc, idx);
+       __x86_pmu_disable(counter, hwc, idx);
 
        clear_bit(idx, cpuc->used);
        cpuc->counters[idx] = NULL;
@@ -414,7 +712,7 @@ static void pmc_generic_disable(struct perf_counter *counter)
         * Make sure the cleared pointer becomes visible before we
         * (potentially) free the counter:
         */
-       smp_wmb();
+       barrier();
 
        /*
         * Drain the remaining delta count out of a counter
@@ -423,78 +721,47 @@ static void pmc_generic_disable(struct perf_counter *counter)
        x86_perf_counter_update(counter, hwc, idx);
 }
 
-static void perf_store_irq_data(struct perf_counter *counter, u64 data)
-{
-       struct perf_data *irqdata = counter->irqdata;
-
-       if (irqdata->len > PERF_DATA_BUFLEN - sizeof(u64)) {
-               irqdata->overrun++;
-       } else {
-               u64 *p = (u64 *) &irqdata->data[irqdata->len];
-
-               *p = data;
-               irqdata->len += sizeof(u64);
-       }
-}
-
 /*
  * Save and restart an expired counter. Called by NMI contexts,
  * so it has to be careful about preempting normal counter ops:
  */
-static void perf_save_and_restart(struct perf_counter *counter)
+static void intel_pmu_save_and_restart(struct perf_counter *counter)
 {
        struct hw_perf_counter *hwc = &counter->hw;
        int idx = hwc->idx;
 
        x86_perf_counter_update(counter, hwc, idx);
-       __hw_perf_counter_set_period(counter, hwc, idx);
+       x86_perf_counter_set_period(counter, hwc, idx);
 
        if (counter->state == PERF_COUNTER_STATE_ACTIVE)
-               __pmc_generic_enable(counter, hwc, idx);
-}
-
-static void
-perf_handle_group(struct perf_counter *sibling, u64 *status, u64 *overflown)
-{
-       struct perf_counter *counter, *group_leader = sibling->group_leader;
-
-       /*
-        * Store sibling timestamps (if any):
-        */
-       list_for_each_entry(counter, &group_leader->sibling_list, list_entry) {
-
-               x86_perf_counter_update(counter, &counter->hw, counter->hw.idx);
-               perf_store_irq_data(sibling, counter->hw_event.type);
-               perf_store_irq_data(sibling, atomic64_read(&counter->count));
-       }
+               __x86_pmu_enable(counter, hwc, idx);
 }
 
 /*
  * Maximum interrupt frequency of 100KHz per CPU
  */
-#define PERFMON_MAX_INTERRUPTS 100000/HZ
+#define PERFMON_MAX_INTERRUPTS (100000/HZ)
 
 /*
  * This handler is triggered by the local APIC, so the APIC IRQ handling
  * rules apply:
  */
-static void __smp_perf_counter_interrupt(struct pt_regs *regs, int nmi)
+static int intel_pmu_handle_irq(struct pt_regs *regs, int nmi)
 {
        int bit, cpu = smp_processor_id();
        u64 ack, status;
        struct cpu_hw_counters *cpuc = &per_cpu(cpu_hw_counters, cpu);
+       int ret = 0;
 
-       rdmsrl(MSR_CORE_PERF_GLOBAL_CTRL, cpuc->global_enable);
+       cpuc->throttle_ctrl = intel_pmu_save_disable_all();
 
-       /* Disable counters globally */
-       wrmsrl(MSR_CORE_PERF_GLOBAL_CTRL, 0);
-       ack_APIC_irq();
-
-       rdmsrl(MSR_CORE_PERF_GLOBAL_STATUS, status);
+       status = intel_pmu_get_status(cpuc->throttle_ctrl);
        if (!status)
                goto out;
 
+       ret = 1;
 again:
+       inc_irq_stat(apic_perf_irqs);
        ack = status;
        for_each_bit(bit, (unsigned long *)&status, X86_PMC_IDX_MAX) {
                struct perf_counter *counter = cpuc->counters[bit];
@@ -503,37 +770,17 @@ again:
                if (!counter)
                        continue;
 
-               perf_save_and_restart(counter);
-
-               switch (counter->hw_event.record_type) {
-               case PERF_RECORD_SIMPLE:
-                       continue;
-               case PERF_RECORD_IRQ:
-                       perf_store_irq_data(counter, instruction_pointer(regs));
-                       break;
-               case PERF_RECORD_GROUP:
-                       perf_handle_group(counter, &status, &ack);
-                       break;
-               }
-               /*
-                * From NMI context we cannot call into the scheduler to
-                * do a task wakeup - but we mark these generic as
-                * wakeup_pending and initate a wakeup callback:
-                */
-               if (nmi) {
-                       counter->wakeup_pending = 1;
-                       set_tsk_thread_flag(current, TIF_PERF_COUNTERS);
-               } else {
-                       wake_up(&counter->waitq);
-               }
+               intel_pmu_save_and_restart(counter);
+               if (perf_counter_overflow(counter, nmi, regs, 0))
+                       __x86_pmu_disable(counter, &counter->hw, bit);
        }
 
-       wrmsrl(MSR_CORE_PERF_GLOBAL_OVF_CTRL, ack);
+       intel_pmu_ack_status(ack);
 
        /*
         * Repeat if there is more work to be done:
         */
-       rdmsrl(MSR_CORE_PERF_GLOBAL_STATUS, status);
+       status = intel_pmu_get_status(cpuc->throttle_ctrl);
        if (status)
                goto again;
 out:
@@ -541,13 +788,16 @@ out:
         * Restore - do not reenable when global enable is off or throttled:
         */
        if (++cpuc->interrupts < PERFMON_MAX_INTERRUPTS)
-               wrmsrl(MSR_CORE_PERF_GLOBAL_CTRL, cpuc->global_enable);
+               intel_pmu_restore_all(cpuc->throttle_ctrl);
+
+       return ret;
 }
 
+static int amd_pmu_handle_irq(struct pt_regs *regs, int nmi) { return 0; }
+
 void perf_counter_unthrottle(void)
 {
        struct cpu_hw_counters *cpuc;
-       u64 global_enable;
 
        if (!cpu_has(&boot_cpu_data, X86_FEATURE_ARCH_PERFMON))
                return;
@@ -555,54 +805,36 @@ void perf_counter_unthrottle(void)
        if (unlikely(!perf_counters_initialized))
                return;
 
-       cpuc = &per_cpu(cpu_hw_counters, smp_processor_id());
+       cpuc = &__get_cpu_var(cpu_hw_counters);
        if (cpuc->interrupts >= PERFMON_MAX_INTERRUPTS) {
                if (printk_ratelimit())
                        printk(KERN_WARNING "PERFMON: max interrupts exceeded!\n");
-               wrmsrl(MSR_CORE_PERF_GLOBAL_CTRL, cpuc->global_enable);
+               hw_perf_restore(cpuc->throttle_ctrl);
        }
-       rdmsrl(MSR_CORE_PERF_GLOBAL_CTRL, global_enable);
-       if (unlikely(cpuc->global_enable && !global_enable))
-               wrmsrl(MSR_CORE_PERF_GLOBAL_CTRL, cpuc->global_enable);
        cpuc->interrupts = 0;
 }
 
 void smp_perf_counter_interrupt(struct pt_regs *regs)
 {
        irq_enter();
-       inc_irq_stat(apic_perf_irqs);
        apic_write(APIC_LVTPC, LOCAL_PERF_VECTOR);
-       __smp_perf_counter_interrupt(regs, 0);
-
+       ack_APIC_irq();
+       x86_pmu.handle_irq(regs, 0);
        irq_exit();
 }
 
-/*
- * This handler is triggered by NMI contexts:
- */
-void perf_counter_notify(struct pt_regs *regs)
+void smp_perf_pending_interrupt(struct pt_regs *regs)
 {
-       struct cpu_hw_counters *cpuc;
-       unsigned long flags;
-       int bit, cpu;
-
-       local_irq_save(flags);
-       cpu = smp_processor_id();
-       cpuc = &per_cpu(cpu_hw_counters, cpu);
-
-       for_each_bit(bit, cpuc->used, X86_PMC_IDX_MAX) {
-               struct perf_counter *counter = cpuc->counters[bit];
-
-               if (!counter)
-                       continue;
-
-               if (counter->wakeup_pending) {
-                       counter->wakeup_pending = 0;
-                       wake_up(&counter->waitq);
-               }
-       }
+       irq_enter();
+       ack_APIC_irq();
+       inc_irq_stat(apic_pending_irqs);
+       perf_counter_do_pending();
+       irq_exit();
+}
 
-       local_irq_restore(flags);
+void set_perf_counter_pending(void)
+{
+       apic->send_IPI_self(LOCAL_PENDING_VECTOR);
 }
 
 void perf_counters_lapic_init(int nmi)
@@ -630,16 +862,23 @@ perf_counter_nmi_handler(struct notifier_block *self,
 {
        struct die_args *args = __args;
        struct pt_regs *regs;
+       int ret;
 
-       if (likely(cmd != DIE_NMI_IPI))
+       switch (cmd) {
+       case DIE_NMI:
+       case DIE_NMI_IPI:
+               break;
+
+       default:
                return NOTIFY_DONE;
+       }
 
        regs = args->regs;
 
        apic_write(APIC_LVTPC, APIC_DM_NMI);
-       __smp_perf_counter_interrupt(regs, 1);
+       ret = x86_pmu.handle_irq(regs, 1);
 
-       return NOTIFY_STOP;
+       return ret ? NOTIFY_STOP : NOTIFY_OK;
 }
 
 static __read_mostly struct notifier_block perf_counter_nmi_notifier = {
@@ -648,15 +887,41 @@ static __read_mostly struct notifier_block perf_counter_nmi_notifier = {
        .priority               = 1
 };
 
-void __init init_hw_perf_counters(void)
+static struct x86_pmu intel_pmu = {
+       .handle_irq             = intel_pmu_handle_irq,
+       .save_disable_all       = intel_pmu_save_disable_all,
+       .restore_all            = intel_pmu_restore_all,
+       .enable                 = intel_pmu_enable_counter,
+       .disable                = intel_pmu_disable_counter,
+       .eventsel               = MSR_ARCH_PERFMON_EVENTSEL0,
+       .perfctr                = MSR_ARCH_PERFMON_PERFCTR0,
+       .event_map              = intel_pmu_event_map,
+       .raw_event              = intel_pmu_raw_event,
+       .max_events             = ARRAY_SIZE(intel_perfmon_event_map),
+};
+
+static struct x86_pmu amd_pmu = {
+       .handle_irq             = amd_pmu_handle_irq,
+       .save_disable_all       = amd_pmu_save_disable_all,
+       .restore_all            = amd_pmu_restore_all,
+       .enable                 = amd_pmu_enable_counter,
+       .disable                = amd_pmu_disable_counter,
+       .eventsel               = MSR_K7_EVNTSEL0,
+       .perfctr                = MSR_K7_PERFCTR0,
+       .event_map              = amd_pmu_event_map,
+       .raw_event              = amd_pmu_raw_event,
+       .max_events             = ARRAY_SIZE(amd_perfmon_event_map),
+};
+
+static int intel_pmu_init(void)
 {
+       union cpuid10_edx edx;
        union cpuid10_eax eax;
-       unsigned int ebx;
        unsigned int unused;
-       union cpuid10_edx edx;
+       unsigned int ebx;
 
        if (!cpu_has(&boot_cpu_data, X86_FEATURE_ARCH_PERFMON))
-               return;
+               return -ENODEV;
 
        /*
         * Check whether the Architectural PerfMon supports
@@ -664,13 +929,57 @@ void __init init_hw_perf_counters(void)
         */
        cpuid(10, &eax.full, &ebx, &unused, &edx.full);
        if (eax.split.mask_length <= ARCH_PERFMON_BRANCH_MISSES_RETIRED)
-               return;
+               return -ENODEV;
+
+       intel_perfmon_version = eax.split.version_id;
+       if (intel_perfmon_version < 2)
+               return -ENODEV;
+
+       pr_info("Intel Performance Monitoring support detected.\n");
+       pr_info("... version:         %d\n", intel_perfmon_version);
+       pr_info("... bit width:       %d\n", eax.split.bit_width);
+       pr_info("... mask length:     %d\n", eax.split.mask_length);
 
-       printk(KERN_INFO "Intel Performance Monitoring support detected.\n");
+       x86_pmu = intel_pmu;
 
-       printk(KERN_INFO "... version:         %d\n", eax.split.version_id);
-       printk(KERN_INFO "... num counters:    %d\n", eax.split.num_counters);
        nr_counters_generic = eax.split.num_counters;
+       nr_counters_fixed = edx.split.num_counters_fixed;
+       counter_value_mask = (1ULL << eax.split.bit_width) - 1;
+
+       return 0;
+}
+
+static int amd_pmu_init(void)
+{
+       x86_pmu = amd_pmu;
+
+       nr_counters_generic = 4;
+       nr_counters_fixed = 0;
+       counter_value_mask = 0x0000FFFFFFFFFFFFULL;
+       counter_value_bits = 48;
+
+       pr_info("AMD Performance Monitoring support detected.\n");
+       return 0;
+}
+
+void __init init_hw_perf_counters(void)
+{
+       int err;
+
+       switch (boot_cpu_data.x86_vendor) {
+       case X86_VENDOR_INTEL:
+               err = intel_pmu_init();
+               break;
+       case X86_VENDOR_AMD:
+               err = amd_pmu_init();
+               break;
+       default:
+               return;
+       }
+       if (err != 0)
+               return;
+
+       pr_info("... num counters:    %d\n", nr_counters_generic);
        if (nr_counters_generic > X86_PMC_MAX_GENERIC) {
                nr_counters_generic = X86_PMC_MAX_GENERIC;
                WARN(1, KERN_ERR "hw perf counters %d > max(%d), clipping!",
@@ -679,48 +988,203 @@ void __init init_hw_perf_counters(void)
        perf_counter_mask = (1 << nr_counters_generic) - 1;
        perf_max_counters = nr_counters_generic;
 
-       printk(KERN_INFO "... bit width:       %d\n", eax.split.bit_width);
-       counter_value_mask = (1ULL << eax.split.bit_width) - 1;
-       printk(KERN_INFO "... value mask:      %016Lx\n", counter_value_mask);
-
-       printk(KERN_INFO "... mask length:     %d\n", eax.split.mask_length);
+       pr_info("... value mask:      %016Lx\n", counter_value_mask);
 
-       nr_counters_fixed = edx.split.num_counters_fixed;
        if (nr_counters_fixed > X86_PMC_MAX_FIXED) {
                nr_counters_fixed = X86_PMC_MAX_FIXED;
                WARN(1, KERN_ERR "hw perf counters fixed %d > max(%d), clipping!",
                        nr_counters_fixed, X86_PMC_MAX_FIXED);
        }
-       printk(KERN_INFO "... fixed counters:  %d\n", nr_counters_fixed);
+       pr_info("... fixed counters:  %d\n", nr_counters_fixed);
 
        perf_counter_mask |= ((1LL << nr_counters_fixed)-1) << X86_PMC_IDX_FIXED;
 
-       printk(KERN_INFO "... counter mask:    %016Lx\n", perf_counter_mask);
+       pr_info("... counter mask:    %016Lx\n", perf_counter_mask);
        perf_counters_initialized = true;
 
        perf_counters_lapic_init(0);
        register_die_notifier(&perf_counter_nmi_notifier);
 }
 
-static void pmc_generic_read(struct perf_counter *counter)
+static void x86_pmu_read(struct perf_counter *counter)
 {
        x86_perf_counter_update(counter, &counter->hw, counter->hw.idx);
 }
 
-static const struct hw_perf_counter_ops x86_perf_counter_ops = {
-       .enable         = pmc_generic_enable,
-       .disable        = pmc_generic_disable,
-       .read           = pmc_generic_read,
+static const struct pmu pmu = {
+       .enable         = x86_pmu_enable,
+       .disable        = x86_pmu_disable,
+       .read           = x86_pmu_read,
 };
 
-const struct hw_perf_counter_ops *
-hw_perf_counter_init(struct perf_counter *counter)
+const struct pmu *hw_perf_counter_init(struct perf_counter *counter)
 {
        int err;
 
        err = __hw_perf_counter_init(counter);
        if (err)
-               return NULL;
+               return ERR_PTR(err);
+
+       return &pmu;
+}
+
+/*
+ * callchain support
+ */
+
+static inline
+void callchain_store(struct perf_callchain_entry *entry, unsigned long ip)
+{
+       if (entry->nr < MAX_STACK_DEPTH)
+               entry->ip[entry->nr++] = ip;
+}
+
+static DEFINE_PER_CPU(struct perf_callchain_entry, irq_entry);
+static DEFINE_PER_CPU(struct perf_callchain_entry, nmi_entry);
+
+
+static void
+backtrace_warning_symbol(void *data, char *msg, unsigned long symbol)
+{
+       /* Ignore warnings */
+}
+
+static void backtrace_warning(void *data, char *msg)
+{
+       /* Ignore warnings */
+}
+
+static int backtrace_stack(void *data, char *name)
+{
+       /* Don't bother with IRQ stacks for now */
+       return -1;
+}
+
+static void backtrace_address(void *data, unsigned long addr, int reliable)
+{
+       struct perf_callchain_entry *entry = data;
+
+       if (reliable)
+               callchain_store(entry, addr);
+}
+
+static const struct stacktrace_ops backtrace_ops = {
+       .warning                = backtrace_warning,
+       .warning_symbol         = backtrace_warning_symbol,
+       .stack                  = backtrace_stack,
+       .address                = backtrace_address,
+};
+
+static void
+perf_callchain_kernel(struct pt_regs *regs, struct perf_callchain_entry *entry)
+{
+       unsigned long bp;
+       char *stack;
+       int nr = entry->nr;
+
+       callchain_store(entry, instruction_pointer(regs));
+
+       stack = ((char *)regs + sizeof(struct pt_regs));
+#ifdef CONFIG_FRAME_POINTER
+       bp = frame_pointer(regs);
+#else
+       bp = 0;
+#endif
+
+       dump_trace(NULL, regs, (void *)stack, bp, &backtrace_ops, entry);
+
+       entry->kernel = entry->nr - nr;
+}
+
+
+struct stack_frame {
+       const void __user       *next_fp;
+       unsigned long           return_address;
+};
+
+static int copy_stack_frame(const void __user *fp, struct stack_frame *frame)
+{
+       int ret;
+
+       if (!access_ok(VERIFY_READ, fp, sizeof(*frame)))
+               return 0;
+
+       ret = 1;
+       pagefault_disable();
+       if (__copy_from_user_inatomic(frame, fp, sizeof(*frame)))
+               ret = 0;
+       pagefault_enable();
+
+       return ret;
+}
+
+static void
+perf_callchain_user(struct pt_regs *regs, struct perf_callchain_entry *entry)
+{
+       struct stack_frame frame;
+       const void __user *fp;
+       int nr = entry->nr;
+
+       regs = (struct pt_regs *)current->thread.sp0 - 1;
+       fp   = (void __user *)regs->bp;
+
+       callchain_store(entry, regs->ip);
+
+       while (entry->nr < MAX_STACK_DEPTH) {
+               frame.next_fp        = NULL;
+               frame.return_address = 0;
+
+               if (!copy_stack_frame(fp, &frame))
+                       break;
+
+               if ((unsigned long)fp < user_stack_pointer(regs))
+                       break;
+
+               callchain_store(entry, frame.return_address);
+               fp = frame.next_fp;
+       }
+
+       entry->user = entry->nr - nr;
+}
+
+static void
+perf_do_callchain(struct pt_regs *regs, struct perf_callchain_entry *entry)
+{
+       int is_user;
+
+       if (!regs)
+               return;
+
+       is_user = user_mode(regs);
+
+       if (!current || current->pid == 0)
+               return;
+
+       if (is_user && current->state != TASK_RUNNING)
+               return;
+
+       if (!is_user)
+               perf_callchain_kernel(regs, entry);
+
+       if (current->mm)
+               perf_callchain_user(regs, entry);
+}
+
+struct perf_callchain_entry *perf_callchain(struct pt_regs *regs)
+{
+       struct perf_callchain_entry *entry;
+
+       if (in_nmi())
+               entry = &__get_cpu_var(nmi_entry);
+       else
+               entry = &__get_cpu_var(irq_entry);
+
+       entry->nr = 0;
+       entry->hv = 0;
+       entry->kernel = 0;
+       entry->user = 0;
+
+       perf_do_callchain(regs, entry);
 
-       return &x86_perf_counter_ops;
+       return entry;
 }