From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 53CD4C2D0E4 for ; Fri, 20 Nov 2020 19:11:20 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BDEC822240 for ; Fri, 20 Nov 2020 19:11:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Jf3rZABf" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BDEC822240 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:43284 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kgBoU-0004oR-JA for qemu-devel@archiver.kernel.org; Fri, 20 Nov 2020 14:11:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41922) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kgBZj-0007T8-Hy for qemu-devel@nongnu.org; Fri, 20 Nov 2020 13:56:03 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:56098) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kgBZf-0008AU-3R for qemu-devel@nongnu.org; Fri, 20 Nov 2020 13:56:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605898558; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DG7n1lY/Hiobxg4WLGYVhL1ajHj2aBFA91adPYMLFP4=; b=Jf3rZABflxeqCx7FJNgc2aQRYnAU+aKiQMk1twWs7rjkO6fv2SYsCOQD/F7lp0r172BBEM BLrxzUjuoqMeZKNykZFQfDXqFsdFjCnz9okuxdZOykx1DycxTTSLunRhF2uMoNi1yBbx4f OSwgFPFbtbITSKxMhx9gaCWggpFusgA= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-506-twp43SyfNR6F-fyrLqtTQA-1; Fri, 20 Nov 2020 13:55:56 -0500 X-MC-Unique: twp43SyfNR6F-fyrLqtTQA-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7487C801B1E; Fri, 20 Nov 2020 18:55:53 +0000 (UTC) Received: from eperezma.remote.csb (ovpn-112-88.ams2.redhat.com [10.36.112.88]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0B4585C1D5; Fri, 20 Nov 2020 18:55:43 +0000 (UTC) From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: qemu-devel@nongnu.org Subject: [RFC PATCH 20/27] vhost: Return used buffers Date: Fri, 20 Nov 2020 19:50:58 +0100 Message-Id: <20201120185105.279030-21-eperezma@redhat.com> In-Reply-To: <20201120185105.279030-1-eperezma@redhat.com> References: <20201120185105.279030-1-eperezma@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Received-SPF: pass client-ip=63.128.21.124; envelope-from=eperezma@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kvm@vger.kernel.org, "Michael S. Tsirkin" , Jason Wang , Daniel Daly , virtualization@lists.linux-foundation.org, Liran Alon , Eli Cohen , Nitin Shrivastav , Alex Barba , Christophe Fontaine , Juan Quintela , Lee Ballard , Lars Ganrot , Rob Miller , Stefano Garzarella , Howard Cai , Parav Pandit , vm , Salil Mehta , Stephen Finucane , Xiao W Wang , Sean Mooney , Stefan Hajnoczi , Jim Harford , Dmytro Kazantsev , Siwei Liu , Harpreet Singh Anand , Michael Lilja , Max Gurtovoy Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Eugenio Pérez --- hw/virtio/vhost-sw-lm-ring.h | 3 +++ hw/virtio/vhost-sw-lm-ring.c | 14 +++++++---- hw/virtio/vhost.c | 46 +++++++++++++++++++++++++++++++++--- 3 files changed, 56 insertions(+), 7 deletions(-) diff --git a/hw/virtio/vhost-sw-lm-ring.h b/hw/virtio/vhost-sw-lm-ring.h index 429a125558..0c4fa772c7 100644 --- a/hw/virtio/vhost-sw-lm-ring.h +++ b/hw/virtio/vhost-sw-lm-ring.h @@ -17,6 +17,9 @@ typedef struct VhostShadowVirtqueue VhostShadowVirtqueue; +VirtIODevice *vhost_vring_vdev(VhostShadowVirtqueue *svq); +VirtQueue *vhost_vring_vdev_vq(VhostShadowVirtqueue *svq); + bool vhost_vring_kick(VhostShadowVirtqueue *vq); int vhost_vring_add(VhostShadowVirtqueue *vq, VirtQueueElement *elem); VirtQueueElement *vhost_vring_get_buf_rcu(VhostShadowVirtqueue *vq, size_t sz); diff --git a/hw/virtio/vhost-sw-lm-ring.c b/hw/virtio/vhost-sw-lm-ring.c index 4fafd1b278..244c722910 100644 --- a/hw/virtio/vhost-sw-lm-ring.c +++ b/hw/virtio/vhost-sw-lm-ring.c @@ -46,6 +46,16 @@ typedef struct VhostShadowVirtqueue { vring_desc_t descs[]; } VhostShadowVirtqueue; +VirtIODevice *vhost_vring_vdev(VhostShadowVirtqueue *svq) +{ + return svq->vdev; +} + +VirtQueue *vhost_vring_vdev_vq(VhostShadowVirtqueue *svq) +{ + return svq->vq; +} + static bool vhost_vring_should_kick_rcu(VhostShadowVirtqueue *vq) { VirtIODevice *vdev = vq->vdev; @@ -179,10 +189,6 @@ static int vhost_vring_add_split(VhostShadowVirtqueue *vq, int vhost_vring_add(VhostShadowVirtqueue *vq, VirtQueueElement *elem) { int host_head = vhost_vring_add_split(vq, elem); - if (vq->ring_id_maps[host_head]) { - g_free(vq->ring_id_maps[host_head]); - } - vq->ring_id_maps[host_head] = elem; return 0; } diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index ac2bc14190..9a3c580dcf 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -986,17 +986,50 @@ static void handle_sw_lm_vq(VirtIODevice *vdev, VirtQueue *vq) } while(!virtio_queue_empty(vq)); } +static void handle_sw_lm_vq_call(struct vhost_dev *hdev, + VhostShadowVirtqueue *svq) +{ + VirtQueueElement *elem; + VirtIODevice *vdev = vhost_vring_vdev(svq); + VirtQueue *vq = vhost_vring_vdev_vq(svq); + uint16_t idx = virtio_get_queue_index(vq); + + RCU_READ_LOCK_GUARD(); + /* + * Make used all buffers as possible. + */ + do { + unsigned i = 0; + + vhost_vring_set_notification_rcu(svq, false); + while (true) { + elem = vhost_vring_get_buf_rcu(svq, sizeof(*elem)); + if (!elem) { + break; + } + + assert(i < virtio_queue_get_num(vdev, idx)); + virtqueue_fill(vq, elem, elem->len, i++); + } + + virtqueue_flush(vq, i); + virtio_notify_irqfd(vdev, vq); + + vhost_vring_set_notification_rcu(svq, true); + } while (vhost_vring_poll_rcu(svq)); +} + static void vhost_handle_call(EventNotifier *n) { struct vhost_virtqueue *hvq = container_of(n, struct vhost_virtqueue, masked_notifier); struct vhost_dev *vdev = hvq->dev; - int idx = vdev->vq_index + (hvq == &vdev->vqs[0] ? 0 : 1); - VirtQueue *vq = virtio_get_queue(vdev->vdev, idx); + int idx = hvq == &vdev->vqs[0] ? 0 : 1; + VhostShadowVirtqueue *vq = vdev->sw_lm_shadow_vq[idx]; if (event_notifier_test_and_clear(n)) { - virtio_notify_irqfd(vdev->vdev, vq); + handle_sw_lm_vq_call(vdev, vq); } } @@ -1028,6 +1061,7 @@ static int vhost_sw_live_migration_start(struct vhost_dev *dev) for (idx = 0; idx < dev->nvqs; ++idx) { struct vhost_virtqueue *vq = &dev->vqs[idx]; + unsigned num = virtio_queue_get_num(dev->vdev, idx); struct vhost_vring_addr addr = { .index = idx, }; @@ -1044,6 +1078,12 @@ static int vhost_sw_live_migration_start(struct vhost_dev *dev) r = dev->vhost_ops->vhost_set_vring_addr(dev, &addr); assert(r == 0); + r = vhost_backend_update_device_iotlb(dev, addr.used_user_addr, + addr.used_user_addr, + sizeof(vring_used_elem_t) * num, + IOMMU_RW); + assert(r == 0); + r = dev->vhost_ops->vhost_set_vring_base(dev, &s); assert(r == 0); } -- 2.18.4