Commit 8e19e5ef authored by Ben Hutchings's avatar Ben Hutchings

Revert "KVM: x86: expose MSR_TSC_AUX to userspace"

This reverts commit bc48f6f5, which was
commit 9dbe6cf9 upstream.  It depends on
several other large commits to work, and without them causes a regression.

References: https://bugzilla.redhat.com/show_bug.cgi?id=1408333Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
Cc: Eric Wheeler <kvm@lists.ewheeler.net>
parent 688ddc50
...@@ -843,8 +843,7 @@ static u32 msrs_to_save[] = { ...@@ -843,8 +843,7 @@ static u32 msrs_to_save[] = {
#ifdef CONFIG_X86_64 #ifdef CONFIG_X86_64
MSR_CSTAR, MSR_KERNEL_GS_BASE, MSR_SYSCALL_MASK, MSR_LSTAR, MSR_CSTAR, MSR_KERNEL_GS_BASE, MSR_SYSCALL_MASK, MSR_LSTAR,
#endif #endif
MSR_IA32_TSC, MSR_IA32_CR_PAT, MSR_VM_HSAVE_PA, MSR_IA32_TSC, MSR_IA32_CR_PAT, MSR_VM_HSAVE_PA
MSR_TSC_AUX,
}; };
static unsigned num_msrs_to_save; static unsigned num_msrs_to_save;
...@@ -3882,20 +3881,6 @@ static void kvm_init_msr_list(void) ...@@ -3882,20 +3881,6 @@ static void kvm_init_msr_list(void)
for (i = j = KVM_SAVE_MSRS_BEGIN; i < ARRAY_SIZE(msrs_to_save); i++) { for (i = j = KVM_SAVE_MSRS_BEGIN; i < ARRAY_SIZE(msrs_to_save); i++) {
if (rdmsr_safe(msrs_to_save[i], &dummy[0], &dummy[1]) < 0) if (rdmsr_safe(msrs_to_save[i], &dummy[0], &dummy[1]) < 0)
continue; continue;
/*
* Even MSRs that are valid in the host may not be exposed
* to the guests in some cases.
*/
switch (msrs_to_save[i]) {
case MSR_TSC_AUX:
if (!kvm_x86_ops->rdtscp_supported())
continue;
break;
default:
break;
}
if (j < i) if (j < i)
msrs_to_save[j] = msrs_to_save[i]; msrs_to_save[j] = msrs_to_save[i];
j++; j++;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment