From nobody Mon Feb 9 20:12:46 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=1677760641; cv=none; d=zohomail.com; s=zohoarc; b=kWfb8+h5+Xr1C4d7Vb1IWQhdUM2wt3seWmMIDtKsNv/ZbFCs9Q3xdqBLo5U5H9UFYliT5cq/iNMJv50kPwBxJkjdB/2ID+XAqucIIlPfFJcQK9oc4CX7z/CwQfZqHoKFhLlawFMCiAHE4ZlMglkB/uIzTjNhyd1kzEZLvmpwUPk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677760641; 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=gRxuVZGl8h1KqXZTVo8H98oGMzaTj2zrcLO/J2UUgog=; b=VovoelAe5SOmQ3297LEa410OiUVu/fWNIvh2dU2w5xmBQwTBNqBPZw6fIzlGGb4I4opMw5B//A0FvJNbLtqzSvxT7KRMYdv29YcBN2vFUSeNKBtdgbX/j1xqrejceCk/otk7PUul0wJnRBJEqLT3/Iipm97JjP4CVHMMwUXfO7Y= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677760641293702.6737262730138; Thu, 2 Mar 2023 04:37:21 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXi6u-0002eZ-9e; Thu, 02 Mar 2023 07:32:38 -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 1pXi6N-00020i-7e for qemu-devel@nongnu.org; Thu, 02 Mar 2023 07:32:03 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pXi6L-0003E7-7P for qemu-devel@nongnu.org; Thu, 02 Mar 2023 07:32:02 -0500 Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-204-vpTajjV8OCipOtNOQfHjmg-1; Thu, 02 Mar 2023 07:31:58 -0500 Received: by mail-wr1-f71.google.com with SMTP id m7-20020a056000008700b002c7047ea429so3199459wrx.21 for ; Thu, 02 Mar 2023 04:31:57 -0800 (PST) Received: from avogadro.local ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id l10-20020a7bc44a000000b003e21dcccf9fsm2682467wmi.16.2023.03.02.04.31.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 04:31:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677760320; 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=gRxuVZGl8h1KqXZTVo8H98oGMzaTj2zrcLO/J2UUgog=; b=TbSjVGauRQkR/x+VMWHXY7JTugA9n5Y4Ekm45XuO6P0WcZHn3MtQy0qdKwMVivMqiYSK5F GBH2SffJbvk93XM3duYxbShcxVxrHW7MF0Wd//iqWSR9o8tGvVo66Xt76hX7m8+Zxq3qFl 8y/XuDntr3U7ojPEoGRhoQRmanyua0k= X-MC-Unique: vpTajjV8OCipOtNOQfHjmg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gRxuVZGl8h1KqXZTVo8H98oGMzaTj2zrcLO/J2UUgog=; b=1oMPKEuTOVMPsb4/IAk2IQ0yMabVejHHaOGJ7zwCpo3McVVrR3Ff5S/qYbxlgyoLTO iL4BR+vbj2yvPFEHtGDqI6BmUcL1aha98UxHcPBNsUAUOOvrrjaSq3qI44cPFGu8A5uo 4XyUvIkBtBZKWEUrn5EX14aNeEPx6cpykQma+uFGTQcPDDXHc64hYhomq5QRjlcJXNGk 8kxGJ5aDrtZzX9jO7irsaJqTDJgTAYSzGKgvbj2pH3MnRTlxfSuvUUaqGiJqP58659b/ 6gcvvGukQwWNWoN1pAAgo2RN01ri/PAWeT+0x8UhZEMXwozos9NmtJIjPTuQMtRP7lt3 8ZTg== X-Gm-Message-State: AO0yUKXNh7E0T17LQG8fOMzKOD8kukf0jWq0sDM68QTctNlGNm8AOH2H SgZOU2zFykZ7IMhssfWYNB/vQqPtMROnxVrNgWkPA/KGpuVTsU228M71gz4UZ0PHLusumQsvHLU 87Byphe28vp1FuUmUwovgNUpoLOpryUB3DHICyVdcknkLTqJ4XNT7JKBec+DlOyaAhZZ5RcKSlC Q= X-Received: by 2002:adf:f34e:0:b0:2c3:dd81:49ad with SMTP id e14-20020adff34e000000b002c3dd8149admr7439773wrp.33.1677760316181; Thu, 02 Mar 2023 04:31:56 -0800 (PST) X-Google-Smtp-Source: AK7set8zIWKSs2SRXciyt57uVT3Ewmnu45+h4rumYDmelaOmbrxmMosQfppJRGC7wKRy6K0042bPsA== X-Received: by 2002:adf:f34e:0:b0:2c3:dd81:49ad with SMTP id e14-20020adff34e000000b002c3dd8149admr7439760wrp.33.1677760315846; Thu, 02 Mar 2023 04:31:55 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: David Woodhouse , Paul Durrant Subject: [PULL 28/62] i386/xen: Add support for Xen event channel delivery to vCPU Date: Thu, 2 Mar 2023 13:29:55 +0100 Message-Id: <20230302123029.153265-29-pbonzini@redhat.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230302123029.153265-1-pbonzini@redhat.com> References: <20230302123029.153265-1-pbonzini@redhat.com> MIME-Version: 1.0 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=170.10.133.124; envelope-from=pbonzini@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_H2=-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.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: pass (identity @redhat.com) X-ZM-MESSAGEID: 1677760641493100001 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 | 94 ++++++++++++++++++++++++++++++++++++--- 3 files changed, 92 insertions(+), 6 deletions(-) diff --git a/include/sysemu/kvm_xen.h b/include/sysemu/kvm_xen.h index cec21c8fab2f..644c7d889c6b 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 e882c4e251c1..1c7603221dc6 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -1799,6 +1799,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 435c51f625a1..1b319e8bad69 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,43 @@ 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 && mrs.mr->ram_block && + !int128_lt(mrs.size, int128_make64(sizeof(struct vcpu_info)))) { + vcpu_info_hva =3D qemu_map_ram_ptr(mrs.mr->ram_block, + mrs.offset_within_region); + } + if (!vcpu_info_hva) { + if (mrs.mr) { + memory_region_unref(mrs.mr); + mrs.mr =3D NULL; + } + ret =3D -EINVAL; + } + + 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 +296,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 +307,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 +388,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 +985,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.1