From: Frederic Weisbecker <frederic@kernel.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: LKML <linux-kernel@vger.kernel.org>,
Frederic Weisbecker <frederic@kernel.org>,
Jiri Olsa <jolsa@redhat.com>, Namhyung Kim <namhyung@kernel.org>,
Joel Fernandes <joel.opensrc@gmail.com>,
Peter Zijlstra <peterz@infradead.org>,
Linus Torvalds <torvalds@linux-foundation.org>,
Yoshinori Sato <ysato@users.sourceforge.jp>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Catalin Marinas <catalin.marinas@arm.com>,
Chris Zankel <chris@zankel.net>,
Paul Mackerras <paulus@samba.org>,
Thomas Gleixner <tglx@linutronix.de>,
Will Deacon <will.deacon@arm.com>,
Michael Ellerman <mpe@ellerman.id.au>,
Rich Felker <dalias@libc.org>,
Mark Rutland <mark.rutland@arm.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Andy Lutomirski <luto@kernel.org>,
Arnaldo Carvalho de Melo <acme@kernel.org>,
Max Filippov <jcmvbkbc@gmail.com>
Subject: [PATCH 12/12] perf/breakpoint: Clean up and consolidate modify_user_hw_breakpoint_check()
Date: Tue, 26 Jun 2018 04:58:59 +0200 [thread overview]
Message-ID: <1529981939-8231-13-git-send-email-frederic@kernel.org> (raw)
In-Reply-To: <1529981939-8231-1-git-send-email-frederic@kernel.org>
Remove the dance around old and new attributes. Just don't modify the
previous breakpoint at all until we have verified everything.
Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Original-patch-by: Andy Lutomirski <luto@kernel.org>
Signed-off-by: Frederic Weisbecker <frederic@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Cc: Rich Felker <dalias@libc.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: Chris Zankel <chris@zankel.net>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Joel Fernandes <joel.opensrc@gmail.com>
---
kernel/events/hw_breakpoint.c | 46 ++++++++++++++++++++++++-------------------
1 file changed, 26 insertions(+), 20 deletions(-)
diff --git a/kernel/events/hw_breakpoint.c b/kernel/events/hw_breakpoint.c
index 7138770..b3814fc 100644
--- a/kernel/events/hw_breakpoint.c
+++ b/kernel/events/hw_breakpoint.c
@@ -461,37 +461,43 @@ register_user_hw_breakpoint(struct perf_event_attr *attr,
}
EXPORT_SYMBOL_GPL(register_user_hw_breakpoint);
+static void hw_breakpoint_copy_attr(struct perf_event_attr *to,
+ struct perf_event_attr *from)
+{
+ to->bp_addr = from->bp_addr;
+ to->bp_type = from->bp_type;
+ to->bp_len = from->bp_len;
+ to->disabled = from->disabled;
+}
+
int
modify_user_hw_breakpoint_check(struct perf_event *bp, struct perf_event_attr *attr,
bool check)
{
- u64 old_addr = bp->attr.bp_addr;
- u64 old_len = bp->attr.bp_len;
- int old_type = bp->attr.bp_type;
- bool modify = attr->bp_type != old_type;
struct arch_hw_breakpoint hw;
- int err = 0;
-
- bp->attr.bp_addr = attr->bp_addr;
- bp->attr.bp_type = attr->bp_type;
- bp->attr.bp_len = attr->bp_len;
-
- if (check && memcmp(&bp->attr, attr, sizeof(*attr)))
- return -EINVAL;
+ int err;
err = hw_breakpoint_parse(bp, attr, &hw);
- if (!err && modify)
- err = modify_bp_slot(bp, old_type, bp->attr.bp_type);
-
- if (err) {
- bp->attr.bp_addr = old_addr;
- bp->attr.bp_type = old_type;
- bp->attr.bp_len = old_len;
+ if (err)
return err;
+
+ if (check) {
+ struct perf_event_attr old_attr;
+
+ old_attr = bp->attr;
+ hw_breakpoint_copy_attr(&old_attr, attr);
+ if (memcmp(&old_attr, attr, sizeof(*attr)))
+ return -EINVAL;
+ }
+
+ if (bp->attr.bp_type != attr->bp_type) {
+ err = modify_bp_slot(bp, bp->attr.bp_type, attr->bp_type);
+ if (err)
+ return err;
}
+ hw_breakpoint_copy_attr(&bp->attr, attr);
bp->hw.info = hw;
- bp->attr.disabled = attr->disabled;
return 0;
}
--
2.7.4
next prev parent reply other threads:[~2018-06-26 3:00 UTC|newest]
Thread overview: 28+ 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:perf/core] perf/arch/xtensa: " tip-bot for Frederic Weisbecker
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 ` Frederic Weisbecker [this message]
2018-06-26 10:31 ` [tip:perf/core] perf/hw_breakpoint: Clean up and consolidate modify_user_hw_breakpoint_check() tip-bot for Frederic Weisbecker
2018-06-26 7:09 ` [GIT PULL] breakpoint: Rework arch validation v4 Ingo Molnar
-- strict thread matches above, loose matches on Subject: below --
2018-06-01 14:31 [GIT PULL] breakpoint: Rework arch validation v3 Frederic Weisbecker
2018-06-01 14:32 ` [PATCH 12/12] perf/breakpoint: Clean up and consolidate modify_user_hw_breakpoint_check() Frederic Weisbecker
2018-05-19 2:45 [PATCH 00/12] breakpoint: Rework arch validation v2 Frederic Weisbecker
2018-05-19 2:45 ` [PATCH 12/12] perf/breakpoint: Clean up and consolidate modify_user_hw_breakpoint_check() Frederic Weisbecker
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=1529981939-8231-13-git-send-email-frederic@kernel.org \
--to=frederic@kernel.org \
--cc=acme@kernel.org \
--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=jcmvbkbc@gmail.com \
--cc=joel.opensrc@gmail.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@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).