Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac46c7fd authored by Frederic Weisbecker's avatar Frederic Weisbecker Committed by Ingo Molnar
Browse files

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: default avatarFrederic 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: default avatarIngo Molnar <mingo@kernel.org>
parent 551624d6

arch/xtensa/include/asm/hw_breakpoint.h

+5 −1
Original line number Diff line number Diff line
@@ -30,13 +30,17 @@ struct arch_hw_breakpoint { 
	u16 type;

};



struct perf_event_attr;

struct perf_event;

struct pt_regs;

struct task_struct;



int hw_breakpoint_slots(int type);

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,

				    unsigned long val, void *data);

arch/xtensa/kernel/hw_breakpoint.c

+12 −21
Original line number Diff line number Diff line
@@ -47,50 +47,41 @@ int arch_check_bp_in_kernelspace(struct arch_hw_breakpoint *hw) 
/*

 * 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 */

	switch (bp->attr.bp_type) {

	switch (attr->bp_type) {

	case HW_BREAKPOINT_X:

		info->type = XTENSA_BREAKPOINT_EXECUTE;

		hw->type = XTENSA_BREAKPOINT_EXECUTE;

		break;

	case HW_BREAKPOINT_R:

		info->type = XTENSA_BREAKPOINT_LOAD;

		hw->type = XTENSA_BREAKPOINT_LOAD;

		break;

	case HW_BREAKPOINT_W:

		info->type = XTENSA_BREAKPOINT_STORE;

		hw->type = XTENSA_BREAKPOINT_STORE;

		break;

	case HW_BREAKPOINT_RW:

		info->type = XTENSA_BREAKPOINT_LOAD | XTENSA_BREAKPOINT_STORE;

		hw->type = XTENSA_BREAKPOINT_LOAD | XTENSA_BREAKPOINT_STORE;

		break;

	default:

		return -EINVAL;

	}



	/* Len */

	info->len = bp->attr.bp_len;

	if (info->len < 1 || info->len > 64 || !is_power_of_2(info->len))

	hw->len = attr->bp_len;

	if (hw->len < 1 || hw->len > 64 || !is_power_of_2(hw->len))

		return -EINVAL;



	/* Address */

	info->address = bp->attr.bp_addr;

	if (info->address & (info->len - 1))

	hw->address = attr->bp_addr;

	if (hw->address & (hw->len - 1))

		return -EINVAL;



	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,

				    unsigned long val, void *data)

{