From nobody Tue May 13 11:59:57 2025 Delivered-To: importer2@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+importer2=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 1675262101299247.0644537756749; Wed, 1 Feb 2023 06:35:01 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pNEBg-0003vH-6e; Wed, 01 Feb 2023 09:34:12 -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 1pNE9o-0001TC-5S for qemu-devel@nongnu.org; Wed, 01 Feb 2023 09:32:22 -0500 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pNE9g-00036u-Pu for qemu-devel@nongnu.org; Wed, 01 Feb 2023 09:32:15 -0500 Received: from i7.infradead.org ([2001:8b0:10b:1:21e:67ff:fecb:7a92]) by casper.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1pNE9Q-00CMb6-3k; Wed, 01 Feb 2023 14:31:54 +0000 Received: from dwoodhou by i7.infradead.org with local (Exim 4.96 #2 (Red Hat Linux)) id 1pNE9Q-007Jrp-0L; Wed, 01 Feb 2023 14:31:52 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; 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=6U4y73NnWvsLRT4gRpgCMxu79GMXx/S6p5fLnRXEG3A=; b=XknL6eomOFzjht4m0sZHFy4Ya0 7qdL0J11PVg9XD+f8UBskLqt8NALjon5J4BdKCMghexPnb+k52w6NDhBvlB3Zqvjs4VXYbmkvFCAq Sq/Bp+mQv/uhHnnIlbx4BRTrHl5NKzhIhaQAMchPf55IxoUnmgyuncQ8X7jXLL50557pZ/MOAy8Ba x/xHaJnqzg5KSgJwwsu+NUTFAwonnvbSbcF8wB2fx5qywrsx98tq5oNRFUSf9vHAoV/7PtERI+kTu L3PGu/b/n4257BjZACssybBYKnrgY5XmDKLhgC30ydVVMsghqmv+yaoHyWvciX7RrdNxvE9dvg5s0 bsi2wEzA==; 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 v10 28/59] i386/xen: Add support for Xen event channel delivery to vCPU Date: Wed, 1 Feb 2023 14:31:17 +0000 Message-Id: <20230201143148.1744093-29-dwmw2@infradead.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230201143148.1744093-1-dwmw2@infradead.org> References: <20230201143148.1744093-1-dwmw2@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SRS-Rewrite: SMTP reverse-path rewritten from by casper.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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=2001:8b0:10b:1236::1; envelope-from=BATV+8c5eeea0684575598b25+7101+infradead.org+dwmw2@casper.srs.infradead.org; helo=casper.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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1675262197480100001 Content-Type: text/plain; charset="utf-8" From: David Woodhouse The kvm_xen_inject_vcpu_callback_vector() function will either deliver the per-vCPU local APIC vector (as an MSI), or just kick the vCPU out of the kernel to trigger KVM's automatic delivery of the global vector. Support for asserting the GSI/PCI_INTX callbacks will come later. Also add kvm_xen_get_vcpu_info_hva() which returns the vcpu_info of a given vCPU. Signed-off-by: David Woodhouse Reviewed-by: Paul Durrant --- include/sysemu/kvm_xen.h | 2 + target/i386/cpu.h | 2 + target/i386/kvm/xen-emu.c | 91 ++++++++++++++++++++++++++++++++++++--- 3 files changed, 89 insertions(+), 6 deletions(-) diff --git a/include/sysemu/kvm_xen.h b/include/sysemu/kvm_xen.h index 0c3a273549..0c0efbe699 100644 --- a/include/sysemu/kvm_xen.h +++ b/include/sysemu/kvm_xen.h @@ -21,6 +21,8 @@ =20 int kvm_xen_soft_reset(void); uint32_t kvm_xen_get_caps(void); +void *kvm_xen_get_vcpu_info_hva(uint32_t vcpu_id); +void kvm_xen_inject_vcpu_callback_vector(uint32_t vcpu_id, int type); =20 #define kvm_xen_has_cap(cap) (!!(kvm_xen_get_caps() & \ KVM_XEN_HVM_CONFIG_ ## cap)) diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 938a1b9c8b..c9b12e7476 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -1788,6 +1788,8 @@ typedef struct CPUArchState { #endif #if defined(CONFIG_KVM) struct kvm_nested_state *nested_state; + MemoryRegion *xen_vcpu_info_mr; + void *xen_vcpu_info_hva; uint64_t xen_vcpu_info_gpa; uint64_t xen_vcpu_info_default_gpa; uint64_t xen_vcpu_time_info_gpa; diff --git a/target/i386/kvm/xen-emu.c b/target/i386/kvm/xen-emu.c index e80de809fc..4513f07c68 100644 --- a/target/i386/kvm/xen-emu.c +++ b/target/i386/kvm/xen-emu.c @@ -21,6 +21,8 @@ #include "trace.h" #include "sysemu/runstate.h" =20 +#include "hw/pci/msi.h" +#include "hw/i386/apic-msidef.h" #include "hw/i386/kvm/xen_overlay.h" #include "hw/i386/kvm/xen_evtchn.h" =20 @@ -248,6 +250,40 @@ static void do_set_vcpu_callback_vector(CPUState *cs, = run_on_cpu_data data) } } =20 +static int set_vcpu_info(CPUState *cs, uint64_t gpa) +{ + X86CPU *cpu =3D X86_CPU(cs); + CPUX86State *env =3D &cpu->env; + MemoryRegionSection mrs =3D { .mr =3D NULL }; + void *vcpu_info_hva =3D NULL; + int ret; + + ret =3D kvm_xen_set_vcpu_attr(cs, KVM_XEN_VCPU_ATTR_TYPE_VCPU_INFO, gp= a); + if (ret || gpa =3D=3D INVALID_GPA) { + goto out; + } + + mrs =3D memory_region_find(get_system_memory(), gpa, + sizeof(struct vcpu_info)); + if (!mrs.mr) { + ret =3D -EINVAL; + } else if (!mrs.mr->ram_block || mrs.size < sizeof(struct vcpu_info) || + !(vcpu_info_hva =3D qemu_map_ram_ptr(mrs.mr->ram_block, + mrs.offset_within_region= ))) { + ret =3D -EINVAL; + memory_region_unref(mrs.mr); + mrs.mr =3D NULL; + } + + out: + if (env->xen_vcpu_info_mr) { + memory_region_unref(env->xen_vcpu_info_mr); + } + env->xen_vcpu_info_hva =3D vcpu_info_hva; + env->xen_vcpu_info_mr =3D mrs.mr; + return ret; +} + static void do_set_vcpu_info_default_gpa(CPUState *cs, run_on_cpu_data dat= a) { X86CPU *cpu =3D X86_CPU(cs); @@ -257,8 +293,7 @@ static void do_set_vcpu_info_default_gpa(CPUState *cs, = run_on_cpu_data data) =20 /* Changing the default does nothing if a vcpu_info was explicitly set= . */ if (env->xen_vcpu_info_gpa =3D=3D INVALID_GPA) { - kvm_xen_set_vcpu_attr(cs, KVM_XEN_VCPU_ATTR_TYPE_VCPU_INFO, - env->xen_vcpu_info_default_gpa); + set_vcpu_info(cs, env->xen_vcpu_info_default_gpa); } } =20 @@ -269,8 +304,52 @@ static void do_set_vcpu_info_gpa(CPUState *cs, run_on_= cpu_data data) =20 env->xen_vcpu_info_gpa =3D data.host_ulong; =20 - kvm_xen_set_vcpu_attr(cs, KVM_XEN_VCPU_ATTR_TYPE_VCPU_INFO, - env->xen_vcpu_info_gpa); + set_vcpu_info(cs, env->xen_vcpu_info_gpa); +} + +void *kvm_xen_get_vcpu_info_hva(uint32_t vcpu_id) +{ + CPUState *cs =3D qemu_get_cpu(vcpu_id); + if (!cs) { + return NULL; + } + + return X86_CPU(cs)->env.xen_vcpu_info_hva; +} + +void kvm_xen_inject_vcpu_callback_vector(uint32_t vcpu_id, int type) +{ + CPUState *cs =3D qemu_get_cpu(vcpu_id); + uint8_t vector; + + if (!cs) { + return; + } + + vector =3D X86_CPU(cs)->env.xen_vcpu_callback_vector; + if (vector) { + /* + * The per-vCPU callback vector injected via lapic. Just + * deliver it as an MSI. + */ + MSIMessage msg =3D { + .address =3D APIC_DEFAULT_ADDRESS | X86_CPU(cs)->apic_id, + .data =3D vector | (1UL << MSI_DATA_LEVEL_SHIFT), + }; + kvm_irqchip_send_msi(kvm_state, msg); + return; + } + + switch (type) { + case HVM_PARAM_CALLBACK_TYPE_VECTOR: + /* + * If the evtchn_upcall_pending field in the vcpu_info is set, then + * KVM will automatically deliver the vector on entering the vCPU + * so all we have to do is kick it out. + */ + qemu_cpu_kick(cs); + break; + } } =20 static void do_set_vcpu_time_info_gpa(CPUState *cs, run_on_cpu_data data) @@ -306,7 +385,7 @@ static void do_vcpu_soft_reset(CPUState *cs, run_on_cpu= _data data) env->xen_vcpu_runstate_gpa =3D INVALID_GPA; env->xen_vcpu_callback_vector =3D 0; =20 - kvm_xen_set_vcpu_attr(cs, KVM_XEN_VCPU_ATTR_TYPE_VCPU_INFO, INVALID_GP= A); + set_vcpu_info(cs, INVALID_GPA); kvm_xen_set_vcpu_attr(cs, KVM_XEN_VCPU_ATTR_TYPE_VCPU_TIME_INFO, INVALID_GPA); kvm_xen_set_vcpu_attr(cs, KVM_XEN_VCPU_ATTR_TYPE_RUNSTATE_ADDR, @@ -903,7 +982,7 @@ int kvm_put_xen_state(CPUState *cs) } =20 if (gpa !=3D INVALID_GPA) { - ret =3D kvm_xen_set_vcpu_attr(cs, KVM_XEN_VCPU_ATTR_TYPE_VCPU_INFO= , gpa); + ret =3D set_vcpu_info(cs, gpa); if (ret < 0) { return ret; } --=20 2.39.0