From nobody Wed Nov 5 15:09:06 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 153567787232780.76722016780059; Thu, 30 Aug 2018 18:11:12 -0700 (PDT) Received: from localhost ([::1]:51428 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fvXxu-0005IY-Vt for importer@patchew.org; Thu, 30 Aug 2018 21:11:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45725) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fvXvE-0003dY-Aw for qemu-devel@nongnu.org; Thu, 30 Aug 2018 21:08:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fvXf4-0004hr-Ej for qemu-devel@nongnu.org; Thu, 30 Aug 2018 20:51:45 -0400 Received: from out1.zte.com.cn ([202.103.147.172]:38450 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 1fvXf4-0004h0-2s for qemu-devel@nongnu.org; Thu, 30 Aug 2018 20:51:42 -0400 Received: from mse01.zte.com.cn (unknown [10.30.3.20]) by Forcepoint Email with ESMTPS id 0F0705423ECB1B57C024; Fri, 31 Aug 2018 08:51:40 +0800 (CST) Received: from notes_smtp.zte.com.cn ([10.30.1.239]) by mse01.zte.com.cn with ESMTP id w7V0pT5N097910; Fri, 31 Aug 2018 08:51:29 +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 2018083108513700-6625331 ; Fri, 31 Aug 2018 08:51:37 +0800 From: Peng Hao To: pbonzini@redhat.com, rkrcmar@redhat.com, mst@redhat.com, ehabkost@redhat.com Date: Fri, 31 Aug 2018 17:05:03 +0800 Message-Id: <1535706305-118115-3-git-send-email-peng.hao2@zte.com.cn> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1535706305-118115-1-git-send-email-peng.hao2@zte.com.cn> References: <1535706305-118115-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-31 08:51:37, Serialize by Router on notes_smtp/zte_ltd(Release 9.0.1FP7|August 17, 2016) at 2018-08-31 08:51:14, Serialize complete at 2018-08-31 08:51:14 X-MAIL: mse01.zte.com.cn w7V0pT5N097910 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 V5 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 , 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 Reviewed-by: Eduardo Habkost --- accel/kvm/kvm-all.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++= ---- include/exec/memory.h | 4 ++-- memory.c | 4 ++-- 3 files changed, 57 insertions(+), 8 deletions(-) diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index 4a3909d..11d8d78 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; @@ -559,6 +560,45 @@ static void kvm_uncoalesce_mmio_region(MemoryListener = *listener, } } =20 +static void kvm_coalesce_pio_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_pio_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_pio_listener =3D { + .coalesced_io_add =3D kvm_coalesce_pio_add, + .coalesced_io_del =3D kvm_coalesce_pio_del, +}; + int kvm_check_extension(KVMState *s, unsigned int extension) { int ret; @@ -1615,6 +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); =20 #ifdef KVM_CAP_VCPU_EVENTS s->vcpu_events =3D kvm_check_extension(s, KVM_CAP_VCPU_EVENTS); @@ -1687,13 +1729,15 @@ static int kvm_init(MachineState *ms) s->memory_listener.listener.eventfd_add =3D kvm_mem_ioeventfd_add; s->memory_listener.listener.eventfd_del =3D kvm_mem_ioeventfd_del; } - s->memory_listener.listener.coalesced_mmio_add =3D kvm_coalesce_mmio_r= egion; - s->memory_listener.listener.coalesced_mmio_del =3D kvm_uncoalesce_mmio= _region; + s->memory_listener.listener.coalesced_io_add =3D kvm_coalesce_mmio_reg= ion; + s->memory_listener.listener.coalesced_io_del =3D kvm_uncoalesce_mmio_r= egion; =20 kvm_memory_listener_register(s, &s->memory_listener, &address_space_memory, 0); memory_listener_register(&kvm_io_listener, &address_space_io); + memory_listener_register(&kvm_coalesced_pio_listener, + &address_space_io); =20 s->many_ioeventfds =3D kvm_check_many_ioeventfds(); =20 @@ -1775,8 +1819,13 @@ 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_UNSPECIFIED, ent->data, + ent->len, true); + } 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/memory.h b/include/exec/memory.h index 448d41a..4600fa3 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -410,9 +410,9 @@ struct MemoryListener { bool match_data, uint64_t data, EventNotifier *e); void (*eventfd_del)(MemoryListener *listener, MemoryRegionSection *sec= tion, bool match_data, uint64_t data, EventNotifier *e); - void (*coalesced_mmio_add)(MemoryListener *listener, MemoryRegionSecti= on *section, + void (*coalesced_io_add)(MemoryListener *listener, MemoryRegionSection= *section, hwaddr addr, hwaddr len); - void (*coalesced_mmio_del)(MemoryListener *listener, MemoryRegionSecti= on *section, + void (*coalesced_io_del)(MemoryListener *listener, MemoryRegionSection= *section, hwaddr addr, hwaddr len); /* Lower =3D earlier (during add), later (during del) */ unsigned priority; diff --git a/memory.c b/memory.c index e9cd446..8b0311e 100644 --- a/memory.c +++ b/memory.c @@ -2126,7 +2126,7 @@ static void memory_region_update_coalesced_range_as(M= emoryRegion *mr, AddressSpa .size =3D fr->addr.size, }; =20 - MEMORY_LISTENER_CALL(as, coalesced_mmio_del, Reverse, §ion, + MEMORY_LISTENER_CALL(as, coalesced_io_del, Reverse, §ion, int128_get64(fr->addr.start), int128_get64(fr->addr.size)); QTAILQ_FOREACH(cmr, &mr->coalesced, link) { @@ -2137,7 +2137,7 @@ static void memory_region_update_coalesced_range_as(M= emoryRegion *mr, AddressSpa continue; } tmp =3D addrrange_intersection(tmp, fr->addr); - MEMORY_LISTENER_CALL(as, coalesced_mmio_add, Forward, &sec= tion, + MEMORY_LISTENER_CALL(as, coalesced_io_add, Forward, §i= on, int128_get64(tmp.start), int128_get64(tmp.size)); } --=20 1.8.3.1