From nobody Thu Nov 6 12:12:22 2025 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; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1540929309250759.7104319482108; Tue, 30 Oct 2018 12:55:09 -0700 (PDT) Received: from localhost ([::1]:55230 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gHa6W-0003zx-2T for importer@patchew.org; Tue, 30 Oct 2018 15:55:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48224) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gHa28-00082Q-Vd for qemu-devel@nongnu.org; Tue, 30 Oct 2018 15:50:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gHa26-0002I9-43 for qemu-devel@nongnu.org; Tue, 30 Oct 2018 15:50:36 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:39215) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gHa25-00022k-QZ for qemu-devel@nongnu.org; Tue, 30 Oct 2018 15:50:33 -0400 Received: by mail-wm1-x330.google.com with SMTP id y144-v6so12447881wmd.4 for ; Tue, 30 Oct 2018 12:50:19 -0700 (PDT) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id g76-v6sm17480094wmd.25.2018.10.30.12.50.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 30 Oct 2018 12:50:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=faNJTJyj9uXXXX6HkaEqNSOvicvGFn9ScCrCdtgd5Bo=; b=pIiLxlmCM/vDWLcpWYlH6t8gerIyM7/XvZQjUQ2aujbRdfx/zRP8rkoOdGYnxiHdOZ fzeVf35Z+nN1OicbKCcjy9JEuiN+zpByjFp4Kf2cMuBQYVVVs2XmmlRqkh/EoFqJHUVA LqQoBlgFwDd/6REWFi71hAEN7AWPtcFBX+gIG+5g1SNk5QGjvYvjAoLp4XN6Y81E3niG zO9J4DW/++CgftvrHpyG02kEjg5o+EZGf2MQ+GP/9BO1Mi84Zs3aq15Z1YmAgebsMalP GUfhCL8hTOW04iEGfV59VdJz4bQEHRN1jtxB6x7Li49pZFHvZ4TcmkiO3/mkDcs8eRsF o7sA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=faNJTJyj9uXXXX6HkaEqNSOvicvGFn9ScCrCdtgd5Bo=; b=ET61NsWFJswB5cnJjdkI/pRr+SzDobKC9MBNF1cSo7AYKpvNMKg9OmDBEaBnvHf3BZ 8/yjcHP5GyBWETbE666igddlXb4vNcFe9Q/zeUBkG9Bwyh41WrtDzNb983lUMbt3oLC9 JKWoQgjEfAUGndUaYFQUHu6rHt8GuI365tV2YoA+GBPrUJpyhYfSfMWSL3ajNVmxkccQ oM6eoX1Yk8zQpUVbu0d/D4IJ1GMRDWk1GXMgWKZqaM60geXcEQTNl5I1FkCkOMusAl8K VVS8MvXXnCX9YurlMw7HdqiPp9OzQcHpq1q0ewxvzR+dVHZ0Rv1KK/pm3crDagBw27tT KdHQ== X-Gm-Message-State: AGRZ1gLKNc0HeoDn0qW2DWAbbsaVYpUbdB0qwrHs/rOUf1xDHHwuvwLN cZr6Q2CzCeHrSOzQTu57g9IHKHON X-Google-Smtp-Source: AJdET5dTeRCBs4+L5Q9yHA3BBav2JK7vGKhyk8cWiqLsEv2DQfzzw4gYrcaNDshd1gA7YA/uvWYMDw== X-Received: by 2002:a1c:96c7:: with SMTP id y190-v6mr88071wmd.36.1540929018402; Tue, 30 Oct 2018 12:50:18 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 30 Oct 2018 20:50:03 +0100 Message-Id: <1540929011-19894-3-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1540929011-19894-1-git-send-email-pbonzini@redhat.com> References: <1540929011-19894-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::330 Subject: [Qemu-devel] [PULL 02/10] x86: hv_evmcs CPU flag support 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: Vitaly Kuznetsov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Vitaly Kuznetsov Adds a new CPU flag to enable the Enlightened VMCS KVM feature. QEMU enables KVM_CAP_HYPERV_ENLIGHTENED_VMCS and gets back the version to be advertised in lower 16 bits of CPUID.0x4000000A:EAX. Suggested-by: Ladi Prosek Signed-off-by: Vitaly Kuznetsov Message-Id: <20181022165506.30332-3-vkuznets@redhat.com> Reviewed-by: Roman Kagan Signed-off-by: Paolo Bonzini --- target/i386/cpu.c | 1 + target/i386/cpu.h | 1 + target/i386/hyperv-proto.h | 2 ++ target/i386/kvm.c | 30 ++++++++++++++++++++++++++++-- 4 files changed, 32 insertions(+), 2 deletions(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 1469a1b..e74b986 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -5565,6 +5565,7 @@ static Property x86_cpu_properties[] =3D { DEFINE_PROP_BOOL("hv-frequencies", X86CPU, hyperv_frequencies, false), DEFINE_PROP_BOOL("hv-reenlightenment", X86CPU, hyperv_reenlightenment,= false), DEFINE_PROP_BOOL("hv-tlbflush", X86CPU, hyperv_tlbflush, false), + DEFINE_PROP_BOOL("hv-evmcs", X86CPU, hyperv_evmcs, false), DEFINE_PROP_BOOL("hv-ipi", X86CPU, hyperv_ipi, false), DEFINE_PROP_BOOL("check", X86CPU, check_cpuid, true), DEFINE_PROP_BOOL("enforce", X86CPU, enforce_cpuid, false), diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 663f3a5..369c223 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -1383,6 +1383,7 @@ struct X86CPU { bool hyperv_frequencies; bool hyperv_reenlightenment; bool hyperv_tlbflush; + bool hyperv_evmcs; bool hyperv_ipi; bool check_cpuid; bool enforce_cpuid; diff --git a/target/i386/hyperv-proto.h b/target/i386/hyperv-proto.h index 8c572cd..c0272b3 100644 --- a/target/i386/hyperv-proto.h +++ b/target/i386/hyperv-proto.h @@ -18,6 +18,7 @@ #define HV_CPUID_FEATURES 0x40000003 #define HV_CPUID_ENLIGHTMENT_INFO 0x40000004 #define HV_CPUID_IMPLEMENT_LIMITS 0x40000005 +#define HV_CPUID_NESTED_FEATURES 0x4000000A #define HV_CPUID_MIN 0x40000005 #define HV_CPUID_MAX 0x4000ffff #define HV_HYPERVISOR_PRESENT_BIT 0x80000000 @@ -60,6 +61,7 @@ #define HV_RELAXED_TIMING_RECOMMENDED (1u << 5) #define HV_CLUSTER_IPI_RECOMMENDED (1u << 10) #define HV_EX_PROCESSOR_MASKS_RECOMMENDED (1u << 11) +#define HV_ENLIGHTENED_VMCS_RECOMMENDED (1u << 14) =20 /* * Basic virtualized MSRs diff --git a/target/i386/kvm.c b/target/i386/kvm.c index 115d8b4..6f5c8a0 100644 --- a/target/i386/kvm.c +++ b/target/i386/kvm.c @@ -832,6 +832,7 @@ int kvm_arch_init_vcpu(CPUState *cs) uint32_t unused; struct kvm_cpuid_entry2 *c; uint32_t signature[3]; + uint16_t evmcs_version; int kvm_base =3D KVM_CPUID_SIGNATURE; int r; Error *local_err =3D NULL; @@ -875,7 +876,8 @@ int kvm_arch_init_vcpu(CPUState *cs) memset(signature, 0, 12); memcpy(signature, cpu->hyperv_vendor_id, len); } - c->eax =3D HV_CPUID_MIN; + c->eax =3D cpu->hyperv_evmcs ? + HV_CPUID_NESTED_FEATURES : HV_CPUID_IMPLEMENT_LIMITS; c->ebx =3D signature[0]; c->ecx =3D signature[1]; c->edx =3D signature[2]; @@ -933,7 +935,16 @@ int kvm_arch_init_vcpu(CPUState *cs) c->eax |=3D HV_CLUSTER_IPI_RECOMMENDED; c->eax |=3D HV_EX_PROCESSOR_MASKS_RECOMMENDED; } - + if (cpu->hyperv_evmcs) { + if (kvm_vcpu_enable_cap(cs, KVM_CAP_HYPERV_ENLIGHTENED_VMCS, 0, + (uintptr_t)&evmcs_version)) { + fprintf(stderr, "Hyper-V Enlightened VMCS " + "(requested by 'hv-evmcs' cpu flag) " + "is not supported by kernel\n"); + return -ENOSYS; + } + c->eax |=3D HV_ENLIGHTENED_VMCS_RECOMMENDED; + } c->ebx =3D cpu->hyperv_spinlock_attempts; =20 c =3D &cpuid_data.entries[cpuid_i++]; @@ -944,6 +955,21 @@ int kvm_arch_init_vcpu(CPUState *cs) =20 kvm_base =3D KVM_CPUID_SIGNATURE_NEXT; has_msr_hv_hypercall =3D true; + + if (cpu->hyperv_evmcs) { + uint32_t function; + + /* Create zeroed 0x40000006..0x40000009 leaves */ + for (function =3D HV_CPUID_IMPLEMENT_LIMITS + 1; + function < HV_CPUID_NESTED_FEATURES; function++) { + c =3D &cpuid_data.entries[cpuid_i++]; + c->function =3D function; + } + + c =3D &cpuid_data.entries[cpuid_i++]; + c->function =3D HV_CPUID_NESTED_FEATURES; + c->eax =3D evmcs_version; + } } =20 if (cpu->expose_kvm) { --=20 1.8.3.1