Juergen Gross e8ac19
Patch-mainline: v5.0-rc1
Juergen Gross e8ac19
Git-commit: e87555e550cef4941579cd879759a7c0dee24e68
Juergen Gross e8ac19
References: git-fixes
Juergen Gross e8ac19
From: Vitaly Kuznetsov <vkuznets@redhat.com>
Juergen Gross e8ac19
Date: Wed, 19 Dec 2018 12:06:13 +0100
Juergen Gross e8ac19
Subject: [PATCH] KVM: x86: svm: report MSR_IA32_MCG_EXT_CTL as unsupported
Juergen Gross e8ac19
MIME-Version: 1.0
Juergen Gross e8ac19
Content-Type: text/plain; charset=UTF-8
Juergen Gross e8ac19
Content-Transfer-Encoding: 8bit
Juergen Gross e8ac19
Juergen Gross e8ac19
AMD doesn't seem to implement MSR_IA32_MCG_EXT_CTL and svm code in kvm
Juergen Gross e8ac19
knows nothing about it, however, this MSR is among emulated_msrs and
Juergen Gross e8ac19
thus returned with KVM_GET_MSR_INDEX_LIST. The consequent KVM_GET_MSRS,
Juergen Gross e8ac19
of course, fails.
Juergen Gross e8ac19
Juergen Gross e8ac19
Report the MSR as unsupported to not confuse userspace.
Juergen Gross e8ac19
Juergen Gross e8ac19
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Juergen Gross e8ac19
Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
Juergen Gross e8ac19
Signed-off-by: Juergen Gross <jgross@suse.com>
Juergen Gross e8ac19
---
Juergen Gross e8ac19
 arch/x86/kvm/svm.c | 7 +++++++
Juergen Gross e8ac19
 1 file changed, 7 insertions(+)
Juergen Gross e8ac19
Juergen Gross e8ac19
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
Juergen Gross e8ac19
index e4f18a305ef6..c4377f02a33b 100644
Juergen Gross e8ac19
--- a/arch/x86/kvm/svm.c
Juergen Gross e8ac19
+++ b/arch/x86/kvm/svm.c
Juergen Gross e8ac19
@@ -5840,6 +5840,13 @@ static bool svm_cpu_has_accelerated_tpr(void)
Juergen Gross e8ac19
 
Juergen Gross e8ac19
 static bool svm_has_emulated_msr(int index)
Juergen Gross e8ac19
 {
Juergen Gross e8ac19
+	switch (index) {
Juergen Gross e8ac19
+	case MSR_IA32_MCG_EXT_CTL:
Juergen Gross e8ac19
+		return false;
Juergen Gross e8ac19
+	default:
Juergen Gross e8ac19
+		break;
Juergen Gross e8ac19
+	}
Juergen Gross e8ac19
+
Juergen Gross e8ac19
 	return true;
Juergen Gross e8ac19
 }
Juergen Gross e8ac19
 
Juergen Gross e8ac19
-- 
Juergen Gross e8ac19
2.35.3
Juergen Gross e8ac19