a11c33863f
5281fad4-numa-sched-leave-node-affinity-alone-if-not-in-auto-mode.patch 52820823-nested-SVM-adjust-guest-handling-of-structure-mappings.patch 52820863-VMX-don-t-crash-processing-d-debug-key.patch 5282492f-x86-eliminate-has_arch_mmios.patch 52864df2-credit-Update-other-parameters-when-setting-tslice_ms.patch 52864f30-fix-leaking-of-v-cpu_affinity_saved-on-domain-destruction.patch 5289d225-nested-VMX-don-t-ignore-mapping-errors.patch 528a0eb0-x86-consider-modules-when-cutting-off-memory.patch 528f606c-x86-hvm-reset-TSC-to-0-after-domain-resume-from-S3.patch 528f609c-x86-crash-disable-the-watchdog-NMIs-on-the-crashing-cpu.patch 52932418-x86-xsave-fix-nonlazy-state-handling.patch - Add missing requires to pciutils package for xend-tools - bnc#851749 - Xen service file does not call xend properly xend.service - bnc#851386 - VUL-0: xen: XSA-78: Insufficient TLB flushing in VT-d (iommu) code 528a0e5b-TLB-flushing-in-dma_pte_clear_one.patch - bnc#849667 - VUL-0: xen: XSA-74: Lock order reversal between page_alloc_lock and mm_rwlock CVE-2013-4553-xsa74.patch - bnc#849665 - VUL-0: CVE-2013-4551: xen: XSA-75: Host crash due to guest VMX instruction execution 52809208-nested-VMX-VMLANUCH-VMRESUME-emulation-must-check-permission-1st.patch - bnc#849668 - VUL-0: xen: XSA-76: Hypercalls exposed to privilege rings 1 and 2 of HVM guests OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=279
47 lines
1.4 KiB
Diff
47 lines
1.4 KiB
Diff
# Commit e47a90e6dca491c0ceea6ffa18055e7e32565e8e
|
|
# Date 2013-10-21 17:26:16 +0200
|
|
# Author Jan Beulich <jbeulich@suse.com>
|
|
# Committer Jan Beulich <jbeulich@suse.com>
|
|
x86/xsave: also save/restore XCR0 across suspend (ACPI S3)
|
|
|
|
Signed-off-by: Jan Beulich <jbeulich@suse.com>
|
|
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
|
|
Acked-by: Keir Fraser <keir@xen.org>
|
|
|
|
--- a/xen/arch/x86/acpi/suspend.c
|
|
+++ b/xen/arch/x86/acpi/suspend.c
|
|
@@ -13,12 +13,14 @@
|
|
#include <asm/hvm/hvm.h>
|
|
#include <asm/hvm/support.h>
|
|
#include <asm/i387.h>
|
|
+#include <asm/xstate.h>
|
|
#include <xen/hypercall.h>
|
|
|
|
static unsigned long saved_lstar, saved_cstar;
|
|
static unsigned long saved_sysenter_esp, saved_sysenter_eip;
|
|
static unsigned long saved_fs_base, saved_gs_base, saved_kernel_gs_base;
|
|
static uint16_t saved_segs[4];
|
|
+static uint64_t saved_xcr0;
|
|
|
|
void save_rest_processor_state(void)
|
|
{
|
|
@@ -38,6 +40,8 @@ void save_rest_processor_state(void)
|
|
rdmsrl(MSR_IA32_SYSENTER_ESP, saved_sysenter_esp);
|
|
rdmsrl(MSR_IA32_SYSENTER_EIP, saved_sysenter_eip);
|
|
}
|
|
+ if ( cpu_has_xsave )
|
|
+ saved_xcr0 = get_xcr0();
|
|
}
|
|
|
|
|
|
@@ -77,6 +81,9 @@ void restore_rest_processor_state(void)
|
|
do_set_segment_base(SEGBASE_GS_USER_SEL, saved_segs[3]);
|
|
}
|
|
|
|
+ if ( cpu_has_xsave && !set_xcr0(saved_xcr0) )
|
|
+ BUG();
|
|
+
|
|
/* Maybe load the debug registers. */
|
|
BUG_ON(is_hvm_vcpu(curr));
|
|
if ( !is_idle_vcpu(curr) && curr->arch.debugreg[7] )
|