From nobody Sat Oct 4 23:47:52 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1759170997; cv=none; d=zohomail.com; s=zohoarc; b=hiexCSv/BdjmHMXIAtt+LFwVOsjxYPOt/xna/Yu4IxjpC/gXNRL5MP6GsP6A9dHksC0laoO41HxIxbvNE55gRFuevouw8JhlguJwkHGvyJ9F+ft+VRt2X2eDNKb6cHsClkVaL42Q31MsrBkKxwGwYsrPvQBDU0MbPvrQcvU2KpM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759170997; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=+R20KfaeepivX48ztS5Qk+Utu4Wf2nP4nwxC8R0e4a4=; b=N52A89VzDMEjqtiIM9iI4rGakIgUvccMkqJKYSbtITxfkuQ8qjb2y2RIQgNjOGxOA93YJ2RhUT6fZUxVWRqP9srppgcLk/I7slvmBS81+ZI8xHAJvTylpOwRYuPpzLWJR00QsX/3/LXv/MDipp7w8e6QHlg3XB9DGLdmIzdwZj8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1759170997116361.55449680137303; Mon, 29 Sep 2025 11:36:37 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1133210.1471420 (Exim 4.92) (envelope-from ) id 1v3IjR-000798-NU; Mon, 29 Sep 2025 18:36:17 +0000 Received: by outflank-mailman (output) from mailman id 1133210.1471420; Mon, 29 Sep 2025 18:36:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1v3IjR-00078u-DE; Mon, 29 Sep 2025 18:36:17 +0000 Received: by outflank-mailman (input) for mailman id 1133210; Mon, 29 Sep 2025 18:36:16 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1v3IhZ-0001U2-7G for xen-devel@lists.xenproject.org; Mon, 29 Sep 2025 18:34:21 +0000 Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [2a00:1450:4864:20::32b]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id e96d1105-9d62-11f0-9d14-b5c5bf9af7f9; Mon, 29 Sep 2025 20:34:19 +0200 (CEST) Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-46e52279279so10850945e9.3 for ; Mon, 29 Sep 2025 11:34:19 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-40fc6de90desm19572933f8f.47.2025.09.29.11.34.17 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 29 Sep 2025 11:34:18 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: e96d1105-9d62-11f0-9d14-b5c5bf9af7f9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759170859; x=1759775659; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+R20KfaeepivX48ztS5Qk+Utu4Wf2nP4nwxC8R0e4a4=; b=Y9+30Hkz4HHQfdraVyqByB/w2vXuPn5+NgKp75yXarQCOItV4arzp+UljZnDb2r+wk uOtH/8hu/grT1nFpqIw+vFiwHI66+1xxDeIBp+BiypFmu7fl4twgnT7Be6RNDX0hfYmN ozT4+xQSVKySdSGZ/7GW8hE8d/qVVEM/aFXgnRDlmqZQeGw9LTrIQU1MoKlYQbXKINw9 pehIP/lffCEoWF+8z5b7ovpOdmT73pFJXYXHpPblQxyh+dJoK2R7mHqwIhaeQSPD/doG PRnlOMpbtAG0puLc6U/46RgN6ueuqHt25FygtxeZKkCY3DT2Hwl+V1BACy/GZAfDDlZ+ A98Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759170859; x=1759775659; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+R20KfaeepivX48ztS5Qk+Utu4Wf2nP4nwxC8R0e4a4=; b=HBt/UqifR5AuGk3jA0Yx3dzY/w6l9sRG7niKwT3Y/39olE80Jy2rqVFV4CiW9ZOO66 Akv120kaE8skmJYAjYe3Vzeg8t7iKfNOO72RN9kGukpc/On6YfDKv+/+HDuY2YEY2psc xq8grKwErZC9Rgg8rWdTa0ulN4YUItqE36gyMYQ4Yv3ftBMkqz5KUVUXOaxqOWBLddmN h4+1dsOGHYYPmLIMWxtrk8QBrgrcQG3vG7FzdqyyWP9ok2fy3WZsaDQz75yKWbkkoxU0 7JcKUKcOfC20XUktUMC1RXFRul5tRl9F8LpGk0FWGXtTecXcKD0IqqboJcLGetKLJbU6 omPg== X-Forwarded-Encrypted: i=1; AJvYcCUM0eD5DrHj8qohU4credFtCl1j9Ohtu01W7gqv8DIyevge4puOWhzwKxo1bu2PHxkqckAELoIMqLE=@lists.xenproject.org X-Gm-Message-State: AOJu0Yy3ccE60tPD6cdNenC3g2VfXA46eiqp92TM4F/8wDyRErp3Ud7Y E8YIlAiRlPJVzrjK4o/+P6ct4NHjkfiu2274aBFe5UZSZW8q0lMm4sGDDjuMHZ6KvRI= X-Gm-Gg: ASbGncsbacjyyi8UPlOO2zqObZstwhMhNtJFBDL//BlwrTDVyfkS7oV9QoTFIrmz2bs +pxSApQ+YVYj4hH8Q6Rm429MBAiH3SnFUIj75o6KvIjkl4PfC2QvyILL1XJDe0vMv8k3UVZm1nW aLz9mTdB85zhiG6q0+cCziAv5r0d0iJBie1cUnD8sAQRIaAxf5b8UBMW9XAazXIBQlX7571ypNT Da3pmgQ/8US5p/wSgZdwDp0MiEchdvBdhRRALNN/YJrXdjav4bffnuSC0PioiJxMbcai5toyupB gP120Sc/o7BEWVHOQbhR3VpUB2nS92GMK3T3bgcgR2Y3b7Ds7wR5s0yOmHAyv8rM88AqchtkklG 26Dzob9U+4yLU9OkTn+LhYukTywSFhGOOGN8+LmHy5i2TO6NfYBvqsDznkG9sBDNNu6cS4ZiB3V 94EV0E/SY= X-Google-Smtp-Source: AGHT+IESuOr/9kkTMP61JEo78aO/qu+Se16k4y0bZLp5zO2vT4tUYcRGwPC2KF7trcFZOrvkB6y8nA== X-Received: by 2002:a05:600c:5491:b0:46e:345d:dfde with SMTP id 5b1f17b1804b1-46e345de049mr203777245e9.16.1759170859187; Mon, 29 Sep 2025 11:34:19 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Peter Maydell , qemu-devel@nongnu.org Cc: Stefano Stabellini , Richard Henderson , Stefano Garzarella , Reinoud Zandijk , David Hildenbrand , Paolo Bonzini , Ilya Leoshkevich , Sunil Muthuswamy , "Michael S. Tsirkin" , David Woodhouse , kvm@vger.kernel.org, Eric Farman , Zhao Liu , xen-devel@lists.xenproject.org, Paul Durrant , Christian Borntraeger , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Halil Pasic , Jason Herne , Marcelo Tosatti , Thomas Huth , Anthony PERARD , qemu-s390x@nongnu.org, "Edgar E. Iglesias" , Peter Xu , Matthew Rosato Subject: [PATCH 15/15] hw/virtio/virtio: Replace legacy cpu_physical_memory_map() call Date: Mon, 29 Sep 2025 20:32:54 +0200 Message-ID: <20250929183254.85478-16-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250929183254.85478-1-philmd@linaro.org> References: <20250929183254.85478-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1759170997677116600 Propagate VirtIODevice::dma_as to virtqueue_undo_map_desc() in order to replace the legacy cpu_physical_memory_unmap() call by address_space_unmap(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/virtio/virtio.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index 9a81ad912e0..1ed3aa6abab 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -31,6 +31,7 @@ #include "hw/qdev-properties.h" #include "hw/virtio/virtio-access.h" #include "system/dma.h" +#include "system/memory.h" #include "system/runstate.h" #include "virtio-qmp.h" =20 @@ -1622,7 +1623,8 @@ out: * virtqueue_unmap_sg() can't be used). Assumes buffers weren't written to * yet. */ -static void virtqueue_undo_map_desc(unsigned int out_num, unsigned int in_= num, +static void virtqueue_undo_map_desc(AddressSpace *as, + unsigned int out_num, unsigned int in_= num, struct iovec *iov) { unsigned int i; @@ -1630,7 +1632,7 @@ static void virtqueue_undo_map_desc(unsigned int out_= num, unsigned int in_num, for (i =3D 0; i < out_num + in_num; i++) { int is_write =3D i >=3D out_num; =20 - cpu_physical_memory_unmap(iov->iov_base, iov->iov_len, is_write, 0= ); + address_space_unmap(as, iov->iov_base, iov->iov_len, is_write, 0); iov++; } } @@ -1832,7 +1834,7 @@ done: return elem; =20 err_undo_map: - virtqueue_undo_map_desc(out_num, in_num, iov); + virtqueue_undo_map_desc(vdev->dma_as, out_num, in_num, iov); goto done; } =20 @@ -1982,7 +1984,7 @@ done: return elem; =20 err_undo_map: - virtqueue_undo_map_desc(out_num, in_num, iov); + virtqueue_undo_map_desc(vdev->dma_as, out_num, in_num, iov); goto done; } =20 --=20 2.51.0