Commit da1cc323 authored by Evgeny Yakovlev's avatar Evgeny Yakovlev Committed by Paolo Bonzini
Browse files

hyperv: set partition-wide MSRs only on first vcpu 



Hyper-V has a notion of partition-wide MSRs.  Those MSRs are read and
written as usual on each VCPU, however the hypervisor maintains a single
global value for all VCPUs.  Thus writing such an MSR from any single
VCPU affects the global value that is read by all other VCPUs.

This leads to an issue during VCPU hotplug: the zero-initialzied values
of those MSRs get synced into KVM and override the global values as has
already been set by the guest.

This change makes the partition-wide MSRs only be synchronized on the
first vcpu.

Signed-off-by: default avatarEvgeny Yakovlev <eyakovlev@virtuozzo.com>
Signed-off-by: default avatarRoman Kagan <rkagan@virtuozzo.com>
Message-Id: <20171122181418.14180-2-rkagan@virtuozzo.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent aff9e6e4

target/i386/cpu.h

+4 −1
Original line number Diff line number Diff line
@@ -1097,10 +1097,13 @@ typedef struct CPUX86State { 
    uint64_t async_pf_en_msr;

    uint64_t pv_eoi_en_msr;



    /* Partition-wide HV MSRs, will be updated only on the first vcpu */

    uint64_t msr_hv_hypercall;

    uint64_t msr_hv_guest_os_id;

    uint64_t msr_hv_vapic;

    uint64_t msr_hv_tsc;



    /* Per-VCPU HV MSRs */

    uint64_t msr_hv_vapic;

    uint64_t msr_hv_crash_params[HV_CRASH_PARAMS];

    uint64_t msr_hv_runtime;

    uint64_t msr_hv_synic_control;

target/i386/kvm.c

+15 −8
Original line number Diff line number Diff line
@@ -1678,19 +1678,26 @@ static int kvm_put_msrs(X86CPU *cpu, int level) 
            kvm_msr_entry_add(cpu, MSR_CORE_PERF_GLOBAL_CTRL,

                              env->msr_global_ctrl);

        }

        /*

         * Hyper-V partition-wide MSRs: to avoid clearing them on cpu hot-add,

         * only sync them to KVM on the first cpu

         */

        if (current_cpu == first_cpu) {

            if (has_msr_hv_hypercall) {

                kvm_msr_entry_add(cpu, HV_X64_MSR_GUEST_OS_ID,

                                  env->msr_hv_guest_os_id);

                kvm_msr_entry_add(cpu, HV_X64_MSR_HYPERCALL,

                                  env->msr_hv_hypercall);

            }

            if (cpu->hyperv_time) {

                kvm_msr_entry_add(cpu, HV_X64_MSR_REFERENCE_TSC,

                                  env->msr_hv_tsc);

            }

        }

        if (cpu->hyperv_vapic) {

            kvm_msr_entry_add(cpu, HV_X64_MSR_APIC_ASSIST_PAGE,

                              env->msr_hv_vapic);

        }

        if (cpu->hyperv_time) {

            kvm_msr_entry_add(cpu, HV_X64_MSR_REFERENCE_TSC, env->msr_hv_tsc);

        }

        if (has_msr_hv_crash) {

            int j;