perf: Remove type specific target pointers

The only reason CQM had to use a hard-coded pmu type was so it could use
cqm_target in hw_perf_event.

Do away with the {tp,bp,cqm}_target pointers and provide a non type
specific one.

This allows us to do away with that silly pmu type as well.

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Vince Weaver <vince@deater.net>
Cc: acme@kernel.org
Cc: acme@redhat.com
Cc: hpa@zytor.com
Cc: jolsa@redhat.com
Cc: kanaka.d.juvva@intel.com
Cc: matt.fleming@intel.com
Cc: tglx@linutronix.de
Cc: torvalds@linux-foundation.org
Cc: vikas.shivappa@linux.intel.com
Link: http://lkml.kernel.org/r/20150305211019.GU21418@twins.programming.kicks-ass.net
Signed-off-by: Ingo Molnar <mingo@kernel.org>

3 files changed, 5 insertions, 6 deletions

diff --git a/arch/arm/kernel/hw_breakpoint.c b/arch/arm/kernel/hw_breakpoint.c
index 7fc70ae21185..dc7d0a95bd36 100644
--- a/arch/arm/kernel/hw_breakpoint.c
+++ b/arch/arm/kernel/hw_breakpoint.c
@@ -648,7 +648,7 @@ int arch_validate_hwbkpt_settings(struct perf_event *bp)
                  * Per-cpu breakpoints are not supported by our stepping
                  * mechanism.
                  */
-                if (!bp->hw.bp_target)
+                if (!bp->hw.target)
                         return -EINVAL;
 
                 /*
diff --git a/arch/arm64/kernel/hw_breakpoint.c b/arch/arm64/kernel/hw_breakpoint.c
index df1cf15377b4..d062f35911c2 100644
--- a/arch/arm64/kernel/hw_breakpoint.c
+++ b/arch/arm64/kernel/hw_breakpoint.c
@@ -527,7 +527,7 @@ int arch_validate_hwbkpt_settings(struct perf_event *bp)
          * Disallow per-task kernel breakpoints since these would
          * complicate the stepping code.
          */
-        if (info->ctrl.privilege == AARCH64_BREAKPOINT_EL1 && bp->hw.bp_target)
+        if (info->ctrl.privilege == AARCH64_BREAKPOINT_EL1 && bp->hw.target)
                 return -EINVAL;
 
         return 0;
diff --git a/arch/x86/kernel/cpu/perf_event_intel_cqm.c b/arch/x86/kernel/cpu/perf_event_intel_cqm.c
index 9a8ef8376fcd..e4d1b8b738fa 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_cqm.c
+++ b/arch/x86/kernel/cpu/perf_event_intel_cqm.c
@@ -263,7 +263,7 @@ static bool __match_event(struct perf_event *a, struct perf_event *b)
         /*
          * Events that target same task are placed into the same cache group.
          */
-        if (a->hw.cqm_target == b->hw.cqm_target)
+        if (a->hw.target == b->hw.target)
                 return true;
 
         /*
@@ -279,7 +279,7 @@ static bool __match_event(struct perf_event *a, struct perf_event *b)
 static inline struct perf_cgroup *event_to_cgroup(struct perf_event *event)
 {
         if (event->attach_state & PERF_ATTACH_TASK)
-                return perf_cgroup_from_task(event->hw.cqm_target);
+                return perf_cgroup_from_task(event->hw.target);
 
         return event->cgrp;
 }
@@ -1365,8 +1365,7 @@ static int __init intel_cqm_init(void)
 
         __perf_cpu_notifier(intel_cqm_cpu_notifier);
 
-        ret = perf_pmu_register(&intel_cqm_pmu, "intel_cqm",
-                                PERF_TYPE_INTEL_CQM);
+        ret = perf_pmu_register(&intel_cqm_pmu, "intel_cqm", -1);
         if (ret)
                 pr_err("Intel CQM perf registration failed: %d\n", ret);
         else