From nobody Mon May 20 20:30:42 2024 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; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1614605391; cv=none; d=zohomail.com; s=zohoarc; b=lV0VLBl0qEAYIBqPr6NcjYO39/DYYGucu8Cr0aFjvgaK1D+tLXkDd12uyv9ovo0KqwUT+lkqHc42Wdmjei8ixlMo6gIzOcJS0CRyaZMTaMfiz2z+jdoPG0OmvFIYaqYCDI/cVTHVm8QWPhduczDF/ExASg8sNN0TISmgPPLAPIY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614605391; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=KbNn16NW2voIZnb30QSq1tkvME8A5PE6xaA6lY++9bM=; b=YWhUt8D0/NFfwmDEPFWsZoJcC8SPLDbVcMTZEsFwyi+tG7nVS6RA5HKecwPprkeRvKQtY5j3jCnt+tvMUJO12kv3LP2U90NBxkqDX70sTWQs9ziVNdreY31lb04L6pu3tuULn4kFpuKl2E5N6K7tJo+oo+xCNk5JeXPCRRjUhE0= ARC-Authentication-Results: i=1; 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1614605391465220.52011064587577; Mon, 1 Mar 2021 05:29:51 -0800 (PST) Received: from localhost ([::1]:38780 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lGicQ-0002pE-BI for importer@patchew.org; Mon, 01 Mar 2021 08:29:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:54738) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lGiWD-0005va-3Y for qemu-devel@nongnu.org; Mon, 01 Mar 2021 08:23:25 -0500 Received: from mail-lf1-x129.google.com ([2a00:1450:4864:20::129]:46284) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lGiW9-0004PS-Ez for qemu-devel@nongnu.org; Mon, 01 Mar 2021 08:23:24 -0500 Received: by mail-lf1-x129.google.com with SMTP id v5so25426975lft.13 for ; Mon, 01 Mar 2021 05:23:18 -0800 (PST) Received: from localhost.localdomain (37-145-186-126.broadband.corbina.ru. [37.145.186.126]) by smtp.gmail.com with ESMTPSA id w26sm2291420lfr.186.2021.03.01.05.23.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Mar 2021 05:23:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=KbNn16NW2voIZnb30QSq1tkvME8A5PE6xaA6lY++9bM=; b=Mcb9Sel/Cij671Jq3Mp6O1ajs8csB043sivwyFBDKNS4fY2ti2iYcoe/poPnGqaCbn +xyG86Jebl+2OR2EJgCHyxZllJuZgWi9ZiJY21LNajSuUlpwsDNpCQ5Q9QAFYv0sEjpr c4HBLuTtsJAZGJUlPTWSF9ki/ekzTIkvvQwL6N1NFTgEnLNXC1hm6BC4Vy3TguUsXvJH Ubi9/0DNbGe4lDqGfnp7Rau7IqjryIrr1EcqOhHIUUEDONibp5zBaNctPQGwgGYJp9oQ s6LxzN+jN9Cyg2ygWqlsV32MZF1Aiz4dK8nx1boFp0PzPob9rzKpVvd8AYajXxwtqKSy BG4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=KbNn16NW2voIZnb30QSq1tkvME8A5PE6xaA6lY++9bM=; b=E7D1sUSWLL8RDm7QRmq9QhJwf/pmxIAExYKO8OpoVmPwl93A0khu70sEFyyXm457+K UB6DhWf9DgzAiqZ08NA87tKHDFyfLxbKvgwyWwcY+qJjcYErXSV6aA0rXfz8njEgNlYg 7S9cGCEDFeD5nib+4wVs26A5CiPhixfuTNIRz/9ScZiHZRgvaOFduvkUTa9pku7YDQcr I/aWrXpRvMzYL40DMc/5kyM7CHNVmOo7nizRdd39nKS9eFzG1+fOCMDWMr/vcxZCGpD3 em/TPH3jS7YgWlPFjrc7Iji5fJdcx382HAvuZEdm02HblprcUDlDip2DH1uUmXVk/geT hjMA== X-Gm-Message-State: AOAM532iyvSHboSSCLFIaE+A0R0GovNXV9Ng9FSzivMhpWLqXEwAXSF+ zVHsNw1+oLa5Y/clCdOGyitayqtyOKgJrQ== X-Google-Smtp-Source: ABdhPJy5AUaM9OlJQciR8h4OFDb96hBCTYCCzbhLuie3Bf1IQqD3idGVjViOAwhytBIVbXlTFy8lgQ== X-Received: by 2002:ac2:420b:: with SMTP id y11mr9462077lfh.215.1614604997409; Mon, 01 Mar 2021 05:23:17 -0800 (PST) From: Elena Afanasova To: qemu-devel@nongnu.org Subject: [PATCH RFC] hw/misc/pc-testdev: add support for ioregionfd testing Date: Mon, 1 Mar 2021 16:16:28 +0300 Message-Id: <20210301131628.5211-1-eafanasova@gmail.com> X-Mailer: git-send-email 2.25.1 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=2a00:1450:4864:20::129; envelope-from=eafanasova@gmail.com; helo=mail-lf1-x129.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: elena.ufimtseva@oracle.com, Elena Afanasova , jag.raman@oracle.com, stefanha@redhat.com, kvm@vger.kernel.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Signed-off-by: Elena Afanasova --- hw/misc/pc-testdev.c | 74 +++++++++++++++++++++++++++++++++++++++ include/sysemu/kvm.h | 4 +-- linux-headers/linux/kvm.h | 24 +++++++++++++ 3 files changed, 100 insertions(+), 2 deletions(-) diff --git a/hw/misc/pc-testdev.c b/hw/misc/pc-testdev.c index e389651869..38355923ca 100644 --- a/hw/misc/pc-testdev.c +++ b/hw/misc/pc-testdev.c @@ -40,6 +40,9 @@ #include "hw/irq.h" #include "hw/isa/isa.h" #include "qom/object.h" +#include "sysemu/kvm.h" +#include +#include "hw/qdev-properties.h" =20 #define IOMEM_LEN 0x10000 =20 @@ -53,6 +56,15 @@ struct PCTestdev { MemoryRegion iomem; uint32_t ioport_data; char iomem_buf[IOMEM_LEN]; + + uint64_t guest_paddr; + uint64_t memory_size; + char *read_fifo; + char *write_fifo; + bool posted_writes; + bool pio; + int rfd; + int wfd; }; =20 #define TYPE_TESTDEV "pc-testdev" @@ -169,6 +181,9 @@ static const MemoryRegionOps test_iomem_ops =3D { =20 static void testdev_realizefn(DeviceState *d, Error **errp) { + struct kvm_ioregion ioreg; + int flags =3D 0; + ISADevice *isa =3D ISA_DEVICE(d); PCTestdev *dev =3D TESTDEV(d); MemoryRegion *mem =3D isa_address_space(isa); @@ -191,14 +206,73 @@ static void testdev_realizefn(DeviceState *d, Error *= *errp) memory_region_add_subregion(io, 0xe8, &dev->ioport_byte); memory_region_add_subregion(io, 0x2000, &dev->irq); memory_region_add_subregion(mem, 0xff000000, &dev->iomem); + + if (!dev->guest_paddr || !dev->write_fifo) { + return; + } + + dev->wfd =3D open(dev->write_fifo, O_WRONLY); + if (dev->wfd < 0) { + error_report("failed to open write fifo %s", dev->write_fifo); + return; + } + + if (dev->read_fifo) { + dev->rfd =3D open(dev->read_fifo, O_RDONLY); + if (dev->rfd < 0) { + error_report("failed to open read fifo %s", dev->read_fifo); + close(dev->wfd); + return; + } + } + + flags |=3D dev->pio ? KVM_IOREGION_PIO : 0; + flags |=3D dev->posted_writes ? KVM_IOREGION_POSTED_WRITES : 0; + ioreg.guest_paddr =3D dev->guest_paddr; + ioreg.memory_size =3D dev->memory_size; + ioreg.write_fd =3D dev->wfd; + ioreg.read_fd =3D dev->rfd; + ioreg.flags =3D flags; + kvm_vm_ioctl(kvm_state, KVM_SET_IOREGION, &ioreg); +} + +static void testdev_unrealizefn(DeviceState *d) +{ + struct kvm_ioregion ioreg; + PCTestdev *dev =3D TESTDEV(d); + + if (!dev->guest_paddr || !dev->write_fifo) { + return; + } + + ioreg.guest_paddr =3D dev->guest_paddr; + ioreg.memory_size =3D dev->memory_size; + ioreg.flags =3D KVM_IOREGION_DEASSIGN; + kvm_vm_ioctl(kvm_state, KVM_SET_IOREGION, &ioreg); + close(dev->wfd); + if (dev->rfd > 0) { + close(dev->rfd); + } } =20 +static Property ioregionfd_properties[] =3D { + DEFINE_PROP_UINT64("addr", PCTestdev, guest_paddr, 0), + DEFINE_PROP_UINT64("size", PCTestdev, memory_size, 0), + DEFINE_PROP_STRING("rfifo", PCTestdev, read_fifo), + DEFINE_PROP_STRING("wfifo", PCTestdev, write_fifo), + DEFINE_PROP_BOOL("pio", PCTestdev, pio, false), + DEFINE_PROP_BOOL("pw", PCTestdev, posted_writes, false), + DEFINE_PROP_END_OF_LIST(), +}; + static void testdev_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); =20 set_bit(DEVICE_CATEGORY_MISC, dc->categories); dc->realize =3D testdev_realizefn; + dc->unrealize =3D testdev_unrealizefn; + device_class_set_props(dc, ioregionfd_properties); } =20 static const TypeInfo testdev_info =3D { diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h index 687c598be9..d68728764a 100644 --- a/include/sysemu/kvm.h +++ b/include/sysemu/kvm.h @@ -234,6 +234,8 @@ int kvm_has_intx_set_mask(void); bool kvm_arm_supports_user_irq(void); =20 =20 +int kvm_vm_ioctl(KVMState *s, int type, ...); + #ifdef NEED_CPU_H #include "cpu.h" =20 @@ -257,8 +259,6 @@ void phys_mem_set_alloc(void *(*alloc)(size_t, uint64_t= *align, bool shared)); =20 int kvm_ioctl(KVMState *s, int type, ...); =20 -int kvm_vm_ioctl(KVMState *s, int type, ...); - int kvm_vcpu_ioctl(CPUState *cpu, int type, ...); =20 /** diff --git a/linux-headers/linux/kvm.h b/linux-headers/linux/kvm.h index 020b62a619..c426fa1e56 100644 --- a/linux-headers/linux/kvm.h +++ b/linux-headers/linux/kvm.h @@ -733,6 +733,29 @@ struct kvm_ioeventfd { __u8 pad[36]; }; =20 +enum { + kvm_ioregion_flag_nr_pio, + kvm_ioregion_flag_nr_posted_writes, + kvm_ioregion_flag_nr_deassign, + kvm_ioregion_flag_nr_max, +}; + +#define KVM_IOREGION_PIO (1 << kvm_ioregion_flag_nr_pio) +#define KVM_IOREGION_POSTED_WRITES (1 << kvm_ioregion_flag_nr_posted_write= s) +#define KVM_IOREGION_DEASSIGN (1 << kvm_ioregion_flag_nr_deassign) + +#define KVM_IOREGION_VALID_FLAG_MASK ((1 << kvm_ioregion_flag_nr_max) - 1) + +struct kvm_ioregion { + __u64 guest_paddr; /* guest physical address */ + __u64 memory_size; /* bytes */ + __u64 user_data; + __s32 read_fd; + __s32 write_fd; + __u32 flags; + __u8 pad[28]; +}; + #define KVM_X86_DISABLE_EXITS_MWAIT (1 << 0) #define KVM_X86_DISABLE_EXITS_HLT (1 << 1) #define KVM_X86_DISABLE_EXITS_PAUSE (1 << 2) @@ -1311,6 +1334,7 @@ struct kvm_vfio_spapr_tce { struct kvm_userspace_memory_region) #define KVM_SET_TSS_ADDR _IO(KVMIO, 0x47) #define KVM_SET_IDENTITY_MAP_ADDR _IOW(KVMIO, 0x48, __u64) +#define KVM_SET_IOREGION _IOW(KVMIO, 0x49, struct kvm_ioregion) =20 /* enable ucontrol for s390 */ struct kvm_s390_ucas_mapping { --=20 2.25.1