perf_counter: Introduce struct for sample data

For easy extension of the sample data, put it in a structure.

Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

2 files changed, 18 insertions, 7 deletions

diff --git a/arch/powerpc/kernel/perf_counter.c b/arch/powerpc/kernel/perf_counter.c
index 4786ad9a2887..5e0bf399c433 100644
--- a/arch/powerpc/kernel/perf_counter.c
+++ b/arch/powerpc/kernel/perf_counter.c
@@ -1001,7 +1001,11 @@ static void record_and_restart(struct perf_counter *counter, long val,
          * Finally record data if requested.
          */
         if (record) {
-                addr = 0;
+                struct perf_sample_data data = {
+                        .regs = regs,
+                        .addr = 0,
+                };
+
                 if (counter->attr.sample_type & PERF_SAMPLE_ADDR) {
                         /*
                          * The user wants a data address recorded.
@@ -1016,9 +1020,9 @@ static void record_and_restart(struct perf_counter *counter, long val,
                         sdsync = (ppmu->flags & PPMU_ALT_SIPR) ?
                                 POWER6_MMCRA_SDSYNC : MMCRA_SDSYNC;
                         if (!(mmcra & MMCRA_SAMPLE_ENABLE) || (mmcra & sdsync))
-                                addr = mfspr(SPRN_SDAR);
+                                data.addr = mfspr(SPRN_SDAR);
                 }
-                if (perf_counter_overflow(counter, nmi, regs, addr)) {
+                if (perf_counter_overflow(counter, nmi, &data)) {
                         /*
                          * Interrupts are coming too fast - throttle them
                          * by setting the counter to 0, so it will be
diff --git a/arch/x86/kernel/cpu/perf_counter.c b/arch/x86/kernel/cpu/perf_counter.c
index 240ca5630632..82a23d487f92 100644
--- a/arch/x86/kernel/cpu/perf_counter.c
+++ b/arch/x86/kernel/cpu/perf_counter.c
@@ -1173,11 +1173,14 @@ static void intel_pmu_reset(void)
  */
 static int intel_pmu_handle_irq(struct pt_regs *regs)
 {
+        struct perf_sample_data data;
         struct cpu_hw_counters *cpuc;
-        struct cpu_hw_counters;
         int bit, cpu, loops;
         u64 ack, status;
 
+        data.regs = regs;
+        data.addr = 0;
+
         cpu = smp_processor_id();
         cpuc = &per_cpu(cpu_hw_counters, cpu);
 
@@ -1210,7 +1213,7 @@ again:
                 if (!intel_pmu_save_and_restart(counter))
                         continue;
 
-                if (perf_counter_overflow(counter, 1, regs, 0))
+                if (perf_counter_overflow(counter, 1, &data))
                         intel_pmu_disable_counter(&counter->hw, bit);
         }
 
@@ -1230,12 +1233,16 @@ again:
 
 static int amd_pmu_handle_irq(struct pt_regs *regs)
 {
-        int cpu, idx, handled = 0;
+        struct perf_sample_data data;
         struct cpu_hw_counters *cpuc;
         struct perf_counter *counter;
         struct hw_perf_counter *hwc;
+        int cpu, idx, handled = 0;
         u64 val;
 
+        data.regs = regs;
+        data.addr = 0;
+
         cpu = smp_processor_id();
         cpuc = &per_cpu(cpu_hw_counters, cpu);
 
@@ -1256,7 +1263,7 @@ static int amd_pmu_handle_irq(struct pt_regs *regs)
                 if (!x86_perf_counter_set_period(counter, hwc, idx))
                         continue;
 
-                if (perf_counter_overflow(counter, 1, regs, 0))
+                if (perf_counter_overflow(counter, 1, &data))
                         amd_pmu_disable_counter(hwc, idx);
         }