1d11625a98
521c6d4a-x86-don-t-allow-Dom0-access-to-the-MSI-address-range.patch 521c6d6c-x86-don-t-allow-Dom0-access-to-the-HT-address-range.patch 521c6e23-x86-Intel-add-support-for-Haswell-CPU-models.patch 521db25f-Fix-inactive-timer-list-corruption-on-second-S3-resume.patch 521e1156-x86-AVX-instruction-emulation-fixes.patch 521ef8d9-AMD-IOMMU-add-missing-checks.patch 52205a7d-hvmloader-smbios-Correctly-count-the-number-of-tables-written.patch 52205a90-public-hvm_xs_strings.h-Fix-ABI-regression-for-OEM-SMBios-strings.patch 52205e27-x86-xsave-initialization-improvements.patch 5226020f-xend-handle-extended-PCI-configuration-space-when-saving-state.patch 52260214-xend-fix-file-descriptor-leak-in-pci-utilities.patch 52285317-hvmloader-fix-SeaBIOS-interface.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=271
104 lines
3.6 KiB
Diff
104 lines
3.6 KiB
Diff
# Commit c6066e78f4a66005b0d5d86c6ade32e2ab78923a
|
|
# Date 2013-08-30 10:56:07 +0200
|
|
# Author Jan Beulich <jbeulich@suse.com>
|
|
# Committer Jan Beulich <jbeulich@suse.com>
|
|
x86/xsave: initialization improvements
|
|
|
|
- properly validate available feature set on APs
|
|
- also validate xsaveopt availability on APs
|
|
- properly indicate whether the initialization is on the BSP (we
|
|
shouldn't be using "cpu == 0" checks for this)
|
|
|
|
Signed-off-by: Jan Beulich <jbeulich@suse.com>
|
|
Acked-by: Keir Fraser <keir@xen.org>
|
|
|
|
--- 2013-08-30.orig/xen/arch/x86/cpu/common.c 2013-08-30 00:00:00.000000000 +0200
|
|
+++ 2013-08-30/xen/arch/x86/cpu/common.c 2013-09-09 11:24:05.000000000 +0200
|
|
@@ -304,7 +304,7 @@ void __cpuinit identify_cpu(struct cpuin
|
|
clear_bit(X86_FEATURE_XSAVE, boot_cpu_data.x86_capability);
|
|
|
|
if ( cpu_has_xsave )
|
|
- xstate_init();
|
|
+ xstate_init(c == &boot_cpu_data);
|
|
|
|
/*
|
|
* The vendor-specific functions might have changed features. Now
|
|
--- 2013-08-30.orig/xen/arch/x86/xstate.c 2013-09-09 11:21:56.000000000 +0200
|
|
+++ 2013-08-30/xen/arch/x86/xstate.c 2013-09-09 11:24:05.000000000 +0200
|
|
@@ -247,11 +247,10 @@ void xstate_free_save_area(struct vcpu *
|
|
}
|
|
|
|
/* Collect the information of processor's extended state */
|
|
-void xstate_init(void)
|
|
+void xstate_init(bool_t bsp)
|
|
{
|
|
- u32 eax, ebx, ecx, edx;
|
|
- int cpu = smp_processor_id();
|
|
- u32 min_size;
|
|
+ u32 eax, ebx, ecx, edx, min_size;
|
|
+ u64 feature_mask;
|
|
|
|
if ( boot_cpu_data.cpuid_level < XSTATE_CPUID )
|
|
return;
|
|
@@ -260,6 +259,7 @@ void xstate_init(void)
|
|
|
|
BUG_ON((eax & XSTATE_FP_SSE) != XSTATE_FP_SSE);
|
|
BUG_ON((eax & XSTATE_YMM) && !(eax & XSTATE_SSE));
|
|
+ feature_mask = (((u64)edx << 32) | eax) & XCNTXT_MASK;
|
|
|
|
/* FP/SSE, XSAVE.HEADER, YMM */
|
|
min_size = XSTATE_AREA_MIN_SIZE;
|
|
@@ -271,31 +271,33 @@ void xstate_init(void)
|
|
* Set CR4_OSXSAVE and run "cpuid" to get xsave_cntxt_size.
|
|
*/
|
|
set_in_cr4(X86_CR4_OSXSAVE);
|
|
- if ( !set_xcr0((((u64)edx << 32) | eax) & XCNTXT_MASK) )
|
|
+ if ( !set_xcr0(feature_mask) )
|
|
BUG();
|
|
cpuid_count(XSTATE_CPUID, 0, &eax, &ebx, &ecx, &edx);
|
|
|
|
- if ( cpu == 0 )
|
|
+ if ( bsp )
|
|
{
|
|
+ xfeature_mask = feature_mask;
|
|
/*
|
|
* xsave_cntxt_size is the max size required by enabled features.
|
|
* We know FP/SSE and YMM about eax, and nothing about edx at present.
|
|
*/
|
|
xsave_cntxt_size = ebx;
|
|
- xfeature_mask = eax + ((u64)edx << 32);
|
|
- xfeature_mask &= XCNTXT_MASK;
|
|
printk("%s: using cntxt_size: %#x and states: %#"PRIx64"\n",
|
|
__func__, xsave_cntxt_size, xfeature_mask);
|
|
-
|
|
- /* Check XSAVEOPT feature. */
|
|
- cpuid_count(XSTATE_CPUID, 1, &eax, &ebx, &ecx, &edx);
|
|
- cpu_has_xsaveopt = !!(eax & XSTATE_FEATURE_XSAVEOPT);
|
|
}
|
|
else
|
|
{
|
|
+ BUG_ON(xfeature_mask != feature_mask);
|
|
BUG_ON(xsave_cntxt_size != ebx);
|
|
- BUG_ON(xfeature_mask != (xfeature_mask & XCNTXT_MASK));
|
|
}
|
|
+
|
|
+ /* Check XSAVEOPT feature. */
|
|
+ cpuid_count(XSTATE_CPUID, 1, &eax, &ebx, &ecx, &edx);
|
|
+ if ( bsp )
|
|
+ cpu_has_xsaveopt = !!(eax & XSTATE_FEATURE_XSAVEOPT);
|
|
+ else
|
|
+ BUG_ON(!cpu_has_xsaveopt != !(eax & XSTATE_FEATURE_XSAVEOPT));
|
|
}
|
|
|
|
int handle_xsetbv(u32 index, u64 new_bv)
|
|
--- 2013-08-30.orig/xen/include/asm-x86/xstate.h 2013-07-09 20:57:12.000000000 +0200
|
|
+++ 2013-08-30/xen/include/asm-x86/xstate.h 2013-09-09 11:24:05.000000000 +0200
|
|
@@ -81,6 +81,6 @@ int __must_check handle_xsetbv(u32 index
|
|
/* extended state init and cleanup functions */
|
|
void xstate_free_save_area(struct vcpu *v);
|
|
int xstate_alloc_save_area(struct vcpu *v);
|
|
-void xstate_init(void);
|
|
+void xstate_init(bool_t bsp);
|
|
|
|
#endif /* __ASM_XSTATE_H */
|