mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2025-01-18 10:56:12 +07:00
perf/arch/xtensa: 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-10-git-send-email-frederic@kernel.org Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
parent
551624d6fc
commit
ac46c7fdde
@ -30,13 +30,17 @@ struct arch_hw_breakpoint {
|
|||||||
u16 type;
|
u16 type;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
struct perf_event_attr;
|
||||||
struct perf_event;
|
struct perf_event;
|
||||||
struct pt_regs;
|
struct pt_regs;
|
||||||
struct task_struct;
|
struct task_struct;
|
||||||
|
|
||||||
int hw_breakpoint_slots(int type);
|
int hw_breakpoint_slots(int type);
|
||||||
int arch_check_bp_in_kernelspace(struct arch_hw_breakpoint *hw);
|
int arch_check_bp_in_kernelspace(struct arch_hw_breakpoint *hw);
|
||||||
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);
|
||||||
|
#define hw_breakpoint_arch_parse hw_breakpoint_arch_parse
|
||||||
int hw_breakpoint_exceptions_notify(struct notifier_block *unused,
|
int hw_breakpoint_exceptions_notify(struct notifier_block *unused,
|
||||||
unsigned long val, void *data);
|
unsigned long val, void *data);
|
||||||
|
|
||||||
|
@ -47,50 +47,41 @@ int arch_check_bp_in_kernelspace(struct arch_hw_breakpoint *hw)
|
|||||||
/*
|
/*
|
||||||
* Construct an arch_hw_breakpoint from a perf_event.
|
* Construct an arch_hw_breakpoint from a perf_event.
|
||||||
*/
|
*/
|
||||||
static int arch_build_bp_info(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);
|
|
||||||
|
|
||||||
/* Type */
|
/* Type */
|
||||||
switch (bp->attr.bp_type) {
|
switch (attr->bp_type) {
|
||||||
case HW_BREAKPOINT_X:
|
case HW_BREAKPOINT_X:
|
||||||
info->type = XTENSA_BREAKPOINT_EXECUTE;
|
hw->type = XTENSA_BREAKPOINT_EXECUTE;
|
||||||
break;
|
break;
|
||||||
case HW_BREAKPOINT_R:
|
case HW_BREAKPOINT_R:
|
||||||
info->type = XTENSA_BREAKPOINT_LOAD;
|
hw->type = XTENSA_BREAKPOINT_LOAD;
|
||||||
break;
|
break;
|
||||||
case HW_BREAKPOINT_W:
|
case HW_BREAKPOINT_W:
|
||||||
info->type = XTENSA_BREAKPOINT_STORE;
|
hw->type = XTENSA_BREAKPOINT_STORE;
|
||||||
break;
|
break;
|
||||||
case HW_BREAKPOINT_RW:
|
case HW_BREAKPOINT_RW:
|
||||||
info->type = XTENSA_BREAKPOINT_LOAD | XTENSA_BREAKPOINT_STORE;
|
hw->type = XTENSA_BREAKPOINT_LOAD | XTENSA_BREAKPOINT_STORE;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Len */
|
/* Len */
|
||||||
info->len = bp->attr.bp_len;
|
hw->len = attr->bp_len;
|
||||||
if (info->len < 1 || info->len > 64 || !is_power_of_2(info->len))
|
if (hw->len < 1 || hw->len > 64 || !is_power_of_2(hw->len))
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
/* Address */
|
/* Address */
|
||||||
info->address = bp->attr.bp_addr;
|
hw->address = attr->bp_addr;
|
||||||
if (info->address & (info->len - 1))
|
if (hw->address & (hw->len - 1))
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int arch_validate_hwbkpt_settings(struct perf_event *bp)
|
|
||||||
{
|
|
||||||
int ret;
|
|
||||||
|
|
||||||
/* Build the arch_hw_breakpoint. */
|
|
||||||
ret = arch_build_bp_info(bp);
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
int hw_breakpoint_exceptions_notify(struct notifier_block *unused,
|
int hw_breakpoint_exceptions_notify(struct notifier_block *unused,
|
||||||
unsigned long val, void *data)
|
unsigned long val, void *data)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user