lkml.org 
[lkml]   [2018]   [Mar]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL for 4.9 125/219] kvm/svm: Setup MCG_CAP on AMD properly
    Date
    From: Borislav Petkov <bp@suse.de>

    [ Upstream commit 74f169090b6f36b867c9df0454366dd9af6f62d1 ]

    MCG_CAP[63:9] bits are reserved on AMD. However, on an AMD guest, this
    MSR returns 0x100010a. More specifically, bit 24 is set, which is simply
    wrong. That bit is MCG_SER_P and is present only on Intel. Thus, clean
    up the reserved bits in order not to confuse guests.

    Signed-off-by: Borislav Petkov <bp@suse.de>
    Cc: Joerg Roedel <joro@8bytes.org>
    Cc: Paolo Bonzini <pbonzini@redhat.com>
    Cc: Radim Krčmář <rkrcmar@redhat.com>
    Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    ---
    arch/x86/kvm/svm.c | 7 +++++++
    1 file changed, 7 insertions(+)

    diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
    index be644afab1bb..68381824c565 100644
    --- a/arch/x86/kvm/svm.c
    +++ b/arch/x86/kvm/svm.c
    @@ -5448,6 +5448,12 @@ static inline void avic_post_state_restore(struct kvm_vcpu *vcpu)
    avic_handle_ldr_update(vcpu);
    }

    +static void svm_setup_mce(struct kvm_vcpu *vcpu)
    +{
    + /* [63:9] are reserved. */
    + vcpu->arch.mcg_cap &= 0x1ff;
    +}
    +
    static struct kvm_x86_ops svm_x86_ops __ro_after_init = {
    .cpu_has_kvm_support = has_svm,
    .disabled_by_bios = is_disabled,
    @@ -5563,6 +5569,7 @@ static struct kvm_x86_ops svm_x86_ops __ro_after_init = {
    .pmu_ops = &amd_pmu_ops,
    .deliver_posted_interrupt = svm_deliver_avic_intr,
    .update_pi_irte = svm_update_pi_irte,
    + .setup_mce = svm_setup_mce,
    };

    static int __init svm_init(void)
    --
    2.14.1
    \
     
     \ /
      Last update: 2018-03-03 23:35    [W:2.770 / U:0.292 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site