62 lines
2.1 KiB
Diff
62 lines
2.1 KiB
Diff
|
# HG changeset patch
|
||
|
|
# User Shan Haitao <haitao.shan@intel.com>
|
||
|
|
# Date 1316300518 -3600
|
||
|
|
# Node ID b78235de5c6407023759f9bbf723dd83887fedf0
|
||
|
|
# Parent c944e82bb092925f31403a129087e9d40e0fa06a
|
||
|
|
Fix PV CPUID virtualization of XSave
|
||
|
|
|
||
|
|
The patch will fix XSave CPUID virtualization for PV guests. The XSave
|
||
|
|
area size returned by CPUID leaf D is changed dynamically depending on
|
||
|
|
the XCR0. Tools/libxc only assigns a static value. The fix will adjust
|
||
|
|
xsave area size during runtime.
|
||
|
|
|
||
|
|
Note: This fix is already in HVM cpuid virtualization. And Dom0 is not
|
||
|
|
affected, either.
|
||
|
|
|
||
|
|
Signed-off-by: Shan Haitao <haitao.shan@intel.com>
|
||
|
|
|
||
|
|
--- a/xen/arch/x86/hvm/hvm.c
|
||
|
|
+++ b/xen/arch/x86/hvm/hvm.c
|
||
|
|
@@ -2310,7 +2310,7 @@ void hvm_cpuid(unsigned int input, unsig
|
||
|
|
{
|
||
|
|
/* reset EBX to default value first */
|
||
|
|
*ebx = XSAVE_AREA_MIN_SIZE;
|
||
|
|
- for ( sub_leaf = 2; sub_leaf < 64; sub_leaf++ )
|
||
|
|
+ for ( sub_leaf = 2; sub_leaf < 63; sub_leaf++ )
|
||
|
|
{
|
||
|
|
if ( !(v->arch.xcr0 & (1ULL << sub_leaf)) )
|
||
|
|
continue;
|
||
|
|
--- a/xen/arch/x86/traps.c
|
||
|
|
+++ b/xen/arch/x86/traps.c
|
||
|
|
@@ -768,6 +768,30 @@ static void pv_cpuid(struct cpu_user_reg
|
||
|
|
{
|
||
|
|
if ( !cpuid_hypervisor_leaves(a, c, &a, &b, &c, &d) )
|
||
|
|
domain_cpuid(current->domain, a, c, &a, &b, &c, &d);
|
||
|
|
+
|
||
|
|
+ switch ( a )
|
||
|
|
+ {
|
||
|
|
+ case 0xd:
|
||
|
|
+ {
|
||
|
|
+ unsigned int sub_leaf, _eax, _ebx, _ecx, _edx;
|
||
|
|
+ /* EBX value of main leaf 0 depends on enabled xsave features */
|
||
|
|
+ if ( c == 0 && current->arch.xcr0 )
|
||
|
|
+ {
|
||
|
|
+ /* reset EBX to default value first */
|
||
|
|
+ b = XSAVE_AREA_MIN_SIZE;
|
||
|
|
+ for ( sub_leaf = 2; sub_leaf < 63; sub_leaf++ )
|
||
|
|
+ {
|
||
|
|
+ if ( !(current->arch.xcr0 & (1ULL << sub_leaf)) )
|
||
|
|
+ continue;
|
||
|
|
+ domain_cpuid(current->domain, a, c, &_eax, &_ebx, &_ecx,
|
||
|
|
+ &_edx);
|
||
|
|
+ if ( (_eax + _ebx) > b )
|
||
|
|
+ b = _eax + _ebx;
|
||
|
|
+ }
|
||
|
|
+ }
|
||
|
|
+ break;
|
||
|
|
+ }
|
||
|
|
+ }
|
||
|
|
goto out;
|
||
|
|
}
|
||
|
|
|