]> git.itanic.dy.fi Git - linux-stable/commit
x86/mm/64: Fix reboot interaction with CR4.PCIDE
authorAndy Lutomirski <luto@kernel.org>
Mon, 9 Oct 2017 04:53:05 +0000 (21:53 -0700)
committerBen Hutchings <ben@decadent.org.uk>
Tue, 9 Jan 2018 00:35:13 +0000 (00:35 +0000)
commit7ebf71f82595bc72f9308d7bb193367cd6534f25
treed4f3b668e0d7053ee0b8859be17cb68601c1de0c
parent7e031825d38f43a6c2a5b1010c2c087e57bfc853
x86/mm/64: Fix reboot interaction with CR4.PCIDE

commit 924c6b900cfdf376b07bccfd80e62b21914f8a5a upstream.

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>
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
Cc: Hugh Dickins <hughd@google.com>
[bwh: Backported to 3.16: use clear_in_cr4()]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
arch/x86/kernel/reboot.c