{"id":2225310,"url":"http://patchwork.ozlabs.org/api/1.2/patches/2225310/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260420200339.708640-16-vsementsov@yandex-team.ru/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.2/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20260420200339.708640-16-vsementsov@yandex-team.ru>","list_archive_url":null,"date":"2026-04-20T20:03:30","name":"[v6,15/22] vhost: final refactoring of vhost vrings map/unmap","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"638c4846ba68cc6d2be46a0306dc89e76795945e","submitter":{"id":84116,"url":"http://patchwork.ozlabs.org/api/1.2/people/84116/?format=json","name":"Vladimir Sementsov-Ogievskiy","email":"vsementsov@yandex-team.ru"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260420200339.708640-16-vsementsov@yandex-team.ru/mbox/","series":[{"id":500672,"url":"http://patchwork.ozlabs.org/api/1.2/series/500672/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=500672","date":"2026-04-20T20:03:18","name":"vhost refactoring and fixes","version":6,"mbox":"http://patchwork.ozlabs.org/series/500672/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2225310/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2225310/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=yandex-team.ru header.i=@yandex-team.ru\n header.a=rsa-sha256 header.s=default header.b=yCaKZ6tQ;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists1p.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)","mail-nwsmtp-smtp-corp-main-68.klg.yp-c.yandex.net;\n dkim=pass header.i=@yandex-team.ru"],"Received":["from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fzxMY19xcz1yCv\n\tfor ; Tue, 21 Apr 2026 06:06:33 +1000 (AEST)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists1p.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from )\n\tid 1wEur0-0001fw-1z; Mon, 20 Apr 2026 16:04:22 -0400","from eggs.gnu.org ([2001:470:142:3::10])\n by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from )\n id 1wEuqv-0001SB-B1\n for qemu-devel@nongnu.org; Mon, 20 Apr 2026 16:04:18 -0400","from forwardcorp1d.mail.yandex.net\n ([2a02:6b8:c41:1300:1:45:d181:df01])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from )\n id 1wEuqt-0001zs-HU\n for qemu-devel@nongnu.org; Mon, 20 Apr 2026 16:04:17 -0400","from mail-nwsmtp-smtp-corp-main-68.klg.yp-c.yandex.net\n (mail-nwsmtp-smtp-corp-main-68.klg.yp-c.yandex.net\n [IPv6:2a02:6b8:c42:94a9:0:640:a3fa:0])\n by forwardcorp1d.mail.yandex.net (Yandex) with ESMTPS id D761780663;\n Mon, 20 Apr 2026 23:04:13 +0300 (MSK)","from vsementsov-lin (unknown [2a02:6bf:8080:54b::1:34])\n by mail-nwsmtp-smtp-corp-main-68.klg.yp-c.yandex.net (smtpcorp) with ESMTPSA\n id f3YMX10K1Sw0-EYOraZle; Mon, 20 Apr 2026 23:04:13 +0300"],"Precedence":"bulk","X-Yandex-Fwd":"1","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru;\n s=default; t=1776715453;\n bh=8EIeZvm1CKDsTOi9FWm63RbYAd44Mkvf/dqAC7eZxQg=;\n h=Message-ID:Date:In-Reply-To:Cc:Subject:References:To:From;\n b=yCaKZ6tQRATwU7ge4mW4iVgjcIju6xrIUPdK1nvy7GkGPSTpRKaVd10f/F/nK9FSq\n yU+IWzHV8E8bAgmRup4KkDs93pJ917jpI8m9jd4PGVsZxjoQ81AXGJkLxvqNv59UmO\n fnZaXCEHuEAui0zKoQsIAHxS3Bgcci4dcbLNdRM8=","From":"Vladimir Sementsov-Ogievskiy ","To":"mst@redhat.com","Cc":"sgarzare@redhat.com, raphael@enfabrica.net, qemu-devel@nongnu.org,\n vsementsov@yandex-team.ru, yc-core@yandex-team.ru,\n d-tatianin@yandex-team.ru, Raphael Norwitz ","Subject":"[PATCH v6 15/22] vhost: final refactoring of vhost vrings map/unmap","Date":"Mon, 20 Apr 2026 23:03:30 +0300","Message-ID":"<20260420200339.708640-16-vsementsov@yandex-team.ru>","X-Mailer":"git-send-email 2.52.0","In-Reply-To":"<20260420200339.708640-1-vsementsov@yandex-team.ru>","References":"<20260420200339.708640-1-vsementsov@yandex-team.ru>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Received-SPF":"pass client-ip=2a02:6b8:c41:1300:1:45:d181:df01;\n envelope-from=vsementsov@yandex-team.ru; helo=forwardcorp1d.mail.yandex.net","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, DKIM_SIGNED=0.1,\n DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001,\n 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.29","List-Id":"qemu development ","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org"},"content":"Introduce helper functions vhost_vrings_map() and\nvhost_vrings_unmap() and use them.\n\nSigned-off-by: Vladimir Sementsov-Ogievskiy \nReviewed-by: Raphael Norwitz \n---\n hw/virtio/vhost.c | 89 +++++++++++++++++++++++++++++------------------\n 1 file changed, 55 insertions(+), 34 deletions(-)","diff":"diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c\nindex a3bf7e5a9b8..c71b18cfc8d 100644\n--- a/hw/virtio/vhost.c\n+++ b/hw/virtio/vhost.c\n@@ -489,6 +489,56 @@ static void vhost_memory_unmap(struct vhost_dev *dev, void **buffer,\n *buffer = NULL;\n }\n \n+static void vhost_vrings_unmap(struct vhost_dev *dev,\n+ struct vhost_virtqueue *vq, bool touched)\n+{\n+ vhost_memory_unmap(dev, &vq->used, vq->used_size, touched,\n+ touched ? vq->used_size : 0);\n+ vhost_memory_unmap(dev, &vq->avail, vq->avail_size, 0,\n+ touched ? vq->avail_size : 0);\n+ vhost_memory_unmap(dev, &vq->desc, vq->desc_size, 0,\n+ touched ? vq->desc_size : 0);\n+}\n+\n+static int vhost_vrings_map(struct vhost_dev *dev,\n+ struct VirtIODevice *vdev,\n+ struct vhost_virtqueue *vq,\n+ unsigned idx)\n+{\n+ vq->desc_size = virtio_queue_get_desc_size(vdev, idx);\n+ vq->desc_phys = virtio_queue_get_desc_addr(vdev, idx);\n+ vq->desc = NULL;\n+ vq->avail_size = virtio_queue_get_avail_size(vdev, idx);\n+ vq->avail_phys = virtio_queue_get_avail_addr(vdev, idx);\n+ vq->avail = NULL;\n+ vq->used_size = virtio_queue_get_used_size(vdev, idx);\n+ vq->used_phys = virtio_queue_get_used_addr(vdev, idx);\n+ vq->used = NULL;\n+\n+ if (vq->desc_phys == 0) {\n+ /* Queue might not be ready for start */\n+ return 0;\n+ }\n+ vq->desc = vhost_memory_map(dev, vq->desc_phys, vq->desc_size, false);\n+ if (!vq->desc) {\n+ goto fail;\n+ }\n+ vq->avail = vhost_memory_map(dev, vq->avail_phys, vq->avail_size, false);\n+ if (!vq->avail) {\n+ goto fail;\n+ }\n+ vq->used = vhost_memory_map(dev, vq->used_phys, vq->used_size, true);\n+ if (!vq->used) {\n+ goto fail;\n+ }\n+\n+ return 1;\n+\n+fail:\n+ vhost_vrings_unmap(dev, vq, false);\n+ return -ENOMEM;\n+}\n+\n static int vhost_verify_ring_part_mapping(void *ring_hva,\n uint64_t ring_gpa,\n uint64_t ring_size,\n@@ -1287,34 +1337,9 @@ int vhost_virtqueue_start(struct vhost_dev *dev,\n };\n struct VirtQueue *vvq = virtio_get_queue(vdev, idx);\n \n- vq->desc_size = virtio_queue_get_desc_size(vdev, idx);\n- vq->desc_phys = virtio_queue_get_desc_addr(vdev, idx);\n- vq->desc = NULL;\n- vq->avail_size = virtio_queue_get_avail_size(vdev, idx);\n- vq->avail_phys = virtio_queue_get_avail_addr(vdev, idx);\n- vq->avail = NULL;\n- vq->used_size = virtio_queue_get_used_size(vdev, idx);\n- vq->used_phys = virtio_queue_get_used_addr(vdev, idx);\n- vq->used = NULL;\n-\n- if (vq->desc_phys == 0) {\n- /* Queue might not be ready for start */\n- return 0;\n- }\n- vq->desc = vhost_memory_map(dev, vq->desc_phys, vq->desc_size, false);\n- if (!vq->desc) {\n- r = -ENOMEM;\n- goto fail;\n- }\n- vq->avail = vhost_memory_map(dev, vq->avail_phys, vq->avail_size, false);\n- if (!vq->avail) {\n- r = -ENOMEM;\n- goto fail;\n- }\n- vq->used = vhost_memory_map(dev, vq->used_phys, vq->used_size, true);\n- if (!vq->used) {\n- r = -ENOMEM;\n- goto fail;\n+ r = vhost_vrings_map(dev, vdev, vq, idx);\n+ if (r <= 0) {\n+ return r;\n }\n \n vq->num = state.num = virtio_queue_get_num(vdev, idx);\n@@ -1375,9 +1400,7 @@ int vhost_virtqueue_start(struct vhost_dev *dev,\n return 0;\n \n fail:\n- vhost_memory_unmap(dev, &vq->used, vq->used_size, 0, 0);\n- vhost_memory_unmap(dev, &vq->avail, vq->avail_size, 0, 0);\n- vhost_memory_unmap(dev, &vq->desc, vq->desc_size, 0, 0);\n+ vhost_vrings_unmap(dev, vq, false);\n return r;\n }\n \n@@ -1424,9 +1447,7 @@ static int do_vhost_virtqueue_stop(struct vhost_dev *dev,\n vhost_vq_index);\n }\n \n- vhost_memory_unmap(dev, &vq->used, vq->used_size, 1, vq->used_size);\n- vhost_memory_unmap(dev, &vq->avail, vq->avail_size, 0, vq->avail_size);\n- vhost_memory_unmap(dev, &vq->desc, vq->desc_size, 0, vq->desc_size);\n+ vhost_vrings_unmap(dev, vq, true);\n return r;\n }\n \n","prefixes":["v6","15/22"]}