From: tip-bot for Frederic Weisbecker <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: tglx@linutronix.de, mingo@kernel.org, luto@kernel.org,
joel.opensrc@gmail.com, paulus@samba.org, frederic@kernel.org,
acme@kernel.org, linux-kernel@vger.kernel.org,
catalin.marinas@arm.com, peterz@infradead.org, dalias@libc.org,
alexander.shishkin@linux.intel.com, chris@zankel.net,
ysato@users.sourceforge.jp, torvalds@linux-foundation.org,
acme@redhat.com, benh@kernel.crashing.org, mpe@ellerman.id.au,
will.deacon@arm.com, namhyung@kernel.org, mark.rutland@arm.com,
hpa@zytor.com, jolsa@redhat.com, jcmvbkbc@gmail.com
Subject: [tip:perf/core] perf/arch/xtensa: Implement hw_breakpoint_arch_parse()
Date: Tue, 26 Jun 2018 03:30:08 -0700 [thread overview]
Message-ID: <tip-ac46c7fddef702dadae18c1fc932530cd31cf9cd@git.kernel.org> (raw)
In-Reply-To: <1529981939-8231-10-git-send-email-frederic@kernel.org>
Commit-ID: ac46c7fddef702dadae18c1fc932530cd31cf9cd
Gitweb: https://git.kernel.org/tip/ac46c7fddef702dadae18c1fc932530cd31cf9cd
Author: Frederic Weisbecker <frederic@kernel.org>
AuthorDate: Tue, 26 Jun 2018 04:58:56 +0200
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Tue, 26 Jun 2018 09:07:58 +0200
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>
---
arch/xtensa/include/asm/hw_breakpoint.h | 6 +++++-
arch/xtensa/kernel/hw_breakpoint.c | 33 ++++++++++++---------------------
2 files changed, 17 insertions(+), 22 deletions(-)
diff --git a/arch/xtensa/include/asm/hw_breakpoint.h b/arch/xtensa/include/asm/hw_breakpoint.h
index 2525bf6816a6..f347c2132e6b 100644
--- a/arch/xtensa/include/asm/hw_breakpoint.h
+++ b/arch/xtensa/include/asm/hw_breakpoint.h
@@ -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);
diff --git a/arch/xtensa/kernel/hw_breakpoint.c b/arch/xtensa/kernel/hw_breakpoint.c
index 6e34c3848885..c2e387c19cda 100644
--- a/arch/xtensa/kernel/hw_breakpoint.c
+++ b/arch/xtensa/kernel/hw_breakpoint.c
@@ -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)
{
next prev parent reply other threads:[~2018-06-26 10:31 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-26 2:58 [GIT PULL] breakpoint: Rework arch validation v4 Frederic Weisbecker
2018-06-26 2:58 ` [PATCH 01/12] perf/breakpoint: Split attribute parse and commit Frederic Weisbecker
2018-06-26 10:25 ` [tip:perf/core] perf/hw_breakpoint: " tip-bot for Frederic Weisbecker
2018-06-26 2:58 ` [PATCH 02/12] perf/breakpoint: Pass arch breakpoint struct to arch_check_bp_in_kernelspace() Frederic Weisbecker
2018-06-26 10:26 ` [tip:perf/core] perf/hw_breakpoint: " tip-bot for Frederic Weisbecker
2018-06-26 2:58 ` [PATCH 03/12] x86: Implement hw_breakpoint_arch_parse() Frederic Weisbecker
2018-06-26 10:26 ` [tip:perf/core] perf/arch/x86: " tip-bot for Frederic Weisbecker
2018-06-26 2:58 ` [PATCH 04/12] powerpc: " Frederic Weisbecker
2018-06-26 10:27 ` [tip:perf/core] perf/arch/powerpc: " tip-bot for Frederic Weisbecker
2018-06-26 2:58 ` [PATCH 05/12] arm: " Frederic Weisbecker
2018-06-26 10:27 ` [tip:perf/core] perf/arch/arm: " tip-bot for Frederic Weisbecker
2018-06-26 2:58 ` [PATCH 06/12] arm64: " Frederic Weisbecker
2018-06-26 10:28 ` [tip:perf/core] perf/arch/arm64: " tip-bot for Frederic Weisbecker
2018-06-26 2:58 ` [PATCH 07/12] sh: Remove "struct arch_hw_breakpoint::name" unused field Frederic Weisbecker
2018-06-26 10:28 ` [tip:perf/core] perf/arch/sh: " tip-bot for Frederic Weisbecker
2018-06-26 2:58 ` [PATCH 08/12] sh: Implement hw_breakpoint_arch_parse() Frederic Weisbecker
2018-06-26 10:29 ` [tip:perf/core] perf/arch/sh: " tip-bot for Frederic Weisbecker
2018-06-26 2:58 ` [PATCH 09/12] xtensa: " Frederic Weisbecker
2018-06-26 10:30 ` tip-bot for Frederic Weisbecker [this message]
2018-06-26 2:58 ` [PATCH 10/12] perf/breakpoint: Remove default hw_breakpoint_arch_parse() Frederic Weisbecker
2018-06-26 10:30 ` [tip:perf/core] perf/hw_breakpoint: " tip-bot for Frederic Weisbecker
2018-06-26 2:58 ` [PATCH 11/12] perf/breakpoint: Pass new breakpoint type to modify_breakpoint_slot() Frederic Weisbecker
2018-06-26 10:31 ` [tip:perf/core] perf/hw_breakpoint: " tip-bot for Frederic Weisbecker
2018-06-26 2:58 ` [PATCH 12/12] perf/breakpoint: Clean up and consolidate modify_user_hw_breakpoint_check() Frederic Weisbecker
2018-06-26 10:31 ` [tip:perf/core] perf/hw_breakpoint: " tip-bot for Frederic Weisbecker
2018-06-26 7:09 ` [GIT PULL] breakpoint: Rework arch validation v4 Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-ac46c7fddef702dadae18c1fc932530cd31cf9cd@git.kernel.org \
--to=tipbot@zytor.com \
--cc=acme@kernel.org \
--cc=acme@redhat.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=benh@kernel.crashing.org \
--cc=catalin.marinas@arm.com \
--cc=chris@zankel.net \
--cc=dalias@libc.org \
--cc=frederic@kernel.org \
--cc=hpa@zytor.com \
--cc=jcmvbkbc@gmail.com \
--cc=joel.opensrc@gmail.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=luto@kernel.org \
--cc=mark.rutland@arm.com \
--cc=mingo@kernel.org \
--cc=mpe@ellerman.id.au \
--cc=namhyung@kernel.org \
--cc=paulus@samba.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
--cc=will.deacon@arm.com \
--cc=ysato@users.sourceforge.jp \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).