Commit 6c69dfb6 authored by Gonglei's avatar Gonglei Committed by Paolo Bonzini
Browse files

i386/cpu/hyperv: support over 64 vcpus for windows guests 

Starting with Windows Server 2012 and Windows 8, if
CPUID.40000005.EAX contains a value of -1, Windows assumes specific
limit to the number of VPs. In this case, Windows Server 2012
guest VMs may use more than 64 VPs, up to the maximum supported
number of processors applicable to the specific Windows
version being used.

https://docs.microsoft.com/en-us/virtualization/hyper-v-on-windows/reference/tlfs



For compatibility, Let's introduce a new property for X86CPU,
named "x-hv-max-vps" as Eduardo's suggestion, and set it
to 0x40 before machine 2.10.

(The "x-" prefix indicates that the property is not supposed to
be a stable user interface.)

Signed-off-by: default avatarGonglei <arei.gonglei@huawei.com>
Message-Id: <1505143227-14324-1-git-send-email-arei.gonglei@huawei.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 05cb8ed5

include/hw/i386/pc.h

+5 −0
Original line number Diff line number Diff line
@@ -371,6 +371,11 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *); 


#define PC_COMPAT_2_10 \

    HW_COMPAT_2_10 \

    {\

        .driver   = TYPE_X86_CPU,\

        .property = "x-hv-max-vps",\

        .value    = "0x40",\

    },



#define PC_COMPAT_2_9 \

    HW_COMPAT_2_9 \

target/i386/cpu.c

+14 −0
Original line number Diff line number Diff line
@@ -4145,6 +4145,20 @@ static Property x86_cpu_properties[] = { 
                     false),

    DEFINE_PROP_BOOL("vmware-cpuid-freq", X86CPU, vmware_cpuid_freq, true),

    DEFINE_PROP_BOOL("tcg-cpuid", X86CPU, expose_tcg, true),



    /*

     * From "Requirements for Implementing the Microsoft

     * Hypervisor Interface":

     * https://docs.microsoft.com/en-us/virtualization/hyper-v-on-windows/reference/tlfs

     *

     * "Starting with Windows Server 2012 and Windows 8, if

     * CPUID.40000005.EAX contains a value of -1, Windows assumes that

     * the hypervisor imposes no specific limit to the number of VPs.

     * In this case, Windows Server 2012 guest VMs may use more than

     * 64 VPs, up to the maximum supported number of processors applicable

     * to the specific Windows version being used."

     */

    DEFINE_PROP_INT32("x-hv-max-vps", X86CPU, hv_max_vps, -1),

    DEFINE_PROP_END_OF_LIST()

};

target/i386/cpu.h

+2 −0
Original line number Diff line number Diff line
@@ -1282,6 +1282,8 @@ struct X86CPU { 
    int32_t socket_id;

    int32_t core_id;

    int32_t thread_id;



    int32_t hv_max_vps;

};



static inline X86CPU *x86_env_get_cpu(CPUX86State *env)

target/i386/kvm.c

+2 −1
Original line number Diff line number Diff line
@@ -786,7 +786,8 @@ int kvm_arch_init_vcpu(CPUState *cs) 


        c = &cpuid_data.entries[cpuid_i++];

        c->function = HYPERV_CPUID_IMPLEMENT_LIMITS;

        c->eax = 0x40;



        c->eax = cpu->hv_max_vps;

        c->ebx = 0x40;



        kvm_base = KVM_CPUID_SIGNATURE_NEXT;