73291eb01a
automatically update UEFI boot binary xen.spec - Upstream patches from Jan 51d5334e-x86-mm-Ensure-useful-progress-in-alloc_l2_table.patch 51dd155c-adjust-x86-EFI-build.patch 51e63d80-x86-cpuidle-Change-logging-for-unknown-APIC-IDs.patch 51e6540d-x86-don-t-use-destroy_xen_mappings-for-vunmap.patch 51e7963f-x86-time-Update-wallclock-in-shared-info-when-altering-domain-time-offset.patch 51ffd577-fix-off-by-one-mistakes-in-vm_alloc.patch 51ffd5fd-x86-refine-FPU-selector-handling-code-for-XSAVEOPT.patch 520114bb-Nested-VMX-Flush-TLBs-and-Caches-if-paging-mode-changed.patch 520a5504-VMX-add-boot-parameter-to-enable-disable-APIC-v-dynamically.patch 520a24f6-x86-AMD-Fix-nested-svm-crash-due-to-assertion-in-__virt_to_maddr.patch 520a2570-x86-AMD-Inject-GP-instead-of-UD-when-unable-to-map-vmcb.patch 520b4b60-VT-d-protect-against-bogus-information-coming-from-BIOS.patch 520b4bda-x86-MTRR-fix-range-check-in-mtrr_add_page.patch 520cb8b6-x86-time-fix-check-for-negative-time-in-__update_vcpu_system_time.patch 520d417d-xen-Add-stdbool.h-workaround-for-BSD.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=266
61 lines
2.3 KiB
Diff
61 lines
2.3 KiB
Diff
# Commit c58d9f2f4844c2ce8859a8d0f26a54cd058eb51f
|
|
# Date 2013-08-05 18:42:37 +0200
|
|
# Author Jan Beulich <jbeulich@suse.com>
|
|
# Committer Jan Beulich <jbeulich@suse.com>
|
|
x86: refine FPU selector handling code for XSAVEOPT
|
|
|
|
Some extra tweaks are necessary to deal with the situation of XSAVEOPT
|
|
not writing the FPU portion of the save image (due to it detecting that
|
|
the register state did not get modified since the last XRSTOR).
|
|
|
|
Signed-off-by: Jan Beulich <jbeulich@suse.com>
|
|
Tested-by: Ben Guthro <ben.guthro@gmail.com>
|
|
Acked-by: Keir Fraser <keir@xen.org>
|
|
|
|
--- a/xen/arch/x86/xstate.c
|
|
+++ b/xen/arch/x86/xstate.c
|
|
@@ -71,10 +71,28 @@ void xsave(struct vcpu *v, uint64_t mask
|
|
|
|
if ( word_size <= 0 || !is_pv_32bit_vcpu(v) )
|
|
{
|
|
+ typeof(ptr->fpu_sse.fip.sel) fcs = ptr->fpu_sse.fip.sel;
|
|
+ typeof(ptr->fpu_sse.fdp.sel) fds = ptr->fpu_sse.fdp.sel;
|
|
+
|
|
if ( cpu_has_xsaveopt )
|
|
+ {
|
|
+ /*
|
|
+ * xsaveopt may not write the FPU portion even when the respective
|
|
+ * mask bit is set. For the check further down to work we hence
|
|
+ * need to put the save image back into the state that it was in
|
|
+ * right after the previous xsaveopt.
|
|
+ */
|
|
+ if ( word_size > 0 &&
|
|
+ (ptr->fpu_sse.x[FPU_WORD_SIZE_OFFSET] == 4 ||
|
|
+ ptr->fpu_sse.x[FPU_WORD_SIZE_OFFSET] == 2) )
|
|
+ {
|
|
+ ptr->fpu_sse.fip.sel = 0;
|
|
+ ptr->fpu_sse.fdp.sel = 0;
|
|
+ }
|
|
asm volatile ( ".byte 0x48,0x0f,0xae,0x37"
|
|
: "=m" (*ptr)
|
|
: "a" (lmask), "d" (hmask), "D" (ptr) );
|
|
+ }
|
|
else
|
|
asm volatile ( ".byte 0x48,0x0f,0xae,0x27"
|
|
: "=m" (*ptr)
|
|
@@ -87,7 +105,14 @@ void xsave(struct vcpu *v, uint64_t mask
|
|
*/
|
|
(!(ptr->fpu_sse.fsw & 0x0080) &&
|
|
boot_cpu_data.x86_vendor == X86_VENDOR_AMD) )
|
|
+ {
|
|
+ if ( cpu_has_xsaveopt && word_size > 0 )
|
|
+ {
|
|
+ ptr->fpu_sse.fip.sel = fcs;
|
|
+ ptr->fpu_sse.fdp.sel = fds;
|
|
+ }
|
|
return;
|
|
+ }
|
|
|
|
if ( word_size > 0 &&
|
|
!((ptr->fpu_sse.fip.addr | ptr->fpu_sse.fdp.addr) >> 32) )
|