From nobody Wed Nov 5 15:09:07 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1535011522931701.3269286055488; Thu, 23 Aug 2018 01:05:22 -0700 (PDT) Received: from localhost ([::1]:34936 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fskcL-0004d9-EM for importer@patchew.org; Thu, 23 Aug 2018 04:05:21 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35485) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fskY7-0001vv-Fg for qemu-devel@nongnu.org; Thu, 23 Aug 2018 04:01:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fskY4-0000rM-6U for qemu-devel@nongnu.org; Thu, 23 Aug 2018 04:00:59 -0400 Received: from out1.zte.com.cn ([202.103.147.172]:45406 helo=mxct.zte.com.cn) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fskY3-0000mf-Rm for qemu-devel@nongnu.org; Thu, 23 Aug 2018 04:00:56 -0400 Received: from mse01.zte.com.cn (unknown [10.30.3.20]) by Forcepoint Email with ESMTPS id 85F65B4CA8EB96C4CDE3; Thu, 23 Aug 2018 16:00:48 +0800 (CST) Received: from notes_smtp.zte.com.cn ([10.30.1.239]) by mse01.zte.com.cn with ESMTP id w7N80AVK064193; Thu, 23 Aug 2018 16:00:10 +0800 (GMT-8) (envelope-from peng.hao2@zte.com.cn) Received: from localhost.localdomain.localdomain ([10.74.120.59]) by szsmtp06.zte.com.cn (Lotus Domino Release 8.5.3FP6) with ESMTP id 2018082316001809-5817066 ; Thu, 23 Aug 2018 16:00:18 +0800 From: Peng Hao To: pbonzini@redhat.com, mst@redhat.com, ehabkost@redhat.com, rkrcmar@redhat.com Date: Fri, 24 Aug 2018 00:14:47 +0800 Message-Id: <1535040889-52782-3-git-send-email-peng.hao2@zte.com.cn> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1535040889-52782-1-git-send-email-peng.hao2@zte.com.cn> References: <1535040889-52782-1-git-send-email-peng.hao2@zte.com.cn> X-MIMETrack: Itemize by SMTP Server on SZSMTP06/server/zte_ltd(Release 8.5.3FP6|November 21, 2013) at 2018-08-23 16:00:18, Serialize by Router on notes_smtp/zte_ltd(Release 9.0.1FP7|August 17, 2016) at 2018-08-23 15:59:59, Serialize complete at 2018-08-23 15:59:59 X-MAIL: mse01.zte.com.cn w7N80AVK064193 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 202.103.147.172 Subject: [Qemu-devel] [PATCH V3 2/4] target-i386:add coalesced_pio API X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peng Hao , zhong.weidong@zte.com.cn, qemu-devel@nongnu.org, kvm@vger.kernel.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Peng Hao --- accel/kvm/kvm-all.c | 58 ++++++++++++++++++++++++++++++++++++++++++++-= ---- include/exec/memattrs.h | 2 +- 2 files changed, 53 insertions(+), 7 deletions(-) diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index eb7db92..830745e 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -78,6 +78,7 @@ struct KVMState int fd; int vmfd; int coalesced_mmio; + int coalesced_pio; struct kvm_coalesced_mmio_ring *coalesced_mmio_ring; bool coalesced_flush_in_progress; int vcpu_events; @@ -536,7 +537,7 @@ static void kvm_coalesce_mmio_region(MemoryListener *li= stener, =20 zone.addr =3D start; zone.size =3D size; - zone.pad =3D 0; + zone.pio =3D 0; =20 (void)kvm_vm_ioctl(s, KVM_REGISTER_COALESCED_MMIO, &zone); } @@ -553,12 +554,51 @@ static void kvm_uncoalesce_mmio_region(MemoryListener= *listener, =20 zone.addr =3D start; zone.size =3D size; - zone.pad =3D 0; + zone.pio =3D 0; =20 (void)kvm_vm_ioctl(s, KVM_UNREGISTER_COALESCED_MMIO, &zone); } } =20 +static void kvm_coalesce_io_add(MemoryListener *listener, + MemoryRegionSection *section, + hwaddr start, hwaddr size) +{ + KVMState *s =3D kvm_state; + + if (s->coalesced_pio) { + struct kvm_coalesced_mmio_zone zone; + + zone.addr =3D start; + zone.size =3D size; + zone.pio =3D 1; + + (void)kvm_vm_ioctl(s, KVM_REGISTER_COALESCED_MMIO, &zone); + } +} + +static void kvm_coalesce_io_del(MemoryListener *listener, + MemoryRegionSection *section, + hwaddr start, hwaddr size) +{ + KVMState *s =3D kvm_state; + + if (s->coalesced_pio) { + struct kvm_coalesced_mmio_zone zone; + + zone.addr =3D start; + zone.size =3D size; + zone.pio =3D 1; + + (void)kvm_vm_ioctl(s, KVM_UNREGISTER_COALESCED_MMIO, &zone); + } +} + +static MemoryListener kvm_coalesced_io_listener =3D { + .coalesced_mmio_add =3D kvm_coalesce_io_add, + .coalesced_mmio_del =3D kvm_coalesce_io_del, +}; + int kvm_check_extension(KVMState *s, unsigned int extension) { int ret; @@ -1615,7 +1655,8 @@ static int kvm_init(MachineState *ms) } =20 s->coalesced_mmio =3D kvm_check_extension(s, KVM_CAP_COALESCED_MMIO); - + s->coalesced_pio =3D s->coalesced_mmio && + kvm_check_extension(s, KVM_CAP_COALESCED_PIO); #ifdef KVM_CAP_VCPU_EVENTS s->vcpu_events =3D kvm_check_extension(s, KVM_CAP_VCPU_EVENTS); #endif @@ -1694,7 +1735,8 @@ static int kvm_init(MachineState *ms) &address_space_memory, 0); memory_listener_register(&kvm_io_listener, &address_space_io); - + memory_listener_register(&kvm_coalesced_io_listener, + &address_space_io); s->many_ioeventfds =3D kvm_check_many_ioeventfds(); =20 s->sync_mmu =3D !!kvm_vm_check_extension(kvm_state, KVM_CAP_SYNC_MMU); @@ -1775,8 +1817,12 @@ void kvm_flush_coalesced_mmio_buffer(void) struct kvm_coalesced_mmio *ent; =20 ent =3D &ring->coalesced_mmio[ring->first]; - - cpu_physical_memory_write(ent->phys_addr, ent->data, ent->len); + if (ent->pio =3D=3D 1) { + address_space_rw(&address_space_io, ent->phys_addr, + MEMTXATTRS_NONE, ent->data, ent->len, tru= e); + } else { + cpu_physical_memory_write(ent->phys_addr, ent->data, ent->= len); + } smp_wmb(); ring->first =3D (ring->first + 1) % KVM_COALESCED_MMIO_MAX; } diff --git a/include/exec/memattrs.h b/include/exec/memattrs.h index d4a1642..12fd64f 100644 --- a/include/exec/memattrs.h +++ b/include/exec/memattrs.h @@ -45,7 +45,7 @@ typedef struct MemTxAttrs { * from "didn't specify" if necessary). */ #define MEMTXATTRS_UNSPECIFIED ((MemTxAttrs) { .unspecified =3D 1 }) - +#define MEMTXATTRS_NONE ((MemTxAttrs) { 0 }) /* New-style MMIO accessors can indicate that the transaction failed. * A zero (MEMTX_OK) response means success; anything else is a failure * of some kind. The memory subsystem will bitwise-OR together results --=20 1.8.3.1