From nobody Mon Apr 29 16:43:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1505143312731325.9242971317101; Mon, 11 Sep 2017 08:21:52 -0700 (PDT) Received: from localhost ([::1]:58388 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1drQX1-0003WS-Nw for importer@patchew.org; Mon, 11 Sep 2017 11:21:51 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48437) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1drQW6-00037O-BQ for qemu-devel@nongnu.org; Mon, 11 Sep 2017 11:20:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1drQW3-00065k-6e for qemu-devel@nongnu.org; Mon, 11 Sep 2017 11:20:54 -0400 Received: from szxga05-in.huawei.com ([45.249.212.191]:2264) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1drQW2-00060o-GC for qemu-devel@nongnu.org; Mon, 11 Sep 2017 11:20:51 -0400 Received: from 172.30.72.58 (EHLO DGGEMS413-HUB.china.huawei.com) ([172.30.72.58]) by dggrg05-dlp.huawei.com (MOS 4.4.6-GA FastPath queued) with ESMTP id DHC20116; Mon, 11 Sep 2017 23:20:39 +0800 (CST) Received: from localhost (10.177.18.62) by DGGEMS413-HUB.china.huawei.com (10.3.19.213) with Microsoft SMTP Server id 14.3.301.0; Mon, 11 Sep 2017 23:20:31 +0800 From: Gonglei To: Date: Mon, 11 Sep 2017 23:20:27 +0800 Message-ID: <1505143227-14324-1-git-send-email-arei.gonglei@huawei.com> X-Mailer: git-send-email 2.8.2.windows.1 MIME-Version: 1.0 X-Originating-IP: [10.177.18.62] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A090204.59B6A9C8.0034, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2014-11-16 11:51:01, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: b4983ca489bb341ee85cb1b669f45877 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] [fuzzy] X-Received-From: 45.249.212.191 Subject: [Qemu-devel] [PATCH] i386/cpu/hyperv: support over 64 vcpus for windows guests X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: weidong.huang@huawei.com, ehabkost@redhat.com, mst@redhat.com, mtosatti@redhat.com, Gonglei , vrozenfe@redhat.com, pbonzini@redhat.com, rth@twiddle.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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/referenc= e/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: Gonglei --- include/hw/i386/pc.h | 5 +++++ target/i386/cpu.c | 1 + target/i386/cpu.h | 2 ++ target/i386/kvm.c | 15 ++++++++++++++- 4 files changed, 22 insertions(+), 1 deletion(-) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 8226904..087d184 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -371,6 +371,11 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_= t *); =20 #define PC_COMPAT_2_10 \ HW_COMPAT_2_10 \ + {\ + .driver =3D TYPE_X86_CPU,\ + .property =3D "x-hv-max-vps",\ + .value =3D "0x40",\ + }, =20 #define PC_COMPAT_2_9 \ HW_COMPAT_2_9 \ diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 69676e1..2702485 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -4145,6 +4145,7 @@ static Property x86_cpu_properties[] =3D { false), DEFINE_PROP_BOOL("vmware-cpuid-freq", X86CPU, vmware_cpuid_freq, true), DEFINE_PROP_BOOL("tcg-cpuid", X86CPU, expose_tcg, true), + DEFINE_PROP_INT32("x-hv-max-vps", X86CPU, hv_max_vps, -1), DEFINE_PROP_END_OF_LIST() }; =20 diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 525d35d..5c726f3 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -1282,6 +1282,8 @@ struct X86CPU { int32_t socket_id; int32_t core_id; int32_t thread_id; + + int32_t hv_max_vps; }; =20 static inline X86CPU *x86_env_get_cpu(CPUX86State *env) diff --git a/target/i386/kvm.c b/target/i386/kvm.c index 6db7783..a898bef 100644 --- a/target/i386/kvm.c +++ b/target/i386/kvm.c @@ -751,7 +751,20 @@ int kvm_arch_init_vcpu(CPUState *cs) =20 c =3D &cpuid_data.entries[cpuid_i++]; c->function =3D HYPERV_CPUID_IMPLEMENT_LIMITS; - c->eax =3D 0x40; + + /* + * From "Requirements for Implementing the Microsoft + * Hypervisor Interface": + * https://docs.microsoft.com/en-us/virtualization/hyper-v-on-wind= ows/reference/tlfs + * + * "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." + */ + c->eax =3D cpu->hv_max_vps; c->ebx =3D 0x40; =20 kvm_base =3D KVM_CPUID_SIGNATURE_NEXT; --=20 1.8.3.1