From nobody Sat May 18 23:14:51 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1608209590; cv=none; d=zohomail.com; s=zohoarc; b=WmdIuYWV35mLTW1IXkAbwAY9ZOj6QIB7CqS5PTrDTJ3ezAbH0wj7W3cotsI0+V+DRFa8zYpDIydiNZY2k1PPE8ldfmobQCWJE9J8l77SMjLnY6ltJs2JF8KH5xNhSJjDcEsAnhfSIJwbeR5LdD9HOGnTqdv90QTuS4hLiUEmh7E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608209590; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=wt4fNRO2ON9GlunoHmHt/Bx+t6xVXzutK0kdaZ0ry7E=; b=Cchx9/zQCiw0XdVa8GZKrJ/DF0JksobXy4XPQaV7iV09wabAhFuTyhm8EibHvmANrJT3XSbb0IuBTghTwwU2epXI8wmM8ZYt9KEX1wbt5S0ON7ZK/FEN8XCUzrSpUAXdEMTZZldMhX5SYdGHZbuClQ60Q2p/qx6vgASI68mKu2Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1608209590212385.50978382259916; Thu, 17 Dec 2020 04:53:10 -0800 (PST) Received: from localhost ([::1]:48844 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kpsmL-0003AV-7x for importer@patchew.org; Thu, 17 Dec 2020 07:53:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60698) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kpsjW-0008KT-Ol for qemu-devel@nongnu.org; Thu, 17 Dec 2020 07:50:15 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:33498) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kpsjT-0005ep-Ks for qemu-devel@nongnu.org; Thu, 17 Dec 2020 07:50:14 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-555-OBvmLqi0OmSVKwzBBS326Q-1; Thu, 17 Dec 2020 07:50:09 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9D565107ACE6 for ; Thu, 17 Dec 2020 12:50:08 +0000 (UTC) Received: from vitty.brq.redhat.com (ovpn-116-238.ams2.redhat.com [10.36.116.238]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3346D5D9C0; Thu, 17 Dec 2020 12:50:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1608209411; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wt4fNRO2ON9GlunoHmHt/Bx+t6xVXzutK0kdaZ0ry7E=; b=SCqgxmjAnwcK28tvEFLPL9/t0RnEU0tSTkefK8PhjcHsDoURfQUIgWmMcjKvDbXKUQ361n XTVWOpuMFrIV9dpXDipCKDvsllWu5vBwggjnqtXCgYmDc32BKXOG7x5OSVp/YJDrqq6cwQ Skr7aHa4EnpUmPtb620zX6Nh4DDjOUQ= X-MC-Unique: OBvmLqi0OmSVKwzBBS326Q-1 From: Vitaly Kuznetsov To: qemu-devel@nongnu.org Subject: [PATCH v2 1/2] i386: introduce kvm_hv_evmcs_available() Date: Thu, 17 Dec 2020 13:49:58 +0100 Message-Id: <20201217124959.262639-2-vkuznets@redhat.com> In-Reply-To: <20201217124959.262639-1-vkuznets@redhat.com> References: <20201217124959.262639-1-vkuznets@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=vkuznets@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=vkuznets@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Marcelo Tosatti , Eduardo Habkost Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Enlightened VMCS feature is hardware specific, it is only supported on Intel CPUs. Introduce a simple kvm_hv_evmcs_available() helper, it will be used to filter out 'hv_evmcs' when 'hyperv=3Don' option is added to X86MachineClass. Signed-off-by: Vitaly Kuznetsov --- target/i386/kvm-stub.c | 5 +++++ target/i386/kvm.c | 8 ++++++++ target/i386/kvm_i386.h | 1 + 3 files changed, 14 insertions(+) diff --git a/target/i386/kvm-stub.c b/target/i386/kvm-stub.c index 92f49121b8fa..0a163ae207c5 100644 --- a/target/i386/kvm-stub.c +++ b/target/i386/kvm-stub.c @@ -39,3 +39,8 @@ bool kvm_hv_vpindex_settable(void) { return false; } + +bool kvm_hv_evmcs_available(void) +{ + return false; +} diff --git a/target/i386/kvm.c b/target/i386/kvm.c index bcfa4b03e077..96395d499729 100644 --- a/target/i386/kvm.c +++ b/target/i386/kvm.c @@ -95,6 +95,7 @@ static bool has_msr_hv_crash; static bool has_msr_hv_reset; static bool has_msr_hv_vpindex; static bool hv_vpindex_settable; +static bool hv_evmcs_available; static bool has_msr_hv_runtime; static bool has_msr_hv_synic; static bool has_msr_hv_stimer; @@ -192,6 +193,11 @@ bool kvm_hv_vpindex_settable(void) return hv_vpindex_settable; } =20 +bool kvm_hv_evmcs_available(void) +{ + return hv_evmcs_available; +} + static int kvm_get_tsc(CPUState *cs) { X86CPU *cpu =3D X86_CPU(cs); @@ -2124,6 +2130,8 @@ int kvm_arch_init(MachineState *ms, KVMState *s) has_pit_state2 =3D kvm_check_extension(s, KVM_CAP_PIT_STATE2); =20 hv_vpindex_settable =3D kvm_check_extension(s, KVM_CAP_HYPERV_VP_INDEX= ); + hv_evmcs_available =3D + kvm_check_extension(s, KVM_CAP_HYPERV_ENLIGHTENED_VMCS); =20 has_exception_payload =3D kvm_check_extension(s, KVM_CAP_EXCEPTION_PAY= LOAD); if (has_exception_payload) { diff --git a/target/i386/kvm_i386.h b/target/i386/kvm_i386.h index dc725083891c..08968cfb33f1 100644 --- a/target/i386/kvm_i386.h +++ b/target/i386/kvm_i386.h @@ -47,6 +47,7 @@ bool kvm_has_x2apic_api(void); bool kvm_has_waitpkg(void); =20 bool kvm_hv_vpindex_settable(void); +bool kvm_hv_evmcs_available(void); =20 uint64_t kvm_swizzle_msi_ext_dest_id(uint64_t address); =20 --=20 2.29.2 From nobody Sat May 18 23:14:51 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1608209568; cv=none; d=zohomail.com; s=zohoarc; b=DZgpndM6ghJSu/BeNTuO46lg0QndN7+kwGhiI3JTmSC3Co0LUe7T/TDUU33J7Mjik/ZJ00vdh01NzxNz4emCutqfWy1jqkz6Zuv4saq+ABFyUEVJ8s8cf40Z+oSNpPwHXAKTTxnvURZuVWXiqPgFFefj+As7phZ4Ts0uW0Y71NE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608209568; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=VaoFFn4EZX5K6u1mTrw18nR7Kxg/hrIggBqDFeL2iY0=; b=Lg2EMzf2f4ETP12BlCvtUcdk1DgThzjjxBIqBLG/p4Vy9W79yZkBK9OtEpkcDW+yni6diA2/GnQ9BeFXV7gV84GfIdyNbY4Bvhhvc0XK39CxZWfQXHkmkocdU59XhTmSHlaD4xP0b5qJQCGqMrAeM5Ag1kjGp8wZfN4j1DAKL7A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1608209568985534.7837746896145; Thu, 17 Dec 2020 04:52:48 -0800 (PST) Received: from localhost ([::1]:48068 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kpslz-0002qy-Vq for importer@patchew.org; Thu, 17 Dec 2020 07:52:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60724) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kpsja-0008Of-Hu for qemu-devel@nongnu.org; Thu, 17 Dec 2020 07:50:18 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:48003) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kpsjY-0005gJ-Jv for qemu-devel@nongnu.org; Thu, 17 Dec 2020 07:50:18 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-57-HgpdCGGvP1KhBLGeJ31NQA-1; Thu, 17 Dec 2020 07:50:14 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 655A7107ACE3 for ; Thu, 17 Dec 2020 12:50:13 +0000 (UTC) Received: from vitty.brq.redhat.com (ovpn-116-238.ams2.redhat.com [10.36.116.238]) by smtp.corp.redhat.com (Postfix) with ESMTP id 097745D9C0; Thu, 17 Dec 2020 12:50:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1608209416; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VaoFFn4EZX5K6u1mTrw18nR7Kxg/hrIggBqDFeL2iY0=; b=ifT9FyGcA1rY9+wiC21DJ73EUDxiGJsbKxScmIaF4BcrnQ+aLjp7Nu3226cDEGctYSuAj+ eGDcbznksvCloeFj4Z0tKbqTnJe7eTXDCNAElQh48tZ2x5fl4ysNmp2J58PeWkHqd4YUCa cwkhUllghTJluz3Rvd1ozb45WewADoo= X-MC-Unique: HgpdCGGvP1KhBLGeJ31NQA-1 From: Vitaly Kuznetsov To: qemu-devel@nongnu.org Subject: [PATCH v2 2/2] i386: provide simple 'hyperv=on' option to x86 machine types Date: Thu, 17 Dec 2020 13:49:59 +0100 Message-Id: <20201217124959.262639-3-vkuznets@redhat.com> In-Reply-To: <20201217124959.262639-1-vkuznets@redhat.com> References: <20201217124959.262639-1-vkuznets@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=vkuznets@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=vkuznets@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Marcelo Tosatti , Eduardo Habkost Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Enabling Hyper-V emulation for a Windows VM is a tiring experience as it requires listing all currently supported enlightenments ("hv_*" CPU features) explicitly. We do have a 'hv_passthrough' mode enabling everything but it can't be used in production as it prevents migration. Introduce a simple 'hyperv=3Don' option for all x86 machine types enabling all currently supported Hyper-V enlightenments. Later, when new enlightenments get implemented, we will be adding them to newer machine types only (by disabling them for legacy machine types) thus preserving migration. Signed-off-by: Vitaly Kuznetsov --- docs/hyperv.txt | 8 ++++++++ hw/i386/x86.c | 42 ++++++++++++++++++++++++++++++++++++++++++ include/hw/i386/x86.h | 7 +++++++ 3 files changed, 57 insertions(+) diff --git a/docs/hyperv.txt b/docs/hyperv.txt index 5df00da54fc4..1a76a07f8417 100644 --- a/docs/hyperv.txt +++ b/docs/hyperv.txt @@ -29,6 +29,14 @@ When any set of the Hyper-V enlightenments is enabled, Q= EMU changes hypervisor identification (CPUID 0x40000000..0x4000000A) to Hyper-V. KVM identificati= on and features are kept in leaves 0x40000100..0x40000101. =20 +Hyper-V enlightenments can be enabled in bulk by specifying 'hyperv=3Don' = to an +x86 machine type: + + qemu-system-x86_64 -machine q35,accel=3Dkvm,kernel-irqchip=3Dsplit,hyper= v=3Don ... + +Note, new enlightenments are only added to the latest (in-develompent) mac= hine +type, older machine types keep the list of the supported features intact to +safeguard migration. =20 3. Existing enlightenments =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D diff --git a/hw/i386/x86.c b/hw/i386/x86.c index 49e1d419b2ce..7a8e0313aedb 100644 --- a/hw/i386/x86.c +++ b/hw/i386/x86.c @@ -418,6 +418,18 @@ void x86_cpu_pre_plug(HotplugHandler *hotplug_dev, cs->cpu_index =3D idx; =20 numa_cpu_pre_plug(cpu_slot, dev, errp); + + if (x86ms->hyperv_enabled) { + X86MachineClass *x86mc =3D X86_MACHINE_GET_CLASS(x86ms); + uint64_t hyperv_features =3D x86mc->default_hyperv_features; + + /* Enlightened VMCS is only available on Intel/VMX */ + if (!kvm_hv_evmcs_available()) { + hyperv_features &=3D ~BIT(HYPERV_FEAT_EVMCS); + } + + cpu->hyperv_features |=3D hyperv_features; + } } =20 CpuInstanceProperties @@ -1199,6 +1211,20 @@ static void x86_machine_set_acpi(Object *obj, Visito= r *v, const char *name, visit_type_OnOffAuto(v, name, &x86ms->acpi, errp); } =20 +static bool x86_machine_get_hyperv(Object *obj, Error **errp) +{ + X86MachineState *x86ms =3D X86_MACHINE(obj); + + return x86ms->hyperv_enabled; +} + +static void x86_machine_set_hyperv(Object *obj, bool value, Error **errp) +{ + X86MachineState *x86ms =3D X86_MACHINE(obj); + + x86ms->hyperv_enabled =3D value; +} + static void x86_machine_initfn(Object *obj) { X86MachineState *x86ms =3D X86_MACHINE(obj); @@ -1222,6 +1248,16 @@ static void x86_machine_class_init(ObjectClass *oc, = void *data) x86mc->save_tsc_khz =3D true; nc->nmi_monitor_handler =3D x86_nmi; =20 + /* Hyper-V features enabled with 'hyperv=3Don' */ + x86mc->default_hyperv_features =3D BIT(HYPERV_FEAT_RELAXED) | + BIT(HYPERV_FEAT_VAPIC) | BIT(HYPERV_FEAT_TIME) | + BIT(HYPERV_FEAT_CRASH) | BIT(HYPERV_FEAT_RESET) | + BIT(HYPERV_FEAT_VPINDEX) | BIT(HYPERV_FEAT_RUNTIME) | + BIT(HYPERV_FEAT_SYNIC) | BIT(HYPERV_FEAT_STIMER) | + BIT(HYPERV_FEAT_FREQUENCIES) | BIT(HYPERV_FEAT_REENLIGHTENMENT) | + BIT(HYPERV_FEAT_TLBFLUSH) | BIT(HYPERV_FEAT_EVMCS) | + BIT(HYPERV_FEAT_IPI) | BIT(HYPERV_FEAT_STIMER_DIRECT); + object_class_property_add(oc, X86_MACHINE_SMM, "OnOffAuto", x86_machine_get_smm, x86_machine_set_smm, NULL, NULL); @@ -1233,6 +1269,12 @@ static void x86_machine_class_init(ObjectClass *oc, = void *data) NULL, NULL); object_class_property_set_description(oc, X86_MACHINE_ACPI, "Enable ACPI"); + + object_class_property_add_bool(oc, X86_MACHINE_HYPERV, + x86_machine_get_hyperv, x86_machine_set_hyperv); + + object_class_property_set_description(oc, X86_MACHINE_HYPERV, + "Enable Hyper-V enlightenments"); } =20 static const TypeInfo x86_machine_info =3D { diff --git a/include/hw/i386/x86.h b/include/hw/i386/x86.h index 56080bd1fb14..c6e9c8500357 100644 --- a/include/hw/i386/x86.h +++ b/include/hw/i386/x86.h @@ -38,6 +38,9 @@ struct X86MachineClass { bool save_tsc_khz; /* Enables contiguous-apic-ID mode */ bool compat_apic_id_mode; + + /* Hyper-V features enabled with 'hyperv=3Don' */ + uint64_t default_hyperv_features; }; =20 struct X86MachineState { @@ -72,10 +75,14 @@ struct X86MachineState { * will be translated to MSI messages in the address space. */ AddressSpace *ioapic_as; + + /* Hyper-V emulation */ + bool hyperv_enabled; }; =20 #define X86_MACHINE_SMM "smm" #define X86_MACHINE_ACPI "acpi" +#define X86_MACHINE_HYPERV "hyperv" =20 #define TYPE_X86_MACHINE MACHINE_TYPE_NAME("x86") OBJECT_DECLARE_TYPE(X86MachineState, X86MachineClass, X86_MACHINE) --=20 2.29.2