From nobody Sat Oct 4 23:42:51 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=1759220789; cv=none; d=zohomail.com; s=zohoarc; b=AqK7rP13tfQuZK8dL8aoY3rjeUvbyarFNslZhcAXcN+2vlmgQWhey8XECuRN+xu5xz5k54H6I67FHFYr9BOQqZyq4WMcjBMuzRjbPsEUyEDewd+z4XtbnMe7zsFbAZ+53CEKGSmvKTCN0xO1MW0a818YiR28qhnvwpN8Ptuc+YU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759220789; 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=V6G+G1uzcfaABlis3k53h+4pZgVxD/SADuKa9RzAV/eur4Vx58EK55wCUEWRkhz3lE/0NQoe/YJDrjv4uYP2xKqLg5qwWuEsau3ZfuJ3mtWxnCPPSLAdlM5ycXylEzNANZLn4J9nuZp6h/gEnbSmAg5rK8SZNvu9zO5ZmNslvQ8= 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 1759220789212967.327890908812; Tue, 30 Sep 2025 01:26:29 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1133919.1472016 (Exim 4.92) (envelope-from ) id 1v3VgZ-0005HL-BO; Tue, 30 Sep 2025 08:26:11 +0000 Received: by outflank-mailman (output) from mailman id 1133919.1472016; Tue, 30 Sep 2025 08:26:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1v3VgZ-0005Gy-64; Tue, 30 Sep 2025 08:26:11 +0000 Received: by outflank-mailman (input) for mailman id 1133919; Tue, 30 Sep 2025 08:26:09 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1v3Vdd-0007Nm-B0 for xen-devel@lists.xenproject.org; Tue, 30 Sep 2025 08:23:09 +0000 Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [2a00:1450:4864:20::331]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id b197e6de-9dd6-11f0-9809-7dc792cee155; Tue, 30 Sep 2025 10:23:07 +0200 (CEST) Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-46e4473d7f6so24843515e9.1 for ; Tue, 30 Sep 2025 01:23:07 -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-40fc82f2965sm21484653f8f.55.2025.09.30.01.23.05 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 30 Sep 2025 01:23:06 -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: b197e6de-9dd6-11f0-9809-7dc792cee155 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759220587; x=1759825387; 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=XsLGFzWQTOCJYDfyRB1ZDBDRURr/nK7iRq+id4fav97QU/FyV44/btlMMGnv9IGtw+ UhgDRpOlZv4aZDxGfQtR/seRHmYD3ei0P8fh59PwyCiZUrc6sbEA5hcY8EqabSheI9PG LVeISu8DHegvqU8w/JbvUDLnQzjFeCSs52sAPh1vMgSMOi10IX2sLNTi/spPr9q6Dqzn poQpGfvfGo8YgSbCIEynUQ0Y8JKOQdfNfvxovXxGV/FskzPhOzTW5Gbce5kSmguNvaNb 6y34WRMg9DaMBZ2C1phR9LBhd6xF1aP0kAb4uu71MA6ZQy9fnAxM5WAu2yasAfiwQpAP 55ag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759220587; x=1759825387; 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=QalbMQ5CSoRONE+Wb0KlbQFr+jD0QIYnTqIO+ytw0GzH9+GTF3nWHtnP247TACyaZE WiA0FG3cHdo73Tb3skYV4NQC3smG4dCxeYb+zeaaYyLM8aR3eqXHupNboL4t8eIIhiKl Hid4XbNLQSz1fZ2N0i0FvdVGvf3vVW7Hrs2Dw8sy54ZuQb9Cily8T/wuv0svvMGdw6Su vD2K60QXmlhPhDsQjlmGlpVtUTsRaNEZ0LHL7niegBqv8iKfSaZEujXdUPuJR8YsvS09 FhyYBvCmkB/UbfNWLClkTxC7iBZYG7TOJcC80150CR5KHGdlZNw7YUnFOjHU7so1ITWi r3cw== X-Forwarded-Encrypted: i=1; AJvYcCXVNkJ0n08NBo9wLu1krtlwuTGKD0okPHC3aLi7MLF0KDOoLcPl2SQ0d5s/OHXPp+Ro+jj10t1z1No=@lists.xenproject.org X-Gm-Message-State: AOJu0YwKg/ZrOxQPW2+HJOpe/OqzH7pZe9cMRTOALFJI12NNAg1x2iA9 FcUNpuzFdFrWhzqcRmngPujNZHXeDAlTIR2OnIFfPfVmskv500pOrKEBcbzr3uM6jJE= X-Gm-Gg: ASbGncuGcEaD6R7E3fYVqiTY3sJ4H8w56YwnmSe2+2s/NQGCyPwPebClANBny+Kof+H ubTYz+BHyaT4BnakvQhLqlkXrnKpTvF72qjaA5cGBRZAZ46wL5RGf8SERzkYJ5RZq84V8TSVCzx o+3sLuVbncIIVWB1Ek969yu/Gi2DwK1F3Bkr8PTof7WlpjppKl1UGq4NKFzAv0q0Ffa+s7GBxWR aLFvv8P7cB5RG/rSYLRpTdwdQs2pRgtExHGtK7cc1R+5hNISp1SMa+cOIWx4LSWjQJn4ou4ZiP8 +COrhB0EL36MPxzicFald7MjHztp760pHouJfOk4VzI709uhnFNsVFkjSWhGZ82sbi/JNZvmH53 5OayJ96I6mEN+MjQwkCIrPwoFzL+NoZ7DwxiU3zcKw5fQEHOA/qkSy+p3aAeaGWlIS0kxzXQBzy PPTO21GOBb7E5EWJNEqd9iatp4N6u5bUc= X-Google-Smtp-Source: AGHT+IGvdNJkPsXhO7mhTBAmSS24HJr1NcQFoKlHMGEeSQcfQp9VTD/G8Mg1Kg5Mqclxy+K9+gFIZw== X-Received: by 2002:a05:600c:4e8c:b0:46e:477a:16cc with SMTP id 5b1f17b1804b1-46e477a1b4emr94534015e9.24.1759220587242; Tue, 30 Sep 2025 01:23:07 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Peter Maydell Cc: Marcelo Tosatti , Ilya Leoshkevich , Reinoud Zandijk , Peter Xu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Zhao Liu , David Hildenbrand , Halil Pasic , kvm@vger.kernel.org, "Edgar E. Iglesias" , xen-devel@lists.xenproject.org, Stefano Garzarella , David Woodhouse , Sunil Muthuswamy , Richard Henderson , Stefano Stabellini , Matthew Rosato , qemu-s390x@nongnu.org, Paul Durrant , "Michael S. Tsirkin" , Christian Borntraeger , Anthony PERARD , Jason Herne , Paolo Bonzini , Thomas Huth , Eric Farman Subject: [PATCH v3 18/18] hw/virtio/virtio: Replace legacy cpu_physical_memory_map() call Date: Tue, 30 Sep 2025 10:21:25 +0200 Message-ID: <20250930082126.28618-19-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250930082126.28618-1-philmd@linaro.org> References: <20250930082126.28618-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: 1759220789846116600 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