diff mbox

KVM: x86: Add MSR_AMD64_DC_CFG to the list of ignored MSRs

Message ID 20170406132220.17178-1-lprosek@redhat.com (mailing list archive)
State New, archived
Headers show

Commit Message

Ladi Prosek April 6, 2017, 1:22 p.m. UTC
Hyper-V writes 0x800000000000 to MSR_AMD64_DC_CFG when running on AMD CPUs
as recommended in erratum 383, analogous to our svm_init_erratum_383.

By ignoring the MSR, this patch enables running Hyper-V in L1 on AMD.

Signed-off-by: Ladi Prosek <lprosek@redhat.com>
---
 arch/x86/kvm/x86.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

David Hildenbrand April 6, 2017, 2:11 p.m. UTC | #1
On 06.04.2017 15:22, Ladi Prosek wrote:
> Hyper-V writes 0x800000000000 to MSR_AMD64_DC_CFG when running on AMD CPUs
> as recommended in erratum 383, analogous to our svm_init_erratum_383.
> 
> By ignoring the MSR, this patch enables running Hyper-V in L1 on AMD.
> 
> Signed-off-by: Ladi Prosek <lprosek@redhat.com>
> ---
>  arch/x86/kvm/x86.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
> index ccbd45e..44814b5 100644
> --- a/arch/x86/kvm/x86.c
> +++ b/arch/x86/kvm/x86.c
> @@ -2155,6 +2155,7 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
>  	case MSR_VM_HSAVE_PA:
>  	case MSR_AMD64_PATCH_LOADER:
>  	case MSR_AMD64_BU_CFG2:
> +	case MSR_AMD64_DC_CFG:
>  		break;
>  
>  	case MSR_EFER:
> @@ -2417,6 +2418,7 @@ int kvm_get_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
>  	case MSR_FAM10H_MMIO_CONF_BASE:
>  	case MSR_AMD64_BU_CFG2:
>  	case MSR_IA32_PERF_CTL:
> +	case MSR_AMD64_DC_CFG:
>  		msr_info->data = 0;
>  		break;
>  	case MSR_K7_EVNTSEL0 ... MSR_K7_EVNTSEL3:
> 

Looks good to me!
Radim Krčmář April 12, 2017, 7:16 p.m. UTC | #2
2017-04-06 15:22+0200, Ladi Prosek:
> Hyper-V writes 0x800000000000 to MSR_AMD64_DC_CFG when running on AMD CPUs
> as recommended in erratum 383, analogous to our svm_init_erratum_383.
> 
> By ignoring the MSR, this patch enables running Hyper-V in L1 on AMD.
> 
> Signed-off-by: Ladi Prosek <lprosek@redhat.com>
> ---

Dirty, but I don't see a reason to overengineer this ...

Applied to kvm/queue, thanks.

> diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
> @@ -2417,6 +2418,7 @@ int kvm_get_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
>  	case MSR_FAM10H_MMIO_CONF_BASE:
>  	case MSR_AMD64_BU_CFG2:
>  	case MSR_IA32_PERF_CTL:
> +	case MSR_AMD64_DC_CFG:

This will change L1 KVM's behavior to set erratum_383_found, but L0 will
kill it anyway after hitting the errata in L2.
diff mbox

Patch

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index ccbd45e..44814b5 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -2155,6 +2155,7 @@  int kvm_set_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
 	case MSR_VM_HSAVE_PA:
 	case MSR_AMD64_PATCH_LOADER:
 	case MSR_AMD64_BU_CFG2:
+	case MSR_AMD64_DC_CFG:
 		break;
 
 	case MSR_EFER:
@@ -2417,6 +2418,7 @@  int kvm_get_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
 	case MSR_FAM10H_MMIO_CONF_BASE:
 	case MSR_AMD64_BU_CFG2:
 	case MSR_IA32_PERF_CTL:
+	case MSR_AMD64_DC_CFG:
 		msr_info->data = 0;
 		break;
 	case MSR_K7_EVNTSEL0 ... MSR_K7_EVNTSEL3: