From nobody Wed Feb 5 13:04:17 2025 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1674893760919273.03203176474483; Sat, 28 Jan 2023 00:16:00 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pLgKE-0006xZ-Dv; Sat, 28 Jan 2023 03:12:39 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pLgJP-0005tV-VS for qemu-devel@nongnu.org; Sat, 28 Jan 2023 03:11:48 -0500 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pLgJJ-0007pG-Mc for qemu-devel@nongnu.org; Sat, 28 Jan 2023 03:11:47 -0500 Received: from i7.infradead.org ([2001:8b0:10b:1:21e:67ff:fecb:7a92]) by desiato.infradead.org with esmtpsa (Exim 4.96 #2 (Red Hat Linux)) id 1pLgIQ-0039w9-0e; Sat, 28 Jan 2023 08:10:49 +0000 Received: from dwoodhou by i7.infradead.org with local (Exim 4.96 #2 (Red Hat Linux)) id 1pLgIw-006mI0-0Y; Sat, 28 Jan 2023 08:11:18 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description; bh=srP5XKIjgnrcFhIs8WrxmVhdDAgM11AkY9uli1RuOLk=; b=Nq5aYvzB0qTxd2m3QXgV4kAv/T 7cCHGCMDZNxuvS2q1nJaPueuh1YnLq7TBDvoRiZc9la3B9FW2pA6yGN9wzwGZKv9/UJTlZ5dAU0WI vH7KmZ9uynduuqkS3ajNk4acW9R/NHvf09Sdot/6JnjSwRdG7imsf0etpllkYXYuHR8aNGykMKbFW H4MGirYSiJLXKCrRQpH6kxlzPQCmSmhWib78QeKJ16h6QSOVmm0Ci/RC73JW0MUZVmpZnAD93kA6i R7zb2c/Z86W/wcgUeBLFBCfPOvX2oGtkjEE0QBi0CA72CHuknvY7rTb8WwYrYLx8BoShhoXMjaV18 9s4vJ0wQ==; From: David Woodhouse To: Peter Maydell , qemu-devel@nongnu.org Cc: Paolo Bonzini , Paul Durrant , Joao Martins , Ankur Arora , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Juan Quintela , "Dr . David Alan Gilbert" , Claudio Fontana , Julien Grall , "Michael S. Tsirkin" , Marcel Apfelbaum , armbru@redhat.com Subject: [PATCH v9 05/58] i386/kvm: handle Xen HVM cpuid leaves Date: Sat, 28 Jan 2023 08:10:20 +0000 Message-Id: <20230128081113.1615111-6-dwmw2@infradead.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230128081113.1615111-1-dwmw2@infradead.org> References: <20230128081113.1615111-1-dwmw2@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SRS-Rewrite: SMTP reverse-path rewritten from by desiato.infradead.org. See http://www.infradead.org/rpr.html 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: none client-ip=2001:8b0:10b:1:d65d:64ff:fe57:4e05; envelope-from=BATV+e8fc867402dd322853dc+7097+infradead.org+dwmw2@desiato.srs.infradead.org; helo=desiato.infradead.org X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1674893761464100002 Content-Type: text/plain; charset="utf-8" From: Joao Martins Introduce support for emulating CPUID for Xen HVM guests. It doesn't make sense to advertise the KVM leaves to a Xen guest, so do Xen unconditionally when the xen-version machine property is set. Signed-off-by: Joao Martins [dwmw2: Obtain xen_version from KVM property, make it automatic] Signed-off-by: David Woodhouse Reviewed-by: Paul Durrant --- target/i386/cpu.c | 1 + target/i386/cpu.h | 2 + target/i386/kvm/kvm.c | 77 ++++++++++++++++++++++++++++++++++++++- target/i386/kvm/xen-emu.c | 4 +- target/i386/kvm/xen-emu.h | 13 ++++++- 5 files changed, 91 insertions(+), 6 deletions(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 4d2b8d0444..eb5a466d4e 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -7070,6 +7070,7 @@ static Property x86_cpu_properties[] =3D { * own cache information (see x86_cpu_load_def()). */ DEFINE_PROP_BOOL("legacy-cache", X86CPU, legacy_cache, true), + DEFINE_PROP_BOOL("xen-vapic", X86CPU, xen_vapic, false), =20 /* * From "Requirements for Implementing the Microsoft diff --git a/target/i386/cpu.h b/target/i386/cpu.h index d4bc19577a..c6c57baed5 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -1964,6 +1964,8 @@ struct ArchCPU { int32_t thread_id; =20 int32_t hv_max_vps; + + bool xen_vapic; }; =20 =20 diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c index aa6eac7cad..24e6e7d083 100644 --- a/target/i386/kvm/kvm.c +++ b/target/i386/kvm/kvm.c @@ -22,6 +22,7 @@ =20 #include #include "standard-headers/asm-x86/kvm_para.h" +#include "standard-headers/xen/arch-x86/cpuid.h" =20 #include "cpu.h" #include "host-cpu.h" @@ -1804,7 +1805,77 @@ int kvm_arch_init_vcpu(CPUState *cs) has_msr_hv_hypercall =3D true; } =20 - if (cpu->expose_kvm) { + if (cs->kvm_state->xen_version) { +#ifdef CONFIG_XEN_EMU + struct kvm_cpuid_entry2 *xen_max_leaf; + + memcpy(signature, "XenVMMXenVMM", 12); + + xen_max_leaf =3D c =3D &cpuid_data.entries[cpuid_i++]; + c->function =3D kvm_base + XEN_CPUID_SIGNATURE; + c->eax =3D kvm_base + XEN_CPUID_TIME; + c->ebx =3D signature[0]; + c->ecx =3D signature[1]; + c->edx =3D signature[2]; + + c =3D &cpuid_data.entries[cpuid_i++]; + c->function =3D kvm_base + XEN_CPUID_VENDOR; + c->eax =3D cs->kvm_state->xen_version; + c->ebx =3D 0; + c->ecx =3D 0; + c->edx =3D 0; + + c =3D &cpuid_data.entries[cpuid_i++]; + c->function =3D kvm_base + XEN_CPUID_HVM_MSR; + /* Number of hypercall-transfer pages */ + c->eax =3D 1; + /* Hypercall MSR base address */ + if (hyperv_enabled(cpu)) { + c->ebx =3D XEN_HYPERCALL_MSR_HYPERV; + kvm_xen_init(cs->kvm_state, c->ebx); + } else { + c->ebx =3D XEN_HYPERCALL_MSR; + } + c->ecx =3D 0; + c->edx =3D 0; + + c =3D &cpuid_data.entries[cpuid_i++]; + c->function =3D kvm_base + XEN_CPUID_TIME; + c->eax =3D ((!!tsc_is_stable_and_known(env) << 1) | + (!!(env->features[FEAT_8000_0001_EDX] & CPUID_EXT2_RDTSCP) << = 2)); + /* default=3D0 (emulate if necessary) */ + c->ebx =3D 0; + /* guest tsc frequency */ + c->ecx =3D env->user_tsc_khz; + /* guest tsc incarnation (migration count) */ + c->edx =3D 0; + + c =3D &cpuid_data.entries[cpuid_i++]; + c->function =3D kvm_base + XEN_CPUID_HVM; + xen_max_leaf->eax =3D kvm_base + XEN_CPUID_HVM; + if (cs->kvm_state->xen_version >=3D XEN_VERSION(4, 5)) { + c->function =3D kvm_base + XEN_CPUID_HVM; + + if (cpu->xen_vapic) { + c->eax |=3D XEN_HVM_CPUID_APIC_ACCESS_VIRT; + c->eax |=3D XEN_HVM_CPUID_X2APIC_VIRT; + } + + c->eax |=3D XEN_HVM_CPUID_IOMMU_MAPPINGS; + + if (cs->kvm_state->xen_version >=3D XEN_VERSION(4, 6)) { + c->eax |=3D XEN_HVM_CPUID_VCPU_ID_PRESENT; + c->ebx =3D cs->cpu_index; + } + } + + kvm_base +=3D 0x100; +#else /* CONFIG_XEN_EMU */ + /* This should never happen as kvm_arch_init() would have died fir= st. */ + fprintf(stderr, "Cannot enable Xen CPUID without Xen support\n"); + abort(); +#endif + } else if (cpu->expose_kvm) { memcpy(signature, "KVMKVMKVM\0\0\0", 12); c =3D &cpuid_data.entries[cpuid_i++]; c->function =3D KVM_CPUID_SIGNATURE | kvm_base; @@ -2524,7 +2595,9 @@ int kvm_arch_init(MachineState *ms, KVMState *s) error_report("kvm: Xen support only available in PC machine"); return -ENOTSUP; } - ret =3D kvm_xen_init(s); + /* hyperv_enabled() doesn't work yet. */ + uint32_t msr =3D XEN_HYPERCALL_MSR; + ret =3D kvm_xen_init(s, msr); if (ret < 0) { return ret; } diff --git a/target/i386/kvm/xen-emu.c b/target/i386/kvm/xen-emu.c index b556d903aa..34d5bc1bc9 100644 --- a/target/i386/kvm/xen-emu.c +++ b/target/i386/kvm/xen-emu.c @@ -15,12 +15,12 @@ #include "kvm/kvm_i386.h" #include "xen-emu.h" =20 -int kvm_xen_init(KVMState *s) +int kvm_xen_init(KVMState *s, uint32_t hypercall_msr) { const int required_caps =3D KVM_XEN_HVM_CONFIG_HYPERCALL_MSR | KVM_XEN_HVM_CONFIG_INTERCEPT_HCALL | KVM_XEN_HVM_CONFIG_SHARED_INF= O; struct kvm_xen_hvm_config cfg =3D { - .msr =3D XEN_HYPERCALL_MSR, + .msr =3D hypercall_msr, .flags =3D KVM_XEN_HVM_CONFIG_INTERCEPT_HCALL, }; int xen_caps, ret; diff --git a/target/i386/kvm/xen-emu.h b/target/i386/kvm/xen-emu.h index 4f31bd96cb..2101df0182 100644 --- a/target/i386/kvm/xen-emu.h +++ b/target/i386/kvm/xen-emu.h @@ -12,8 +12,17 @@ #ifndef QEMU_I386_KVM_XEN_EMU_H #define QEMU_I386_KVM_XEN_EMU_H =20 -#define XEN_HYPERCALL_MSR 0x40000000 +#define XEN_HYPERCALL_MSR 0x40000000 +#define XEN_HYPERCALL_MSR_HYPERV 0x40000200 =20 -int kvm_xen_init(KVMState *s); +#define XEN_CPUID_SIGNATURE 0 +#define XEN_CPUID_VENDOR 1 +#define XEN_CPUID_HVM_MSR 2 +#define XEN_CPUID_TIME 3 +#define XEN_CPUID_HVM 4 + +#define XEN_VERSION(maj, min) ((maj) << 16 | (min)) + +int kvm_xen_init(KVMState *s, uint32_t hypercall_msr); =20 #endif /* QEMU_I386_KVM_XEN_EMU_H */ --=20 2.39.0