]> git.proxmox.com Git - pve-kernel.git/blob - patches/kernel/0008-kvm-x86-Add-AMD-s-EX_CFG-to-the-list-of-ignored-MSRs.patch
fix #2008: kvm: x86: Add AMD's EX_CFG to the list of ignored MSRs
[pve-kernel.git] / patches / kernel / 0008-kvm-x86-Add-AMD-s-EX_CFG-to-the-list-of-ignored-MSRs.patch
1 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2 From: Eduardo Habkost <ehabkost@redhat.com>
3 Date: Mon, 17 Dec 2018 22:34:18 -0200
4 Subject: [PATCH] kvm: x86: Add AMD's EX_CFG to the list of ignored MSRs
5
6 Some guests OSes (including Windows 10) write to MSR 0xc001102c
7 on some cases (possibly while trying to apply a CPU errata).
8 Make KVM ignore reads and writes to that MSR, so the guest won't
9 crash.
10
11 The MSR is documented as "Execution Unit Configuration (EX_CFG)",
12 at AMD's "BIOS and Kernel Developer's Guide (BKDG) for AMD Family
13 15h Models 00h-0Fh Processors".
14
15 Cc: stable@vger.kernel.org
16 Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
17 Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
18 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
19 ---
20 arch/x86/include/asm/msr-index.h | 1 +
21 arch/x86/kvm/x86.c | 2 ++
22 2 files changed, 3 insertions(+)
23
24 diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h
25 index c8f73efb4ece..9e39cc8bd989 100644
26 --- a/arch/x86/include/asm/msr-index.h
27 +++ b/arch/x86/include/asm/msr-index.h
28 @@ -390,6 +390,7 @@
29 #define MSR_F15H_NB_PERF_CTR 0xc0010241
30 #define MSR_F15H_PTSC 0xc0010280
31 #define MSR_F15H_IC_CFG 0xc0011021
32 +#define MSR_F15H_EX_CFG 0xc001102c
33
34 /* Fam 10h MSRs */
35 #define MSR_FAM10H_MMIO_CONF_BASE 0xc0010058
36 diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
37 index 477563e7ccbd..f049ecfac7bb 100644
38 --- a/arch/x86/kvm/x86.c
39 +++ b/arch/x86/kvm/x86.c
40 @@ -2426,6 +2426,7 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
41 case MSR_AMD64_PATCH_LOADER:
42 case MSR_AMD64_BU_CFG2:
43 case MSR_AMD64_DC_CFG:
44 + case MSR_F15H_EX_CFG:
45 break;
46
47 case MSR_IA32_UCODE_REV:
48 @@ -2721,6 +2722,7 @@ int kvm_get_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
49 case MSR_AMD64_BU_CFG2:
50 case MSR_IA32_PERF_CTL:
51 case MSR_AMD64_DC_CFG:
52 + case MSR_F15H_EX_CFG:
53 msr_info->data = 0;
54 break;
55 case MSR_F15H_PERF_CTL0 ... MSR_F15H_PERF_CTR5: