From nobody Sun Oct 26 01:45:00 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 1516078553947550.966758781534; Mon, 15 Jan 2018 20:55:53 -0800 (PST) Received: from localhost ([::1]:35243 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ebJHt-0006Oc-3b for importer@patchew.org; Mon, 15 Jan 2018 23:55:53 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48353) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ebJAS-0000DX-AA for qemu-devel@nongnu.org; Mon, 15 Jan 2018 23:48:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ebJAR-00051f-3a for qemu-devel@nongnu.org; Mon, 15 Jan 2018 23:48:12 -0500 Received: from mx1.redhat.com ([209.132.183.28]:55970) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ebJAQ-00051F-Pz for qemu-devel@nongnu.org; Mon, 15 Jan 2018 23:48:11 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E03D576525; Tue, 16 Jan 2018 04:48:09 +0000 (UTC) Received: from redhat.com (ovpn-125-221.rdu2.redhat.com [10.10.125.221]) by smtp.corp.redhat.com (Postfix) with SMTP id 3BCFF87039; Tue, 16 Jan 2018 04:48:09 +0000 (UTC) Date: Tue, 16 Jan 2018 06:48:08 +0200 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Message-ID: <1516077852-7974-25-git-send-email-mst@redhat.com> References: <1516077852-7974-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1516077852-7974-1-git-send-email-mst@redhat.com> X-Mutt-Fcc: =sent X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Tue, 16 Jan 2018 04:48:09 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 24/33] vhost: Merge sections added to temporary list 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: Peter Maydell , "Dr. David Alan Gilbert" , Igor Mammedov 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 Content-Type: text/plain; charset="utf-8" From: "Dr. David Alan Gilbert" As sections are reported by the listener to the _nop and _add methods, add them to the temporary section list but now merge them with the previous section if the new one abuts and the backend allows. Signed-off-by: Dr. David Alan Gilbert Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Reviewed-by: Igor Mammedov --- docs/interop/vhost-user.txt | 2 +- hw/virtio/vhost.c | 72 ++++++++++++++++++++++++++++++++++++++---= ---- hw/virtio/trace-events | 2 ++ 3 files changed, 65 insertions(+), 11 deletions(-) diff --git a/docs/interop/vhost-user.txt b/docs/interop/vhost-user.txt index 9fcf48d..a8c5623 100644 --- a/docs/interop/vhost-user.txt +++ b/docs/interop/vhost-user.txt @@ -551,7 +551,7 @@ Master message types Master payload: N/A Slave payload: u64 =20 - Query how many queues the backend supports. This request should be + Query how many queue pairs the backend supports. This request should= be sent only when VHOST_USER_PROTOCOL_F_MQ is set in queried protocol features by VHOST_USER_GET_PROTOCOL_FEATURES. =20 diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index 0bdd833..e63099f 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -709,14 +709,65 @@ out: return; } =20 -static void vhost_add_section(struct vhost_dev *dev, - MemoryRegionSection *section) -{ - ++dev->n_tmp_sections; - dev->tmp_sections =3D g_renew(MemoryRegionSection, dev->tmp_sections, - dev->n_tmp_sections); - dev->tmp_sections[dev->n_tmp_sections - 1] =3D *section; - memory_region_ref(section->mr); +/* Adds the section data to the tmp_section structure. + * It relies on the listener calling us in memory address order + * and for each region (via the _add and _nop methods) to + * join neighbours. + */ +static void vhost_region_add_section(struct vhost_dev *dev, + MemoryRegionSection *section) +{ + bool need_add =3D true; + uint64_t mrs_size =3D int128_get64(section->size); + uint64_t mrs_gpa =3D section->offset_within_address_space; + uintptr_t mrs_host =3D (uintptr_t)memory_region_get_ram_ptr(section->m= r) + + section->offset_within_region; + + trace_vhost_region_add_section(section->mr->name, mrs_gpa, mrs_size, + mrs_host); + + if (dev->n_tmp_sections) { + /* Since we already have at least one section, lets see if + * this extends it; since we're scanning in order, we only + * have to look at the last one, and the FlatView that calls + * us shouldn't have overlaps. + */ + MemoryRegionSection *prev_sec =3D dev->tmp_sections + + (dev->n_tmp_sections - 1); + uint64_t prev_gpa_start =3D prev_sec->offset_within_address_space; + uint64_t prev_size =3D int128_get64(prev_sec->size); + uint64_t prev_gpa_end =3D range_get_last(prev_gpa_start, prev_si= ze); + uint64_t prev_host_start =3D + (uintptr_t)memory_region_get_ram_ptr(prev_sec->mr)= + + prev_sec->offset_within_region; + uint64_t prev_host_end =3D range_get_last(prev_host_start, prev_= size); + + if (prev_gpa_end + 1 =3D=3D mrs_gpa && + prev_host_end + 1 =3D=3D mrs_host && + section->mr =3D=3D prev_sec->mr && + (!dev->vhost_ops->vhost_backend_can_merge || + dev->vhost_ops->vhost_backend_can_merge(dev, + mrs_host, mrs_size, + prev_host_start, prev_size))) { + /* The two sections abut */ + need_add =3D false; + prev_sec->size =3D int128_add(prev_sec->size, section->size); + trace_vhost_region_add_section_abut(section->mr->name, + mrs_size + prev_size); + } + } + + if (need_add) { + ++dev->n_tmp_sections; + dev->tmp_sections =3D g_renew(MemoryRegionSection, dev->tmp_sectio= ns, + dev->n_tmp_sections); + dev->tmp_sections[dev->n_tmp_sections - 1] =3D *section; + /* The flatview isn't stable and we don't use it, making it NULL + * means we can memcmp the list. + */ + dev->tmp_sections[dev->n_tmp_sections - 1].fv =3D NULL; + memory_region_ref(section->mr); + } } =20 static void vhost_region_add(MemoryListener *listener, @@ -728,11 +779,12 @@ static void vhost_region_add(MemoryListener *listener, if (!vhost_section(section)) { return; } + vhost_region_add_section(dev, section); =20 - vhost_add_section(dev, section); vhost_set_memory(listener, section, true); } =20 +/* Called on regions that have not changed */ static void vhost_region_nop(MemoryListener *listener, MemoryRegionSection *section) { @@ -743,7 +795,7 @@ static void vhost_region_nop(MemoryListener *listener, return; } =20 - vhost_add_section(dev, section); + vhost_region_add_section(dev, section); } =20 static void vhost_region_del(MemoryListener *listener, diff --git a/hw/virtio/trace-events b/hw/virtio/trace-events index 4a493bc..0e63c87 100644 --- a/hw/virtio/trace-events +++ b/hw/virtio/trace-events @@ -1,6 +1,8 @@ # See docs/devel/tracing.txt for syntax documentation. =20 # hw/virtio/vhost.c +vhost_region_add_section(const char *name, uint64_t gpa, uint64_t size, ui= nt64_t host) "%s: 0x%"PRIx64"+0x%"PRIx64" @ 0x%"PRIx64 +vhost_region_add_section_abut(const char *name, uint64_t new_size) "%s: 0x= %"PRIx64 vhost_section(const char *name, int r) "%s:%d" =20 # hw/virtio/virtio.c --=20 MST