{"id":2225325,"url":"http://patchwork.ozlabs.org/api/patches/2225325/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260420202032.714884-6-vsementsov@yandex-team.ru/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/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":"<20260420202032.714884-6-vsementsov@yandex-team.ru>","list_archive_url":null,"date":"2026-04-20T20:20:26","name":"[v2,05/10] vhost: simplify vhost_memory_map() and vhost_memory_unmap()","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"b6ac98014d92c61bacec27a89abf3733c2f2a479","submitter":{"id":84116,"url":"http://patchwork.ozlabs.org/api/people/84116/?format=json","name":"Vladimir Sementsov-Ogievskiy","email":"vsementsov@yandex-team.ru"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260420202032.714884-6-vsementsov@yandex-team.ru/mbox/","series":[{"id":500676,"url":"http://patchwork.ozlabs.org/api/series/500676/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=500676","date":"2026-04-20T20:20:24","name":"vhost-user: VHOST_USER_PROTOCOL_F_GPA_ADDRESSES","version":2,"mbox":"http://patchwork.ozlabs.org/series/500676/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2225325/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2225325/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=Oc+aBoJ6;\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-80.iva.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 4fzxjN6qnpz1yCv\n\tfor ; Tue, 21 Apr 2026 06:22:00 +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 1wEv6t-00061R-Pv; Mon, 20 Apr 2026 16:20:48 -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 1wEv6s-00060j-5j\n for qemu-devel@nongnu.org; Mon, 20 Apr 2026 16:20:46 -0400","from forwardcorp1a.mail.yandex.net ([178.154.239.72])\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 1wEv6q-0006OZ-88\n for qemu-devel@nongnu.org; Mon, 20 Apr 2026 16:20:45 -0400","from mail-nwsmtp-smtp-corp-main-80.iva.yp-c.yandex.net\n (mail-nwsmtp-smtp-corp-main-80.iva.yp-c.yandex.net\n [IPv6:2a02:6b8:c0c:c00c:0:640:e0de:0])\n by forwardcorp1a.mail.yandex.net (Yandex) with ESMTPS id DBB5BC01BD;\n Mon, 20 Apr 2026 23:20:42 +0300 (MSK)","from vsementsov-lin (unknown [2a02:6bf:8080:54b::1:34])\n by mail-nwsmtp-smtp-corp-main-80.iva.yp-c.yandex.net (smtpcorp) with ESMTPSA\n id XKYwe10MOSw0-ya10Q2Iq; Mon, 20 Apr 2026 23:20:42 +0300"],"X-Yandex-Fwd":"1","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru;\n s=default; t=1776716442;\n bh=y2itUKXedtugRUfBxJQ6CsdLWnW9+GVj1qpys57wb6k=;\n h=Message-ID:Date:In-Reply-To:Cc:Subject:References:To:From;\n b=Oc+aBoJ63sLLiQUKAjJJdZAcgnb6fR2XC6HLtO96gLmkhjHQnscGeC8ErAFutSs75\n lLlr+m/a4wi74hinEdeisEaHj/VilGix1AblPnxvtK/1P7KOEHNubqejjbBA0jVCCV\n dbDX1GBNb6vOt8zS2FdDgL3QP+KNJ//rrwk5UrKg=","From":"Vladimir Sementsov-Ogievskiy ","To":"mst@redhat.com","Cc":"sgarzare@redhat.com, qemu-devel@nongnu.org, vsementsov@yandex-team.ru,\n d-tatianin@yandex-team.ru","Subject":"[PATCH v2 05/10] vhost: simplify vhost_memory_map() and\n vhost_memory_unmap()","Date":"Mon, 20 Apr 2026 23:20:26 +0300","Message-ID":"<20260420202032.714884-6-vsementsov@yandex-team.ru>","X-Mailer":"git-send-email 2.52.0","In-Reply-To":"<20260420202032.714884-1-vsementsov@yandex-team.ru>","References":"<20260420202032.714884-1-vsementsov@yandex-team.ru>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Received-SPF":"pass client-ip=178.154.239.72;\n envelope-from=vsementsov@yandex-team.ru; helo=forwardcorp1a.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","Precedence":"list","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":"Make these functions simple wrappers around address_space_map() and\naddress_space_unmap(). Move IOMMU handling logic one layer up to the\ncallers.\n\nSigned-off-by: Vladimir Sementsov-Ogievskiy \n---\n hw/virtio/vhost.c | 43 ++++++++++++++++++++++++-------------------\n 1 file changed, 24 insertions(+), 19 deletions(-)","diff":"diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c\nindex 564a5d46982..cc083572f40 100644\n--- a/hw/virtio/vhost.c\n+++ b/hw/virtio/vhost.c\n@@ -456,21 +456,17 @@ static inline void vhost_dev_log_resize(struct vhost_dev *dev, uint64_t size)\n static void *vhost_memory_map(struct vhost_dev *dev, hwaddr addr,\n hwaddr len, bool is_write)\n {\n- if (!vhost_dev_has_iommu(dev)) {\n- hwaddr mapped_len = len;\n- void *res = address_space_map(dev->vdev->dma_as, addr, &mapped_len,\n- is_write, MEMTXATTRS_UNSPECIFIED);\n- if (!res) {\n- return NULL;\n- }\n- if (len != mapped_len) {\n- address_space_unmap(dev->vdev->dma_as, res, mapped_len, 0, 0);\n- return NULL;\n- }\n- return res;\n- } else {\n- return (void *)(uintptr_t)addr;\n+ hwaddr mapped_len = len;\n+ void *res = address_space_map(dev->vdev->dma_as, addr, &mapped_len,\n+ is_write, MEMTXATTRS_UNSPECIFIED);\n+ if (!res) {\n+ return NULL;\n+ }\n+ if (len != mapped_len) {\n+ address_space_unmap(dev->vdev->dma_as, res, mapped_len, 0, 0);\n+ return NULL;\n }\n+ return res;\n }\n \n static void vhost_memory_unmap(struct vhost_dev *dev, void **buffer,\n@@ -481,17 +477,18 @@ static void vhost_memory_unmap(struct vhost_dev *dev, void **buffer,\n return;\n }\n \n- if (!vhost_dev_has_iommu(dev)) {\n- address_space_unmap(dev->vdev->dma_as, *buffer, len, is_write,\n- access_len);\n- }\n-\n+ address_space_unmap(dev->vdev->dma_as, *buffer, len, is_write,\n+ access_len);\n *buffer = NULL;\n }\n \n static void vhost_vrings_unmap(struct vhost_dev *dev,\n struct vhost_virtqueue *vq, bool touched)\n {\n+ if (vhost_dev_has_iommu(dev)) {\n+ return;\n+ }\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@@ -519,6 +516,14 @@ static int vhost_vrings_map(struct vhost_dev *dev,\n /* Queue might not be ready for start */\n return 0;\n }\n+\n+ if (vhost_dev_has_iommu(dev)) {\n+ vq->desc = (void *)(uintptr_t)vq->desc_phys;\n+ vq->avail = (void *)(uintptr_t)vq->avail_phys;\n+ vq->used = (void *)(uintptr_t)vq->used_phys;\n+ return 1;\n+ }\n+\n vq->desc = vhost_memory_map(dev, vq->desc_phys, vq->desc_size, false);\n if (!vq->desc) {\n goto fail;\n","prefixes":["v2","05/10"]}