From nobody Mon Feb 9 14:02:49 2026 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; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1539896732323709.2162160751604; Thu, 18 Oct 2018 14:05:32 -0700 (PDT) Received: from localhost ([::1]:44683 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gDFTy-00024A-2Y for importer@patchew.org; Thu, 18 Oct 2018 17:05:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48103) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gDEyJ-0007JP-DU for qemu-devel@nongnu.org; Thu, 18 Oct 2018 16:32:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gDEyF-0006J5-8o for qemu-devel@nongnu.org; Thu, 18 Oct 2018 16:32:43 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:33364) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gDEy9-00068t-4E for qemu-devel@nongnu.org; Thu, 18 Oct 2018 16:32:33 -0400 Received: by mail-wr1-x42b.google.com with SMTP id e4-v6so35109830wrs.0 for ; Thu, 18 Oct 2018 13:32:27 -0700 (PDT) Received: from 640k.lan (dynamic-adsl-78-12-231-174.clienti.tiscali.it. [78.12.231.174]) by smtp.gmail.com with ESMTPSA id a12-v6sm14270952wrr.71.2018.10.18.13.32.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Oct 2018 13:32:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=YVxtFGxDJw1vToy/wlvj40Ia2zdT2TZELui9N0jMEmI=; b=l3+2aGVU6dBNaILR4wFB4ICwwdpdLOd+uX7Kwie3OZQ7Yjz2dVme+JSJiuzNXd5NXk nVgUdhPndTWOY+/sYRmc/X67NxCNzhToA4ZkvtxyK/p1ZrQuG8L71Z9ebaChlHvbqWS0 QkE1kyMFSSMdIOZskmIwJ5F4Qlrc46MRGs2a1ecmB+S1o7HlxjLMofAqT+OB1iqpF7Z5 QLFTo3WS+Jfk3ESOYlTGUBHcDTp2CcUwn2bLAPI6sur/6uzXzS6ISzlm8e/iFAe4qMyI DEJjF0zqQiGrzekWY8CSTmoKhvzQUj61nXqb8as8Dvff3Kptf+rINyLSpl5i7yWSuuTT 8Tgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=YVxtFGxDJw1vToy/wlvj40Ia2zdT2TZELui9N0jMEmI=; b=GZSpXBg3p+xExmck0J2fa6ptl1Rs1NXCDBVN7QDPh+KzWtWNz/rztVmyaagpbusLKc UIHK1m790kQPsNFkPT5fftWzchVCLZ9m4VVBmcJysIwHCYBxmdALa/ZGBPaXzwhRAtt0 QDiWMB1c3t1TPood15o0HWb4IkfGkk0hG8bxXWjVYlyUW3M37avEt/Bt6fO4D+Z7XshV 4GrL3ZeYu/X7/BD2/X7O5czU0qJNaiQ/QS7Ft0qg9K37rxwtRkRXEYa2e9tK9yqq8/tG ibjwUBPVv0IQ1oCW0CWRUTmVhfvlDXm0azbKsWhs9yhGoxmac7V18aeREi7/6yUz0aHI gJmw== X-Gm-Message-State: ABuFfog34bseraSjbwe1GMcigSvqeL60MobdlIM8t9505N9u9cAAbFyG Eh5fPHBKeIbZotD5JXVjyJ8EnX2G X-Google-Smtp-Source: ACcGV63X9d7yhEUlxAv78KXK8TgcFVhKwqM6V/3XIU4bfuEsNsubzMF2axH/+dc32uA6ttRDPbprpg== X-Received: by 2002:a5d:60c3:: with SMTP id x3-v6mr31674553wrt.193.1539894746141; Thu, 18 Oct 2018 13:32:26 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 18 Oct 2018 22:31:35 +0200 Message-Id: <1539894735-14232-9-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1539894735-14232-1-git-send-email-pbonzini@redhat.com> References: <1539894735-14232-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42b Subject: [Qemu-devel] [PULL 08/48] 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 Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDMRC_1 RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Peng Hao the primary API realization. Signed-off-by: Peng Hao Reviewed-by: Eduardo Habkost Message-Id: <1539795177-21038-3-git-send-email-peng.hao2@zte.com.cn> Signed-off-by: Paolo Bonzini --- accel/kvm/kvm-all.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++= +--- include/exec/memory.h | 4 ++-- memory.c | 4 ++-- 3 files changed, 57 insertions(+), 7 deletions(-) diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index de12f78..4880a05 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -79,6 +79,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; @@ -560,6 +561,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; @@ -1616,6 +1656,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); @@ -1686,13 +1728,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 @@ -1778,7 +1822,13 @@ void kvm_flush_coalesced_mmio_buffer(void) =20 ent =3D &ring->coalesced_mmio[ring->first]; =20 - 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 3a427aa..667466b 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -419,9 +419,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 d852f11..51204aa 100644 --- a/memory.c +++ b/memory.c @@ -2129,7 +2129,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) { @@ -2140,7 +2140,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