From: Steven Rostedt <rostedt@goodmis.org>
To: tip-bot for Andy Lutomirski <tipbot@zytor.com>
Cc: luto@kernel.org, rostedt@goodmis.org, hpa@zytor.com,
linux-kernel@vger.kernel.org, mingo@kernel.org,
tglx@linutronix.de, bp@alien8.de,
linux-tip-commits@vger.kernel.org
Subject: Re: [tip:x86/urgent] x86/mm/64: Fix reboot interaction with CR4.PCIDE
Date: Mon, 9 Oct 2017 08:42:57 -0400 [thread overview]
Message-ID: <20171009084257.0a8ac06c@gandalf.local.home> (raw)
In-Reply-To: <tip-924c6b900cfdf376b07bccfd80e62b21914f8a5a@git.kernel.org>
On Mon, 9 Oct 2017 04:36:01 -0700
tip-bot for Andy Lutomirski <tipbot@zytor.com> wrote:
> Commit-ID: 924c6b900cfdf376b07bccfd80e62b21914f8a5a
> Gitweb: https://git.kernel.org/tip/924c6b900cfdf376b07bccfd80e62b21914f8a5a
> Author: Andy Lutomirski <luto@kernel.org>
> AuthorDate: Sun, 8 Oct 2017 21:53:05 -0700
> Committer: Thomas Gleixner <tglx@linutronix.de>
> CommitDate: Mon, 9 Oct 2017 13:31:04 +0200
>
> x86/mm/64: Fix reboot interaction with CR4.PCIDE
>
> Trying to reboot via real mode fails with PCID on: long mode cannot
> be exited while CR4.PCIDE is set. (No, I have no idea why, but the
> SDM and actual CPUs are in agreement here.) The result is a GPF and
> a hang instead of a reboot.
>
> I didn't catch this in testing because neither my computer nor my VM
> reboots this way. I can trigger it with reboot=bios, though.
>
> Fixes: 660da7c9228f ("x86/mm: Enable CR4.PCIDE on supported systems")
> Reported-and-tested-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Didn't someone somewhere say not to combine tags? Have them always be
separate. I noticed they were separate when Andy submitted it, but I'm
assuming that Thomas combined it.
-- Steve
> Signed-off-by: Andy Lutomirski <luto@kernel.org>
> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
> Cc: Borislav Petkov <bp@alien8.de>
> Link: https://lkml.kernel.org/r/f1e7d965998018450a7a70c2823873686a8b21c0.1507524746.git.luto@kernel.org
>
> ---
> arch/x86/kernel/reboot.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
> index 54180fa..add33f6 100644
> --- a/arch/x86/kernel/reboot.c
> +++ b/arch/x86/kernel/reboot.c
> @@ -105,6 +105,10 @@ void __noreturn machine_real_restart(unsigned int type)
> load_cr3(initial_page_table);
> #else
> write_cr3(real_mode_header->trampoline_pgd);
> +
> + /* Exiting long mode will fail if CR4.PCIDE is set. */
> + if (static_cpu_has(X86_FEATURE_PCID))
> + cr4_clear_bits(X86_CR4_PCIDE);
> #endif
>
> /* Jump to the identity-mapped low memory code */
prev parent reply other threads:[~2017-10-09 12:43 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-09 4:53 [PATCH] " Andy Lutomirski
2017-10-09 11:36 ` [tip:x86/urgent] " tip-bot for Andy Lutomirski
2017-10-09 12:42 ` Steven Rostedt [this message]
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=20171009084257.0a8ac06c@gandalf.local.home \
--to=rostedt@goodmis.org \
--cc=bp@alien8.de \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=luto@kernel.org \
--cc=mingo@kernel.org \
--cc=tglx@linutronix.de \
--cc=tipbot@zytor.com \
/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
all inboxes | Powered by JetHome®