From: "tip-bot2 for Peter Zijlstra" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Andrew Cooper <Andrew.Cooper3@citrix.com>,
"Peter Zijlstra (Intel)" <peterz@infradead.org>,
Thomas Gleixner <tglx@linutronix.de>,
Daniel Thompson <daniel.thompson@linaro.org>,
x86 <x86@kernel.org>, LKML <linux-kernel@vger.kernel.org>
Subject: [tip: x86/entry] x86/debug: Support negative polarity DR6 bits
Date: Fri, 04 Sep 2020 13:16:06 -0000 [thread overview]
Message-ID: <159922536683.20229.14204270773798170350.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20200902133201.354220797@infradead.org>
The following commit has been merged into the x86/entry branch of tip:
Commit-ID: f4956cf83ed12271bdbd5b547f3378add72bbffb
Gitweb: https://git.kernel.org/tip/f4956cf83ed12271bdbd5b547f3378add72bbffb
Author: Peter Zijlstra <peterz@infradead.org>
AuthorDate: Wed, 02 Sep 2020 15:26:01 +02:00
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Fri, 04 Sep 2020 15:12:57 +02:00
x86/debug: Support negative polarity DR6 bits
DR6 has a whole bunch of bits that have negative polarity; they were
architecturally reserved and defined to be 1 and are now getting used.
Since they're 1 by default, 0 becomes the signal value.
Handle this by xor'ing the read DR6 value by the reserved mask, this
will flip them around such that 1 is the signal value (positive
polarity).
Current Linux doesn't yet support any of these bits, but there's two
defined:
- DR6[11] Bus Lock Debug Exception (ISEr39)
- DR6[16] Restricted Transactional Memory (SDM)
Update ptrace_{set,get}_debugreg() to provide/consume the value in
architectural polarity. Although afaict ptrace_set_debugreg(6) is
pointless, the value is not consumed anywhere.
Change hw_breakpoint_restore() to alway write the DR6_RESERVED value
to DR6, again, no consumer for that write.
Suggested-by: Andrew Cooper <Andrew.Cooper3@citrix.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Daniel Thompson <daniel.thompson@linaro.org>
Link: https://lore.kernel.org/r/20200902133201.354220797@infradead.org
---
arch/x86/kernel/hw_breakpoint.c | 2 +-
arch/x86/kernel/ptrace.c | 4 ++--
arch/x86/kernel/traps.c | 5 ++---
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/arch/x86/kernel/hw_breakpoint.c b/arch/x86/kernel/hw_breakpoint.c
index 7b7d9f2..d17a1da 100644
--- a/arch/x86/kernel/hw_breakpoint.c
+++ b/arch/x86/kernel/hw_breakpoint.c
@@ -464,7 +464,7 @@ void hw_breakpoint_restore(void)
set_debugreg(__this_cpu_read(cpu_debugreg[1]), 1);
set_debugreg(__this_cpu_read(cpu_debugreg[2]), 2);
set_debugreg(__this_cpu_read(cpu_debugreg[3]), 3);
- set_debugreg(current->thread.debugreg6, 6);
+ set_debugreg(DR6_RESERVED, 6);
set_debugreg(__this_cpu_read(cpu_dr7), 7);
}
EXPORT_SYMBOL_GPL(hw_breakpoint_restore);
diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
index e7537c5..5f98289 100644
--- a/arch/x86/kernel/ptrace.c
+++ b/arch/x86/kernel/ptrace.c
@@ -601,7 +601,7 @@ static unsigned long ptrace_get_debugreg(struct task_struct *tsk, int n)
if (bp)
val = bp->hw.info.address;
} else if (n == 6) {
- val = thread->debugreg6;
+ val = thread->debugreg6 ^ DR6_RESERVED; /* Flip back to arch polarity */
} else if (n == 7) {
val = thread->ptrace_dr7;
}
@@ -657,7 +657,7 @@ static int ptrace_set_debugreg(struct task_struct *tsk, int n,
if (n < HBP_NUM) {
rc = ptrace_set_breakpoint_addr(tsk, n, val);
} else if (n == 6) {
- thread->debugreg6 = val;
+ thread->debugreg6 = val ^ DR6_RESERVED; /* Flip to positive polarity */
rc = 0;
} else if (n == 7) {
rc = ptrace_write_dr7(tsk, val);
diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
index 1e89001..114515b 100644
--- a/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
@@ -745,9 +745,8 @@ static __always_inline unsigned long debug_read_clear_dr6(void)
* Keep it simple: clear DR6 immediately.
*/
get_debugreg(dr6, 6);
- set_debugreg(0, 6);
- /* Filter out all the reserved bits which are preset to 1 */
- dr6 &= ~DR6_RESERVED;
+ set_debugreg(DR6_RESERVED, 6);
+ dr6 ^= DR6_RESERVED; /* Flip to positive polarity */
/*
* The SDM says "The processor clears the BTF flag when it
next prev parent reply other threads:[~2020-09-04 13:18 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-02 13:25 [PATCH 00/13] x86/debug: Untangle handle_debug() Peter Zijlstra
2020-09-02 13:25 ` [PATCH 01/13] x86/entry: Fix AC assertion Peter Zijlstra
2020-09-02 15:58 ` Brian Gerst
2020-09-02 16:24 ` Jürgen Groß
2020-09-02 16:31 ` peterz
2020-09-02 17:02 ` Brian Gerst
2020-09-02 16:26 ` Andrew Cooper
2020-09-04 13:16 ` [tip: x86/urgent] " tip-bot2 for Peter Zijlstra
2020-09-02 13:25 ` [PATCH 02/13] x86/debug: Allow a single level of #DB recursion Peter Zijlstra
2020-09-02 23:59 ` Sasha Levin
2020-09-03 16:12 ` Josh Poimboeuf
2020-09-02 13:25 ` [PATCH 03/13] x86/debug: Sync BTF earlier Peter Zijlstra
2020-09-04 13:16 ` [tip: x86/entry] " tip-bot2 for Peter Zijlstra
2020-09-02 13:25 ` [PATCH 04/13] x86/debug: Move kprobe_debug_handler() into exc_debug_kernel() Peter Zijlstra
2020-09-04 13:16 ` [tip: x86/entry] " tip-bot2 for Peter Zijlstra
2020-09-02 13:25 ` [PATCH 05/13] x86/debug: Remove handle_debug(.user) argument Peter Zijlstra
2020-09-04 13:16 ` [tip: x86/entry] " tip-bot2 for Peter Zijlstra
2020-09-02 13:25 ` [PATCH 06/13] x86/debug: Simplify #DB signal code Peter Zijlstra
2020-09-04 13:16 ` [tip: x86/entry] " tip-bot2 for Peter Zijlstra
2020-09-02 13:25 ` [PATCH 07/13] x86/debug: Move historical SYSENTER junk into exc_debug_kernel() Peter Zijlstra
2020-09-04 13:16 ` [tip: x86/entry] " tip-bot2 for Peter Zijlstra
2020-09-02 13:25 ` [PATCH 08/13] x86/debug: Move cond_local_irq_enable() block into exc_debug_user() Peter Zijlstra
2020-09-04 13:16 ` [tip: x86/entry] " tip-bot2 for Peter Zijlstra
2020-09-02 13:25 ` [PATCH 09/13] x86/debug: Remove the historical junk Peter Zijlstra
2020-09-04 13:16 ` [tip: x86/entry] " tip-bot2 for Peter Zijlstra
2020-09-02 13:25 ` [PATCH 10/13] x86/debug: Remove aout_dump_debugregs() Peter Zijlstra
2020-09-04 13:16 ` [tip: x86/entry] " tip-bot2 for Peter Zijlstra
2020-09-02 13:26 ` [PATCH 11/13] x86/debug: Simplify hw_breakpoint_handler() Peter Zijlstra
2020-09-04 13:16 ` [tip: x86/entry] " tip-bot2 for Peter Zijlstra
2020-09-02 13:26 ` [RFC][PATCH 12/13] x86/debug: Support negative polarity DR6 bits Peter Zijlstra
2020-09-04 13:16 ` tip-bot2 for Peter Zijlstra [this message]
2020-09-02 13:26 ` [RFC][PATCH 13/13] x86/debug: Change thread.debugreg6 to thread.virtual_dr6 Peter Zijlstra
2020-09-04 13:16 ` [tip: x86/entry] " tip-bot2 for Peter Zijlstra
2020-09-03 15:21 ` [PATCH 00/13] x86/debug: Untangle handle_debug() Daniel Thompson
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=159922536683.20229.14204270773798170350.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=Andrew.Cooper3@citrix.com \
--cc=daniel.thompson@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/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).