perf/arch/powerpc: Implement hw_breakpoint_arch_parse()

Migrate to the new API in order to remove arch_validate_hwbkpt_settings()
that clumsily mixes up architecture validation and commit

Signed-off-by: Frederic Weisbecker <frederic@kernel.org>
Acked-by: Michael Ellerman <mpe@ellerman.id.au>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Chris Zankel <chris@zankel.net>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Joel Fernandes <joel.opensrc@gmail.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rich Felker <dalias@libc.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Link: http://lkml.kernel.org/r/1529981939-8231-5-git-send-email-frederic@kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --git a/arch/powerpc/include/asm/hw_breakpoint.h b/arch/powerpc/include/asm/hw_breakpoint.h
index 4d0b1bfcdfd07f933ef65db5c6ccb4bb5382f111..38ae180610bdf57d95aab4edc47cd21b8e3684f5 100644 (file)
--- a/arch/powerpc/include/asm/hw_breakpoint.h
+++ b/arch/powerpc/include/asm/hw_breakpoint.h
@@ -52,6 +52,7 @@ struct arch_hw_breakpoint {
 #include <asm/reg.h>
 #include <asm/debug.h>
 
+struct perf_event_attr;
 struct perf_event;
 struct pmu;
 struct perf_sample_data;
@@ -61,7 +62,10 @@ struct perf_sample_data;
 extern int hw_breakpoint_slots(int type);
 extern int arch_bp_generic_fields(int type, int *gen_bp_type);
 extern int arch_check_bp_in_kernelspace(struct arch_hw_breakpoint *hw);
-extern int arch_validate_hwbkpt_settings(struct perf_event *bp);
+extern int hw_breakpoint_arch_parse(struct perf_event *bp,
+                                   const struct perf_event_attr *attr,
+                                   struct arch_hw_breakpoint *hw);
+#define hw_breakpoint_arch_parse hw_breakpoint_arch_parse
 extern int hw_breakpoint_exceptions_notify(struct notifier_block *unused,
                                                unsigned long val, void *data);
 int arch_install_hw_breakpoint(struct perf_event *bp);

diff --git a/arch/powerpc/kernel/hw_breakpoint.c b/arch/powerpc/kernel/hw_breakpoint.c
index 899bcec3f3c8431619058ddc9bcec3f88befd000..fec8a6773119ff809524ba0119ef079189f7442a 100644 (file)
--- a/arch/powerpc/kernel/hw_breakpoint.c
+++ b/arch/powerpc/kernel/hw_breakpoint.c
@@ -139,30 +139,31 @@ int arch_bp_generic_fields(int type, int *gen_bp_type)
 /*
  * Validate the arch-specific HW Breakpoint register settings
  */
-int arch_validate_hwbkpt_settings(struct perf_event *bp)
+int hw_breakpoint_arch_parse(struct perf_event *bp,
+                            const struct perf_event_attr *attr,
+                            struct arch_hw_breakpoint *hw)
 {
        int ret = -EINVAL, length_max;
-       struct arch_hw_breakpoint *info = counter_arch_bp(bp);
 
        if (!bp)
                return ret;
 
-       info->type = HW_BRK_TYPE_TRANSLATE;
-       if (bp->attr.bp_type & HW_BREAKPOINT_R)
-               info->type |= HW_BRK_TYPE_READ;
-       if (bp->attr.bp_type & HW_BREAKPOINT_W)
-               info->type |= HW_BRK_TYPE_WRITE;
-       if (info->type == HW_BRK_TYPE_TRANSLATE)
+       hw->type = HW_BRK_TYPE_TRANSLATE;
+       if (attr->bp_type & HW_BREAKPOINT_R)
+               hw->type |= HW_BRK_TYPE_READ;
+       if (attr->bp_type & HW_BREAKPOINT_W)
+               hw->type |= HW_BRK_TYPE_WRITE;
+       if (hw->type == HW_BRK_TYPE_TRANSLATE)
                /* must set alteast read or write */
                return ret;
-       if (!(bp->attr.exclude_user))
-               info->type |= HW_BRK_TYPE_USER;
-       if (!(bp->attr.exclude_kernel))
-               info->type |= HW_BRK_TYPE_KERNEL;
-       if (!(bp->attr.exclude_hv))
-               info->type |= HW_BRK_TYPE_HYP;
-       info->address = bp->attr.bp_addr;
-       info->len = bp->attr.bp_len;
+       if (!attr->exclude_user)
+               hw->type |= HW_BRK_TYPE_USER;
+       if (!attr->exclude_kernel)
+               hw->type |= HW_BRK_TYPE_KERNEL;
+       if (!attr->exclude_hv)
+               hw->type |= HW_BRK_TYPE_HYP;
+       hw->address = attr->bp_addr;
+       hw->len = attr->bp_len;
 
        /*
         * Since breakpoint length can be a maximum of HW_BREAKPOINT_LEN(8)
@@ -176,12 +177,12 @@ int arch_validate_hwbkpt_settings(struct perf_event *bp)
        if (cpu_has_feature(CPU_FTR_DAWR)) {
                length_max = 512 ; /* 64 doublewords */
                /* DAWR region can't cross 512 boundary */
-               if ((bp->attr.bp_addr >> 9) !=
-                   ((bp->attr.bp_addr + bp->attr.bp_len - 1) >> 9))
+               if ((attr->bp_addr >> 9) !=
+                   ((attr->bp_addr + attr->bp_len - 1) >> 9))
                        return -EINVAL;
        }
-       if (info->len >
-           (length_max - (info->address & HW_BREAKPOINT_ALIGN)))
+       if (hw->len >
+           (length_max - (hw->address & HW_BREAKPOINT_ALIGN)))
                return -EINVAL;
        return 0;
 }