diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2017-03-06 19:07:35 +0000 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2017-03-16 02:18:58 +0000 |
| commit | 8e19e5ef5b7704b34352a26591aece50abbbad9b (patch) | |
| tree | 266fd148712e3246221560a73bea2a835e242922 /arch | |
| parent | 688ddc50ce7300bf323ae75010ae039e796eea06 (diff) | |
Revert "KVM: x86: expose MSR_TSC_AUX to userspace"
This reverts commit bc48f6f5a8c6d628a1af649306eaf906493bb986, which was
commit 9dbe6cf941a6fe82933aef565e4095fb10f65023 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=1408333
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Cc: Eric Wheeler <kvm@lists.ewheeler.net>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kvm/x86.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 4408aee8236d..d0284b49317b 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -843,8 +843,7 @@ static u32 msrs_to_save[] = { #ifdef CONFIG_X86_64 MSR_CSTAR, MSR_KERNEL_GS_BASE, MSR_SYSCALL_MASK, MSR_LSTAR, #endif - MSR_IA32_TSC, MSR_IA32_CR_PAT, MSR_VM_HSAVE_PA, - MSR_TSC_AUX, + MSR_IA32_TSC, MSR_IA32_CR_PAT, MSR_VM_HSAVE_PA }; static unsigned num_msrs_to_save; @@ -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++) { if (rdmsr_safe(msrs_to_save[i], &dummy[0], &dummy[1]) < 0) 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) msrs_to_save[j] = msrs_to_save[i]; j++; |