From nobody Mon Feb 9 20:12:47 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=1677761507; cv=none; d=zohomail.com; s=zohoarc; b=d0xBthiYTAYc9MSAXCS1J4LCcTp+0uE724mE/ocDHao+RZBDbRHUpIB2h41PNswP+RkFSwRF8k6TjLow7XVax22rJqCrObF2RbRtxPrXRDH/6Ab4YlH+6q0O+r1py1F/SJ3bmW9u4r3qLJyRKUWUh7ChAj2WvWN083/dKhr8ep0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677761507; 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=dB6WbxKXppn/pBKWsu4ZTdMZRThfOq9ma6VEMSb9U9w=; b=jNqPvtY0hBtuBaX34Lb0yfxvacx/XizFgp8f+QthG7qIg+PfXUpcrs6G/H45JI/jjGNQ8sGSvZw+omj9D74k9IIws3GAks389r4rzbloC7o6IxrHaEzcA+67tDnulT5w/PJKhmnQEaZWXmFBXPNmB8EwXvussecG4+RWZsuKiKA= 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 1677761507130238.73016209879916; Thu, 2 Mar 2023 04:51:47 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXiAG-0006EO-Fc; Thu, 02 Mar 2023 07:36:05 -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 1pXi76-0002s5-21 for qemu-devel@nongnu.org; Thu, 02 Mar 2023 07:32:50 -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 1pXi73-0003Q2-CS for qemu-devel@nongnu.org; Thu, 02 Mar 2023 07:32:46 -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-340-W8SGBWovM_aYp-f-HOYvWA-1; Thu, 02 Mar 2023 07:32:43 -0500 Received: by mail-wr1-f71.google.com with SMTP id t19-20020a0560001a5300b002ce013276b8so176316wry.1 for ; Thu, 02 Mar 2023 04:32:43 -0800 (PST) Received: from avogadro.local ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id n7-20020a5d4c47000000b002c5534db60bsm15114788wrt.71.2023.03.02.04.32.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 04:32:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677760364; 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=dB6WbxKXppn/pBKWsu4ZTdMZRThfOq9ma6VEMSb9U9w=; b=GYfek5T4AaNGZI9mj+dnxksU47t+hhHFORCmTpgat6GrL2UiHR1HaYuRGEHoYP4Y7Jq7Rd rF6ecJSiHv35rr21K8V4hi+zyr5rGAF5piHNfZcW3tz4rzgvwqznGlTaO2Bfq/O2FkOXXn A9wh1T93tvwVKYuXB8M6b44x9iH/twI= X-MC-Unique: W8SGBWovM_aYp-f-HOYvWA-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=dB6WbxKXppn/pBKWsu4ZTdMZRThfOq9ma6VEMSb9U9w=; b=j1/NZdEgKLbmetLKsiCwXVnvjYjv4OHlos51LAwDYnW2huw0MboKes5P7hpx+IDZW4 9m2XQ1PB7C1RevtLKlrgNkb5EsAM6QrXrfbzt0a+auJJEoTOmP8X344qfi+TKe0XwUYo y0Cqj/tyJF1fmuBM/tDcfWNeAAhs7gAqXJWmEJ+MmEyRCrPIOVFCw6w21g3HA84fdX2S VVT6oAuFvO1NRud4UpNFuhOk60o1PtKRGQuwf//lTmxH5BauhDVlMLPl0iGspgo5L5c5 Y/kmGytGyXl5rWG71pjUW5T6ruYFGitEoEDk+D7uy1OdMZddWOYaftD36l1sHznEXzDG e92A== X-Gm-Message-State: AO0yUKVdXhorW18WrpfOy/Mh5va+4oMzN5emlWP0/FUcHAWP+fhI+7/7 trSlyGwzGqP9kbEGu8ozyFq/xXI5Px6TLj9kNc04gUek6vygLUL8mIDWxdTPTcGCf1px+Cw82lM 7O7f1Zam/3VuY1/Hjfxpoookr2qWP8S1ZOdtJ3jIy0kY3h+SJGRl5PlFtn6ge+hcg1P0Ut3+++R c= X-Received: by 2002:a5d:570e:0:b0:2cb:b1dd:9adb with SMTP id a14-20020a5d570e000000b002cbb1dd9adbmr7791500wrv.17.1677760361978; Thu, 02 Mar 2023 04:32:41 -0800 (PST) X-Google-Smtp-Source: AK7set9RgEebUENZxQ+06g7zWv80Z5ZBGn5x6KEWUvKVgj4X7OyNdRAXBKxLvYbHUPQQFz04kPD3Vw== X-Received: by 2002:a5d:570e:0:b0:2cb:b1dd:9adb with SMTP id a14-20020a5d570e000000b002cbb1dd9adbmr7791484wrv.17.1677760361667; Thu, 02 Mar 2023 04:32:41 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: David Woodhouse , Paul Durrant Subject: [PULL 44/62] hw/xen: Support mapping grant frames Date: Thu, 2 Mar 2023 13:30:11 +0100 Message-Id: <20230302123029.153265-45-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: 1677761507442100002 Content-Type: text/plain; charset="utf-8" From: David Woodhouse Signed-off-by: David Woodhouse Reviewed-by: Paul Durrant --- hw/i386/kvm/xen_gnttab.c | 73 ++++++++++++++++++++++++++++++++++++++- hw/i386/kvm/xen_overlay.c | 2 +- hw/i386/kvm/xen_overlay.h | 2 ++ 3 files changed, 75 insertions(+), 2 deletions(-) diff --git a/hw/i386/kvm/xen_gnttab.c b/hw/i386/kvm/xen_gnttab.c index ef8857e50c7b..72e87aea6ad6 100644 --- a/hw/i386/kvm/xen_gnttab.c +++ b/hw/i386/kvm/xen_gnttab.c @@ -37,13 +37,26 @@ OBJECT_DECLARE_SIMPLE_TYPE(XenGnttabState, XEN_GNTTAB) #define XEN_PAGE_SHIFT 12 #define XEN_PAGE_SIZE (1ULL << XEN_PAGE_SHIFT) =20 +#define ENTRIES_PER_FRAME_V1 (XEN_PAGE_SIZE / sizeof(grant_entry_v1_t)) + struct XenGnttabState { /*< private >*/ SysBusDevice busdev; /*< public >*/ =20 + QemuMutex gnt_lock; + uint32_t nr_frames; uint32_t max_frames; + + union { + grant_entry_v1_t *v1; + /* Theoretically, v2 support could be added here. */ + } entries; + + MemoryRegion gnt_frames; + MemoryRegion *gnt_aliases; + uint64_t *gnt_frame_gpas; }; =20 struct XenGnttabState *xen_gnttab_singleton; @@ -51,6 +64,7 @@ struct XenGnttabState *xen_gnttab_singleton; static void xen_gnttab_realize(DeviceState *dev, Error **errp) { XenGnttabState *s =3D XEN_GNTTAB(dev); + int i; =20 if (xen_mode !=3D XEN_EMULATE) { error_setg(errp, "Xen grant table support is for Xen emulation"); @@ -58,6 +72,38 @@ static void xen_gnttab_realize(DeviceState *dev, Error *= *errp) } s->nr_frames =3D 0; s->max_frames =3D kvm_xen_get_gnttab_max_frames(); + memory_region_init_ram(&s->gnt_frames, OBJECT(dev), "xen:grant_table", + XEN_PAGE_SIZE * s->max_frames, &error_abort); + memory_region_set_enabled(&s->gnt_frames, true); + s->entries.v1 =3D memory_region_get_ram_ptr(&s->gnt_frames); + memset(s->entries.v1, 0, XEN_PAGE_SIZE * s->max_frames); + + /* Create individual page-sizes aliases for overlays */ + s->gnt_aliases =3D (void *)g_new0(MemoryRegion, s->max_frames); + s->gnt_frame_gpas =3D (void *)g_new(uint64_t, s->max_frames); + for (i =3D 0; i < s->max_frames; i++) { + memory_region_init_alias(&s->gnt_aliases[i], OBJECT(dev), + NULL, &s->gnt_frames, + i * XEN_PAGE_SIZE, XEN_PAGE_SIZE); + s->gnt_frame_gpas[i] =3D INVALID_GPA; + } + + qemu_mutex_init(&s->gnt_lock); + + xen_gnttab_singleton =3D s; +} + +static int xen_gnttab_post_load(void *opaque, int version_id) +{ + XenGnttabState *s =3D XEN_GNTTAB(opaque); + uint32_t i; + + for (i =3D 0; i < s->nr_frames; i++) { + if (s->gnt_frame_gpas[i] !=3D INVALID_GPA) { + xen_overlay_do_map_page(&s->gnt_aliases[i], s->gnt_frame_gpas[= i]); + } + } + return 0; } =20 static bool xen_gnttab_is_needed(void *opaque) @@ -70,8 +116,11 @@ static const VMStateDescription xen_gnttab_vmstate =3D { .version_id =3D 1, .minimum_version_id =3D 1, .needed =3D xen_gnttab_is_needed, + .post_load =3D xen_gnttab_post_load, .fields =3D (VMStateField[]) { VMSTATE_UINT32(nr_frames, XenGnttabState), + VMSTATE_VARRAY_UINT32(gnt_frame_gpas, XenGnttabState, nr_frames, 0, + vmstate_info_uint64, uint64_t), VMSTATE_END_OF_LIST() } }; @@ -106,6 +155,28 @@ type_init(xen_gnttab_register_types) =20 int xen_gnttab_map_page(uint64_t idx, uint64_t gfn) { - return -ENOSYS; + XenGnttabState *s =3D xen_gnttab_singleton; + uint64_t gpa =3D gfn << XEN_PAGE_SHIFT; + + if (!s) { + return -ENOTSUP; + } + + if (idx >=3D s->max_frames) { + return -EINVAL; + } + + QEMU_IOTHREAD_LOCK_GUARD(); + QEMU_LOCK_GUARD(&s->gnt_lock); + + xen_overlay_do_map_page(&s->gnt_aliases[idx], gpa); + + s->gnt_frame_gpas[idx] =3D gpa; + + if (s->nr_frames <=3D idx) { + s->nr_frames =3D idx + 1; + } + + return 0; } =20 diff --git a/hw/i386/kvm/xen_overlay.c b/hw/i386/kvm/xen_overlay.c index 8685d879594e..39fda1b72c3f 100644 --- a/hw/i386/kvm/xen_overlay.c +++ b/hw/i386/kvm/xen_overlay.c @@ -49,7 +49,7 @@ struct XenOverlayState { =20 struct XenOverlayState *xen_overlay_singleton; =20 -static void xen_overlay_do_map_page(MemoryRegion *page, uint64_t gpa) +void xen_overlay_do_map_page(MemoryRegion *page, uint64_t gpa) { /* * Xen allows guests to map the same page as many times as it likes diff --git a/hw/i386/kvm/xen_overlay.h b/hw/i386/kvm/xen_overlay.h index 5c46a0b03659..75ecb6b3598b 100644 --- a/hw/i386/kvm/xen_overlay.h +++ b/hw/i386/kvm/xen_overlay.h @@ -21,4 +21,6 @@ int xen_sync_long_mode(void); int xen_set_long_mode(bool long_mode); bool xen_is_long_mode(void); =20 +void xen_overlay_do_map_page(MemoryRegion *page, uint64_t gpa); + #endif /* QEMU_XEN_OVERLAY_H */ --=20 2.39.1