From nobody Sat Oct 4 22:00:05 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=1759205638; cv=none; d=zohomail.com; s=zohoarc; b=I532pyJlDLdeC32FCKb6JELN7sfTGGIHlT3BNnMru8vShdLYf40Tl1sbOmjd4k9x7Lo/W+ImcsDK9pfMGPmbOTIXqLgD1F3UO1FS7JkGCHg65nbNXr8SuHPEi9WQxezC9yJsN/J2K5W8p21Oo80VsEKV9qTSPVvYGL8lU5/+koI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759205638; 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=I6r7ywVdtgg6puBO7GNeh9QBn+ePwbPPQeAATrRMKjs=; b=iDc1FXdLhpPHlg1yDlA3ZTARTNMgxiNX2x0WWSFSQ09R6iZIwwtQ6o9fV/QLVcEoVSB+ciaYmQ9oOt61krcAu9VyHVxBcguHZRlLM7KDS21O9gZ0XygzwopjlfWZ4CMDDP4Yc6/u75N0Ql33jhR7vsnP4XlFSCh+2rmsRJ7PQkI= 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 1759205638224701.4109902270562; Mon, 29 Sep 2025 21:13:58 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1133433.1471547 (Exim 4.92) (envelope-from ) id 1v3RkA-0006uW-6W; Tue, 30 Sep 2025 04:13:38 +0000 Received: by outflank-mailman (output) from mailman id 1133433.1471547; Tue, 30 Sep 2025 04:13:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1v3RkA-0006uP-3L; Tue, 30 Sep 2025 04:13:38 +0000 Received: by outflank-mailman (input) for mailman id 1133433; Tue, 30 Sep 2025 04:13:36 +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 1v3Rk8-0006tq-Qp for xen-devel@lists.xenproject.org; Tue, 30 Sep 2025 04:13:36 +0000 Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [2a00:1450:4864:20::329]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id d579bb90-9db3-11f0-9d14-b5c5bf9af7f9; Tue, 30 Sep 2025 06:13:35 +0200 (CEST) Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-46e5b7dfeb0so907105e9.1 for ; Mon, 29 Sep 2025 21:13:35 -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-40fb89065b5sm20717307f8f.17.2025.09.29.21.13.32 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 29 Sep 2025 21:13:33 -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: d579bb90-9db3-11f0-9d14-b5c5bf9af7f9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759205615; x=1759810415; 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=I6r7ywVdtgg6puBO7GNeh9QBn+ePwbPPQeAATrRMKjs=; b=fVZPoyatAZE+MTsGz82hLPW8a0Gx8jGqMC9oMt118ArZSHvZhmHAbNgx4uGYiGyYZP C+o2JDUTR2Aly/f8G8YtihJs2MQGhvxg7bSAbElIDweo3nx6VUPl9Qgz7J5bopEebFEx gcNtZZ+fbdh2dLEiLyqrCZZZ0IEx3HKsjny9DeFPqzfh7bRbFY37vnXJtQmA6Vp1wOyB Ct+Wke9VSFlBwb5w2aVN59fVs5afq6oPpeNHlP6AmAvw6s42e5uzYumK1hPND6fj7mxy daIfAUlfbAdh4e1zkREAB0MykFWbwKU6oedkfXXLdRF40+/jtdi56Ei7HxafbH6OH96K 0n3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759205615; x=1759810415; 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=I6r7ywVdtgg6puBO7GNeh9QBn+ePwbPPQeAATrRMKjs=; b=lZ6TxVscdMyHXY9SofpVGKRj8RBd1qXBLGeecTvK/venXUrHEmapQHq7nc7/5yXts0 wyKVogujR5YqCpodWi6+PJun4xM41F8vf1KTK1vgWjzXHcHHwOhVrRhCAluMM7saEWwn 1dpTm0gFwFKrXhAnDLv/RG9Ike5SrkET3/H7jdSZyVyXodItQQG4wbruT3jBt9Vgc9sy yHn1U2qtM/iaJBzrxAjp7ARwdP3Lie/17mP65SdQtCzVFda9L5PO/6R7qlV1vuPAcAen /KDdmL0Af7reFCjI/im+RDMfpG2FWKyjYgaNuMlyZFHS8rFuf6F890Vi2B6gdqXzSh5W MWfQ== X-Forwarded-Encrypted: i=1; AJvYcCUTfrkXUgzN1L34C4q6IQy4jI78Q+JF3o0t7ybsu8jrNGKaYbQ0w8SIkxCEiiDUkC0y1Gi+SIGzWEY=@lists.xenproject.org X-Gm-Message-State: AOJu0YxQEjICHiDU/alQq6JbTdo905cFLQBVpq4PNtoGlyCWzVHR3/6e D5n5DrvyQWrLD9WAotAQWZnxXoedc+Fqqa3Y4M5ILVfX1jh01wLQ22c378YB1qpuIkY= X-Gm-Gg: ASbGncs4x8EDvmDVHaKznAUYZizODYWhi47eBcOzxkm1n0KfgzrXs5iThJ2ECm1ldBn mAIGR0FyTzbG+Z7kjoTzVAQjxDHUGt2yG/Z4pbVUh3HAWtooUn6zohs+6FagvM9xOH4X5GcWdnw BUYZ0Q7148m36TstqTdOV75cBQACfWScp572zeuqCn0/ZkENKSpk9xMR1byZz+JePijpbhJDDtm IF1t7LgF4xPsoi58T6GI/lY5bRKHGOGWBoJQncPdkMRRE9LLPQvvZh2/pzolp3LyrIm95mQSykQ 2079RJ+UEK0yI4jdFRlqUoWtRAF1JPe8huf02uqE8bmY0nBC/V0NsIp/abbz1tVHA6WJFTJ3n55 AsOdU85Vqq/z9fc1QHaHPF1fursgyWi1jTcZrKyAW0fC7SDAVwfPIlFOqWSf5Mit/gn6S1TC+te 1CL8VWW/xgaiuK//cP1XHYjLXcu4tM2/4= X-Google-Smtp-Source: AGHT+IGBpgGcnWw+C0SOcyJxraGAzm/jw0VAg2sebXTPvNY3JrfVFmYx+CN+ELmzscd2IQVrEVRZAA== X-Received: by 2002:a5d:5f54:0:b0:403:4b6f:546e with SMTP id ffacd0b85a97d-40e47ee04bfmr14022629f8f.30.1759205614864; Mon, 29 Sep 2025 21:13:34 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Peter Maydell Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jason Herne , Stefano Stabellini , Stefano Garzarella , xen-devel@lists.xenproject.org, Paolo Bonzini , Ilya Leoshkevich , Anthony PERARD , Paul Durrant , Eric Farman , Marcelo Tosatti , Halil Pasic , Matthew Rosato , Reinoud Zandijk , Zhao Liu , David Woodhouse , Christian Borntraeger , Sunil Muthuswamy , kvm@vger.kernel.org, "Michael S. Tsirkin" , Peter Xu , Thomas Huth , qemu-s390x@nongnu.org, "Edgar E. Iglesias" , Richard Henderson , David Hildenbrand Subject: [PATCH v2 01/17] docs/devel/loads-stores: Stop mentioning cpu_physical_memory_write_rom() Date: Tue, 30 Sep 2025 06:13:09 +0200 Message-ID: <20250930041326.6448-2-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250930041326.6448-1-philmd@linaro.org> References: <20250930041326.6448-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: 1759205639137116600 Update the documentation after commit 3c8133f9737 ("Rename cpu_physical_memory_write_rom() to address_space_write_rom()"). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- docs/devel/loads-stores.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/devel/loads-stores.rst b/docs/devel/loads-stores.rst index 9471bac8599..f9b565da57a 100644 --- a/docs/devel/loads-stores.rst +++ b/docs/devel/loads-stores.rst @@ -474,7 +474,7 @@ This function is intended for use by the GDB stub and s= imilar code. It takes a virtual address, converts it to a physical address via an MMU lookup using the current settings of the specified CPU, and then performs the access (using ``address_space_rw`` for -reads or ``cpu_physical_memory_write_rom`` for writes). +reads or ``address_space_write_rom`` for writes). This means that if the access is a write to a ROM then this function will modify the contents (whereas a normal guest CPU access would ignore the write attempt). --=20 2.51.0 From nobody Sat Oct 4 22:00:05 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=1759205644; cv=none; d=zohomail.com; s=zohoarc; b=S36ZY5NrzlFo98STQnENExJwm6DPfMMGyPrqpF6IaP8rZoLd7RvjNnOTV+VL+JVDb5sHicJa30wePc2nBmiaFG9bSss3oQfOm4nJGocXzoY3k0FJYFF95tCHLRGVQJL4YQguNSuH0Z89ZCKm2kn3eVEMiL7UzW5hjGzxxVS9/LI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759205644; 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=tJyVnOWNCddCGl/+ypfUNoAsZWxoJ+Iw1ZeRnG+UY2M=; b=j7XqCbBP9b9aH3PVpLPZ+dtHt09KkT5hgI34l9aDQG9alWAiVfesqAw4/wlD6jVM1Ww04Y9LAfcpq+pSRWPX9L9j8YaFENJUXC2NL+axVPet90tx5WlpMg6LcX4dHOcR0BRcIFbaLu2TU/9HoO1UWNXulBnhX3dkCvqUL9ycnW0= 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 1759205644212179.0547429977446; Mon, 29 Sep 2025 21:14:04 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1133434.1471558 (Exim 4.92) (envelope-from ) id 1v3RkF-0007Ac-Eh; Tue, 30 Sep 2025 04:13:43 +0000 Received: by outflank-mailman (output) from mailman id 1133434.1471558; Tue, 30 Sep 2025 04:13:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1v3RkF-0007AV-B8; Tue, 30 Sep 2025 04:13:43 +0000 Received: by outflank-mailman (input) for mailman id 1133434; Tue, 30 Sep 2025 04:13:42 +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 1v3RkD-0006tq-W8 for xen-devel@lists.xenproject.org; Tue, 30 Sep 2025 04:13:41 +0000 Received: from mail-wm1-x343.google.com (mail-wm1-x343.google.com [2a00:1450:4864:20::343]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id d9164c8e-9db3-11f0-9d14-b5c5bf9af7f9; Tue, 30 Sep 2025 06:13:41 +0200 (CEST) Received: by mail-wm1-x343.google.com with SMTP id 5b1f17b1804b1-45b4d89217aso34332435e9.2 for ; Mon, 29 Sep 2025 21:13:41 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-46e56f3dbcfsm38006405e9.3.2025.09.29.21.13.38 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 29 Sep 2025 21:13:39 -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: d9164c8e-9db3-11f0-9d14-b5c5bf9af7f9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759205621; x=1759810421; 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=tJyVnOWNCddCGl/+ypfUNoAsZWxoJ+Iw1ZeRnG+UY2M=; b=ACXfFaboSEXrvFZAkO+AUOw52QTW3XvN0agAckRm4Lt4kX6TxN4ZE/Hp6vmLTW32ur hWaQbQuxIZ7TFkOlfHAXdzlAKf5sma9x3dkdUaqvtOkSP6eqenxJmDiF0lUrCtDaS5Yi EJM4k6IEJNnxLpWhlQ+mA2DPZYIj1erKD84AbmTS9x2EFnIjkI+vpanfLF+P+pnPKdKp /J7hwuPCMd8+83DiS9Jq1cfkPJB87oH6+Pf2m7eduiYOJwziRdSQOgN8sYJ9KNUyZ79y B7arW6OC5zYANZq0ygvXoKl4tB6QHJDwMnZ8DcV7LRlX7urNeMaOKw6zl3/xQdYiIaZI cL5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759205621; x=1759810421; 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=tJyVnOWNCddCGl/+ypfUNoAsZWxoJ+Iw1ZeRnG+UY2M=; b=THN2Wz+l2fDwVvyHmla3zZF1mN9tz6aphs9hGtT2kllgXnXIXlsHrdqs7m0aKPXG/4 ofSvPyKJJ6PFJZT/YFdSC50lOjYNfBLHz4Da7foWSPJE2vFaO9esSEUq9g7jvkCHyiQk u5CN7ysSbMSiOdsyxnSz6vFlPIc3XanwJsD050tAZgS7j4BQS81porIMUEXRVSx/h6Ov sHIj4tqs9AFDUADsGXIcwq+UfzTMbsQ0GO4btBzsHzKFdo6zZUOPq5cJwTx4+NKRWwtH pVOV7I+ygO4tTywrp0v/kb2NcD1hSa5FA3U/sjcfZ+0MLXG9X1RddNWhvvvqgQ4ZhyKP QAvg== X-Forwarded-Encrypted: i=1; AJvYcCUBSE2MQOh7Y0PYIX9N52wCF9+KYohl1cY/SupqrEl2kPKsoCbRj15EdreUswWDAewXFgmdR+ir/Sk=@lists.xenproject.org X-Gm-Message-State: AOJu0YzKftsxll2uZZWJ72fNTEK2X3hWrkhy/rWCjN6ECVQTJNQzAXON AS1ZYdDzs/3UKCUIF3b6R/xEHPtdk/dbrOPiHbhsy+AT3MP4wK+vAJ+5LvEEBUTCOxQ= X-Gm-Gg: ASbGncvb2vwDVDritsdLrBJE+N8uzWKTOyn6sN6nOMplrLZ+CWPzDa0OzJC91hDV/AY 5w8MWgqTSDL7F8yWcKMga3f49WNgfPpZHwVknZenH3UTEu0D93GSKDanPtTtBGfJE1laGYOyMH8 0K851Jg6ol04XbJKmPudLbMVBcMDgE0ACLo6NeA0WJahwaB7aUrbdUNEViEISh2aBjO5rLGaMD7 YaNSzVFBPlhAacNXz4Vw53Zua6ZgQWZWAd/rQY8sxDypg6MHc3KGDE80D3uC5R0HRYOYDLHpapt I559l5pO0rAugmotW7X3pvPeG25VD+9YIJNRKJYq/AQD3g86tONfnOyXB1ZpPdildwgLW0yUxLl sqHTAgu8ef72S89zuwLTLnsDwVfBxYd9TPtYx3+i/W3miQs5umTkCWVGNeFIjo7Q7fkIaQ4tjYX nNSpMo85HroXBd4Y7iJzR0 X-Google-Smtp-Source: AGHT+IEBLGmPjHaV6MityTIXBSpNltcXVYjuhb00aWpIbO25PxYLKS/w9T+ltaJf/K1UbWKlm67UDQ== X-Received: by 2002:a05:600c:4ec6:b0:46c:7097:6363 with SMTP id 5b1f17b1804b1-46e329b441cmr166612445e9.13.1759205620914; Mon, 29 Sep 2025 21:13:40 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Peter Maydell Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jason Herne , Stefano Stabellini , Stefano Garzarella , xen-devel@lists.xenproject.org, Paolo Bonzini , Ilya Leoshkevich , Anthony PERARD , Paul Durrant , Eric Farman , Marcelo Tosatti , Halil Pasic , Matthew Rosato , Reinoud Zandijk , Zhao Liu , David Woodhouse , Christian Borntraeger , Sunil Muthuswamy , kvm@vger.kernel.org, "Michael S. Tsirkin" , Peter Xu , Thomas Huth , qemu-s390x@nongnu.org, "Edgar E. Iglesias" , Richard Henderson , David Hildenbrand Subject: [PATCH v2 02/17] system/memory: Better describe @plen argument of flatview_translate() Date: Tue, 30 Sep 2025 06:13:10 +0200 Message-ID: <20250930041326.6448-3-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250930041326.6448-1-philmd@linaro.org> References: <20250930041326.6448-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: 1759205645185116600 flatview_translate()'s @plen argument is output-only and can be NULL. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/system/memory.h | 5 +++-- system/physmem.c | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/include/system/memory.h b/include/system/memory.h index aa85fc27a10..3e5bf3ef05e 100644 --- a/include/system/memory.h +++ b/include/system/memory.h @@ -2992,13 +2992,14 @@ IOMMUTLBEntry address_space_get_iotlb_entry(Address= Space *as, hwaddr addr, * @addr: address within that address space * @xlat: pointer to address within the returned memory region section's * #MemoryRegion. - * @len: pointer to length + * @plen_out: pointer to valid read/write length of the translated address. + * It can be @NULL when we don't care about it. * @is_write: indicates the transfer direction * @attrs: memory attributes */ MemoryRegion *flatview_translate(FlatView *fv, hwaddr addr, hwaddr *xlat, - hwaddr *len, bool is_write, + hwaddr *plen_out, bool is_write, MemTxAttrs attrs); =20 static inline MemoryRegion *address_space_translate(AddressSpace *as, diff --git a/system/physmem.c b/system/physmem.c index 8a8be3a80e2..2d1697fce4c 100644 --- a/system/physmem.c +++ b/system/physmem.c @@ -566,7 +566,7 @@ iotlb_fail: =20 /* Called from RCU critical section */ MemoryRegion *flatview_translate(FlatView *fv, hwaddr addr, hwaddr *xlat, - hwaddr *plen, bool is_write, + hwaddr *plen_out, bool is_write, MemTxAttrs attrs) { MemoryRegion *mr; @@ -574,13 +574,13 @@ MemoryRegion *flatview_translate(FlatView *fv, hwaddr= addr, hwaddr *xlat, AddressSpace *as =3D NULL; =20 /* This can be MMIO, so setup MMIO bit. */ - section =3D flatview_do_translate(fv, addr, xlat, plen, NULL, + section =3D flatview_do_translate(fv, addr, xlat, plen_out, NULL, is_write, true, &as, attrs); mr =3D section.mr; =20 if (xen_enabled() && memory_access_is_direct(mr, is_write, attrs)) { hwaddr page =3D ((addr & TARGET_PAGE_MASK) + TARGET_PAGE_SIZE) - a= ddr; - *plen =3D MIN(page, *plen); + *plen_out =3D MIN(page, *plen_out); } =20 return mr; --=20 2.51.0 From nobody Sat Oct 4 22:00:05 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=1759205647; cv=none; d=zohomail.com; s=zohoarc; b=NJxSQ3HL6k1vqqYV0gkCbvizTU3tpKNJLMTERFOBnm5Kzvxwub5A/Zdexg4Rur12HlVIaQqfvCHa213AgyMVN/JbBBS2bqqdS+1eTN2w8oJSCXSzPNzVI+iSsPJE8ZxHdKaBYZojOK2grqqVIz9AR5kgTEgc6L3NX/pFkhZIBbg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759205647; 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=J6XZQA4g1t2k7eXHW7Di/TUkQvEa/xc7WHxCnzJSKoM=; b=LRHzV3nTy0cNf8jijtSvF94eOFv2jAX/HYG/XCznqpQSG+8dvH5ZWj8KGBz6EsYrXw+2PrzWnZAXuUHUbamrCXE0XdHQh5PF2di3ahIuLauLmXfHmx37g9CbCtRwwole/PQ+HAWEhxFs7nS7bFDXVX3RiJ4ruIxVfbjO96/UaNg= 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 175920564746975.86503284814228; Mon, 29 Sep 2025 21:14:07 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1133437.1471568 (Exim 4.92) (envelope-from ) id 1v3RkM-0007XU-LN; Tue, 30 Sep 2025 04:13:50 +0000 Received: by outflank-mailman (output) from mailman id 1133437.1471568; Tue, 30 Sep 2025 04:13:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1v3RkM-0007XN-I8; Tue, 30 Sep 2025 04:13:50 +0000 Received: by outflank-mailman (input) for mailman id 1133437; Tue, 30 Sep 2025 04:13:48 +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 1v3RkK-0006gD-Dl for xen-devel@lists.xenproject.org; Tue, 30 Sep 2025 04:13:48 +0000 Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [2a00:1450:4864:20::42b]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id dc2685f6-9db3-11f0-9809-7dc792cee155; Tue, 30 Sep 2025 06:13:46 +0200 (CEST) Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-3ee1221ceaaso4373187f8f.3 for ; Mon, 29 Sep 2025 21:13:46 -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-40fc56f7badsm20596977f8f.29.2025.09.29.21.13.44 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 29 Sep 2025 21:13:45 -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: dc2685f6-9db3-11f0-9809-7dc792cee155 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759205626; x=1759810426; 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=J6XZQA4g1t2k7eXHW7Di/TUkQvEa/xc7WHxCnzJSKoM=; b=rvEfaaVf5DZYXnk02ew5puqhy9s9ozh72EXeXMu2qbrNQbdwCrLPTNo0+TSPGZJ7sM EQ/aEWBdV9SqJLKmrOOgUJy3swe2haJEsI9u9atJPi+Bir7hGna7CfCz75NP+Nm08XEi lOzIgCV1i1ja9BHuAoaQn+NteDTeGHZ4BYCDtj/vh/9cU4TK5YZpvjNjZFrsxxCt4PyY EMtU/t5PZfM+MYZFmEtpswkSJTQzo/wRqyHaPWuf54yeE/jKLfTIaShviFLif1j4pWO8 Rwd8OQ/vTUnf5qAbY8nSiTPVS8nmGJghjwgOiwptzZEEX4WrVOtOSN/R5oaHpmxAPr6u wamg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759205626; x=1759810426; 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=J6XZQA4g1t2k7eXHW7Di/TUkQvEa/xc7WHxCnzJSKoM=; b=WfieuLb1DJgnXOa22p0fh4qgX/sNGz6YS3khFhn8tESq8il2fNdfUe5xxc6kVhOXl+ phprWbcgQxfZLC/PtcvKt6kBrgRCCe6ctm3Bd8wHzkkM+/NZhj19iqRse3m44JKif2BS be0NJglU3RBu7hwoqd68msVmF2CS6l4ZPlya4cxRxQUH31VbQEeYlcTum6skr+LKFaxK YZKBl2l5WmnEoF/RbbVdMKS0k5tMOov3c5RU0Jqnlj/1BHrwpcmasS4rSWpGbNK1HPuu /Ka0BaoWueOxd/k1KWSBnW4DqL9OuVNt4+ZBk4HPh8Usj4MpAhwkfdUNDAIS+O+Y44xE fvKQ== X-Forwarded-Encrypted: i=1; AJvYcCXRoGfJOvuxw5SA2GUyzd5vd1KmpG4VrFsqluNWEXBsVASWKRF5Z2H0B6+7BkJhgkEB0Ll5XLWJNDM=@lists.xenproject.org X-Gm-Message-State: AOJu0Yxy8pDQc5IDyd3qZq5In3DPW+h9qyetWaNmTYxXbub2KYLxhzBJ +bMJ2oVMf8SARbGjkQJkM7X5zGDZ7EwbsyLnZ9GhCXleUDGLnSxrnKEqwIwHqsTaFsA= X-Gm-Gg: ASbGncsQEZCt0XAPN0lxlEAJveFejIXyQBArbhE+IxSxALWwNYaix8LkhAUSw3J8aE5 iAmIATNswBaC6r7KlOhh0sQ/u6tooEu68bCSuWKmcu/Yu3HvWicU5j+TUnER0UR9wtsMx8D3pY/ 5PJIeys94jXc0X8tFsKque5zCWNz1p3Hz9X/C1+3FxyBp13QaLQYvxzWlAmJTLyWA4jOGfS+GIo Bh2aY8mCeUKXzqq4knlnf+Hs534XwUTuC7JobqIUeB7TFI8fDz6hm2XJ9xgoZvTsXBRFw/leuc0 JCc3hNKRjkOTggASH6SSJS+on3W3SBHN5L8Hi9bZHOQ9f55qVJmzgWa5rSNKlbNRTB1qrJBzM1B cxaqrsc6P2rBKN+rXgujaWeU0SzSIoRIS7jM8/LCjF7USLNgh42xB4B0pkY+6jgoLMcg0BXFrjc UeeqVMuMM1Phb0SnPStEf1xbnLRuPov/0XrwohLatZmA== X-Google-Smtp-Source: AGHT+IH4qhPqaNC0ZqE7vVzxj8tSipzOFCi7y5DLl309Ye1K/9debpwVgj0eZ2sdSCTFy4WRMq+1ZQ== X-Received: by 2002:a05:6000:2901:b0:3ef:42fe:8539 with SMTP id ffacd0b85a97d-40e47ee0a37mr19502672f8f.25.1759205626154; Mon, 29 Sep 2025 21:13:46 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Peter Maydell Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jason Herne , Stefano Stabellini , Stefano Garzarella , xen-devel@lists.xenproject.org, Paolo Bonzini , Ilya Leoshkevich , Anthony PERARD , Paul Durrant , Eric Farman , Marcelo Tosatti , Halil Pasic , Matthew Rosato , Reinoud Zandijk , Zhao Liu , David Woodhouse , Christian Borntraeger , Sunil Muthuswamy , kvm@vger.kernel.org, "Michael S. Tsirkin" , Peter Xu , Thomas Huth , qemu-s390x@nongnu.org, "Edgar E. Iglesias" , Richard Henderson , David Hildenbrand Subject: [PATCH v2 03/17] system/memory: Factor address_space_is_io() out Date: Tue, 30 Sep 2025 06:13:11 +0200 Message-ID: <20250930041326.6448-4-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250930041326.6448-1-philmd@linaro.org> References: <20250930041326.6448-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: 1759205649056116600 Factor address_space_is_io() out of cpu_physical_memory_is_io(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth --- include/system/memory.h | 9 +++++++++ system/physmem.c | 21 ++++++++++++--------- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/include/system/memory.h b/include/system/memory.h index 3e5bf3ef05e..546c643961d 100644 --- a/include/system/memory.h +++ b/include/system/memory.h @@ -3030,6 +3030,15 @@ static inline MemoryRegion *address_space_translate(= AddressSpace *as, bool address_space_access_valid(AddressSpace *as, hwaddr addr, hwaddr len, bool is_write, MemTxAttrs attrs); =20 +/** + * address_space_is_io: check whether an guest physical addresses + * whithin an address space is I/O memory. + * + * @as: #AddressSpace to be accessed + * @addr: address within that address space + */ +bool address_space_is_io(AddressSpace *as, hwaddr addr); + /* address_space_map: map a physical memory region into a host virtual add= ress * * May map a subset of the requested range, given by and returned in @plen. diff --git a/system/physmem.c b/system/physmem.c index 2d1697fce4c..be8e66dfe02 100644 --- a/system/physmem.c +++ b/system/physmem.c @@ -3358,6 +3358,17 @@ bool address_space_access_valid(AddressSpace *as, hw= addr addr, return flatview_access_valid(fv, addr, len, is_write, attrs); } =20 +bool address_space_is_io(AddressSpace *as, hwaddr addr) +{ + MemoryRegion *mr; + + RCU_READ_LOCK_GUARD(); + mr =3D address_space_translate(as, addr, &addr, NULL, false, + MEMTXATTRS_UNSPECIFIED); + + return !(memory_region_is_ram(mr) || memory_region_is_romd(mr)); +} + static hwaddr flatview_extend_translation(FlatView *fv, hwaddr addr, hwaddr target_len, @@ -3754,15 +3765,7 @@ int cpu_memory_rw_debug(CPUState *cpu, vaddr addr, =20 bool cpu_physical_memory_is_io(hwaddr phys_addr) { - MemoryRegion*mr; - hwaddr l =3D 1; - - RCU_READ_LOCK_GUARD(); - mr =3D address_space_translate(&address_space_memory, - phys_addr, &phys_addr, &l, false, - MEMTXATTRS_UNSPECIFIED); - - return !(memory_region_is_ram(mr) || memory_region_is_romd(mr)); + return address_space_is_io(&address_space_memory, phys_addr); } =20 int qemu_ram_foreach_block(RAMBlockIterFunc func, void *opaque) --=20 2.51.0 From nobody Sat Oct 4 22:00:05 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1759205696; cv=none; d=zohomail.com; s=zohoarc; b=lozsRrnI7P+WY4ZSm97sJxesyC6TIKIQFwyK0h0gPHquzocObHQmVwIkZ3t4M1IFBE04Ug7qbvHjAbBfk/zb2k8DcbtJtKr1qBaTw2FMowgHe8RrBxwSgLtGSNmaIvPv2KJKNJdhjwce1LoJiDn3/TRDtSeytbWLKQjjZgKv4ys= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759205696; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=jPaFfZE+Vm6W3t7QC31lKwf41cuqTfJ0BWTKMrsHvkU=; b=TxKC8R2ux2614mx8Jb2bcpbiITmsmHydAtKiqcCjV/EZdsYnABJeOEwtOQXdUDTjWY7Nbz2cUCSF6DDElTk8UcFSOYVO7aKGo2wfRQdhWLrrp4RCFW56xj5k0JaslvSsm16Qb96YlRuBNFaJX3QUvQzzvSrbWBfRc1kDcdI+tYA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1759205696370739.6828948764986; Mon, 29 Sep 2025 21:14:56 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v3RkZ-0001ht-8S; Tue, 30 Sep 2025 00:14:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v3RkX-0001hB-Er for qemu-devel@nongnu.org; Tue, 30 Sep 2025 00:14:01 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v3RkR-0000mn-JE for qemu-devel@nongnu.org; Tue, 30 Sep 2025 00:14:01 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-45b4d89217aso34333085e9.2 for ; Mon, 29 Sep 2025 21:13:54 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-46e56f536a3sm43891685e9.8.2025.09.29.21.13.50 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 29 Sep 2025 21:13:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759205631; x=1759810431; darn=nongnu.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=jPaFfZE+Vm6W3t7QC31lKwf41cuqTfJ0BWTKMrsHvkU=; b=s/FfLKRdElILKe9w5w2H7KUN63HnGFj8oW9q46C8Zeh+LACNh0b2uTRRbu8rTU7CXp SQK6+D/mlmJl9NL657qcUPJKyncqEZAO1uWVJ8Ic73WhjlgfdGsQz2MLs5Dssuaw8HA8 ZujsDCLyljGtJGrQwo18SF3xrg+zl9kZ6+KFya9OiWjUMlUsnYGu9XXXRSiQ1CHK9+Et P5AgR+ph/m9vgZjSJMTXOMgNGWdPp1JoNcfRjrM1lg/xwqzLZi2q2cKNvy+b6QzY6F0e z3hwiNHLxLO0D//HJQFD1NuO3Vf35kGpBU0JYeENBuR/hDkOx4RVGm0R4egUbeL1EOZB tivg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759205631; x=1759810431; 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=jPaFfZE+Vm6W3t7QC31lKwf41cuqTfJ0BWTKMrsHvkU=; b=QgPNobXiHQ/siFPhfdiICjQIl/wXUJzg6z7TME8TfIpEaKzObHeJjL0r25os/k/LfZ 7Kdrt5hdY8Oy6himejqOKva99wcw7xe23/7Q2wfrRGrvPJczhT7oCaFIwP4uvZf3NU1K 0B9bkpHaCgmB4cMC8tnnuI+4T22aRCHY7v4dZarg3EsAHSOQ44Ue9ArRDz7nifQu3o28 rt1npQkCPkqhgdYKEjaEoezN7lOmw+NT9XDzEPQlMb8gwmxdBa5pLCKziQeHWoARmE2n 4cU9zMj/Fr+30nxZurgCa5A2ubSjehB8pBkekWPHYxls2QpocFJg4/WKfK8GvzMuClJ7 WciQ== X-Gm-Message-State: AOJu0YzvZaSZgADFA5PoWAwyAs/WCacGkd1RpU18D0VWRLmR1Tj8VNaB Tl2YIvxqtgvZZNRMVeSXnsXvVSrZXXMKtBUNYyVgRHEw7eRoGvpdmkvb7RtIDJ7Xh74Kx9S27DQ ywLqb2KiTiw== X-Gm-Gg: ASbGncsBkIML3sOnmzL300hDGtvtRA6OsrJGyTz2yZhZI0XyAeY8G2GPx/QFVfHP3K3 tbG4bT5Bw4LvibJcKwERMKeN/AqflOGyJOH24DYBtPJ6vMDe/smapw670fvdBV8McuXQb5qQ+iK RCrDkF7r/awoYGmNPEdi7/hvH19x9IqPUiC+b3imiTOq9M+ts/gSSTAg3c5UTJn4dPfGtzBVFPt H4Zf3kBSytz+nZb3WwbXdxn8+umNJdgOuKN3MMyRIB007CRmNKK+C8lYySZusw6utbMmJoH+Ts2 bQW7UYF2cGZzfstukwxOkm+wjCsBPQ/2BXJf2DitQww7u3nrG/5K5cLP9hPZfBUhX6qIBJ4Z+GB d+wwWjtLCaYU4NWMJtehvPUzXwMe+J3+wGcVTjBof3e8yV838U/JLMXNkmTs2jjP73d3fLa1Y6F a1NnuFZ8aqbTSRui08TCQ95R27kuMa9t8= X-Google-Smtp-Source: AGHT+IGcac+YiZIcZSnCrqiaQ5DwkBXJUwHzOeJuSpEQu46EHairXFh+p7pa80eZkns9YIhZ38oTxg== X-Received: by 2002:a05:600c:444d:b0:45f:2cd5:5086 with SMTP id 5b1f17b1804b1-46e3299f4f3mr172171215e9.3.1759205631445; Mon, 29 Sep 2025 21:13:51 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Peter Maydell Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jason Herne , Stefano Stabellini , Stefano Garzarella , xen-devel@lists.xenproject.org, Paolo Bonzini , Ilya Leoshkevich , Anthony PERARD , Paul Durrant , Eric Farman , Marcelo Tosatti , Halil Pasic , Matthew Rosato , Reinoud Zandijk , Zhao Liu , David Woodhouse , Christian Borntraeger , Sunil Muthuswamy , kvm@vger.kernel.org, "Michael S. Tsirkin" , Peter Xu , Thomas Huth , qemu-s390x@nongnu.org, "Edgar E. Iglesias" , Richard Henderson , David Hildenbrand Subject: [PATCH v2 04/17] target/i386/arch_memory_mapping: Use address_space_memory_is_io() Date: Tue, 30 Sep 2025 06:13:12 +0200 Message-ID: <20250930041326.6448-5-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250930041326.6448-1-philmd@linaro.org> References: <20250930041326.6448-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=philmd@linaro.org; helo=mail-wm1-x335.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, T_SPF_TEMPERROR=0.01 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1759205697659116600 Since all functions have an address space argument, it is trivial to replace cpu_physical_memory_is_io() by address_space_memory_is_io(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/i386/arch_memory_mapping.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/target/i386/arch_memory_mapping.c b/target/i386/arch_memory_ma= pping.c index a2398c21732..560f4689abc 100644 --- a/target/i386/arch_memory_mapping.c +++ b/target/i386/arch_memory_mapping.c @@ -35,7 +35,7 @@ static void walk_pte(MemoryMappingList *list, AddressSpac= e *as, } =20 start_paddr =3D (pte & ~0xfff) & ~(0x1ULL << 63); - if (cpu_physical_memory_is_io(start_paddr)) { + if (address_space_is_io(as, start_paddr)) { /* I/O region */ continue; } @@ -65,7 +65,7 @@ static void walk_pte2(MemoryMappingList *list, AddressSpa= ce *as, } =20 start_paddr =3D pte & ~0xfff; - if (cpu_physical_memory_is_io(start_paddr)) { + if (address_space_is_io(as, start_paddr)) { /* I/O region */ continue; } @@ -100,7 +100,7 @@ static void walk_pde(MemoryMappingList *list, AddressSp= ace *as, if (pde & PG_PSE_MASK) { /* 2 MB page */ start_paddr =3D (pde & ~0x1fffff) & ~(0x1ULL << 63); - if (cpu_physical_memory_is_io(start_paddr)) { + if (address_space_is_io(as, start_paddr)) { /* I/O region */ continue; } @@ -142,7 +142,7 @@ static void walk_pde2(MemoryMappingList *list, AddressS= pace *as, */ high_paddr =3D ((hwaddr)(pde & 0x1fe000) << 19); start_paddr =3D (pde & ~0x3fffff) | high_paddr; - if (cpu_physical_memory_is_io(start_paddr)) { + if (address_space_is_io(as, start_paddr)) { /* I/O region */ continue; } @@ -203,7 +203,7 @@ static void walk_pdpe(MemoryMappingList *list, AddressS= pace *as, if (pdpe & PG_PSE_MASK) { /* 1 GB page */ start_paddr =3D (pdpe & ~0x3fffffff) & ~(0x1ULL << 63); - if (cpu_physical_memory_is_io(start_paddr)) { + if (address_space_is_io(as, start_paddr)) { /* I/O region */ continue; } --=20 2.51.0 From nobody Sat Oct 4 22:00:05 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=1759205658; cv=none; d=zohomail.com; s=zohoarc; b=ZFzgCUEMDlNHat4od2oJ+wO737p6odESfFNjd4qI7edCyZ0dVPGErOglS8wacDX/D09f7Qm/bFk+7A5gfNyoAxGaI5/tMfWzQIASk5W5ZDMyEz+lrN+fIigbwrD2XFcQmFWwQUsiCAexg6SfaseQLnpV2tGgNaXdTKISn3EOrWA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759205658; 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=UsPYBf9Y41DYeMpdEdOkBi/mu9mpDrkpGT9A+u43FVY=; b=LAoi3yhZHdM0VqTBMJ5Koc3hBjaEY3UOA85frIvNs5Diq1C2LO2rclf1aj82KSf8raT2sEcPxy4hK+OHtZaIqfkdPAmqBJjq+MnDWNOVT3U26iUUUXSrXyf6IpgsryZzgsMDru8O+Xsen201/FpxXBErVfv8nnDKWJtdeuqSKkc= 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 1759205658047845.9463587143043; Mon, 29 Sep 2025 21:14:18 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1133448.1471589 (Exim 4.92) (envelope-from ) id 1v3RkV-0008Lw-Cp; Tue, 30 Sep 2025 04:13:59 +0000 Received: by outflank-mailman (output) from mailman id 1133448.1471589; Tue, 30 Sep 2025 04:13:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1v3RkV-0008Lp-7o; Tue, 30 Sep 2025 04:13:59 +0000 Received: by outflank-mailman (input) for mailman id 1133448; Tue, 30 Sep 2025 04:13:58 +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 1v3RkU-0006tq-0w for xen-devel@lists.xenproject.org; Tue, 30 Sep 2025 04:13:58 +0000 Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [2a00:1450:4864:20::429]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id e2abb080-9db3-11f0-9d14-b5c5bf9af7f9; Tue, 30 Sep 2025 06:13:57 +0200 (CEST) Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-3fa528f127fso4221194f8f.1 for ; Mon, 29 Sep 2025 21:13:57 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-46e2ab31e97sm251610955e9.14.2025.09.29.21.13.55 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 29 Sep 2025 21:13:56 -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: e2abb080-9db3-11f0-9d14-b5c5bf9af7f9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759205637; x=1759810437; 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=UsPYBf9Y41DYeMpdEdOkBi/mu9mpDrkpGT9A+u43FVY=; b=EOltNrgaoPb01blgoG8FhMbkMNs42aJp+3jl6NEtrplaKslDjHAwMKagldcrT0QbO6 RlDv5ardTLkf/rjliK7D12I3wC2SS5Z+FZKFl6q9ybKoseD31QU47Pl0v3/Iz00bKQjq nsQji94mkLt8yN3wqimjvK0Q8uMXS/DZE5mVfrTbnbB51i4YMPGmZuHlayihkKaQzzg6 3N/to+1Z4HbkxodoNlG+tZyI149VgTHHz6vlki25XMnXYe/XHk204mfg8fURq5l1m2kp dBN0Ibo/VZlPe3s1dGZnTNeu69eJ7Kk1omln7lF9P861PJz6Y6RIXNMRcwte4i+YYLFf wMNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759205637; x=1759810437; 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=UsPYBf9Y41DYeMpdEdOkBi/mu9mpDrkpGT9A+u43FVY=; b=CXf3xF8D7eY3mulRfhvSD9wKI5WB7aaf6Jph5qjT3vsyYQRDEvzlvG4p/y/XlEZtcy Y6F2TfYBZfeZLteWz79STyN5JBWtdT+iHgZQdROUmVMAQIfG5mhuR7xzVc+j9yFF8tAl urPqUTK4YXMD75QDN5u6IHSZovou02NwGTTUnFCf0YFOq6PkhXC3PlKlt/jVGwSoVxGi NFjYeau9PRM4hxx+8IFDa0pd3ukG4daGiHqAdKfz1Ia4vod4PR4KvBASkdof2pk7tx/i XN9t3isvzGjKGzuq4jHKjo2T6/dxHT6qNrGsyWTZCVRy4CLIpmNuKSICmm8JCd1Ufv8e 7ITw== X-Forwarded-Encrypted: i=1; AJvYcCVwtWr7/jFbO9S+tzx29xXGr+j9d0jpv2ZZlS7w/rbCtIeBp9TXkosZwGkHCUAGzylR/YHWVY5ymCo=@lists.xenproject.org X-Gm-Message-State: AOJu0YwKV+whCc3WbRuEMnEDkJGETeJNKcWHivzAlyChHLFUBf/4s3ay hd8uQQNb5eCSdp6J1sPBFM8jtTGZ8bsppJ2rdZ792ES7n1ljiy92A5S7FU3jMtZBYwc= X-Gm-Gg: ASbGnctX+PhzVlUT6X/9Wq0UR0wqY0JHaL4fZtuWH+ZfXLjoG5faVUJmZOms16/28J3 NRBEmAokvTeJYMnce8mfhrGiuRV8SsTnzd0/VxTrOHnOMCz6vb/U8CC/ZYdLle6IjtPH5w74WNK CHPQR7vwBP0hQsEo3d+nZPD9k4yM34qLXfgfEZK1B/ksy7WNASd2H3SqIDD75Imtq7OibQKyL8Z ywM8TH6Sg0hsUpRWFHkLF4t8G2Od1gZ58yb8vEoYSZ0oZgFDoqsLYpJ1jQ+G4MgxWxaniZMtFyM Jup+p0ie+LRdo53vTFnsAr2zcXWGfT7wKwdmwjh03c+gZPi3IV8jd6rugCuEkWgbpNuHnYuQLdo Oi5uKsKZI/c1OhsycwCwrnm4M9t2zFt9hxHQi7R7eQiFF++g7WkkgtA80ZwuegcNfdUEIi39TMm pWHUywHEBtSoW+7FeBwJKm X-Google-Smtp-Source: AGHT+IH3He/bgDcAVA0O1uM4KAZUJWAOZ5pxrLV0agMvoc3nOriIeKi2nLWEPRWZf/BAWQ6cyeIFXA== X-Received: by 2002:a05:6000:40c7:b0:407:d776:4434 with SMTP id ffacd0b85a97d-4241227789emr2285457f8f.30.1759205636900; Mon, 29 Sep 2025 21:13:56 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Peter Maydell Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jason Herne , Stefano Stabellini , Stefano Garzarella , xen-devel@lists.xenproject.org, Paolo Bonzini , Ilya Leoshkevich , Anthony PERARD , Paul Durrant , Eric Farman , Marcelo Tosatti , Halil Pasic , Matthew Rosato , Reinoud Zandijk , Zhao Liu , David Woodhouse , Christian Borntraeger , Sunil Muthuswamy , kvm@vger.kernel.org, "Michael S. Tsirkin" , Peter Xu , Thomas Huth , qemu-s390x@nongnu.org, "Edgar E. Iglesias" , Richard Henderson , David Hildenbrand Subject: [PATCH v2 05/17] hw/s390x/sclp: Use address_space_memory_is_io() in sclp_service_call() Date: Tue, 30 Sep 2025 06:13:13 +0200 Message-ID: <20250930041326.6448-6-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250930041326.6448-1-philmd@linaro.org> References: <20250930041326.6448-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: 1759205659160116600 When cpu_address_space_init() isn't called during vCPU creation, its single address space is the global &address_space_memory. As s390x boards don't call cpu_address_space_init(), cpu_get_address_space(CPU(cpu), 0) returns &address_space_memory. We can then replace cpu_physical_memory_is_io() by the semantically equivalent address_space_memory_is_io() call. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth --- hw/s390x/sclp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c index 9718564fa42..f507b36cd91 100644 --- a/hw/s390x/sclp.c +++ b/hw/s390x/sclp.c @@ -16,6 +16,7 @@ #include "qemu/units.h" #include "qapi/error.h" #include "hw/boards.h" +#include "system/memory.h" #include "hw/s390x/sclp.h" #include "hw/s390x/event-facility.h" #include "hw/s390x/s390-pci-bus.h" @@ -301,6 +302,7 @@ int sclp_service_call(S390CPU *cpu, uint64_t sccb, uint= 32_t code) CPUS390XState *env =3D &cpu->env; SCLPDevice *sclp =3D get_sclp_device(); SCLPDeviceClass *sclp_c =3D SCLP_GET_CLASS(sclp); + AddressSpace *as =3D cpu_get_address_space(CPU(cpu), 0); SCCBHeader header; g_autofree SCCB *work_sccb =3D NULL; =20 @@ -308,7 +310,7 @@ int sclp_service_call(S390CPU *cpu, uint64_t sccb, uint= 32_t code) if (env->psw.mask & PSW_MASK_PSTATE) { return -PGM_PRIVILEGED; } - if (cpu_physical_memory_is_io(sccb)) { + if (address_space_is_io(as, sccb)) { return -PGM_ADDRESSING; } if ((sccb & ~0x1fffUL) =3D=3D 0 || (sccb & ~0x1fffUL) =3D=3D env->psa --=20 2.51.0 From nobody Sat Oct 4 22:00:05 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=1759205659; cv=none; d=zohomail.com; s=zohoarc; b=C7moVlr+B4V3Ean+t3Rqnw3AwNWdaBaCEOjv0FnrqUe8vYJ/H7newvMKXUhzlf8/G4zlPiMTYNrtDihMNqS74s6D+FsYCyjZ6vmTDOLWHpA/h2pEc2wh7H99CFy8kcmd36lWSIUGsmfMLKsc6xqgitHhBpnO4y8rfhk6wqkk+I0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759205659; 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=GJHuzj8i65yKq7/CrLnIUXqdpZj8DIZ6OJzdCMb/6CI=; b=eEqvyuzMJPg9sc9Ba9r9aCJpFfeQ63g9OZ9nJ/QzyBzwLpGy/5Pj+gD5UAI1D/UZ058hCLul2wGFQPw9rk1G+ctdOvDGOvUQJlT3wMVLFJDF1zREJ5wi7fPqB583l/WPVqlwBZ6jjA1IunGXKYhY593AlM2SJZHmBYpvbDGh52w= 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 1759205659487186.23239636219535; Mon, 29 Sep 2025 21:14:19 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1133460.1471598 (Exim 4.92) (envelope-from ) id 1v3Rkc-0000S7-Lo; Tue, 30 Sep 2025 04:14:06 +0000 Received: by outflank-mailman (output) from mailman id 1133460.1471598; Tue, 30 Sep 2025 04:14:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1v3Rkc-0000Rz-HT; Tue, 30 Sep 2025 04:14:06 +0000 Received: by outflank-mailman (input) for mailman id 1133460; Tue, 30 Sep 2025 04:14:05 +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 1v3Rkb-0006gD-AN for xen-devel@lists.xenproject.org; Tue, 30 Sep 2025 04:14:05 +0000 Received: from mail-wm1-x330.google.com (mail-wm1-x330.google.com [2a00:1450:4864:20::330]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id e638c73c-9db3-11f0-9809-7dc792cee155; Tue, 30 Sep 2025 06:14:03 +0200 (CEST) Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-46e2e363118so52025545e9.0 for ; Mon, 29 Sep 2025 21:14:03 -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-40fc6cf3835sm20954191f8f.46.2025.09.29.21.14.00 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 29 Sep 2025 21:14:01 -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: e638c73c-9db3-11f0-9809-7dc792cee155 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759205643; x=1759810443; 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=GJHuzj8i65yKq7/CrLnIUXqdpZj8DIZ6OJzdCMb/6CI=; b=NgSRl0JJURpI02GiMygQU/1oYHxfu4MuU5AaAdfcfOb51gVpkYej74DwRgjlygjoyh nu5ccUqc6sKCsNhQdAHkqcmyLiVghEhcI7RJwDLBWsoMAGEt4H7JMLmLnVEs8nAfgSm6 vjLOW3GWEJHaQLeBiB7vaXg9TwwqFDwLrLJzDOzPvJOfQYASBKOQx1SSy3YahPBby4yJ pZEPM4pOCeTsGx+gksflyCBsPOBSC0+OAfNbIn6GMak8NmTUBptWxl4QAFcg3ozjjT9V L0XP9X9djr9gVmz1QCXu2Hr7eiYapKRKO7MPuk5aV8trmnYD2LK+2ykRW0phQbXJHy08 Bx7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759205643; x=1759810443; 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=GJHuzj8i65yKq7/CrLnIUXqdpZj8DIZ6OJzdCMb/6CI=; b=mjH3AVPmDzWq05RS0cVbaptBwZNxYob8Y/N7F3KoJPf/x5H3Pfq3vEMR/Koix5UAQR LFOyy3lmQSUDpCZkn0utcwojJUXKef3bqkVO1//dvAP5xc8CxpGVI0KHiGsroNUzzhoW j6oyP2A0TIpznT4PjSAPBjpBF9oXwJLQKs/bhJkf5acX3JjQXJ7RT4uNR4XnJvldQoJb E1RerPIV+iVsZlJIrkJooq04OmwG9nOECygKvl3rknu+ZK+Ib5WyUrrtsYDqaDVwbGka Pu0ZeGFhbr49qUPYPnsPXn96i7Y+ETn4wciGFuE6zh2+uhNcAMZqCVwVwuusKFzLkn1B JZvg== X-Forwarded-Encrypted: i=1; AJvYcCWd74C/FrkDJtFjJT9DgVFfaevS3We31qw6bKVbp93zSI7Q5fBoKsMZ4lkaDoen9GQC6zc9rWz49Pk=@lists.xenproject.org X-Gm-Message-State: AOJu0YwEscXEb9uwFRCzns7MAe8pPxn2nyzi7QIx/4ktI9DYvYDgZjrW 0VN5uMGL3Pw4HBVTOuiqztRWXOvf6pAPeKe6AQGqIAl53QRO+m/1tEsJYEBirJ6zxGg= X-Gm-Gg: ASbGncvcpG5XTzatR+ItKTI1B9HReDG+MFScqHhcT9Ub9hNIh9zfC+s1qg6cGF/K2jH C4iYGQggB2IJVPNnakKBple5hyi6HKi7XPDWGRND6kxTSfuOhAS7zVsHCGw3c7hcBaBEpyp/ZId 0+2kF3CukrkLPIlNxS+oGPAD7YF2hIyXssPSXo94XMoN8FmBJpwoBEchcTRNfedg1y0W9Zp38Ui Yn+khahYwvda/fHAsmkAqRsktWZciNS1QKywmM8iKZzLNQMG6cSiC8G4iSId9JAPpiqWOysAeqC VDM5uD2Ii9AJdbHgqOj9sPW001fciuk80mDv0JqmTa/qqOWJX7htq28EPbs6FVNaX1yAK7i3e4H fRLird6ycOMs8+gYdLTzYkUsxRL+r1r3178l3Dcz4+Hiydal8QjCByt52ZKeeuLBRJ/DdpVhw2U vje9h71j6oblT16170I2fEY0P5F7F72D0= X-Google-Smtp-Source: AGHT+IFzoydC/PtH1+zccfqdIbgaSIsqjwZE3Y6j7iXWudBl2KZiSFlGWhLtg5m0yJ4ctRkRXODKlQ== X-Received: by 2002:a5d:588c:0:b0:3f9:fd59:7a5f with SMTP id ffacd0b85a97d-40e4a05bf52mr18187688f8f.33.1759205643111; Mon, 29 Sep 2025 21:14:03 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Peter Maydell Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jason Herne , Stefano Stabellini , Stefano Garzarella , xen-devel@lists.xenproject.org, Paolo Bonzini , Ilya Leoshkevich , Anthony PERARD , Paul Durrant , Eric Farman , Marcelo Tosatti , Halil Pasic , Matthew Rosato , Reinoud Zandijk , Zhao Liu , David Woodhouse , Christian Borntraeger , Sunil Muthuswamy , kvm@vger.kernel.org, "Michael S. Tsirkin" , Peter Xu , Thomas Huth , qemu-s390x@nongnu.org, "Edgar E. Iglesias" , Richard Henderson , David Hildenbrand Subject: [PATCH v2 06/17] system/physmem: Remove cpu_physical_memory_is_io() Date: Tue, 30 Sep 2025 06:13:14 +0200 Message-ID: <20250930041326.6448-7-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250930041326.6448-1-philmd@linaro.org> References: <20250930041326.6448-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: 1759205661105116601 There are no more uses of the legacy cpu_physical_memory_is_io() method. Remove it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- include/exec/cpu-common.h | 2 -- system/physmem.c | 5 ----- 2 files changed, 7 deletions(-) diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h index e413d8b3079..a73463a7038 100644 --- a/include/exec/cpu-common.h +++ b/include/exec/cpu-common.h @@ -149,8 +149,6 @@ void *cpu_physical_memory_map(hwaddr addr, void cpu_physical_memory_unmap(void *buffer, hwaddr len, bool is_write, hwaddr access_len); =20 -bool cpu_physical_memory_is_io(hwaddr phys_addr); - /* Coalesced MMIO regions are areas where write operations can be reordere= d. * This usually implies that write operations are side-effect free. This = allows * batching which can make a major impact on performance when using diff --git a/system/physmem.c b/system/physmem.c index be8e66dfe02..573e5bb1adc 100644 --- a/system/physmem.c +++ b/system/physmem.c @@ -3763,11 +3763,6 @@ int cpu_memory_rw_debug(CPUState *cpu, vaddr addr, return 0; } =20 -bool cpu_physical_memory_is_io(hwaddr phys_addr) -{ - return address_space_is_io(&address_space_memory, phys_addr); -} - int qemu_ram_foreach_block(RAMBlockIterFunc func, void *opaque) { RAMBlock *block; --=20 2.51.0 From nobody Sat Oct 4 22:00:05 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=1759205787; cv=none; d=zohomail.com; s=zohoarc; b=Va1XiZKYmhBha4IhWTlfFcj7zQrN2XxMEUk2KD8EgcEAOmdn5ynnOt1WIYy4UlVGegbh/Ln2bR2GjMIwPfU7d68XEGT3ff/8Db8xGNEVTSYPc6E6XzCVOAYTFuvoDj1wwIC7iAINP5WdC3Gj3nlW9XdHEXF0yJz36nTqV9G9KWk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759205787; 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=uk5+wyHN7CkT7HC+T4CiL8GLFFBvq7A2wJEeem4enV4=; b=fbwBUnXHOK7Xo6uEHfaMn//2JwLxnfb3lBODtByqEn8GFjocboX6atFyjUHGnjhEzLWdTOb6JLIGYBAl8ztuUfQqETw5LAM1wTh4vgMe9xsA9aqCbr1MjDYt4IGQdB+jh51qFZ/dP3hy9nfav8qTCg6wA5ULCjRLpN55jbnzhA4= 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 1759205787474313.8278875149599; Mon, 29 Sep 2025 21:16:27 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1133507.1471666 (Exim 4.92) (envelope-from ) id 1v3Rmc-0003O6-B0; Tue, 30 Sep 2025 04:16:10 +0000 Received: by outflank-mailman (output) from mailman id 1133507.1471666; Tue, 30 Sep 2025 04:16:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1v3Rmb-0003LK-TY; Tue, 30 Sep 2025 04:16:09 +0000 Received: by outflank-mailman (input) for mailman id 1133507; Tue, 30 Sep 2025 04:16:07 +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 1v3Rki-0006gD-1B for xen-devel@lists.xenproject.org; Tue, 30 Sep 2025 04:14:12 +0000 Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [2a00:1450:4864:20::431]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id e99a04a1-9db3-11f0-9809-7dc792cee155; Tue, 30 Sep 2025 06:14:09 +0200 (CEST) Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-3f0ae439bc3so2702479f8f.1 for ; Mon, 29 Sep 2025 21:14:09 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-46e5b69bc0bsm5141855e9.3.2025.09.29.21.14.07 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 29 Sep 2025 21:14:08 -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: e99a04a1-9db3-11f0-9809-7dc792cee155 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759205649; x=1759810449; 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=uk5+wyHN7CkT7HC+T4CiL8GLFFBvq7A2wJEeem4enV4=; b=eWdKJLfb2akGaqL0w5RBNmdQBGpZMIrcpsdg1SO/rsjS4blWeOjCUQ21OXhZV+dRC1 q+donle6dNBA+YjLvUeunSxgrut1/wH/ugY1GRw+ws6XgQ+B/sJzGAbZhDWT0Y15AJmC Xw+nqTlUPKU19Oh3CY+gRZb2rmEGgerytEBm5FebAhJcHGh9OEqm2LrlCrCjE9BZFrs5 Ywvv/jllfm+naevyepYz5xtobfguexr9xxa+lTsF5EhfqTM2+PXIrlqPOCcA/017jQ/j FuxYDqOsDj4RdHy+/I5ZWHbnT1AaU6brFbnJU/4iqP1L1dWhBWDgR+wHVj6Z40TfKlDK MqoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759205649; x=1759810449; 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=uk5+wyHN7CkT7HC+T4CiL8GLFFBvq7A2wJEeem4enV4=; b=psmpZcKfxd6uOX9MN4cUK1+9Ig4jwtpXI872qFh8e2yvx5aXTMpxNPzqptDXh2336j vZQT/B2wFdK680Br91jOP9zM7oqKIkk+rSShde0ZeI7UwQ6mX5glGCcfTWNBSpUL4hfx WLbOyC6ZhkTvlh+k6fMXcUvJnuVepLIt9/6AB6YhJpw8tFRiLKn1JPp9zHoozd9LjSdb 6BMB6gXPMBchWJ/wI+azbudihaBxuEALKJ9XqIdSJxEBKn6DYW8KEqVxw+M/YlVaLv4s 8sNPdG0dTRC/fZp55rl2kKlVdejDFwY+C+KyvkELnYK6t1vfvK9gtWzkFyT7FrAaQMaA Mq/Q== X-Forwarded-Encrypted: i=1; AJvYcCUK9bhMb0JksMX7zVfMbfOBd7T/uHuGm/1x1y8+gCxEWV6tvCSia3aWLRyL1EWubfsQ4e1SWLpr2RA=@lists.xenproject.org X-Gm-Message-State: AOJu0YysXyb/D1kO+C2hnqxWBliazXpIPJ1VcAzlfdDeLTS8j/gHftVu vPNex9EpEYz7+gLv6JyB352UlaLR/Z23+5uf7xL+xYY2mYSuQQ6UcaZCykvJduyHo3I= X-Gm-Gg: ASbGncu8Rv4kYZqq8IeulPQFWeTOMmBYSgzOFsKpmbXpP4FSkng+fZ8wDcCC4Z3+Fun td3B4OJtp098Kvy00zG5FBALlovSKf5Y71FhTQxdk451BXI4i3b9jgVfVMgIar5gelryFzNqz9h ThgPewwALNbPz5bV5WL41B8FfIKNsjjA2NLsARSEBjiwmqf/s4spQsoWCMmZAOWP54SzrJVKEuD OMIQmwo7E8nyoMdZ0IDCU4xZnt9W5qau/A01RfHF7QMVx6PBT4EAY7yKlp94WgxQhHKAH+HQpUb mDeiv98UenLYoIrNYyXWKpLmMLU7C4/w5S3+mxe799WJVzgio2YXNkolbUH4rlsEEa34LJ3Ig96 TANgMqFaCylL0+d/yvXE39NY4/1J6CLmo0WBrVA6OyXS/KF/NN+0ukP9yExLvLOVWeLv+e/iHxB Mjg7uozcKsQBORM96r8XAWXRcDUWGgze0= X-Google-Smtp-Source: AGHT+IHVwaY6Q4s0F84QmaOmJAx4BK9ueW3Bbg0HpiOJvzkr7RtDJkQ0plXWj1SaEJLGINz1Ov7KPQ== X-Received: by 2002:a05:6000:3101:b0:3eb:5e99:cbbc with SMTP id ffacd0b85a97d-40e458a9394mr12531634f8f.9.1759205648705; Mon, 29 Sep 2025 21:14:08 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Peter Maydell Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jason Herne , Stefano Stabellini , Stefano Garzarella , xen-devel@lists.xenproject.org, Paolo Bonzini , Ilya Leoshkevich , Anthony PERARD , Paul Durrant , Eric Farman , Marcelo Tosatti , Halil Pasic , Matthew Rosato , Reinoud Zandijk , Zhao Liu , David Woodhouse , Christian Borntraeger , Sunil Muthuswamy , kvm@vger.kernel.org, "Michael S. Tsirkin" , Peter Xu , Thomas Huth , qemu-s390x@nongnu.org, "Edgar E. Iglesias" , Richard Henderson , David Hildenbrand Subject: [PATCH v2 07/17] system/physmem: Pass address space argument to cpu_flush_icache_range() Date: Tue, 30 Sep 2025 06:13:15 +0200 Message-ID: <20250930041326.6448-8-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250930041326.6448-1-philmd@linaro.org> References: <20250930041326.6448-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: 1759205789007116600 Rename cpu_flush_icache_range() as address_space_flush_icache_range(), passing an address space by argument. The single caller, rom_reset(), already operates on an address space. Use it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- include/exec/cpu-common.h | 2 -- include/system/memory.h | 2 ++ hw/core/loader.c | 2 +- system/physmem.c | 5 ++--- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h index a73463a7038..6c7d84aacb4 100644 --- a/include/exec/cpu-common.h +++ b/include/exec/cpu-common.h @@ -156,8 +156,6 @@ void cpu_physical_memory_unmap(void *buffer, hwaddr len, */ void qemu_flush_coalesced_mmio_buffer(void); =20 -void cpu_flush_icache_range(hwaddr start, hwaddr len); - typedef int (RAMBlockIterFunc)(RAMBlock *rb, void *opaque); =20 int qemu_ram_foreach_block(RAMBlockIterFunc func, void *opaque); diff --git a/include/system/memory.h b/include/system/memory.h index 546c643961d..dfea90c4d6b 100644 --- a/include/system/memory.h +++ b/include/system/memory.h @@ -2977,6 +2977,8 @@ void address_space_cache_invalidate(MemoryRegionCache= *cache, */ void address_space_cache_destroy(MemoryRegionCache *cache); =20 +void address_space_flush_icache_range(AddressSpace *as, hwaddr addr, hwadd= r len); + /* address_space_get_iotlb_entry: translate an address into an IOTLB * entry. Should be called from an RCU critical section. */ diff --git a/hw/core/loader.c b/hw/core/loader.c index 524af6f14a0..477661a0255 100644 --- a/hw/core/loader.c +++ b/hw/core/loader.c @@ -1242,7 +1242,7 @@ static void rom_reset(void *unused) * that the instruction cache for that new region is clear, so tha= t the * CPU definitely fetches its instructions from the just written d= ata. */ - cpu_flush_icache_range(rom->addr, rom->datasize); + address_space_flush_icache_range(rom->as, rom->addr, rom->datasize= ); =20 trace_loader_write_rom(rom->name, rom->addr, rom->datasize, rom->i= srom); } diff --git a/system/physmem.c b/system/physmem.c index 573e5bb1adc..70b02675b93 100644 --- a/system/physmem.c +++ b/system/physmem.c @@ -3214,7 +3214,7 @@ MemTxResult address_space_write_rom(AddressSpace *as,= hwaddr addr, return MEMTX_OK; } =20 -void cpu_flush_icache_range(hwaddr addr, hwaddr len) +void address_space_flush_icache_range(AddressSpace *as, hwaddr addr, hwadd= r len) { /* * This function should do the same thing as an icache flush that was @@ -3229,8 +3229,7 @@ void cpu_flush_icache_range(hwaddr addr, hwaddr len) RCU_READ_LOCK_GUARD(); while (len > 0) { hwaddr addr1, l =3D len; - MemoryRegion *mr =3D address_space_translate(&address_space_memory, - addr, &addr1, &l, true, + MemoryRegion *mr =3D address_space_translate(as, addr, &addr1, &l,= true, MEMTXATTRS_UNSPECIFIED); =20 if (!memory_region_supports_direct_access(mr)) { --=20 2.51.0 From nobody Sat Oct 4 22:00:05 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1759205728; cv=none; d=zohomail.com; s=zohoarc; b=cKsI73Yy1pQvGP+LEoxFSiKwOkMEA/w1YMIw0Zhhm3/bw3TaGUaSiiltF67FWLoT10ik0NPiSxpGtbOuGs/P+KYy55uYDE+dyjfbyB+6A+i5BSDbssMDhKYGnDLCtsHlzSZEtiqI8QIEe87OcQn62VlH7xNTcY9tey4w7Mgjl20= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759205728; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=cfNLwv+i5cO84zMF6diWkvUfOapkzoMYrwwz0ZMfYgk=; b=RXUDMZCR06xl6/Mqt/gsNeXe3sFaBUgikKKvvKiaTGKJ4b48fEFSub2GnCkfqnFtGeJOIv2OcDsqqrGy7Z0QeYjEjF5uIXa98cNtS/4hg3Muc3dYNMVmoaZsbNmlOPJATCnvnRSRxksyt3gCfN0LRjWJ+4icWP3CZuCxcei1Vsg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1759205728348981.2875163408297; Mon, 29 Sep 2025 21:15:28 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v3Rl0-0001rI-LS; Tue, 30 Sep 2025 00:14:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v3Rku-0001ob-2r for qemu-devel@nongnu.org; Tue, 30 Sep 2025 00:14:24 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v3Rko-0000uw-TJ for qemu-devel@nongnu.org; Tue, 30 Sep 2025 00:14:23 -0400 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-3f0308469a4so3076668f8f.0 for ; Mon, 29 Sep 2025 21:14:16 -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-41f00aebdb7sm8027318f8f.57.2025.09.29.21.14.12 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 29 Sep 2025 21:14:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759205655; x=1759810455; darn=nongnu.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=cfNLwv+i5cO84zMF6diWkvUfOapkzoMYrwwz0ZMfYgk=; b=iWUw2zCJ6+RAADwmLX1QsrzZQVeE6rmLoRQWTSBFhj75qWMMxXjVuupNvDC7KtBZWx UqejVTfzudDNYpZag0Q+uxZPqaDnhhRiO9SqH1oArMEN3KA5Zg29xjWAdyV30HMyVfQz p7tIp/ubL6CkfbYS5y/9RdQqpQDIfu2HQfAS0F6S/n64UJ84uoVlnDEOjZN1YOtqn4oH COohWnv5LigIi0T6kye66OeJTS9u67LBcNJ+pwFsBxE/t2XQHdZ1Yi9944l+YrqcHKKh dJLOq539oB/6+UT2rO8qbjgDgHNnQMUegpOHsYOhAo6Lz5TDkwMtqeTMW9MKYK5lcC2S cjQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759205655; x=1759810455; 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=cfNLwv+i5cO84zMF6diWkvUfOapkzoMYrwwz0ZMfYgk=; b=iFfmm2olMK0l+3XBKUf2TEBjtW+7M7eHA7EMwpwY4CKQ+EMl9fIYnkLh9tVnhpq8Tp eEz4zo72VZ94ijJAMgXCULv3DR1XwTlv9j7B0qIFUpioExP4FQCxJMH0bNsTIZJZoSIz yCs8gwn0Oe3iiNXGqInj6NajDtH1ceNjqRzZbTmg7R31Hy7KNxXIF/N2eNBgHOJXtfz8 5UOqLb0gLwBicybyMT/WTRYjIW2z2TngYzCpHEgBx2A1OLkz0kjQwX7SFFcPOot1pKhT 3N44LUaG4dva06ppWlZklk5HvfTF4JwdPz63lELk0MTU++Fd7TjzailfYmhi4H+py02H VYKQ== X-Gm-Message-State: AOJu0YwPGZMBkVTLlCsf1c/N/ZIWWe+jV6734JcS5JX9UHs5/KdXRtbh ysd8qXubz1cgEdLJMEbMbaZw9Ql0SmhGGJLgtRDd3Fvjz9OAc4J1o8nJaeHEhfta743HP1jGpnz qFHabj4q0qg== X-Gm-Gg: ASbGncu37QxKc2pToRvyeue2nFjkmlCR2MvsF15ftg6cuguSb5KQvlCRysp6YAY/5fG Jc/gc3qkVllOAZnXfp8QWcOv4SZuFCq3YKyOUAUjVuTtzR+WqBF100v8JomV3f+Lv1cjfSrpP6z f6tcNN9aqfDrdbyvvhp8mi8hfN5jiQCnriYZEP1TjvJ1MCZWo1w6VvRtERsKGroJzWptyYOVYp+ ZM/pEhWymVcng/LPN8/qdZcOYrvSnY3bWYd0/xoE/+z3q5FugiLwXeNVBUhHzWqXpdV0piWUUr4 /yLrJ3Zgk5mcQStkG7KK1xcMXqojWmGU/5w/B2wFDR9yTGECXfmweRRiHik8qgqNcBMYtQjUrde co2j69JxDkL0PPATq7Zv0iTk2DJfBc6T3jT3qLAVA1ChBtJ9WKWYk+c9b4KtJZcIrYL6iZ5bWZx krgwoCzIwyhE9hj9t0G2Me X-Google-Smtp-Source: AGHT+IHP/zG4X6xn4hUDdclB/D1afSsyjXOgC/ThtRrRCj048iTFTeDxSXkrbhWZePrU5zQ+WKtYTA== X-Received: by 2002:a05:6000:1848:b0:3eb:8395:e2e0 with SMTP id ffacd0b85a97d-40e4b38923emr16718454f8f.51.1759205654828; Mon, 29 Sep 2025 21:14:14 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Peter Maydell Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jason Herne , Stefano Stabellini , Stefano Garzarella , xen-devel@lists.xenproject.org, Paolo Bonzini , Ilya Leoshkevich , Anthony PERARD , Paul Durrant , Eric Farman , Marcelo Tosatti , Halil Pasic , Matthew Rosato , Reinoud Zandijk , Zhao Liu , David Woodhouse , Christian Borntraeger , Sunil Muthuswamy , kvm@vger.kernel.org, "Michael S. Tsirkin" , Peter Xu , Thomas Huth , qemu-s390x@nongnu.org, "Edgar E. Iglesias" , Richard Henderson , David Hildenbrand Subject: [PATCH v2 08/17] hw/s390x/sclp: Replace [cpu_physical_memory -> address_space]_r/w() Date: Tue, 30 Sep 2025 06:13:16 +0200 Message-ID: <20250930041326.6448-9-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250930041326.6448-1-philmd@linaro.org> References: <20250930041326.6448-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=philmd@linaro.org; helo=mail-wr1-x436.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1759205730008116600 cpu_physical_memory_read() and cpu_physical_memory_write() are legacy (see commit b7ecba0f6f6), replace by address_space_read() and address_space_write(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth --- hw/s390x/sclp.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c index f507b36cd91..152c773d1b4 100644 --- a/hw/s390x/sclp.c +++ b/hw/s390x/sclp.c @@ -319,7 +319,8 @@ int sclp_service_call(S390CPU *cpu, uint64_t sccb, uint= 32_t code) } =20 /* the header contains the actual length of the sccb */ - cpu_physical_memory_read(sccb, &header, sizeof(SCCBHeader)); + address_space_read(as, sccb, MEMTXATTRS_UNSPECIFIED, + &header, sizeof(SCCBHeader)); =20 /* Valid sccb sizes */ if (be16_to_cpu(header.length) < sizeof(SCCBHeader)) { @@ -332,7 +333,8 @@ int sclp_service_call(S390CPU *cpu, uint64_t sccb, uint= 32_t code) * the host has checked the values */ work_sccb =3D g_malloc0(be16_to_cpu(header.length)); - cpu_physical_memory_read(sccb, work_sccb, be16_to_cpu(header.length)); + address_space_read(as, sccb, MEMTXATTRS_UNSPECIFIED, + work_sccb, be16_to_cpu(header.length)); =20 if (!sclp_command_code_valid(code)) { work_sccb->h.response_code =3D cpu_to_be16(SCLP_RC_INVALID_SCLP_CO= MMAND); @@ -346,8 +348,8 @@ int sclp_service_call(S390CPU *cpu, uint64_t sccb, uint= 32_t code) =20 sclp_c->execute(sclp, work_sccb, code); out_write: - cpu_physical_memory_write(sccb, work_sccb, - be16_to_cpu(work_sccb->h.length)); + address_space_write(as, sccb, MEMTXATTRS_UNSPECIFIED, + work_sccb, be16_to_cpu(header.length)); =20 sclp_c->service_interrupt(sclp, sccb); =20 --=20 2.51.0 From nobody Sat Oct 4 22:00:05 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=1759205792; cv=none; d=zohomail.com; s=zohoarc; b=lb6lozzrijYg48P3tDEYIer7iA90BlCxHvLIRyZ81/JB0SOI9CfQEt0KfyVNOlu46C5MYzUCokBvFhUPgwTH/j8TkY0HuRvfYVRA6OVGy4Z/95PEHCHk2SE/8f739re6iez4ni5uc7hLm/SvXPni4Fy2YNRSRVRiewcIAMVvfhw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759205792; 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=JRsfrHQBMjnrXhlxfeiXrXfyISPq/9LUWh417J9QSAY=; b=EPAJRL4R3cqqSopO5BR9JcteRtGJvNE5VM2vvQv75iUWIUoDFv/VwMTfXFyoHqDfTlmybC2q1meKy40PQxpDQ1T83+sr7Mh17FelcJhnhl1WjtCUUy+2L9Z3SIqbyM+O4o8fMvjQCrc5rcsRjpNOkIODjfxkY7yZLmc+qpiSidM= 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 17592057922831018.246987744583; Mon, 29 Sep 2025 21:16:32 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1133506.1471658 (Exim 4.92) (envelope-from ) id 1v3Rmb-00039d-Gq; Tue, 30 Sep 2025 04:16:09 +0000 Received: by outflank-mailman (output) from mailman id 1133506.1471658; Tue, 30 Sep 2025 04:16:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1v3Rmb-00038l-35; Tue, 30 Sep 2025 04:16:09 +0000 Received: by outflank-mailman (input) for mailman id 1133506; Tue, 30 Sep 2025 04:16:06 +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 1v3Rkt-0006gD-1o for xen-devel@lists.xenproject.org; Tue, 30 Sep 2025 04:14:23 +0000 Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [2a00:1450:4864:20::435]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id f0d7c145-9db3-11f0-9809-7dc792cee155; Tue, 30 Sep 2025 06:14:21 +0200 (CEST) Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-3ee13baf2e1so4220066f8f.3 for ; Mon, 29 Sep 2025 21:14:21 -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-40fb74e46bcsm20884752f8f.8.2025.09.29.21.14.18 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 29 Sep 2025 21:14:19 -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: f0d7c145-9db3-11f0-9809-7dc792cee155 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759205661; x=1759810461; 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=JRsfrHQBMjnrXhlxfeiXrXfyISPq/9LUWh417J9QSAY=; b=HmQDEgd0WLroLb9N28GnwNptCIEWEgi1qt+7DGtYwOs0AymCIuxDUB3KwrhmrW9Vq+ L+Kwbw5MN+9fd3uHtxJr1hpIp7QmTkNRuLDLTLgZ3ywCl9gz9TZS/hQev0YInkWcDOIl BXwaSjXLJ9pRMI7FRVXZJ+zAUy+yA76DhNeEdhFKEm95OYL7+1JDRjR6zUfLq6HIPjJA kQcfJbQURI8sM8GkXrrjGr60P8fIkD8GHhIqP6gFtgbnzNuhuaicuS3N7RLJF2UlnwEd PYhDABqv1EeOWccjhZyfWWCxYQLwiyZE3EdNoEDnqlHlNTVdyYeqfkKw+1/cstIX30UR Xk2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759205661; x=1759810461; 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=JRsfrHQBMjnrXhlxfeiXrXfyISPq/9LUWh417J9QSAY=; b=VpqKDAO7gIG+cOedTEefgOIuOxTmnHYDKiq+HMFlzPgQ7ArjJOnzuouKGz/sEhjzZA Yn5e+dYy1Ixh5HNbW6GJhDTGFkQCfz8rKvwX7+1XZ+6iC3Ux4FHtCZ88q5Y3qH8mJD8L buJ4XVUcT8oMIu28AbkmrD3SxHA4yPw2p86Ojlj6qlA7aEd34zDAPVEzcx18AKtAT9au INPzHsaLkMjBUo2p3yd6XOFeSqYPT+ebBjMNdF0ogP7RWIbmf+7fuZPia8p2IQz928Mm +4SkDFOEFO8cJgkqavRo7RL8E2YPblAaqC3/WgTDr3ejBhq+Vrq+6YoD1qlb9axutrTF AqpA== X-Forwarded-Encrypted: i=1; AJvYcCVTdjiKXyym8DzfWx+cBqetmIkqFK4O0qyUVW0DNpDJ641YYRXWDWlUqFB+CsoDCrWYYj37DliEZ8E=@lists.xenproject.org X-Gm-Message-State: AOJu0YzWCuByY3ZzVNEvqq2GA46NEB0t6FjRn4na2p8gKd41ZrhkUxAa oNwjxJPbTWheE9nKQY4RszEnE+iLUfkIM7GEwaFIj6mqz/eJa/YONCW46o0eyjpYtJk= X-Gm-Gg: ASbGncu66iWtkpyq60BMRlfdw9AwbRs1Qf7F320AkVNAvBrIHYIaqOzK+xSsMgKRLkU fb8J4Scj4PdpIX/xfSNXzoHcXZNbcT5KjGAsDJjP07t5xWtqMEtFAYAUJpnYDLu4y2TcGmUExL3 DLpxR8KqECQj6Ody7h1L9iBggoQdUmacrXgLiWvB5PYbWIknKNd2U6V40JDG6ZO6BTpbT/KRVpQ TDMRVSejE4q65wvVpYjlhiHzvJBdncpy6SPa/Vpjl8Gofp5N5dtF4QAGXwOdvb2feWD7SDajxR+ xZDcglIC0scs2TZZK1K8qbvCuLzel6GIYe0sdLuZsu7E6sre14HNCgiuEGuFGX1ZYOa+R24s3iR yiP4ZzARyl1b3Rn88+k+huStB9Xg3U30viRRJmeE/DuK3mw/RgXZ52beLTlO5X6uD38iakkkGBK xBzCrxpNf3nT47J82Y2dC6ruClKyDDjhY= X-Google-Smtp-Source: AGHT+IEAmcRaAQ7y3JKYkZc+1B3lBRPGfbSyTbOeVCtcFaGQrh4be0IXziHu3DKBh/h2DslEMGPKwA== X-Received: by 2002:a05:6000:2dc9:b0:3eb:c276:a362 with SMTP id ffacd0b85a97d-40e3d69c099mr16747038f8f.0.1759205660946; Mon, 29 Sep 2025 21:14:20 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Peter Maydell Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jason Herne , Stefano Stabellini , Stefano Garzarella , xen-devel@lists.xenproject.org, Paolo Bonzini , Ilya Leoshkevich , Anthony PERARD , Paul Durrant , Eric Farman , Marcelo Tosatti , Halil Pasic , Matthew Rosato , Reinoud Zandijk , Zhao Liu , David Woodhouse , Christian Borntraeger , Sunil Muthuswamy , kvm@vger.kernel.org, "Michael S. Tsirkin" , Peter Xu , Thomas Huth , qemu-s390x@nongnu.org, "Edgar E. Iglesias" , Richard Henderson , David Hildenbrand Subject: [PATCH v2 09/17] target/s390x/mmu: Replace [cpu_physical_memory -> address_space]_rw() Date: Tue, 30 Sep 2025 06:13:17 +0200 Message-ID: <20250930041326.6448-10-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250930041326.6448-1-philmd@linaro.org> References: <20250930041326.6448-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: 1759205793246116600 When cpu_address_space_init() isn't called during vCPU creation, its single address space is the global &address_space_memory. As s390x boards don't call cpu_address_space_init(), cpu_get_address_space(CPU(cpu), 0) returns &address_space_memory. We can then replace cpu_physical_memory_rw() by the semantically equivalent address_space_rw() call. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth --- target/s390x/mmu_helper.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/target/s390x/mmu_helper.c b/target/s390x/mmu_helper.c index 00946e9c0fe..4e2f31dc763 100644 --- a/target/s390x/mmu_helper.c +++ b/target/s390x/mmu_helper.c @@ -23,6 +23,7 @@ #include "kvm/kvm_s390x.h" #include "system/kvm.h" #include "system/tcg.h" +#include "system/memory.h" #include "exec/page-protection.h" #include "exec/target_page.h" #include "hw/hw.h" @@ -522,6 +523,7 @@ int s390_cpu_pv_mem_rw(S390CPU *cpu, unsigned int offse= t, void *hostbuf, int s390_cpu_virt_mem_rw(S390CPU *cpu, vaddr laddr, uint8_t ar, void *host= buf, int len, bool is_write) { + AddressSpace *as =3D cpu_get_address_space(CPU(cpu), 0); int currlen, nr_pages, i; target_ulong *pages; uint64_t tec; @@ -545,8 +547,8 @@ int s390_cpu_virt_mem_rw(S390CPU *cpu, vaddr laddr, uin= t8_t ar, void *hostbuf, /* Copy data by stepping through the area page by page */ for (i =3D 0; i < nr_pages; i++) { currlen =3D MIN(len, TARGET_PAGE_SIZE - (laddr % TARGET_PAGE_S= IZE)); - cpu_physical_memory_rw(pages[i] | (laddr & ~TARGET_PAGE_MASK), - hostbuf, currlen, is_write); + address_space_rw(as, pages[i] | (laddr & ~TARGET_PAGE_MASK), + MEMTXATTRS_UNSPECIFIED, hostbuf, currlen, is_= write); laddr +=3D currlen; hostbuf +=3D currlen; len -=3D currlen; --=20 2.51.0 From nobody Sat Oct 4 22:00:05 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1759205704; cv=none; d=zohomail.com; s=zohoarc; b=b+kL1rxFbHDvEnCIcK28EEYr3JeZBPMV9dWX62PQM6i2L6M6t9psGdUGWuKhIUVDUVnZHxFOggdSC6SA+xVccxnZl25GUogtLzuvh55u44JRvHUkyw8aR1+kwGFYSYJn4uYdSKO6O19IJTxfcZaBpyWtmD/HgDxPgjw5yOh8/kY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759205704; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=DbEYNZgIU6LqvkF49qge8kIj2C3i6K2S813tsyxbWwg=; b=VYw4+VFBSEKVa0d+lmbwNkH9v5R2mMBOazBQD7pfsPndGx0fO1ZzPzEc+1sxdRUGz2EpnlMLbnfF88OfmL0U7+Gijqw7XIzs/vVgfcFfDzyp0ctW9HKPT858dJiLFrjfkK2fjOG9Qg5sgNTqBtm81OatFTJ5B0pp2dk2VCAS5qM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1759205704359873.8917461197467; Mon, 29 Sep 2025 21:15:04 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v3Rl9-0001uw-Dr; Tue, 30 Sep 2025 00:14:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v3Rl4-0001td-HI for qemu-devel@nongnu.org; Tue, 30 Sep 2025 00:14:35 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v3Rl2-0000yP-2C for qemu-devel@nongnu.org; Tue, 30 Sep 2025 00:14:34 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-46e491a5b96so18992015e9.2 for ; Mon, 29 Sep 2025 21:14:31 -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-40fb89fb19fsm21119525f8f.21.2025.09.29.21.14.24 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 29 Sep 2025 21:14:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759205669; x=1759810469; darn=nongnu.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=DbEYNZgIU6LqvkF49qge8kIj2C3i6K2S813tsyxbWwg=; b=bqxEmSr7uzomIyiI8JmO4qsFNcf+m0ro3odV4UW++TALTSyqxh4pspzjRr//vKm7VE fnMZfSis+N+gnM9fxA0H9dA9IdWh0CiBk/ZJ/zck8M9trvGgIJG+BwhYBJTQcqK2X1Ex hPS4jZJ0cPSkyOATMiHR67vBtyRMKeWcYOxnIKmY5vgNK/eZfUXwPXJ8UQbd0bS8MaGZ 7MYSb3GMSbbAEw95gzFy7XPDEsTNFw2Qnl9iWjjOiLn4zZKoUJxDykKfPl5RHMOCZClE Vhf9mU2NE9BD6XCSjzGgxZs9HPLXj9+ZStA+yYlw3cuzDEHWNAtO6dhL6CMFGuvan5SD lsPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759205669; x=1759810469; 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=DbEYNZgIU6LqvkF49qge8kIj2C3i6K2S813tsyxbWwg=; b=ahXZe13kH+JT4qEP2Y3fHfbXXbyMyl6+rSRzyQc7OEUJGVbeW079WSAOVQYpZQRSxW WotPhD46smUmAxuwAFMMuzuGIgYhOMk0fMkETgTEmASaIewVsECYBzkhuLBX3XpmSm5p aPb/NLVwJR6JXEpHiViD/f2zuZHMs1wSHqsD19H9zaT3rnORLo0Ifg6PbE11p1ddS/Sl nYja8ICvACbD9upwXaCPZiFB60iRAqdoQuKDGUJBWNd1PegcX/StdtCApQrnS02OFii7 H4MlR++PTLl+qTRGwq4vlaV3Z6PZZRRe4mjGt0IIT4Wn4zm0i1ybePipYP2yQeMXiLqG 5kDQ== X-Gm-Message-State: AOJu0YxboNbdEl8fZOhnRjnKTmNDou2caZn5qzX7bg74tQ/+xofdZLAs BAUnClje0BHRXxEDdCNY33zLyUI5o08oi4rbOCZSMN6jSV6v/D+KBp4lkVcTUeGi0UqKvBA9Xr0 MTwLwg3gW+A== X-Gm-Gg: ASbGncsA5hC3h7DnJ3XRjY++15ccD6IW2wVWoJXDbpC/PIx5GgKpVNEgjvAbPM0hnjT gy6QW+3Qjq5rQaVySjYp4rGz6Wwb6CJCLszcTRYV8C4ZdTI1VedB52oSwmBes9utWV9JKI4/eco kX/OkbtJT3mXn6KyZCTkv2CtvkwQTDoTipcw3Moc1niMQcQYPfgs7AbXdCGlRmawuIW3jVywYlc uRaqS+Nge4ovZgRBrhyes9OjvMjJNTF1b39k/n9XfZ7dFrTHqG61Zrb4Z1zFRDct8rSAyrP3nIL sNJHT6V01je4PQiog1e6wMpsIEz/eB/kxvXmNrjWyFF0e1fLVG9hxKdx1FvFtZp+OfEPuW73CQ3 DNj18aCLcZDRkmEb0hhOEqu/o0ymk447dHboV/L03uPHcyeGLe7pxPS+F15i97SKiBNm6CE9pZp wRu4jnfD4UYIssWV7seecHoFokwc4YzE4= X-Google-Smtp-Source: AGHT+IGQV+zsO38iVKo0msrSbqnR/OPqPQnfcFKxd1s907Qhohb0/U7DrOdOWLv1d/ID8PieNnQk2g== X-Received: by 2002:a05:600c:871a:b0:46e:477a:f3dd with SMTP id 5b1f17b1804b1-46e477af5c1mr75062075e9.36.1759205669015; Mon, 29 Sep 2025 21:14:29 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Peter Maydell Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jason Herne , Stefano Stabellini , Stefano Garzarella , xen-devel@lists.xenproject.org, Paolo Bonzini , Ilya Leoshkevich , Anthony PERARD , Paul Durrant , Eric Farman , Marcelo Tosatti , Halil Pasic , Matthew Rosato , Reinoud Zandijk , Zhao Liu , David Woodhouse , Christian Borntraeger , Sunil Muthuswamy , kvm@vger.kernel.org, "Michael S. Tsirkin" , Peter Xu , Thomas Huth , qemu-s390x@nongnu.org, "Edgar E. Iglesias" , Richard Henderson , David Hildenbrand Subject: [PATCH v2 10/17] target/i386/whpx: Replace legacy cpu_physical_memory_rw() call Date: Tue, 30 Sep 2025 06:13:18 +0200 Message-ID: <20250930041326.6448-11-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250930041326.6448-1-philmd@linaro.org> References: <20250930041326.6448-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=philmd@linaro.org; helo=mail-wm1-x331.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1759205707874116600 Get the vCPU address space and convert the legacy cpu_physical_memory_rw() by address_space_rw(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/i386/whpx/whpx-all.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/target/i386/whpx/whpx-all.c b/target/i386/whpx/whpx-all.c index 2a85168ed51..82ba177c4a5 100644 --- a/target/i386/whpx/whpx-all.c +++ b/target/i386/whpx/whpx-all.c @@ -788,8 +788,11 @@ static HRESULT CALLBACK whpx_emu_mmio_callback( void *ctx, WHV_EMULATOR_MEMORY_ACCESS_INFO *ma) { - cpu_physical_memory_rw(ma->GpaAddress, ma->Data, ma->AccessSize, - ma->Direction); + CPUState *cpu =3D (CPUState *)ctx; + AddressSpace *as =3D cpu_addressspace(cs, MEMTXATTRS_UNSPECIFIED); + + address_space_rw(as, ma->GpaAddress, MEMTXATTRS_UNSPECIFIED, + ma->Data, ma->AccessSize, ma->Direction); return S_OK; } =20 --=20 2.51.0 From nobody Sat Oct 4 22:00:05 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=1759205789; cv=none; d=zohomail.com; s=zohoarc; b=V7sTgx7wnK2iHptJaRJasQo3Lo/ePFQT+0uwQkPPlYHO65UAmu+4Bi7IMDmaYiyAqGyyDOwLgWGJjM97PAlt1AWNIWcqk3mpgEdx+UuCPUo5wZctu2hB5mYvxP90kANASYGZiBUWPe9uNwq0XbXEVIeIJ1/VAnCi8BGlq3xqXsw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759205789; 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=onCfEhinWarPReSMP2g+nvBYz1NYywUR3fuXcFIYVYM=; b=GtAO8uZ13Qk5MeDpd6pLF5CwpScgWYAWc3Qx3X79LdNQLYIsReuhWoxBM34vMc+0UsL200XVG+Tc3R6hgKX76KC4zBWQX770kDTA0Ng0NwCJCijpgAh80H3bZvit6VxRRXDva8FD6gBJ+PGAooWYdiBHNfI/DUThrs8QLxVgi/0= 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 175920578984127.849337845717628; Mon, 29 Sep 2025 21:16:29 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1133503.1471646 (Exim 4.92) (envelope-from ) id 1v3Rma-0002wt-Ab; Tue, 30 Sep 2025 04:16:08 +0000 Received: by outflank-mailman (output) from mailman id 1133503.1471646; Tue, 30 Sep 2025 04:16:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1v3Rma-0002v7-5N; Tue, 30 Sep 2025 04:16:08 +0000 Received: by outflank-mailman (input) for mailman id 1133503; Tue, 30 Sep 2025 04:16:05 +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 1v3Rl7-0006tq-3c for xen-devel@lists.xenproject.org; Tue, 30 Sep 2025 04:14:37 +0000 Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [2a00:1450:4864:20::435]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id f9eac94d-9db3-11f0-9d14-b5c5bf9af7f9; Tue, 30 Sep 2025 06:14:36 +0200 (CEST) Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-421b93ee372so863903f8f.2 for ; Mon, 29 Sep 2025 21:14:36 -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-40fc72b0aeesm21288982f8f.49.2025.09.29.21.14.32 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 29 Sep 2025 21:14:34 -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: f9eac94d-9db3-11f0-9d14-b5c5bf9af7f9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759205676; x=1759810476; 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=onCfEhinWarPReSMP2g+nvBYz1NYywUR3fuXcFIYVYM=; b=qUMVFovuwwEM0MouPOZLAmN8/fXpO51T6uDuWnFsUn9Rd5EaopI0zTwzslaimDS/XI fs780cVFN/rvWKwI9lMi8GaWeERy5Ln6qHA9i+mDLF1a6xglCTBCsvM1AizId9yXkXLc qc1WtWmmARzoTXteSf1rKe+GSzOEVCTbz5fvUZnas6rAggCDTDg4kUcrpNC3NSDQ5Koa U3o71jrYPDLoXz7w0PAcWYEi52d8iKQoT1zouX/bEY9z4MBMktOqTB0Mx4inkTbDubtS PHttfarWMkO0fGgr4hhu7oFjKoWG/P1En/yv/g9njv3Bn+Jdg/gkGuwUHtRM9kdkQILz MlUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759205676; x=1759810476; 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=onCfEhinWarPReSMP2g+nvBYz1NYywUR3fuXcFIYVYM=; b=vBVrpScJR8t8vA5yXCENu+ikKXkcPGm8ELkl4RQAfDL0cpfDJxx9UvgTogfYXiT262 puLzsLMBIsEqXCN6XEt7rMBXd2aN/8+pxsVALvWF1TZOHYspyEhHsEQi6o5sq5RZfHNV me8kK6Ceye0y9t2XGaLMppF/UTqL2qYNaAf3/zcsco6lvtnzOGmQMYadsIOffpShd0Y7 /LA1tjuzjdJPOjw5UzjRNnXXKoJmEEwb4RnmPiVqxO9QX1eUNhBbQA0GVgZbg61POo7f DEf5JwOwqmCc1iBYA5jhoQ2K0Z28i/GqgCkJCxoysletvYHOtf7Ecjlq12RNp1JTRnoK ok+g== X-Forwarded-Encrypted: i=1; AJvYcCVcIlS7h9s4IGvMzVDmSsnPpOzSmr7WUGiQAgh8/fJgzrfL5t/UQpXNvad1yEabfHUBEcft/f3f44U=@lists.xenproject.org X-Gm-Message-State: AOJu0Yz0Xlu39DPqX2VWL3VC/CDNUBqU3cADn/srUNKUEGHG4dKc1Iig KLn3FwzOqonCD7CVXa4d4DPoAL5lTtyt+pr9cFujcnTImmMQQT/+KwIuijXbdZTvfbQ= X-Gm-Gg: ASbGncsPz+exIPkBSEA3wOlHha1uzYb0KgtsyRPE9OL+4DZmW5K0cJnOlh7c7H4No2h ZVoeGLUYR7WamgrUTimieA3NQNEDMsTzczpGx835GP8gZHfjWLWbfFJte/qqupp4gifkC3YWvhj m5Eqpiv18ISyytdLK4tqj93bCjJG2lHCG3wKnBXnrqW7kDio8AiA1KOEU9Gpq29qryJtedQjKjB pc0vSAeNNFjf5qO60XEOwDRuHiIjw3+DLAXtN0KtASLqBCL+inRp31fx9XqWPvh5/J0bHzWKGXH oiZ/RhKI3V0NfpbF+1f0WTq3/VF2HPMlCj56Rp+w2HFR/G9n30BZE1GKiYzJku6+jZ4xjs7T5Lm SPKizbbNPamcdfqzVMrkjLhjBr/KJv5KQ4sU9asao22aD80VSUurqG2hzsiPIXXqk58hTmfVoc6 ssl+Wrp/GSxK8Zm2sriiCVUJ9c48uPz2lHZxTHmb+F/A== X-Google-Smtp-Source: AGHT+IHXSt4CkpBPH+1BT7FZNZBNpbDyORtYFCRXPSlc1PSaGA5no80rsQKq3Agt1aNkmXQ30vgX3Q== X-Received: by 2002:a05:6000:2689:b0:424:2158:c1a7 with SMTP id ffacd0b85a97d-4242158c3cbmr1203705f8f.34.1759205675919; Mon, 29 Sep 2025 21:14:35 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Peter Maydell Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jason Herne , Stefano Stabellini , Stefano Garzarella , xen-devel@lists.xenproject.org, Paolo Bonzini , Ilya Leoshkevich , Anthony PERARD , Paul Durrant , Eric Farman , Marcelo Tosatti , Halil Pasic , Matthew Rosato , Reinoud Zandijk , Zhao Liu , David Woodhouse , Christian Borntraeger , Sunil Muthuswamy , kvm@vger.kernel.org, "Michael S. Tsirkin" , Peter Xu , Thomas Huth , qemu-s390x@nongnu.org, "Edgar E. Iglesias" , Richard Henderson , David Hildenbrand Subject: [PATCH v2 11/17] target/i386/kvm: Replace legacy cpu_physical_memory_rw() call Date: Tue, 30 Sep 2025 06:13:19 +0200 Message-ID: <20250930041326.6448-12-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250930041326.6448-1-philmd@linaro.org> References: <20250930041326.6448-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: 1759205791029116600 Get the vCPU address space and convert the legacy cpu_physical_memory_rw() by address_space_rw(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/i386/kvm/xen-emu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/target/i386/kvm/xen-emu.c b/target/i386/kvm/xen-emu.c index 284c5ef6f68..52de0198343 100644 --- a/target/i386/kvm/xen-emu.c +++ b/target/i386/kvm/xen-emu.c @@ -21,6 +21,7 @@ #include "system/address-spaces.h" #include "xen-emu.h" #include "trace.h" +#include "system/memory.h" #include "system/runstate.h" =20 #include "hw/pci/msi.h" @@ -75,6 +76,7 @@ static bool kvm_gva_to_gpa(CPUState *cs, uint64_t gva, ui= nt64_t *gpa, static int kvm_gva_rw(CPUState *cs, uint64_t gva, void *_buf, size_t sz, bool is_write) { + AddressSpace *as =3D cpu_addressspace(cs, MEMTXATTRS_UNSPECIFIED); uint8_t *buf =3D (uint8_t *)_buf; uint64_t gpa; size_t len; @@ -87,7 +89,7 @@ static int kvm_gva_rw(CPUState *cs, uint64_t gva, void *_= buf, size_t sz, len =3D sz; } =20 - cpu_physical_memory_rw(gpa, buf, len, is_write); + address_space_rw(as, gpa, MEMTXATTRS_UNSPECIFIED, buf, len, is_wri= te); =20 buf +=3D len; sz -=3D len; --=20 2.51.0 From nobody Sat Oct 4 22:00:05 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1759205834; cv=none; d=zohomail.com; s=zohoarc; b=M9wHfVtvBtMUTnaXjb+Vi3hyi4HwLlaL2NzNAcSPNpmQ4yyHu7oQ7k/uJuoC2droFDlT8RJUGWkwkXimE/8jIUyjk4Gmnkd7LGs0so2xc9yhJ+WQeqirW+HP1zjd8NgaFfkMfSlpX0uu1f0y74mO42dfVRM6IURU2xAlj0aqG0U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759205834; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=QtU1C0M8U0OTbHcI2E95ZD2Zrsmz5/OESKETD6NudSM=; b=hsYqLQk9kE3Y1uOv6sVypfN+WrJCmaDfItH8nO1y0zGHru3d0m1dSeQjDrg0NYKxFlJHa0XSpSdbOEVtlV01E+xlZY3DwlF+WAjZiYp4jP42w3zZffvDzVb8UrJSNm3MTAAvhAhHvlFkh9c1tv/mN9jqJukJL7swewi2nuTf/Ig= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1759205834946921.6382844083082; Mon, 29 Sep 2025 21:17:14 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v3RlQ-00023j-VH; Tue, 30 Sep 2025 00:14:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v3RlN-00020O-83 for qemu-devel@nongnu.org; Tue, 30 Sep 2025 00:14:53 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v3RlJ-00013a-TJ for qemu-devel@nongnu.org; Tue, 30 Sep 2025 00:14:51 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-46e30ef74b0so37706055e9.0 for ; Mon, 29 Sep 2025 21:14:46 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-46e4ab0bf62sm98607665e9.9.2025.09.29.21.14.39 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 29 Sep 2025 21:14:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759205681; x=1759810481; darn=nongnu.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=QtU1C0M8U0OTbHcI2E95ZD2Zrsmz5/OESKETD6NudSM=; b=z2B7yiHln37aClp2bGkqESsXoKLWWnrzwDJtaUjneo2v1YiLk6/xEmokAxxCS1sHSO P1juIOxgWJGx07p7c/6hdl42fs1OmFMBlVcQ4nR6Bg0dIwxtNfH3sqBjWU8h2qS4N7xa 2DmOfeV5gyU1swg5ma9U3kthuaiGw++4lZk/VC6tjzOe8g7GPmmEyFiFNorM0v3GT+Zs bJ8xT2uLHqPJRvEX7HwaQdKNYxoiJ3P+Eaz2CEeXcZRe5heT4/PeJ/iZ/GJk+4c9jPzq kLmh6X73i+wfUykpVvKik7TjDSZ8xtz/3JADMIBajqd37RMxL5vO+DMWY5kLMIN8Qyfp GZlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759205681; x=1759810481; 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=QtU1C0M8U0OTbHcI2E95ZD2Zrsmz5/OESKETD6NudSM=; b=HAP7QVwQIcG49bGpMu1SaAyNlhPBcpuywvt4a7LdRIkFJHfRspnnB6fV4b7BRgaazn QnkxcI6g+yJwGnjPDJtUhc9oGx4TmEAjzKKZGXi5869WMlaczfznGU5C28sSZbj/OkdJ Kg+FtvW2oJzi8hcYgpLOOxhpB/tEx8hLVsmR+s+zOaqntd4EvuSz7dSLt00miB5XLy8e +dEpBJgGxw+zNcZhw5jjX+rl5VL3CmjXh86TdVog6/FLz0s/LHHUSXI9KTcusZAaQPYO Ba0BHMTN+iKZd4lbvtyGNbB4jzGbzbiLXAYM/Ro752b3ML3bfWa3AmTX8nuZ6tQfctGG 6dWA== X-Gm-Message-State: AOJu0YzP/YZOKcJZ/CXmSln73PekXlImpr9GMQ3YsexRPaosbImMBA5d lb7HDVUSdfGi4sfX5xCFpYEGFMVrfDM2S4zzyMrZqEXgJyvXncJz/JVMxAxncNNfBHUmnToAchJ klsbwxfCTgw== X-Gm-Gg: ASbGncsKLdU6TL8IyrBH8dbOwPwq3rh6DxTdc0rqD87yC59KLNP7Q2tciQUMBlcwxqV ulkuYa0TMdbC3+6QVvonjCt2qKB2kl5me+C7fPJYb3hmlYFUuLGnrfr9QhZpfFes6lwlWjNL8jS Xwj35XbGjCUgobgZJyU7bJTkenYx47SQ2UOL32AA0Y/dlfk2xlPHglpgTHXlYyjAFRPXdjV6DLP 4acG7XqVNo4QTIl8c4DgAUpHNRzE1wx4SPOjxA3vreCh95O1aCB/yhrtYadHUXFyqYmpUyhJqZ2 vYCs82lfhNwh1CQBHmlykIsAweRD9jKISD88RfjQYy73Ksx6k9tPOdg26DFFM3BqTamFkbyBACN weS1Uil20m3NICC874ge4asq35XdvnNJRV6CEguKxFA+f76/0FAO8mLSjWJ1psDQzRna8SmoJQd orkyIpjIBLIjXw8QZN79js X-Google-Smtp-Source: AGHT+IGUG79kearmVn7+9qugGuIF+Iaatq5RHrgppUdDi9qlZIXdMZGH9YdXisC+M3CCPhGM+TJyoQ== X-Received: by 2002:a05:600c:a00c:b0:46e:41b0:f0cb with SMTP id 5b1f17b1804b1-46e41b0f464mr152474875e9.25.1759205681405; Mon, 29 Sep 2025 21:14:41 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Peter Maydell Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jason Herne , Stefano Stabellini , Stefano Garzarella , xen-devel@lists.xenproject.org, Paolo Bonzini , Ilya Leoshkevich , Anthony PERARD , Paul Durrant , Eric Farman , Marcelo Tosatti , Halil Pasic , Matthew Rosato , Reinoud Zandijk , Zhao Liu , David Woodhouse , Christian Borntraeger , Sunil Muthuswamy , kvm@vger.kernel.org, "Michael S. Tsirkin" , Peter Xu , Thomas Huth , qemu-s390x@nongnu.org, "Edgar E. Iglesias" , Richard Henderson , David Hildenbrand Subject: [PATCH v2 12/17] target/i386/nvmm: Inline cpu_physical_memory_rw() in nvmm_mem_callback Date: Tue, 30 Sep 2025 06:13:20 +0200 Message-ID: <20250930041326.6448-13-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250930041326.6448-1-philmd@linaro.org> References: <20250930041326.6448-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=philmd@linaro.org; helo=mail-wm1-x336.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1759205835615116600 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/i386/nvmm/nvmm-all.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/target/i386/nvmm/nvmm-all.c b/target/i386/nvmm/nvmm-all.c index ed424251673..2e442baf4b7 100644 --- a/target/i386/nvmm/nvmm-all.c +++ b/target/i386/nvmm/nvmm-all.c @@ -15,6 +15,7 @@ #include "accel/accel-ops.h" #include "system/nvmm.h" #include "system/cpus.h" +#include "system/memory.h" #include "system/runstate.h" #include "qemu/main-loop.h" #include "qemu/error-report.h" @@ -516,7 +517,9 @@ nvmm_io_callback(struct nvmm_io *io) static void nvmm_mem_callback(struct nvmm_mem *mem) { - cpu_physical_memory_rw(mem->gpa, mem->data, mem->size, mem->write); + /* TODO: Get CPUState via mem->vcpu? */ + address_space_rw(&address_space_memory, mem->gpa, MEMTXATTRS_UNSPECIFI= ED, + mem->data, mem->size, mem->write); =20 /* Needed, otherwise infinite loop. */ current_cpu->vcpu_dirty =3D false; --=20 2.51.0 From nobody Sat Oct 4 22:00:05 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=1759205781; cv=none; d=zohomail.com; s=zohoarc; b=LF1I3pp45bWOBkm3qGM+CFtoFscON3jHPgGAQkE42cPUJkAp+8X+/eFhmWRkAiCQ+692aN5eiE4oiyskh2X3b4tcgAIkNXUwcYEaC694lOgCzcAq8TgB3tEN0+E06pCmrRqaoB4+FwLK3LYoqESqphUYZ5T+3t99FFSp1MrJ0JE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759205781; 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=U9bErLRqv9kjbdzs2kwz9FzL8C8SAPMQ12Esuz3D9Fo=; b=CIDuW2cXlTtwLHmzrN9c1WYE8qMFpRR0rv1wO8pAKCNpc2cw8xiADmpuMdj92JVLSydpHFrBP+s5qL5dZOqn9rg06tqQz9mUfIZMlwzxIgKnyVt74WPscMSOxrCa8kYjWSVIYirAFRp7Lij/jY70U0W7M6rVynJoA8VFVZXo3ds= 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 175920578167496.10934366151491; Mon, 29 Sep 2025 21:16:21 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1133490.1471608 (Exim 4.92) (envelope-from ) id 1v3RmW-0001sS-2H; Tue, 30 Sep 2025 04:16:04 +0000 Received: by outflank-mailman (output) from mailman id 1133490.1471608; Tue, 30 Sep 2025 04:16:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1v3RmV-0001sF-UL; Tue, 30 Sep 2025 04:16:03 +0000 Received: by outflank-mailman (input) for mailman id 1133490; Tue, 30 Sep 2025 04:16:03 +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 1v3RlH-0006tq-Lv for xen-devel@lists.xenproject.org; Tue, 30 Sep 2025 04:14:47 +0000 Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [2a00:1450:4864:20::334]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 004b39ac-9db4-11f0-9d14-b5c5bf9af7f9; Tue, 30 Sep 2025 06:14:47 +0200 (CEST) Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-46e2562e8cbso41430165e9.1 for ; Mon, 29 Sep 2025 21:14:47 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-46e2a9ac5basm284686015e9.7.2025.09.29.21.14.45 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 29 Sep 2025 21:14:46 -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: 004b39ac-9db4-11f0-9d14-b5c5bf9af7f9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759205687; x=1759810487; 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=U9bErLRqv9kjbdzs2kwz9FzL8C8SAPMQ12Esuz3D9Fo=; b=SvzTjNGjToxYRmnX1XsGif8m5i+Rmippesloev6S3qUHzuPYLC6f649MhBanCuGbfH Q73cAHfOEE5BQ23PdenGtwqMJal1FPU5mhq4As7PyAHpsN9rgIDwXJdR0TALVgoO5ET6 E2rt14cPlZTrECszG9vPzdUXnH096zUTYTpkeUgoJSZScP62DIUCKVbUoz9YrtwWsuaR lY1G+vZm4+Uoecf4o6TN1qU5rOud4Sor0NrJDdHxwgWdnKYwJVbYvmWFJkRgdDHe6dwf 1mEtJuEeGEwkTSxkGTcOyGyexlv8hDP1aH0VE5r5aQ5eJV4X3JMFoRI66vQA389RI0nQ 23CA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759205687; x=1759810487; 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=U9bErLRqv9kjbdzs2kwz9FzL8C8SAPMQ12Esuz3D9Fo=; b=CLre+0tXs3pO2MuCbC4EVyt+0ptnP7JKhGfREaCjwcIzt6k/rFsHjl8F/MiKDW1gYP WYDEXGPK4r7FM8uR+GdAYI4iVQoh57+r2GEHeZfU5L1JXw6salE4ZaCk95HL7KmVg1h0 12N95K+8viqb5Ltp3T8YHnXYQEI4KuG8Dm611qhLZiOZTDtb3PNInUZ4n8WnCpE2Z+6B gXJBfrWeNT58o/+vYIVpSQ0bgnyoZZb8ObhtMIphtow2P9HEM7TWOs7Z48qkdFOUe0nR ZGbWwdTDzaAuA9xZzwA/DeiHZVsQ++H58VckoF5Yged/pE9NafrT/8HOzuQiHKjfHYjW IocA== X-Forwarded-Encrypted: i=1; AJvYcCW72ITtAXA00UEM8EIlWc9H0elMfPRYEZLWne/QDaokQVA0hXyln4/2pQ+A1jrUOfDAdMTyfV0aQ7o=@lists.xenproject.org X-Gm-Message-State: AOJu0Yw3sDk8ZrB6yeFxjnwVhcJfNA+9CRXSXyIFY/i0qRRmU8ST633J i7i5LPJmW+rP45Fkh+e+T0r27DtgIABn8Kk7Eiw1M59q0Pb+qkGa9+dbwVMZV8tWw88= X-Gm-Gg: ASbGncuRvWFg0QuymycVS3rXDRsXf7BRquW4uISIoCjwcDtOzlpMyAUEigzC8d1Kd/L 7U1PjQrMgyLp4Xge9Xt2UxnOIeZHuxV4I5SXnPGryHEsfgaKS9C2v53CzgLjMjnvyqN93AnFsTH I14bxB50QEgNV+2HYatvWeytqSLZjJVVJjZCyOEDNaMVonb603mOadjtUeDBPUOw2HejkGRyCYr KLc12ZsKz2oZ+IXfFNsfWhNFY/pwaIFjVljzWA2IEo5SPHK9DQOGiYdoCjN7gTDq4pFoYhX78M1 U5YMxCidV1pd5Rt3th75m/89mRgXOXb4EgjzRgFNqnHWg3i3xGnTyQfca4fBZTZrP/TQQBwelyH qoDLRX/ZbWq38knEmjKQwwAb3sTbF8VY7r/d0jA0Mc0SUbFH7ndrFV5WCLGjtIwx57+MoyJBhqM VMWgfMul+jNvcY3jhEjXvx X-Google-Smtp-Source: AGHT+IGyKmmQIMqQURGJv7gP62rq5JnP7SAE6q2ubqy946YRUlo5uVTz66eDWtBwE0h2GgBG2/uY2w== X-Received: by 2002:a05:600c:4e43:b0:46e:3f6f:a8ee with SMTP id 5b1f17b1804b1-46e3f6faa76mr119745615e9.13.1759205686721; Mon, 29 Sep 2025 21:14:46 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Peter Maydell Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jason Herne , Stefano Stabellini , Stefano Garzarella , xen-devel@lists.xenproject.org, Paolo Bonzini , Ilya Leoshkevich , Anthony PERARD , Paul Durrant , Eric Farman , Marcelo Tosatti , Halil Pasic , Matthew Rosato , Reinoud Zandijk , Zhao Liu , David Woodhouse , Christian Borntraeger , Sunil Muthuswamy , kvm@vger.kernel.org, "Michael S. Tsirkin" , Peter Xu , Thomas Huth , qemu-s390x@nongnu.org, "Edgar E. Iglesias" , Richard Henderson , David Hildenbrand Subject: [PATCH v2 13/17] hw/xen/hvm: Inline cpu_physical_memory_rw() in rw_phys_req_item() Date: Tue, 30 Sep 2025 06:13:21 +0200 Message-ID: <20250930041326.6448-14-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250930041326.6448-1-philmd@linaro.org> References: <20250930041326.6448-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: 1759205783408116600 cpu_physical_memory_rw() is legacy, replace by address_space_rw(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/xen/xen-hvm-common.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/hw/xen/xen-hvm-common.c b/hw/xen/xen-hvm-common.c index 78e0bc8f644..52e2cce397a 100644 --- a/hw/xen/xen-hvm-common.c +++ b/hw/xen/xen-hvm-common.c @@ -12,6 +12,7 @@ #include "hw/xen/xen-bus.h" #include "hw/boards.h" #include "hw/xen/arch_hvm.h" +#include "system/memory.h" #include "system/runstate.h" #include "system/system.h" #include "system/xen.h" @@ -279,8 +280,8 @@ static void do_outp(uint32_t addr, * memory, as part of the implementation of an ioreq. * * Equivalent to - * cpu_physical_memory_rw(addr + (req->df ? -1 : +1) * req->size * i, - * val, req->size, 0/1) + * address_space_rw(as, addr + (req->df ? -1 : +1) * req->size * i, + * attrs, val, req->size, 0/1) * except without the integer overflow problems. */ static void rw_phys_req_item(hwaddr addr, @@ -295,7 +296,8 @@ static void rw_phys_req_item(hwaddr addr, } else { addr +=3D offset; } - cpu_physical_memory_rw(addr, val, req->size, rw); + address_space_rw(&address_space_memory, addr, MEMTXATTRS_UNSPECIFIED, + val, req->size, rw); } =20 static inline void read_phys_req_item(hwaddr addr, --=20 2.51.0 From nobody Sat Oct 4 22:00:05 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=1759205788; cv=none; d=zohomail.com; s=zohoarc; b=lOGhk49oTuEJva/om3CQVVccp1m8gGBNbjgGT1d8V6XDMTx/WvcZH/g02TRlkkDwHcX7vIpG9Fxrcxk+Y9c24J9/7TDIrnHeJOUErVHMpVk7uQzneN/BHxeeVUyj9mGdyXOGTCeDSNkLQe04EPHIjM0AwOzV/mFvgGB/4CvihNQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759205788; 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=tDZrJ5n4JJlGtTIDZGasXxs/GbyDfsVnrlhryX3chWg=; b=dKowJTC2x2D4hV7QVhejZoWs9HxfYKP+56ZYgTRCBoeMv0kdr5P7LIXyt4B06cc16rV7/Aw3MzmFVPOAZSHLHs5RmFiHBDNwREsojU6Bpg3PbSmgIVPm8OG5rZ5K0LuiAJKpVMf90WUfnjPBNL6XYManE4cCzhDYycGNVyoPCyg= 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 1759205788746492.56862919702303; Mon, 29 Sep 2025 21:16:28 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1133499.1471628 (Exim 4.92) (envelope-from ) id 1v3RmY-0002YS-Kk; Tue, 30 Sep 2025 04:16:06 +0000 Received: by outflank-mailman (output) from mailman id 1133499.1471628; Tue, 30 Sep 2025 04:16:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1v3RmY-0002Y4-Hn; Tue, 30 Sep 2025 04:16:06 +0000 Received: by outflank-mailman (input) for mailman id 1133499; Tue, 30 Sep 2025 04:16:04 +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 1v3RlN-0006tq-Mx for xen-devel@lists.xenproject.org; Tue, 30 Sep 2025 04:14:53 +0000 Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [2a00:1450:4864:20::42b]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 03e2d382-9db4-11f0-9d14-b5c5bf9af7f9; Tue, 30 Sep 2025 06:14:53 +0200 (CEST) Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-3ee15505cdeso4203838f8f.0 for ; Mon, 29 Sep 2025 21:14:53 -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-41855fc661esm13064710f8f.45.2025.09.29.21.14.50 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 29 Sep 2025 21:14:51 -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: 03e2d382-9db4-11f0-9d14-b5c5bf9af7f9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759205693; x=1759810493; 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=tDZrJ5n4JJlGtTIDZGasXxs/GbyDfsVnrlhryX3chWg=; b=J6pxTyPCIja4+jlJxWtpeDTXBaD/YcUHXHs+PrKTrT3xLGasL8EKv9EIug8OKlGnsX L0NX+vEXqTEvHC6OP2FlyqY+QgzkF6sFgvBd1n5G1ElVQEGpxyFN9nzmkGATCaDJgY9b euN2z1y25yekC03eJqdBOHGKhzFX5jgsos703ndW3dCMIIceDyikBZlO05nl2c2Xtv9t 8AUAy0UCA5bhjSofvznNpJwIhdSHmTTaz5ycNPIXv8h/y2j4JI88GV/mOx5V6bUaRdOd JjN6Z9fIBGwANfoyZ78FF0Tp1JwE0t8ZDVIEH4S7roYu3IuEpLyZfIHwTizA4yYYSPQJ ED2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759205693; x=1759810493; 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=tDZrJ5n4JJlGtTIDZGasXxs/GbyDfsVnrlhryX3chWg=; b=rZjZ/sQhXEN4nj1/xRMPI3lTew4mj7EeDeQSaxOMCwtgi+bn4LhY6hFrxPA/5aUCk+ atAwEuLlyXRD8MQEQSWehBG9YsraPMkecbTov8iFolsDtjgUi+Ded+IV+CMa2uKUp9EN qVZzViTqC5VdUZNeHBB3C7J2KvuOGpsiZq65FnAVBpxom5I/vf1pehLpiOJnkhYAjXvp RT6a6PoIq+/XPqGMkkcewgCRz8zCLpjr+FsADLWlUf4SbEMlHgBtbjCmOSedx2m1l1p6 RLVoYioTP1ugwyKjc/NWyjwreGwKR8yL0TsPylEHrfLLvmJ+oLcBl3nXTdzCWuUbH8U7 SVxg== X-Forwarded-Encrypted: i=1; AJvYcCV+6QxUvfcCi4y4W1CiluedSjNmFuyjYvW+H7JFgY90MJeJyCXgEvaTDAe/1tqDFcRrBbWdvgka8d8=@lists.xenproject.org X-Gm-Message-State: AOJu0Yzl64eaDeSaPUuX+2IaaTRzg7w437NGCW9hmtBlbASFdLirVuSF +TlXjymvi+dVKTBWo1lsBBRZTAmziJq5EZ4MmuSEZVC5C82GiBKoeFx1fCTb9FJsiPo= X-Gm-Gg: ASbGnct0DLr1y0JNd45ZEmaj4pmLdgCzSypJhnbsG1nSvj8Q+IwjKa49gowWHLQSDB1 OoVMIKLleebKVoSNsX5yAnVLwlRRUE3kNBodaqhuhtYDHSFSyURgiE7cIO8WPp2UK4Dtsm38dZK Am3wJYrIQ3fBzHfqHRfmVClY1T8gghvkkJMMiRACuG70HrR/qifzD4XMgJ7PGpaFwQdrj3nBQ9j glrrRKbE7r5avsKnIFmJW/eozgxmao78+1+f4lMqu9tMs1/9BM2RXnqBT9PpTdvq0h1kk32nSMa M5sewNH2lI0S88ulw7Zsf3cVy+O9VwBcuUVvyUskldHSCHJ1/ja65Bi2In9uQ7YPFPWYK2IeQBC neauBQTW7eEjgffDTQsX4wfHooshI5z+bWWL/yqxYt9oeS8wOLt2YMn2RPq++gRv4qRo/WBJ01w JYwV7d40elvsgNzyY627rk X-Google-Smtp-Source: AGHT+IGTcuGp6K4U+VzNJFqsWFt5qmyyMICY36EpMMpwA/c/CYvK54pPvXL/H3Oj0HTHDk8uqyOMBA== X-Received: by 2002:a05:6000:2901:b0:3e7:617f:8458 with SMTP id ffacd0b85a97d-424116eaebcmr2419836f8f.24.1759205692755; Mon, 29 Sep 2025 21:14:52 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Peter Maydell Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jason Herne , Stefano Stabellini , Stefano Garzarella , xen-devel@lists.xenproject.org, Paolo Bonzini , Ilya Leoshkevich , Anthony PERARD , Paul Durrant , Eric Farman , Marcelo Tosatti , Halil Pasic , Matthew Rosato , Reinoud Zandijk , Zhao Liu , David Woodhouse , Christian Borntraeger , Sunil Muthuswamy , kvm@vger.kernel.org, "Michael S. Tsirkin" , Peter Xu , Thomas Huth , qemu-s390x@nongnu.org, "Edgar E. Iglesias" , Richard Henderson , David Hildenbrand Subject: [PATCH v2 14/17] system/physmem: Un-inline cpu_physical_memory_read/write() Date: Tue, 30 Sep 2025 06:13:22 +0200 Message-ID: <20250930041326.6448-15-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250930041326.6448-1-philmd@linaro.org> References: <20250930041326.6448-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: 1759205791065116600 Un-inline cpu_physical_memory_read() and cpu_physical_memory_write(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/exec/cpu-common.h | 12 ++---------- system/physmem.c | 10 ++++++++++ 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h index 6c7d84aacb4..6e8cb530f6e 100644 --- a/include/exec/cpu-common.h +++ b/include/exec/cpu-common.h @@ -133,16 +133,8 @@ void cpu_address_space_destroy(CPUState *cpu, int asid= x); =20 void cpu_physical_memory_rw(hwaddr addr, void *buf, hwaddr len, bool is_write); -static inline void cpu_physical_memory_read(hwaddr addr, - void *buf, hwaddr len) -{ - cpu_physical_memory_rw(addr, buf, len, false); -} -static inline void cpu_physical_memory_write(hwaddr addr, - const void *buf, hwaddr len) -{ - cpu_physical_memory_rw(addr, (void *)buf, len, true); -} +void cpu_physical_memory_read(hwaddr addr, void *buf, hwaddr len); +void cpu_physical_memory_write(hwaddr addr, const void *buf, hwaddr len); void *cpu_physical_memory_map(hwaddr addr, hwaddr *plen, bool is_write); diff --git a/system/physmem.c b/system/physmem.c index 70b02675b93..6d6bc449376 100644 --- a/system/physmem.c +++ b/system/physmem.c @@ -3188,6 +3188,16 @@ void cpu_physical_memory_rw(hwaddr addr, void *buf, buf, len, is_write); } =20 +void cpu_physical_memory_read(hwaddr addr, void *buf, hwaddr len) +{ + cpu_physical_memory_rw(addr, buf, len, false); +} + +void cpu_physical_memory_write(hwaddr addr, const void *buf, hwaddr len) +{ + cpu_physical_memory_rw(addr, (void *)buf, len, true); +} + /* used for ROM loading : can write in RAM and ROM */ MemTxResult address_space_write_rom(AddressSpace *as, hwaddr addr, MemTxAttrs attrs, --=20 2.51.0 From nobody Sat Oct 4 22:00:05 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1759205841; cv=none; d=zohomail.com; s=zohoarc; b=JeMUvYfKM+zEXRPrV1UmTliUrWQ1D0fxnYBk8NMFBhshVoSKhBondAgufKb5ege1Lzixj1JBzbgekukgVNbkju++ktSmO8ZIL4XncjljPJGDjA+B9cHYtOddfTG2Z2nKmAGjGZ6wv8cZnxflHkHZKY4cXBPG1dPqaiNj6sryOUY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759205841; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=FwO23E8zQD3tYxR1qcdfXict3HnZqpkDFtM6ocAlj5I=; b=O7YJOM0IYvPXXT1bVU7M/x1GuOSKFrgONepusT22I1nn4weT4pbmC0gWh/IfKDEfrDEK2PTPgu8k5sXw9pJn6wBEwohHFTTlDKLPr4CpfOpLiZm5t5CsWsbxp5k/jyjmTDv39GwOwgPwTkpWSsx+oNmir8ZcHV7fQzlspEk1jn4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1759205841538817.1405910926135; Mon, 29 Sep 2025 21:17:21 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v3Rli-0002UT-Pa; Tue, 30 Sep 2025 00:15:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v3Rlb-0002OG-7e for qemu-devel@nongnu.org; Tue, 30 Sep 2025 00:15:08 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v3RlV-00019J-Hr for qemu-devel@nongnu.org; Tue, 30 Sep 2025 00:15:05 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-46b303f7469so36841705e9.1 for ; Mon, 29 Sep 2025 21:15:01 -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-40fb72fbb27sm20526091f8f.4.2025.09.29.21.14.56 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 29 Sep 2025 21:14:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759205699; x=1759810499; darn=nongnu.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=FwO23E8zQD3tYxR1qcdfXict3HnZqpkDFtM6ocAlj5I=; b=h8gBZDxnUYiT/ROMNxMXngUfW8Jv+1yHdkP0EtHkVyti2akvvfSt2UtZeHEaaEKR2C QZWMcK3m7sXEIGAqvWHZoJg4Oz2OM5G1bvo4ioW+ZrSi+DO4IzHKXkkaiFHmlIW3ipHZ 1NdoA579aD0Akon1A9UWJEJ4PcJweMKvaV9j8AVsMgXn8IWcM9uW2mlCbjshO/8cycbi XZD6mjRKgK3IoOqSPIHajbu4NiVErjcp8g2g6pcmhJKht2VRgfpVOea/+kwgPNrMjZes UsBVkFQosSdgE/zMjPfxfZIerI1DpXMTZcCtUylc/EMWkT5Igp8RNTnE+/fwCsUlnxrF U6cA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759205699; x=1759810499; 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=FwO23E8zQD3tYxR1qcdfXict3HnZqpkDFtM6ocAlj5I=; b=aDnW4dlDuGgUz9fI2OURiqg1PAHhZGavF7EA6smn6L97HKbPQi+BFASGXKAnvz3rtY wyQ8RWYMGo3t+0C4qDtyqiJ5/UJV3/k055QUCd1d+BO1SS/7dXAqHNjijI5s47WpUfoR 7HnfYzymSIifQj88kMdVODuFGL9ROcYuVt6Y0B0zj6SG4L14ol6XyZ5r+utsEWHiNrNr r7MaO/ziPOOlS20cM8MTNsWz7dttxGtd/zN8dS/FWA+BBBby+ppmVhVViLCYnAcxM59J DQ2FI+qwIdOSbkJG79tuYm0M+B8GVaebp2JHcTyEVqsoU+u9IFA4kCllEznVKV2zjch0 gZYw== X-Gm-Message-State: AOJu0YwoYpqAbCNAGy9C6OhpPc4Vsz6CjkcADtp2A5kHi2Qzb7XGzZsn zUP2xXwFe5HJCCOYLgMk20Y51x3yfpORuzwxeOW2qV7qbX82kW4C+kIyYaWpqL26h0Ppimm+9NK YgNjlajqJcg== X-Gm-Gg: ASbGncsrD076SQsFK+E0FEwM8mPxIZVTmreMh5Qr0EkntoROnZ1X/YPqZiqOZ5+khAG 6xUmHKAQlqaWazrA2kqrpViYda/nbjqsTnxd6yhRshfzcZkqOA6fx7Sq6XmDbzsFK8PvHxTqy4b wGds0JKWAKlNZb1xDP3057kL8wwB0e1V7YjvPd7nmGn1B3zIH5vzL4GqIlYGok4Aion+Ex4aTqR 2mox3IYywf8p7Rcm8PsZXnIqx4oIhdgg0AdyGpcO3qkCqFi1PfmJo1nQJwuQM8tYgP0lDJ+1Hto kEBRP1vegTzG6eaWoH7y3+W+uB9kV6j6nmcvTi0RFmMbha1GoBmfjckIMwXVkR/f/nhmgoas1sb RI+aPcnpZuT+hKMCrj0pEiTiR1w7AT95/lTHLIl+xxPXPy8E5PLsayYRc9USlDM7Y6zBiL4JYTQ 0bHX/dqcqmQzR+A6E45wtgFVRX20RPHIzt3LgghK0uOw== X-Google-Smtp-Source: AGHT+IHQUeMIWrPOvhxUlcXifIoWvE3/8AU9Ob5ucePyts2g6/ZGYEFjge5tsRgBwyw13Vrh3DLZdg== X-Received: by 2002:a05:6000:430d:b0:3ed:a43d:e8c4 with SMTP id ffacd0b85a97d-40e458a9856mr16110543f8f.6.1759205698778; Mon, 29 Sep 2025 21:14:58 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Peter Maydell Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jason Herne , Stefano Stabellini , Stefano Garzarella , xen-devel@lists.xenproject.org, Paolo Bonzini , Ilya Leoshkevich , Anthony PERARD , Paul Durrant , Eric Farman , Marcelo Tosatti , Halil Pasic , Matthew Rosato , Reinoud Zandijk , Zhao Liu , David Woodhouse , Christian Borntraeger , Sunil Muthuswamy , kvm@vger.kernel.org, "Michael S. Tsirkin" , Peter Xu , Thomas Huth , qemu-s390x@nongnu.org, "Edgar E. Iglesias" , Richard Henderson , David Hildenbrand Subject: [PATCH v2 15/17] system/physmem: Inline cpu_physical_memory_rw() and remove it Date: Tue, 30 Sep 2025 06:13:23 +0200 Message-ID: <20250930041326.6448-16-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250930041326.6448-1-philmd@linaro.org> References: <20250930041326.6448-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=philmd@linaro.org; helo=mail-wm1-x32a.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1759205843972116600 After inlining the legacy cpu_physical_memory_rw() in the 2 functions using it (cpu_physical_memory_read and cpu_physical_memory_write), we removed all its use: remove it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- docs/devel/loads-stores.rst | 4 +--- scripts/coccinelle/exec_rw_const.cocci | 22 ---------------------- include/exec/cpu-common.h | 2 -- system/physmem.c | 13 ++++--------- 4 files changed, 5 insertions(+), 36 deletions(-) diff --git a/docs/devel/loads-stores.rst b/docs/devel/loads-stores.rst index f9b565da57a..c906c6509ee 100644 --- a/docs/devel/loads-stores.rst +++ b/docs/devel/loads-stores.rst @@ -460,10 +460,8 @@ For new code they are better avoided: =20 ``cpu_physical_memory_write`` =20 -``cpu_physical_memory_rw`` - Regexes for git grep: - - ``\`` + - ``\`` =20 ``cpu_memory_rw_debug`` ~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/scripts/coccinelle/exec_rw_const.cocci b/scripts/coccinelle/ex= ec_rw_const.cocci index 1a202969519..4c02c94e04e 100644 --- a/scripts/coccinelle/exec_rw_const.cocci +++ b/scripts/coccinelle/exec_rw_const.cocci @@ -21,13 +21,6 @@ expression E1, E2, E3, E4, E5; + address_space_rw(E1, E2, E3, E4, E5, true) | =20 -- cpu_physical_memory_rw(E1, E2, E3, 0) -+ cpu_physical_memory_rw(E1, E2, E3, false) -| -- cpu_physical_memory_rw(E1, E2, E3, 1) -+ cpu_physical_memory_rw(E1, E2, E3, true) -| - - cpu_physical_memory_map(E1, E2, 0) + cpu_physical_memory_map(E1, E2, false) | @@ -62,18 +55,6 @@ symbol true, false; + address_space_write(E1, E2, E3, E4, E5) ) =20 -// Avoid uses of cpu_physical_memory_rw() with a constant is_write argumen= t. -@@ -expression E1, E2, E3; -@@ -( -- cpu_physical_memory_rw(E1, E2, E3, false) -+ cpu_physical_memory_read(E1, E2, E3) -| -- cpu_physical_memory_rw(E1, E2, E3, true) -+ cpu_physical_memory_write(E1, E2, E3) -) - // Remove useless cast @@ expression E1, E2, E3, E4, E5, E6; @@ -93,9 +74,6 @@ type T; + address_space_write_rom(E1, E2, E3, E4, E5) | =20 -- cpu_physical_memory_rw(E1, (T *)(E2), E3, E4) -+ cpu_physical_memory_rw(E1, E2, E3, E4) -| - cpu_physical_memory_read(E1, (T *)(E2), E3) + cpu_physical_memory_read(E1, E2, E3) | diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h index 6e8cb530f6e..910e1c2afb9 100644 --- a/include/exec/cpu-common.h +++ b/include/exec/cpu-common.h @@ -131,8 +131,6 @@ void cpu_address_space_init(CPUState *cpu, int asidx, */ void cpu_address_space_destroy(CPUState *cpu, int asidx); =20 -void cpu_physical_memory_rw(hwaddr addr, void *buf, - hwaddr len, bool is_write); void cpu_physical_memory_read(hwaddr addr, void *buf, hwaddr len); void cpu_physical_memory_write(hwaddr addr, const void *buf, hwaddr len); void *cpu_physical_memory_map(hwaddr addr, diff --git a/system/physmem.c b/system/physmem.c index 6d6bc449376..a654b2af2a3 100644 --- a/system/physmem.c +++ b/system/physmem.c @@ -3181,21 +3181,16 @@ MemTxResult address_space_set(AddressSpace *as, hwa= ddr addr, return error; } =20 -void cpu_physical_memory_rw(hwaddr addr, void *buf, - hwaddr len, bool is_write) -{ - address_space_rw(&address_space_memory, addr, MEMTXATTRS_UNSPECIFIED, - buf, len, is_write); -} - void cpu_physical_memory_read(hwaddr addr, void *buf, hwaddr len) { - cpu_physical_memory_rw(addr, buf, len, false); + address_space_read(&address_space_memory, addr, + MEMTXATTRS_UNSPECIFIED, buf, len); } =20 void cpu_physical_memory_write(hwaddr addr, const void *buf, hwaddr len) { - cpu_physical_memory_rw(addr, (void *)buf, len, true); + address_space_write(&address_space_memory, addr, + MEMTXATTRS_UNSPECIFIED, buf, len); } =20 /* used for ROM loading : can write in RAM and ROM */ --=20 2.51.0 From nobody Sat Oct 4 22:00:05 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=1759205780; cv=none; d=zohomail.com; s=zohoarc; b=Ss2L9TwYEMKOLTtP2kSS8ELNypiiCQhtAMNygU8n1aNNFExCPYqMueYFzpAKJVN2H8UYPxWE5YCNcgZMFvI1uMAyqggLzuuoJOZxXbn7CguY3IXnBiQDpsrtAXFKNuQzVV6FN1OZcbMYNNw4AKIOjafYd3KBk3RGeqAqikYFkFM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759205780; 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=MBpejQiq0e/vydo49FSQoIaJ0P/BjZpeA7dR40L/9NI=; b=jR9j1L/9Chwp2BFKIH+RLb2BjbnqAkD6tU4nnKHxgqL77/RqzqlMep2LLXTWNOkJhOJEmAqnldv+TS2yEhwHFGv0ap9p4pbkmJ6Uhp6q4jBVjoS6wZiF9geMHhwwT+zK66MgJiKXW17proDQRHy4Qr/3UZfy88C9JE7dH2zT7Dc= 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 1759205780253994.218809840146; Mon, 29 Sep 2025 21:16:20 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1133501.1471633 (Exim 4.92) (envelope-from ) id 1v3RmZ-0002bb-0i; Tue, 30 Sep 2025 04:16:07 +0000 Received: by outflank-mailman (output) from mailman id 1133501.1471633; Tue, 30 Sep 2025 04:16:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1v3RmY-0002av-Pp; Tue, 30 Sep 2025 04:16:06 +0000 Received: by outflank-mailman (input) for mailman id 1133501; Tue, 30 Sep 2025 04:16:05 +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 1v3Rla-0006gD-Tj for xen-devel@lists.xenproject.org; Tue, 30 Sep 2025 04:15:06 +0000 Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [2a00:1450:4864:20::433]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 0afec4bb-9db4-11f0-9809-7dc792cee155; Tue, 30 Sep 2025 06:15:05 +0200 (CEST) Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-421851bca51so973983f8f.1 for ; Mon, 29 Sep 2025 21:15:05 -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-410f2007372sm20002659f8f.16.2025.09.29.21.15.02 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 29 Sep 2025 21:15:03 -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: 0afec4bb-9db4-11f0-9809-7dc792cee155 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759205705; x=1759810505; 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=MBpejQiq0e/vydo49FSQoIaJ0P/BjZpeA7dR40L/9NI=; b=CEWYI7sWfgToYfH3zNpYS3Y+8F0dVEJD689lzHHWBgt2kMJlxJTwUbLqrYsPrxGHzK gkg+ax1/tA6XFnJrERGORi1hRXLc+go8OKX70Re46URM2qEnytrYis0R2Jp2JAgmZrBf JHWA9P6Wzf3/9s2FePXBVirSeimC5iU2g+EVy4IiTs4+VIv1Tclt+yD2Zd/XPJbAV6EX ffOo6DvZ/5ftCi35Bxna7AbztCQ+aADOP6PZqWj71MTwFGdrI2wtBFeBtZh0X54hm4t3 GjIOr22Tpdi873iuIOGvje2M1DktQhcqionkBcFtGG26EjIklp9UHFTKNrcRPXwmwngC C1pw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759205705; x=1759810505; 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=MBpejQiq0e/vydo49FSQoIaJ0P/BjZpeA7dR40L/9NI=; b=xBdZtQXeyCPdb+uMZcFv1OrcITMnk/R1XDyTLbznGCHn7d3R9nG5PexP8D8VRzBy61 S2KtevPQFO6qEIPkaaGVbvYb2ylJdFFevlXynIhpNYeCtQ+9itwXbDbk4/3a3ZHzYnS7 jQsFiD8xvuhlb2VHUKqsYSnJvVlfTcvIP8MIP2KEIpI0BkpKRGGEzT5AksawCL3uGr8e dOUnM5eu0C4t9H8ErXiNRxbL+XEOTvyEP60ETGVogvadiMaIDWZDugwqR2ne14q5hLFz crYCPBwl7qrEdhC2/lKwZladfO9w+P7MXM3CyVDjXdHc0nvIADYpFTfK3rl5DSzlvkW8 H0uQ== X-Forwarded-Encrypted: i=1; AJvYcCVTfYy1ka5Qi3iirimemcLO5tNyUWjYR9q/s3vbnQJMa2Tw6WcSAg36dKZjptpDdqsa6KEUmRx3QFc=@lists.xenproject.org X-Gm-Message-State: AOJu0YygKeRi79Jbl69t4q/8Fe9Vs15B1v9VtCxqy9LnDqWRNTd9HsxG 65E7ZmnZVFiX/f8ZcZDFbm+noa17s7WBu3Q0sg8tSBXDSDkgkHYdfdzB6y6SNRVMorY= X-Gm-Gg: ASbGnctAvYWEtrInCGO4eRKv2ep7HerPWj6WU0vs4jR1nkdbngLu8PqZbZeJXiV1cR7 QaLqpANiM8e2B0h8zF6ncVxOf2EWdxGdXnQMntfUjhZ25v4zVY+isnXr1rFyNmU2wYxmqrdUcOL eT+7LJV0jFuqRnC+/CdBhU/F5yvjplFcFdbJKqPfz6hMUb33qEhg/UsZCGXY/bsxpfsW2PPvjFF 3JpPcqO8HloQHcp8P96xZjpwCbr+zbBsIHlkFX5VYrQYVcQIQld5CckeBuefRNOD/u+o6f8rKwB 3UeL2150xvjs44XFbUeNecbCepfa7Y9gg9JqhNpnEW6t5h8omn42Bck21TOfMmcjkv1AQE9Opwz b0mL4h+U3qzuSESkPmMBELNuI0mHBo9AJTYmEz5DpjqvnEFL4qw0vOpWEqP7OPjtywkhbG8ns0T ebsWwv6/GejLp3mb/GUTkfGt8s+rjcbrs= X-Google-Smtp-Source: AGHT+IGgqJ0JuJ77y43D9HwYeERomJh5OkTJMDKGyPclR/IBy8JcemLZxj5L2abT5KLJLVAD5Z41ZA== X-Received: by 2002:a05:6000:2385:b0:3da:d015:bf84 with SMTP id ffacd0b85a97d-40e481be8a9mr20254181f8f.25.1759205704783; Mon, 29 Sep 2025 21:15:04 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Peter Maydell Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jason Herne , Stefano Stabellini , Stefano Garzarella , xen-devel@lists.xenproject.org, Paolo Bonzini , Ilya Leoshkevich , Anthony PERARD , Paul Durrant , Eric Farman , Marcelo Tosatti , Halil Pasic , Matthew Rosato , Reinoud Zandijk , Zhao Liu , David Woodhouse , Christian Borntraeger , Sunil Muthuswamy , kvm@vger.kernel.org, "Michael S. Tsirkin" , Peter Xu , Thomas Huth , qemu-s390x@nongnu.org, "Edgar E. Iglesias" , Richard Henderson , David Hildenbrand Subject: [PATCH v2 16/17] hw/virtio/vhost: Replace legacy cpu_physical_memory_*map() calls Date: Tue, 30 Sep 2025 06:13:24 +0200 Message-ID: <20250930041326.6448-17-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250930041326.6448-1-philmd@linaro.org> References: <20250930041326.6448-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: 1759205780772116600 Use VirtIODevice::dma_as address space to convert the legacy cpu_physical_memory_[un]map() calls to address_space_[un]map(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/virtio/vhost.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index 6557c58d12a..890d2bac585 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -27,6 +27,7 @@ #include "migration/blocker.h" #include "migration/qemu-file-types.h" #include "system/dma.h" +#include "system/memory.h" #include "trace.h" =20 /* enabled until disconnected backend stabilizes */ @@ -455,7 +456,8 @@ static void *vhost_memory_map(struct vhost_dev *dev, hw= addr addr, hwaddr *plen, bool is_write) { if (!vhost_dev_has_iommu(dev)) { - return cpu_physical_memory_map(addr, plen, is_write); + return address_space_map(vdev->dma_as, addr, plen, is_write, + MEMTXATTRS_UNSPECIFIED); } else { return (void *)(uintptr_t)addr; } @@ -466,7 +468,7 @@ static void vhost_memory_unmap(struct vhost_dev *dev, v= oid *buffer, hwaddr access_len) { if (!vhost_dev_has_iommu(dev)) { - cpu_physical_memory_unmap(buffer, len, is_write, access_len); + address_space_unmap(vdev->dma_as, buffer, len, is_write, access_le= n); } } =20 --=20 2.51.0 From nobody Sat Oct 4 22:00:05 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1759205841; cv=none; d=zohomail.com; s=zohoarc; b=d4qwoDqgrK4rtwzEG8tLQwg2JdvFFK67PcGNfEmZ+RTJNnIAJZ1mmbkQu5oKmwRLLlNwDbexndqOAA08DaAgQJtX1lXHqPYsl+kcVnjpRzAkJBucQ9ckfwyxeNkb3SjD8PqXunsKvurWYlUBC2p096BHsSHgUX8cR3Uv6M2F29c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759205841; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=+R20KfaeepivX48ztS5Qk+Utu4Wf2nP4nwxC8R0e4a4=; b=H8VWDFD8OnCqPbJIrxe4GjUJ0aYpDWjCePw8MgwtG/P6F0H4PJvil+CG0JvQyfFHQsRtsW+o6CLHMZiB2UFt8lg15BLgCM8RuuyH8j/xcpJefOsfQ+xj3SC9fyeOKaGL/srX5VUS88rjgqqfAbluNt8nDf+v4S7xHWMMhnkN9nQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1759205841509414.7823255354143; Mon, 29 Sep 2025 21:17:21 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v3RmM-0002px-3L; Tue, 30 Sep 2025 00:15:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v3Rlq-0002i8-4J for qemu-devel@nongnu.org; Tue, 30 Sep 2025 00:15:24 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v3Rlg-0001PW-TZ for qemu-devel@nongnu.org; Tue, 30 Sep 2025 00:15:17 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-46e414f90ceso5574395e9.0 for ; Mon, 29 Sep 2025 21:15:12 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-46e56f3dcacsm39499115e9.2.2025.09.29.21.15.08 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 29 Sep 2025 21:15:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759205710; x=1759810510; darn=nongnu.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=Ew2p8msneU6d/cNB2wXDwy/bIxjB3bqGO3/3ZHGQbjzrEW1ccXwCMLtyZgbWpJfsbJ D4XAqWcEnZWKmEPqM+7Xdo959TcPTtzUIHRFbyHKo98A3OaEBNrUJi6vJms7mV3IlEFa Y2FxW5Gfmmh5KE/t4/gE4Mk3mZbJN37Sv6LscHMT6a3rFNiDpaAcl1x30yPS1jeMj6TV yvNOISKh534PGNbsWMsVbiUfsz2q174wVmd8HKhAaOUVc0fQoOGpN6xDr9yjpyeWyut1 3PIktyZFJtfAHYkuXyV3XxR21ez25UYY6TiGwlRJfjFtmw8GMuNzrZplxlCcgTk5qR06 O9+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759205710; x=1759810510; 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=ReMgWbO856NWiCedMbiKmJEe0O2371QsZcicnRzXEbySCc8mGIULEgQcVnbuPLZwbJ idkNuLeQz1X7ReEvLJZdiuOt2F4Z9wbPOgLNRoSZXF/UZefEz5XwL8uz1+7oPVLn5SAW PIgx4EptiWJsybqrYARJJYxjeNzgrQXywkfIkYJM209M2dld7zw1d1UjEe48PFbP6NwC ZL3vOsEZxwXeT8A83W/T92qxmBKu/ecEW0Kpc7CoS1R0qlWjO11+4N45p+FoY2KH9dLw PKD4ISy/dkT2W2JPtypBV4uHWIuoElhL3Oz+nGwhchHvQI5CFEKtH7Q0ECWN7xuP8YBR pS4A== X-Gm-Message-State: AOJu0Yz2FLieDOMZ1LS9nmEBnpKUZARxCIXdwgVz0Cmxnx0+jYfFl14T DFZd00HhJCQm4X5VYZp5sQ81KMN0FdzCZl7ps5YjWv/HB5oXUAQ7TN1O70TZpFxFa5i/ENnF/xe lYoU41kwA5Q== X-Gm-Gg: ASbGncs5JgcXjmhxGTfVAoac10YaT0g3JUMUIjkgJX1xISS5F3kTpOCTBTSTKjoq3N5 vssiZk3DOTDFxlrb9cGpy43uPTzCfaH+u30IQPJNzifN+SZLV5MsqGtflqpFjunuRj2MYWDX7E2 ZIrpcE6UYp1+k+Kt+TYofZSL6hhzH3KhjaMigSwMgMpFeXVFQ/ebn3DdRVkfq7Z1nMXeVkclCRL IzOwzLJAujMwTY38FFbJSMOmasQlffgCsVaoFyFn/JTkm6sn2HG15Y/WW89v8LihqGRYuR39Eiu q2mWVbBD5fKOVpZcFvLoecjCNx2iVTQ6YlcK1CkxVE39kh7vuP1HuZxSvRbfuKJW2Zehm1inUD+ 091vS7vEHyzqCiKLzM885lPuvNzwhY3SIDwiJmG/rZFiMWcvQh5/2wVf8zjGI70PotJ+OPCJcGx S0DJe4kpbw3EslJOzck5BlhTWTViYBdKQ= X-Google-Smtp-Source: AGHT+IEUJE1IYP/kfT6NPYb+xEkszrcjL4tSyyPjenIF9G8p6iMdA3UofkAUQEEOCpstatyYsaodDw== X-Received: by 2002:a05:600c:5290:b0:46e:394b:4991 with SMTP id 5b1f17b1804b1-46e394b4b1emr152224145e9.11.1759205710145; Mon, 29 Sep 2025 21:15:10 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Peter Maydell Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jason Herne , Stefano Stabellini , Stefano Garzarella , xen-devel@lists.xenproject.org, Paolo Bonzini , Ilya Leoshkevich , Anthony PERARD , Paul Durrant , Eric Farman , Marcelo Tosatti , Halil Pasic , Matthew Rosato , Reinoud Zandijk , Zhao Liu , David Woodhouse , Christian Borntraeger , Sunil Muthuswamy , kvm@vger.kernel.org, "Michael S. Tsirkin" , Peter Xu , Thomas Huth , qemu-s390x@nongnu.org, "Edgar E. Iglesias" , Richard Henderson , David Hildenbrand Subject: [PATCH v2 17/17] hw/virtio/virtio: Replace legacy cpu_physical_memory_map() call Date: Tue, 30 Sep 2025 06:13:25 +0200 Message-ID: <20250930041326.6448-18-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250930041326.6448-1-philmd@linaro.org> References: <20250930041326.6448-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=philmd@linaro.org; helo=mail-wm1-x332.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1759205843854116600 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