perf/arch/sh: 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> 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: Michael Ellerman <mpe@ellerman.id.au> 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-9-git-send-email-frederic@kernel.org Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
parent
9234428957
commit
551624d6fc
|
@ -40,6 +40,7 @@ struct sh_ubc {
|
||||||
struct clk *clk; /* optional interface clock / MSTP bit */
|
struct clk *clk; /* optional interface clock / MSTP bit */
|
||||||
};
|
};
|
||||||
|
|
||||||
|
struct perf_event_attr;
|
||||||
struct perf_event;
|
struct perf_event;
|
||||||
struct task_struct;
|
struct task_struct;
|
||||||
struct pmu;
|
struct pmu;
|
||||||
|
@ -54,7 +55,10 @@ static inline int hw_breakpoint_slots(int type)
|
||||||
|
|
||||||
/* arch/sh/kernel/hw_breakpoint.c */
|
/* arch/sh/kernel/hw_breakpoint.c */
|
||||||
extern int arch_check_bp_in_kernelspace(struct arch_hw_breakpoint *hw);
|
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,
|
extern int hw_breakpoint_exceptions_notify(struct notifier_block *unused,
|
||||||
unsigned long val, void *data);
|
unsigned long val, void *data);
|
||||||
|
|
||||||
|
|
|
@ -173,40 +173,40 @@ int arch_bp_generic_fields(int sh_len, int sh_type,
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int arch_build_bp_info(struct perf_event *bp)
|
static int arch_build_bp_info(struct perf_event *bp,
|
||||||
|
const struct perf_event_attr *attr,
|
||||||
|
struct arch_hw_breakpoint *hw)
|
||||||
{
|
{
|
||||||
struct arch_hw_breakpoint *info = counter_arch_bp(bp);
|
hw->address = attr->bp_addr;
|
||||||
|
|
||||||
info->address = bp->attr.bp_addr;
|
|
||||||
|
|
||||||
/* Len */
|
/* Len */
|
||||||
switch (bp->attr.bp_len) {
|
switch (attr->bp_len) {
|
||||||
case HW_BREAKPOINT_LEN_1:
|
case HW_BREAKPOINT_LEN_1:
|
||||||
info->len = SH_BREAKPOINT_LEN_1;
|
hw->len = SH_BREAKPOINT_LEN_1;
|
||||||
break;
|
break;
|
||||||
case HW_BREAKPOINT_LEN_2:
|
case HW_BREAKPOINT_LEN_2:
|
||||||
info->len = SH_BREAKPOINT_LEN_2;
|
hw->len = SH_BREAKPOINT_LEN_2;
|
||||||
break;
|
break;
|
||||||
case HW_BREAKPOINT_LEN_4:
|
case HW_BREAKPOINT_LEN_4:
|
||||||
info->len = SH_BREAKPOINT_LEN_4;
|
hw->len = SH_BREAKPOINT_LEN_4;
|
||||||
break;
|
break;
|
||||||
case HW_BREAKPOINT_LEN_8:
|
case HW_BREAKPOINT_LEN_8:
|
||||||
info->len = SH_BREAKPOINT_LEN_8;
|
hw->len = SH_BREAKPOINT_LEN_8;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Type */
|
/* Type */
|
||||||
switch (bp->attr.bp_type) {
|
switch (attr->bp_type) {
|
||||||
case HW_BREAKPOINT_R:
|
case HW_BREAKPOINT_R:
|
||||||
info->type = SH_BREAKPOINT_READ;
|
hw->type = SH_BREAKPOINT_READ;
|
||||||
break;
|
break;
|
||||||
case HW_BREAKPOINT_W:
|
case HW_BREAKPOINT_W:
|
||||||
info->type = SH_BREAKPOINT_WRITE;
|
hw->type = SH_BREAKPOINT_WRITE;
|
||||||
break;
|
break;
|
||||||
case HW_BREAKPOINT_W | HW_BREAKPOINT_R:
|
case HW_BREAKPOINT_W | HW_BREAKPOINT_R:
|
||||||
info->type = SH_BREAKPOINT_RW;
|
hw->type = SH_BREAKPOINT_RW;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
@ -218,19 +218,20 @@ static int arch_build_bp_info(struct perf_event *bp)
|
||||||
/*
|
/*
|
||||||
* Validate the arch-specific HW Breakpoint register settings
|
* 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)
|
||||||
{
|
{
|
||||||
struct arch_hw_breakpoint *info = counter_arch_bp(bp);
|
|
||||||
unsigned int align;
|
unsigned int align;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
ret = arch_build_bp_info(bp);
|
ret = arch_build_bp_info(bp, attr, hw);
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
ret = -EINVAL;
|
ret = -EINVAL;
|
||||||
|
|
||||||
switch (info->len) {
|
switch (hw->len) {
|
||||||
case SH_BREAKPOINT_LEN_1:
|
case SH_BREAKPOINT_LEN_1:
|
||||||
align = 0;
|
align = 0;
|
||||||
break;
|
break;
|
||||||
|
@ -251,7 +252,7 @@ int arch_validate_hwbkpt_settings(struct perf_event *bp)
|
||||||
* Check that the low-order bits of the address are appropriate
|
* Check that the low-order bits of the address are appropriate
|
||||||
* for the alignment implied by len.
|
* for the alignment implied by len.
|
||||||
*/
|
*/
|
||||||
if (info->address & align)
|
if (hw->address & align)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
Loading…
Reference in New Issue