mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 10:40:03 +01:00
x86/vmx: Correct the long mode check in vmx_cpuid_intercept()
%cs.L may be set in a legacy mode segment, or clear in a compatibility mode
segment; it is not the correct way to check for long mode being active.
Both of these situations result in incorrect visibility of the SYSCALL feature
in CPUID, and by extension, incorrect behaviour in hvm_efer_valid().
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Reviewed-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Kevin Tian <kevin.tian@intel.com>
master commit: fcb618c025
master date: 2016-11-16 10:32:54 +0000
This commit is contained in:
1 parent
6af399dd18
commit
cebf5ac0b0
1 file changed
+1
-3
@@ -2066,7 +2066,6 @@ static void vmx_cpuid_intercept(
|
||||
unsigned int *ecx, unsigned int *edx)
|
||||
{
|
||||
unsigned int input = *eax;
|
||||
struct segment_register cs;
|
||||
struct vcpu *v = current;
|
||||
|
||||
hvm_cpuid(input, eax, ebx, ecx, edx);
|
||||
@@ -2075,8 +2074,7 @@ static void vmx_cpuid_intercept(
|
||||
{
|
||||
case 0x80000001:
|
||||
/* SYSCALL is visible iff running in long mode. */
|
||||
vmx_get_segment_register(v, x86_seg_cs, &cs);
|
||||
if ( cs.attr.fields.l )
|
||||
if ( hvm_long_mode_enabled(v) )
|
||||
*edx |= cpufeat_mask(X86_FEATURE_SYSCALL);
|
||||
else
|
||||
*edx &= ~(cpufeat_mask(X86_FEATURE_SYSCALL));
|
||||
|
||||