From nobody Mon Feb 9 18:19:15 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1612976493; cv=none; d=zohomail.com; s=zohoarc; b=SbiWGhwL0Ju3V49VZV7nEfA7JFHFPpPzCpSU4stOd4bAJAOdKc9xC3DMWO+AYWSesdH4ERiSaLoi2XemjVHkmPkygks+LFY3N5AMehjRb8y/5uNdryB7kB7tA1OAnq4AMaR8iWC8M92JqULK6kbl+qWBUgeNsCqLnfUfNBvYKRI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612976493; 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=1+pMs6qYjHqm8UjfJLma0Z1tkMqnmcp9Y730qatau+c=; b=fe7pszQrwCtfTcKiDLIeikFOWiv/BxNnJ2WqzAuA9mskVMgC0CZu35Tz0tCzi9nKimxMffK/fvgZBTzHh2xOdOf0cuVJ3tb9yz+tfvrfGoLDgfepMFZ2TuovgFF/ptPYksjdunklPKlC5t9DarPEhtFoY0Q5/rCTsKdjgSV5AYY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1612976492494159.88221209955134; Wed, 10 Feb 2021 09:01:32 -0800 (PST) Received: from localhost ([::1]:54122 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9srp-0001JW-Qn for importer@patchew.org; Wed, 10 Feb 2021 12:01:29 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42436) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l9sYZ-0007PZ-4c for qemu-devel@nongnu.org; Wed, 10 Feb 2021 11:41:35 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:47670) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l9sYR-0008Vm-Io for qemu-devel@nongnu.org; Wed, 10 Feb 2021 11:41:34 -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-382-wEIEAY-oMN6TF2IxfcBEMQ-1; Wed, 10 Feb 2021 11:41:24 -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 13343107ACE3 for ; Wed, 10 Feb 2021 16:41:24 +0000 (UTC) Received: from vitty.brq.redhat.com (unknown [10.40.195.108]) by smtp.corp.redhat.com (Postfix) with ESMTP id 88CF25D9E8; Wed, 10 Feb 2021 16:41:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612975286; 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=1+pMs6qYjHqm8UjfJLma0Z1tkMqnmcp9Y730qatau+c=; b=fTPsO7h0T96BzxBIzeGhF18hP8OgGEN7Q6yHOiiUl2fpkpB2MUEdeWSz/fcr2I0vdy4nt0 HTLIIbWkNmwaTcCfxEwGLhMKoZxmL/w8ziyIK89yTK+CS64KC9O7bmO76adkSfuvNXBfZQ MuEFl+xGBqfw0c90kw11wxKLYdKBsug= X-MC-Unique: wEIEAY-oMN6TF2IxfcBEMQ-1 From: Vitaly Kuznetsov To: qemu-devel@nongnu.org, Eduardo Habkost Subject: [PATCH v4 20/21] i386: provide simple 'hv-default=on' option Date: Wed, 10 Feb 2021 17:40:32 +0100 Message-Id: <20210210164033.607612-21-vkuznets@redhat.com> In-Reply-To: <20210210164033.607612-1-vkuznets@redhat.com> References: <20210210164033.607612-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=63.128.21.124; envelope-from=vkuznets@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -33 X-Spam_score: -3.4 X-Spam_bar: --- X-Spam_report: (-3.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.568, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=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 , Igor Mammedov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) 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 'hv-passthrough' mode enabling everything but it can't be used in production as it prevents migration. Introduce a simple 'hv-default=3Don' CPU flag enabling all currently suppor= ted Hyper-V enlightenments. Later, when new enlightenments get implemented, compat_props mechanism will be used to disable them for legacy machine type= s, this will keep 'hv-default=3Don' configurations migratable. Signed-off-by: Vitaly Kuznetsov --- docs/hyperv.txt | 16 ++++++++++++--- target/i386/cpu.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++ target/i386/cpu.h | 3 +++ 3 files changed, 68 insertions(+), 3 deletions(-) diff --git a/docs/hyperv.txt b/docs/hyperv.txt index 5df00da54fc4..a54c066cab09 100644 --- a/docs/hyperv.txt +++ b/docs/hyperv.txt @@ -17,10 +17,20 @@ compatible hypervisor and use Hyper-V specific features. =20 2. Setup =3D=3D=3D=3D=3D=3D=3D=3D=3D -No Hyper-V enlightenments are enabled by default by either KVM or QEMU. In -QEMU, individual enlightenments can be enabled through CPU flags, e.g: +All currently supported Hyper-V enlightenments can be enabled by specifying +'hv-default=3Don' CPU flag: =20 - qemu-system-x86_64 --enable-kvm --cpu host,hv_relaxed,hv_vpindex,hv_time= , ... + qemu-system-x86_64 --enable-kvm --cpu host,hv-default ... + +Alternatively, it is possible to do fine-grained enablement through CPU fl= ags, +e.g: + + qemu-system-x86_64 --enable-kvm --cpu host,hv-relaxed,hv-vpindex,hv-time= ... + +It is also possible to disable individual enlightenments from the default = list, +this can be used for debugging purposes: + + qemu-system-x86_64 --enable-kvm --cpu host,hv-default=3Don,hv-evmcs=3Dof= f ... =20 Sometimes there are dependencies between enlightenments, QEMU is supposed = to check that the supplied configuration is sane. diff --git a/target/i386/cpu.c b/target/i386/cpu.c index f8df2caed779..013aa60272d8 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -4736,6 +4736,12 @@ static void x86_hv_passthrough_set(Object *obj, bool= value, Error **errp) { X86CPU *cpu =3D X86_CPU(obj); =20 + if (cpu->hyperv_default) { + error_setg(errp, + "'hv-default' and 'hv-paththrough' are mutually exclusi= ve"); + return; + } + cpu->hyperv_passthrough =3D value; =20 /* hv-passthrough overrides everything with what's supported by the ho= st */ @@ -4748,6 +4754,33 @@ static void x86_hv_passthrough_set(Object *obj, bool= value, Error **errp) return; } =20 +static bool x86_hv_default_get(Object *obj, Error **errp) +{ + X86CPU *cpu =3D X86_CPU(obj); + + return cpu->hyperv_default; +} + +static void x86_hv_default_set(Object *obj, bool value, Error **errp) +{ + X86CPU *cpu =3D X86_CPU(obj); + + if (cpu->hyperv_passthrough) { + error_setg(errp, + "'hv-default' and 'hv-paththrough' are mutually exclusi= ve"); + return; + } + + cpu->hyperv_default =3D value; + + /* hv-default overrides everything with the default set */ + if (value) { + cpu->hyperv_features =3D cpu->hyperv_default_features; + cpu->hyperv_features_on =3D 0; + cpu->hyperv_features_off =3D 0; + } +} + /* Generic getter for "feature-words" and "filtered-features" properties */ static void x86_cpu_get_feature_words(Object *obj, Visitor *v, const char *name, void *opaque, @@ -7152,6 +7185,21 @@ static void x86_cpu_initfn(Object *obj) if (xcc->model) { x86_cpu_load_model(cpu, xcc->model); } + + /* Hyper-V features enabled with 'hv-default=3Don' */ + cpu->hyperv_default_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_IPI) | + BIT(HYPERV_FEAT_STIMER_DIRECT); + + /* Enlightened VMCS is only available on Intel/VMX */ + if (kvm_hv_evmcs_available()) { + cpu->hyperv_default_features |=3D BIT(HYPERV_FEAT_EVMCS); + } } =20 static int64_t x86_cpu_get_arch_id(CPUState *cs) @@ -7486,6 +7534,10 @@ static void x86_cpu_common_class_init(ObjectClass *o= c, void *data) x86_hv_passthrough_get, x86_hv_passthrough_set); =20 + object_class_property_add_bool(oc, "hv-default", + x86_hv_default_get, + x86_hv_default_set); + for (w =3D 0; w < FEATURE_WORDS; w++) { int bitnr; for (bitnr =3D 0; bitnr < 64; bitnr++) { diff --git a/target/i386/cpu.h b/target/i386/cpu.h index b4fbd46f0fc9..59350e70fb51 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -1670,6 +1670,9 @@ struct X86CPU { uint64_t hyperv_features_on; uint64_t hyperv_features_off; bool hyperv_passthrough; + /* 'hv-default' enablement */ + uint64_t hyperv_default_features; + bool hyperv_default; OnOffAuto hyperv_no_nonarch_cs; uint32_t hyperv_vendor_id[3]; uint32_t hyperv_interface_id[4]; --=20 2.29.2