Commit 1a7bbda5 authored Oct 10, 2012 by Konrad Rzeszutek Wilk

xen/bootup: allow {read|write}_cr8 pvops call.



We actually do not do anything about it. Just return a default
value of zero and if the kernel tries to write anything but 0
we BUG_ON.

This fixes the case when an user tries to suspend the machine
and it blows up in save_processor_state b/c 'read_cr8' is set
to NULL and we get:

kernel BUG at /home/konrad/ssd/linux/arch/x86/include/asm/paravirt.h:100!
invalid opcode: 0000 [#1] SMP
Pid: 2687, comm: init.late Tainted: G           O 3.6.0upstream-00002-gac264ac-dirty #4 Bochs Bochs
RIP: e030:[<ffffffff814d5f42>]  [<ffffffff814d5f42>] save_processor_state+0x212/0x270

.. snip..
Call Trace:
 [<ffffffff810733bf>] do_suspend_lowlevel+0xf/0xac
 [<ffffffff8107330c>] ? x86_acpi_suspend_lowlevel+0x10c/0x150
 [<ffffffff81342ee2>] acpi_suspend_enter+0x57/0xd5

CC: stable@vger.kernel.org
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

parent cd0608e7

arch/x86/xen/enlighten.c

+15 −1

Original line number	Diff line number	Diff line
		@@ -987,7 +987,16 @@ static void xen_write_cr4(unsigned long cr4)

		native_write_cr4(cr4);
		}

		#ifdef CONFIG_X86_64
		static inline unsigned long xen_read_cr8(void)
		{
		return 0;
		}
		static inline void xen_write_cr8(unsigned long val)
		{
		BUG_ON(val);
		}
		#endif
		static int xen_write_msr_safe(unsigned int msr, unsigned low, unsigned high)
		{
		int ret;
		@@ -1156,6 +1165,11 @@ static const struct pv_cpu_ops xen_cpu_ops __initconst = {
		.read_cr4_safe = native_read_cr4_safe,
		.write_cr4 = xen_write_cr4,

		#ifdef CONFIG_X86_64
		.read_cr8 = xen_read_cr8,
		.write_cr8 = xen_write_cr8,
		#endif

		.wbinvd = native_wbinvd,

		.read_msr = native_read_msr_safe,

Admin message