From patchwork Fri Dec 8 20:32:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Dr. David Alan Gilbert" X-Patchwork-Id: 846419 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3ytkfQ52vCz9sxR for ; Sat, 9 Dec 2017 07:36:45 +1100 (AEDT) Received: from localhost ([::1]:38947 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eNPNy-00050v-ME for incoming@patchwork.ozlabs.org; Fri, 08 Dec 2017 15:36:42 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50144) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eNPKa-0002Lc-63 for qemu-devel@nongnu.org; Fri, 08 Dec 2017 15:33:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eNPKZ-0001MD-3g for qemu-devel@nongnu.org; Fri, 08 Dec 2017 15:33:12 -0500 Received: from mx1.redhat.com ([209.132.183.28]:49446) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eNPKY-0001Le-Tv for qemu-devel@nongnu.org; Fri, 08 Dec 2017 15:33:11 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2677381DE2; Fri, 8 Dec 2017 20:33:10 +0000 (UTC) Received: from dgilbert-t530.redhat.com (ovpn-117-141.ams2.redhat.com [10.36.117.141]) by smtp.corp.redhat.com (Postfix) with ESMTP id EBC4219E7B; Fri, 8 Dec 2017 20:33:08 +0000 (UTC) From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, imammedo@redhat.com Date: Fri, 8 Dec 2017 20:32:53 +0000 Message-Id: <20171208203257.13102-5-dgilbert@redhat.com> In-Reply-To: <20171208203257.13102-1-dgilbert@redhat.com> References: <20171208203257.13102-1-dgilbert@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Fri, 08 Dec 2017 20:33:10 +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] [RFC v2 4/8] vhost: New memory update functions 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: maxime.coquelin@redhat.com, groug@kaod.org, mst@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: "Dr. David Alan Gilbert" vhost_update_mem will replace the existing update mechanism. They make use of the Flatview we have now to make the update simpler. This commit just adds the basic structure. Signed-off-by: Dr. David Alan Gilbert --- hw/virtio/vhost.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 50 insertions(+), 1 deletion(-) diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index 8b2310a054..d1b2d3441b 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -634,11 +634,51 @@ static void vhost_begin(MemoryListener *listener) dev->mem_changed_start_addr = -1; } +struct vhost_update_mem_tmp { + struct vhost_dev *dev; + uint32_t nregions; + struct vhost_memory_region *regions; +}; + +/* Called for each MRS from vhost_update_mem */ +static int vhost_update_mem_cb(MemoryRegionSection *mrs, void *opaque) +{ + if (!vhost_section(mrs)) { + return 0; + } + + /* TODO */ + return 0; +} + +static int vhost_update_mem(struct vhost_dev *dev, bool *changed) +{ + int res; + struct vhost_update_mem_tmp vtmp; + vtmp.regions = 0; + vtmp.nregions = 0; + vtmp.dev = dev; + + *changed = false; + res = address_space_iterate(&address_space_memory, + vhost_update_mem_cb, &vtmp); + if (res) { + goto out; + } + + /* TODO */ + *changed = dev->mem_changed_start_addr > dev->mem_changed_end_addr; +out: + g_free(vtmp.regions); + return res; +} + static void vhost_commit(MemoryListener *listener) { struct vhost_dev *dev = container_of(listener, struct vhost_dev, memory_listener); uint64_t log_size; + bool changed; int r; if (!dev->memory_changed) { @@ -647,7 +687,12 @@ static void vhost_commit(MemoryListener *listener) if (!dev->started) { return; } - if (dev->mem_changed_start_addr > dev->mem_changed_end_addr) { + if (vhost_update_mem(dev, &changed)) { + return; + } + + if (!changed) { + /* None of the mappings we care about changed */ return; } @@ -1519,6 +1564,7 @@ void vhost_ack_features(struct vhost_dev *hdev, const int *feature_bits, int vhost_dev_start(struct vhost_dev *hdev, VirtIODevice *vdev) { int i, r; + bool changed; /* should only be called after backend is connected */ assert(hdev->vhost_ops); @@ -1531,6 +1577,9 @@ int vhost_dev_start(struct vhost_dev *hdev, VirtIODevice *vdev) goto fail_features; } + if (vhost_update_mem(hdev, &changed)) { + goto fail_mem; + } if (vhost_dev_has_iommu(hdev)) { memory_listener_register(&hdev->iommu_listener, vdev->dma_as); }