From nobody Sat Oct 4 22:05:33 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=1759394549; cv=none; d=zohomail.com; s=zohoarc; b=aYkDEOOEUOzUqO6vWOvSgg5Qd3412IlOqX5dXoITLIOtTncrZNbAopDk11ybt3wfVy6ux4kwHFcPzpPDn39nDkd+B9edIpnp/Y1KiTxXw3QWJqi4Z7OIytY/eSqEZjO7dd4znqhik8M04UrTK2plXesAuHBz8HeVTXaxz5YSceA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759394549; 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=iZbMFuqv6fPsNo3iE9e1SOZvaCpAOHHXsyI94+ea34sZW6Oo3SsAUKwz4QXAFLj/YyMOwN+Fn5c91pys/pytxbSn5FqJh3F0tatv149v4RI0TtnMpqWOeC1yT1IifmpmmvKIkn9Qe44KsniPDEbUryKesy8fiXNbGH/ky3lxeng= 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 1759394549739707.3055255438762; Thu, 2 Oct 2025 01:42:29 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1135391.1472508 (Exim 4.92) (envelope-from ) id 1v4EtA-0008HJ-5K; Thu, 02 Oct 2025 08:42:12 +0000 Received: by outflank-mailman (output) from mailman id 1135391.1472508; Thu, 02 Oct 2025 08:42:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1v4EtA-0008HA-2F; Thu, 02 Oct 2025 08:42:12 +0000 Received: by outflank-mailman (input) for mailman id 1135391; Thu, 02 Oct 2025 08:42:10 +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 1v4Et8-000821-Fy for xen-devel@lists.xenproject.org; Thu, 02 Oct 2025 08:42:10 +0000 Received: from mail-wr1-x42c.google.com (mail-wr1-x42c.google.com [2a00:1450:4864:20::42c]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id af3f1d74-9f6b-11f0-9d14-b5c5bf9af7f9; Thu, 02 Oct 2025 10:42:10 +0200 (CEST) Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-42420c7de22so434632f8f.1 for ; Thu, 02 Oct 2025 01:42:10 -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-4255d8a6b40sm2649068f8f.2.2025.10.02.01.42.08 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 02 Oct 2025 01:42:09 -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: af3f1d74-9f6b-11f0-9d14-b5c5bf9af7f9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759394529; x=1759999329; 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=HUrg8BLEDewS7+yN7BCvek2xSFof8pnvebsVU7NUsCLdvZHaQwqaCDHRSJns/SHZlO 3bV9uPFh0icr8VN4/H8QvTeLhZ5Xv5t1S+Jxe5OY4VZNvzEQCsbn7hrRpiSMICtjWWvJ S/dO0Z1vPHjD78p5bc1fLVkjpLp3yxxSyo/2xBJEPY2DDlXGdkAJx7fztaPL5gr2dG2F o6tYbnHqQlr3/tRWY4dAC6HX4Ws6yyVGgdo+1m3rQ5DX2vh+EHm5qR8WrenwOP8Hjo0s usUGOwK/VegyfIS3VzzHkcWkvf/kSDvyBjpP7i+AWZuT+VAoDVhhJUBugluZx8U+PapX 3SVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759394529; x=1759999329; 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=drOcLM5crYpk4AOfRopXmNorXqFhmqTcMKSpqpBIvSMj4CHKomvrbvH0gF5cqtfB/C vpRnLtrJzqcgIlBOIfgGoE4dveLLUqrTIGoTaxkVvAXo6dVQX+vrrtq/lj+0xDCwapfN u5SAQpxqFXJ/lcVrPQkxecHBNh832aHxKUHtMcTx6tCtjAo2mL3ICaMaaKoYCkiFhotE FCa3RcvR/OcbcFa5k+0KaeHXYJe7TWsXWGtoHEHzpTsghOn3EX7wwFy6TGXMGlBk5Uor 5OONVjiWt16x+nRhL1Vi02JTowIWvHYoDBNp4Hocy+5Sh1TzYsVhRf1nqo22fO4KVhny /HWg== X-Forwarded-Encrypted: i=1; AJvYcCXPI1Eal9hOelf8zgruSeKYQPr7Sal4Oxp+MJJXHbB0Tod93Znlkbvei5tlMDLMpcmohpRH+6dhUq0=@lists.xenproject.org X-Gm-Message-State: AOJu0YzsA9nF2IQ4MVGkoKeK2TAszj/i0DvyYB5QlbmYOIefJr6k9BKa 02TjvPwqr8HOXRCSNlgOEBizAZIrdUDSBY4xyAvOvqEvw1K2Ry6TBkh7oSxtvGJDuqQ= X-Gm-Gg: ASbGnctdbWg/6Sek/mdxZilfecp1oT3CoDWdnU5+FmEA4TxydrYs+VBxfW7lIBwlj5G hDvyHdq+1OE0pJdpPraz/XHPAq4cWpW1qeUna9M9RDSaa3PGqt1jvrAZLgggdFXAZ56SEixJH0Q wLM/c63OVcj8wjMMCdFWglTtOGE1s0lR0xudsST39sqVI24cxPR9X4iX3mKwHjm/s+3Gkj1wjbw o/iA89e+b/eJc83NTHFyLXyVNrABBa1X6f9MGY7l9HZEGLZJI8/DiFRtXtzDpiizdYR7UfFrCYD GXG34XOKTTvW/z14WWE1sa170fO0eUHkVOpCbKcFFyc+BMJ1EDNSBD5Znwo8BMnJTo2pPIvAqLr r/gGUoyErBMaVCuDLaxpKLDHXRNgzzh0U16yViPgBVZpVB5BLcd0wiJ2sErk0dkopFrt1MSci0g CfAA77+tOlUnp6+KJp9iXO6frUck3Nug== X-Google-Smtp-Source: AGHT+IE1u3COjNq+oE6xio5GRW1A/vqSgcySFumrJ67RNAp4nOAK/5HZJkMzy+g6L+RiVVekcEJmKw== X-Received: by 2002:a05:6000:400c:b0:401:5ad1:682 with SMTP id ffacd0b85a97d-42557807a65mr5230357f8f.14.1759394529461; Thu, 02 Oct 2025 01:42:09 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-s390x@nongnu.org, kvm@vger.kernel.org, xen-devel@lists.xenproject.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PATCH v4 01/17] docs/devel/loads-stores: Stop mentioning cpu_physical_memory_write_rom() Date: Thu, 2 Oct 2025 10:41:46 +0200 Message-ID: <20251002084203.63899-2-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251002084203.63899-1-philmd@linaro.org> References: <20251002084203.63899-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: 1759394551692116600 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:05:33 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=1759394558; cv=none; d=zohomail.com; s=zohoarc; b=BMl9/2xG57wZe3aQjusv7VoCpvxksmEDls3FoWlZbMXjOPyspRJbIVJZr6uk00YvlKt2ijtEt+gA22u3BDSwTgYNBCMtTl47gC0rJZ0sILh0EoYAu5+OlxwpJKZ2zztpHcIos2TRv+MM6HPQeBTlHwjWAMMLowxLTUuZHNMmQn8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759394558; 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=HWUjqrhoII9IYKgjMFDNsLi+Cgv2QEPokr0XBtkHqiA=; b=G92tgRVJbgcKJ7NPIxTPM4H7oSIUL5ThJrkfjoA6rMtH91sGivfyZfZ+gP2AEGAAb3PEOiQGhWiYAnITqF39IgJDvV3+eVJRwxNjrqUVpCO8lG8g0wjrjXAPrY33aP9lBbtlNZC8Z25bvxwAXAGYvorofD5vmGM83JkXE187n00= 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 1759394558486437.1173501920928; Thu, 2 Oct 2025 01:42:38 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1135392.1472518 (Exim 4.92) (envelope-from ) id 1v4EtH-00008a-Bq; Thu, 02 Oct 2025 08:42:19 +0000 Received: by outflank-mailman (output) from mailman id 1135392.1472518; Thu, 02 Oct 2025 08:42:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1v4EtH-00008S-8z; Thu, 02 Oct 2025 08:42:19 +0000 Received: by outflank-mailman (input) for mailman id 1135392; Thu, 02 Oct 2025 08:42:17 +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 1v4EtF-00006C-Aq for xen-devel@lists.xenproject.org; Thu, 02 Oct 2025 08:42:17 +0000 Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [2a00:1450:4864:20::42d]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id b224fe7a-9f6b-11f0-9809-7dc792cee155; Thu, 02 Oct 2025 10:42:15 +0200 (CEST) Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-3f99ac9acc4so661095f8f.3 for ; Thu, 02 Oct 2025 01:42:15 -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-4255d8e960asm2619549f8f.37.2025.10.02.01.42.13 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 02 Oct 2025 01:42:13 -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: b224fe7a-9f6b-11f0-9809-7dc792cee155 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759394534; x=1759999334; 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=HWUjqrhoII9IYKgjMFDNsLi+Cgv2QEPokr0XBtkHqiA=; b=d2ACYnQjdJCASID/4ODKXEmYI3ls8DpnygtOYq43nb/uma58piGGaoVCDpeX/UgFm0 3WrpL0Wq0YFEMDTU366YXAKS//gcDqGovyyV/sT+zr4UE/ridBCckz+82etsMf3VXbLV bxIjNc0iyb4bwU/a5Zhhn5YzoRhJGl/H5XnY2ldFy91Tde+T0JNA+YjT4IrVY/0rY+ag +f+/+GaiFdchEOCxQrcO5lntABcp4qlZREQKPEHkQpEx6MSv6g9bNlMJYrsmRel5lWSo rbfOjfxhqE11g6+54q9mwrblkdFHgW1gBXCre7G5bQ5VqPok3z4pY7EDwviXxhKzLN5Z DA6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759394534; x=1759999334; 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=HWUjqrhoII9IYKgjMFDNsLi+Cgv2QEPokr0XBtkHqiA=; b=cTFR0it0HsYdBzYp2Hd15CjFvAcwsCX/z8rK+JVlxM+NNdUYJXVwJnH4rEUFTUIHPf 9304lTyOIjCVgWtPQDOD0hvmpveDs7A0BBmRo8r3BOZ9APBgXY6n7u2GYR14Ub8iFPC2 YvN7O+NEWiC2FeflOHqbAlDqJ+woOGMzYWCjakc9g/+gcDVOrfydj4Nd2EQ3Z6UZNI0V ZoIr5k5ZwswCR/L9nx1J/+KvUNc2YCZ4jsPktU6IIz6mWn8C1GaGVspe7xI2JRVnv/43 k6NiW0qvXDGjpHzdl5AfY2q3Sf/VAUQ/a5OsCQuer83ZzIoz7xs5z00BBxzNfwnx47W0 Yp9Q== X-Forwarded-Encrypted: i=1; AJvYcCVpvmR4HrGrUk3jjxWTmQmtoEmb+fhbqsQ7cIoJg0u9sSrUAUGVMWP8Mwzkj9ibw7rXqXx5sYNWVf8=@lists.xenproject.org X-Gm-Message-State: AOJu0YxENtRG6kiKYxm0I4xsqVUC4IquHCAiD4D7l/eG3rskaQY+OAtF 3wMoQ5IAxmykSf2aHHEwrBdQYd5TcdgzVLnmuQecr7NChjGeckQ2a2O42WucUy6rcZs= X-Gm-Gg: ASbGncsvK2SHWC6bkKSV1ApHWNu+8dbxM9BouKP7QZrW3rT4R39ZlaNQ6X4KNidWZoI 8r1nzpc35x8W1y6n6tONl2nIrPujudvuqY0pR08QrmBW8Se01poWihxVlfQ0uyOcunUwgFVNovP /S2DO0Ga5DGzXoMUAKbbO7fWiTGKabb9Y2V2WK6/czPySeYdQL5oOkFn4x3/WT7pmWfeCJgdUsH grZeKdf5zoCuD+XU3tc2apx3DnwKb47cySpEPbq0FmeO6csHfb1oyot0hhYFdtvihE/sMDvOgAB utAiCWbRMGkqr+agBLUgtqss5HdvbvVQJd/pN2kPNbSixB2Ukc62G6YxdKk0S7vOVbPngcxjQs4 yU4A8kwtQdn6SlISzBaB7pVfxdgljyc8r68e5H5RZxdz6tqmsRdW5FCbxiUylkJbsnYrPebCugR qHAduJlmibUyoquUp/MS2TO5fKyTvY6A== X-Google-Smtp-Source: AGHT+IGTHDHXIrJOhOoypYRjJsVDikLhcyRvRa/vBA1Wlz/iaLsadlO4HdF+yc3FSV0R35r+UTvjog== X-Received: by 2002:a05:6000:2586:b0:3e4:d981:e312 with SMTP id ffacd0b85a97d-42557817210mr5123294f8f.62.1759394534260; Thu, 02 Oct 2025 01:42:14 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-s390x@nongnu.org, kvm@vger.kernel.org, xen-devel@lists.xenproject.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , Richard Henderson , Paolo Bonzini , Peter Xu , David Hildenbrand Subject: [PATCH v4 02/17] system/memory: Factor address_space_is_io() out Date: Thu, 2 Oct 2025 10:41:47 +0200 Message-ID: <20251002084203.63899-3-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251002084203.63899-1-philmd@linaro.org> References: <20251002084203.63899-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: 1759394561745116600 Factor address_space_is_io() out of cpu_physical_memory_is_io(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth Reviewed-by: Richard Henderson --- 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 aa85fc27a10..1b2b0e5ce1e 100644 --- a/include/system/memory.h +++ b/include/system/memory.h @@ -3029,6 +3029,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 225ab817883..c2829ab407a 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:05:33 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=1759394557; cv=none; d=zohomail.com; s=zohoarc; b=Epnjl6p7tkbPaHL4IHWLymhNdQCD0Ar8oGxDxFwhQ8ZFEbLBS4K1VLdUexqg6Kdyhc3fJN1FO/KUNSMSCi7LxsBFkZ2h8XCE7/U2t0vefUQpcFqlW5lp+qA9LQtMSPlpZnHIsqbuhWN32PPXrALdN3faeaMVb0vnODfrB4dvDoI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759394557; 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=Rvvp0krdvj9KI0seW+qea5ZtA/ftLNrinoYyViTKgNM=; b=VTiv22VMVaTx2x2oUfcZOnoZSt81oIFRyFnI4XJD3UuAYHMOiB5oNU+KNcq8us6AilhAsFn+oajesn2K5DtQd7BjMzLfRdXFubPZQkYYT5NQSFGxHee7rQb8jrOKlruWepi2U+O0haTsEpxtZ4CMtFHfiXay5C6L0TOaYrneiD8= 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 1759394557721698.1645941698017; Thu, 2 Oct 2025 01:42:37 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1135394.1472527 (Exim 4.92) (envelope-from ) id 1v4EtI-0000OT-OF; Thu, 02 Oct 2025 08:42:20 +0000 Received: by outflank-mailman (output) from mailman id 1135394.1472527; Thu, 02 Oct 2025 08:42:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1v4EtI-0000OI-Kx; Thu, 02 Oct 2025 08:42:20 +0000 Received: by outflank-mailman (input) for mailman id 1135394; Thu, 02 Oct 2025 08:42:20 +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 1v4EtI-000821-4x for xen-devel@lists.xenproject.org; Thu, 02 Oct 2025 08:42:20 +0000 Received: from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com [2a00:1450:4864:20::32d]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id b50027e4-9f6b-11f0-9d14-b5c5bf9af7f9; Thu, 02 Oct 2025 10:42:19 +0200 (CEST) Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-46e37d6c21eso4990735e9.0 for ; Thu, 02 Oct 2025 01:42:19 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4255d8abf0bsm2636723f8f.17.2025.10.02.01.42.18 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 02 Oct 2025 01:42:18 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: b50027e4-9f6b-11f0-9d14-b5c5bf9af7f9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759394539; x=1759999339; 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=Rvvp0krdvj9KI0seW+qea5ZtA/ftLNrinoYyViTKgNM=; b=Gdk0KsJiwZ8C00SypL+Y5E6t7SFCZXOTy3WPN126zkG66JuzyUYKPO6+MB1ZifYQKE 1U2a7b06mSDLO3VYiwULdxqdMrSEmjVk/nnszrn7NKuQj/S2L7ee3rwOEFBN1ylFL48G s3GdSYpzolCUHtRcdUE9dbfBf///krf1JDpkquFJ21u3LSfzKis+Qbxlj6Z1DQMBkATm 4A+rhAfV1IryIQ6+L57cbttq6scJO7F6948SR7emELGQJZ0pU3qb+ikUdaG/k6Ldu+OD QUnn1vlVAGjUqU4hctVP2vM5+wYcfSCS+GiVu8f5js4xeSO7erzlOABRx11r8x71crPp v6Kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759394539; x=1759999339; 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=Rvvp0krdvj9KI0seW+qea5ZtA/ftLNrinoYyViTKgNM=; b=kNRJncatOG6H8jkAcg1HdggL5yeUUakrz9Z624aqXSKM9s5Mkgu7tzX4jpUYh8pPfj d3QgJYE0hMP1kyucZEJadeJOxCTPsrxfH8JlLDs4dsRVAW1zudGH8+IJEf5K/qNuXVlz ivCUlzaW2yFbiSHgJ+9l/7SxENLHR8wfmvFut91ldC9vACQpL51vgfXgKJdUsl4oA3sk moBgCvjKsI/3aIaL5yn916mhVaYgIEHSQv7ViQOzY3FH53J5dAYxmUyyLRajB/eZwIgF 7va0jSuUjM6RKBOqqA2fkukO95WrlFA9K9zUe6FvfPv9phFIRW6XdAf/3lrUcrot1f4l edUQ== X-Forwarded-Encrypted: i=1; AJvYcCXB2ZQ66UR9cZiOqignUs7clu8IBAGJdXpZj7sMO5blOHpAeuqFgxzEA0fBGiXJDqyrOSrHZwvcQXI=@lists.xenproject.org X-Gm-Message-State: AOJu0Yyg3ZZ+eoy5yYziL35BvtNwcR2q2D0c5c0DyTB22LSJMyumslew cgv1rIvYkXkEeNGB3bpXdniGxge5MhaxL3qOlLoBlLY4KPJIps4J/9WCQ/wzXhTjLqc= X-Gm-Gg: ASbGnctQQ10vUFk6WcSJrrhlpnKrZyx2K9e/CTyTCBmcUMvYOszzs4zrxFL/6MXGTfK IouJwP1VfrkOIg3jTmqhjlWTxUkZpNygNNNnS/fh9dp0SPZqJ/scf+0DlI3oCYXiVUYPh0tYmsV GijrKCNh0fiTtbeMN7IZfodpHVECyzljSBc9KA4wu+Y0HrsPGn6XfPw3pvW5tCU+Lveap79TamP 79GyPHcoHxkMJ1+6hFev7WUSclZbeNW98awdN+ygDRYxGthoaTLxZV37KbPjnGPW8C3q0BBNLAE XGDr0rvEcDmM8PLyrLqTYa+Grd7JRmGbtfGWLurLFgR5ABbUyBsq0BtyPt4j5SQxH3bMRQBiS8Y SrUJgf2z641v/jamJJHkj29vjOb6Ypy1yxch5c3G+KXLaqb2638AcOYO9J1I7RFIeVzjy2p1Xhn 8MmeyT01GlaS2E5OhADgUXctr3iAtpyQ== X-Google-Smtp-Source: AGHT+IG82FlfkoxisOQbRYrohdopoSBAhOILCB0HaVdDr5q4Gy9SbJH0YmtL/0EDlkKLEQXXp8/WZQ== X-Received: by 2002:a05:600c:4ec6:b0:46c:e3df:529e with SMTP id 5b1f17b1804b1-46e612ba9ecmr42260135e9.19.1759394539032; Thu, 02 Oct 2025 01:42:19 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-s390x@nongnu.org, kvm@vger.kernel.org, xen-devel@lists.xenproject.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Paolo Bonzini , Zhao Liu Subject: [PATCH v4 03/17] target/i386/arch_memory_mapping: Use address_space_memory_is_io() Date: Thu, 2 Oct 2025 10:41:48 +0200 Message-ID: <20251002084203.63899-4-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251002084203.63899-1-philmd@linaro.org> References: <20251002084203.63899-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: 1759394559629116600 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 Reviewed-by: Richard Henderson --- 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:05:33 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=1759394568; cv=none; d=zohomail.com; s=zohoarc; b=i/NL7wf84iEyn6ZlIcf+JWTztRa/JJgJbMJyxRrtB/RgoYl+GFydr94NFc4zCPBNM2Zmt/ek7tM9xXKN+kEFr14RSOlXqMa3pb93xRaa94i6TwIQ7cQ/PoG6/WcJN1R5NFWQdANPwVd7PQljfG9kzMchJlwewrku20R0dHHioBE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759394568; 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=2534c4RtZyXLI9bpIizaZmKA+am5Tc7GXq0BfJ3FTIY=; b=WsSDxyyHFfOCTLmsQEq3Ux0gbl09HuMlD7P9E82UZgGlBQO7hd4iD/ai8fRnBMVaYZE/drSYaNtKSEKI5QD/PkrfSzXWWiD2U0ZSQ4VEBRTv4zAwQiCRm1ojHN7YPSfFoDq2xdN0Qw6oD8zlqkXwywrSB6yZnYvFJMCH4xarofE= 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 17593945684695.214919523043136; Thu, 2 Oct 2025 01:42:48 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1135411.1472549 (Exim 4.92) (envelope-from ) id 1v4Eta-0001S4-95; Thu, 02 Oct 2025 08:42:38 +0000 Received: by outflank-mailman (output) from mailman id 1135411.1472549; Thu, 02 Oct 2025 08:42: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 1v4Eta-0001Rv-3e; Thu, 02 Oct 2025 08:42:38 +0000 Received: by outflank-mailman (input) for mailman id 1135411; Thu, 02 Oct 2025 08:42:36 +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 1v4EtY-00006C-Ek for xen-devel@lists.xenproject.org; Thu, 02 Oct 2025 08:42:36 +0000 Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [2a00:1450:4864:20::32b]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id b7eaced5-9f6b-11f0-9809-7dc792cee155; Thu, 02 Oct 2025 10:42:24 +0200 (CEST) Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-46e4f2696bdso8986575e9.0 for ; Thu, 02 Oct 2025 01:42:24 -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-46e693c2e6fsm23962295e9.17.2025.10.02.01.42.22 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 02 Oct 2025 01:42:23 -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: b7eaced5-9f6b-11f0-9809-7dc792cee155 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759394544; x=1759999344; 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=2534c4RtZyXLI9bpIizaZmKA+am5Tc7GXq0BfJ3FTIY=; b=ODcOHn7+gDdOhBsd0UdB2lf2mVklGxDcW92vimPUzx0U0A/TB0vFMhc4+eXnoVm+Zb qtP6OOu7AuPsbLEicTlcuNou/86gt+IGO+PkAQLczQyFRCPtqFOOjlsPIR7flcDkiM/w VaIMTK81SOY2rQzbU1ntqYVsu5jfcQoAgYPPWggeVMym2h1mtro8za3dlZhUeC7BwhTH IA8DMiph5jXXDf7GXJ1PLhloUGXfPJRHbbEHnroV7koaeaNbJRYwcGZ76qS+CR8qOgUZ zgqcqWNcY37mWG3HhI5hjmv/Ma2Z28qdmF/YYXeGjDsyjY/tAt5leRjY4TCzhyjNeKfx 6mWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759394544; x=1759999344; 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=2534c4RtZyXLI9bpIizaZmKA+am5Tc7GXq0BfJ3FTIY=; b=eAx4Tg2svaWfQmRp9KLZLbXPI+gkW/eGdCA1XTaZClYNLOo4c5RjOtCptPY/plplwG fQxk2pp1jVYB9HWIOvZ2YMStMFI+MvlVC+tCSmhCNuHqZC2lIoGmEhkiw5ytUBph5Kl3 aqNoXtqShRd8utfaERsXStZR+oJ8pSSueHTyxOlbCmsFG/1ruja0OKBoik1yxqLwSKdz Yz4a5HPCIqRJqcU9ltnF26zsoyzSmhoUNt/ehr/r5uCCu2RDJPDN9qPq3CwhxMCcGZfQ dYLM0PO3NJoHEFX2bgGAi0QMcI6Rz2EcW09HtdJ18NK4s3cIBG7dQPf2cZRd+yKNT0SN bkBg== X-Forwarded-Encrypted: i=1; AJvYcCXBtSH7SfErPo8oc/xwoemvFB4vZUpDu1mLGKBWfUFMrn4iealTlUmjUd8DjROo5tEqA2KM8HyPwyk=@lists.xenproject.org X-Gm-Message-State: AOJu0YzDOvW9qpNAzABf8V+zFInzmlUqgXkoLurNOKHjI3sQCVbm2qyQ T1EINqsIwlYWOMOhc6+/T0z3Sbb5m8KCTKn0FdFMJ5zFJ8iWOTNWH6p+PUZYug21Lxk= X-Gm-Gg: ASbGnctBO6cnw7TKY/L8s+EyH7EI+xD1nuC87EPWRNJeMCQ66yqKkfWb7GC9gdHF5/r 8meaQYqaCUGfz/hMPNmufud/gIfWrPB1q9dFli0yIoPNS0aciLqbALBLefxAVcTx61FSnCvVF4l Q9VylL8y05KD7ciVEXf9ldCgoZCGy55wSt/Kd1i3E1gjcbimmi31jd4LN3v+n5IdNBI4RHxaECr UVypJ3/CqY8Qb2HL85wtqyBPZjCEWg6d4NB7swHExeYZESNZFWcb0P2Q49UKEU8R8Mv5KpgHOvf Sk95CMAl+p77AIlj0Y41VvUUv3Lwj60+Y2J3bSsiz45sgd/ZPbBvQ/c1nowa2EyIicqpHgo55ON 4QmYF+XJfKZwK5V9+GFv/QnSbx3V/2jrLqrlz5piya9Zy1K3xyKxJNSovoPI0pZqvrD32P6PY0l ksaggBJbygHtkeZukRoqdE0UPVsnLd7A== X-Google-Smtp-Source: AGHT+IFP18ee6bgm/ejyh8kmRYFVi1hqLlMKkbtTf3ZacHJyOl7EopZwJsToQT2tvIjzxTw/P2KdoA== X-Received: by 2002:a05:600c:3149:b0:46e:3b81:c3f9 with SMTP id 5b1f17b1804b1-46e61269212mr56566845e9.17.1759394543997; Thu, 02 Oct 2025 01:42:23 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-s390x@nongnu.org, kvm@vger.kernel.org, xen-devel@lists.xenproject.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , Richard Henderson , Halil Pasic , Christian Borntraeger , Jason Herne , Eric Farman , Matthew Rosato , David Hildenbrand , Ilya Leoshkevich Subject: [PATCH v4 04/17] hw/s390x/sclp: Use address_space_memory_is_io() in sclp_service_call() Date: Thu, 2 Oct 2025 10:41:49 +0200 Message-ID: <20251002084203.63899-5-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251002084203.63899-1-philmd@linaro.org> References: <20251002084203.63899-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: 1759394570071116600 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->as points to &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 Reviewed-by: Richard Henderson Reviewed-by: Eric Farman --- hw/s390x/sclp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c index 9718564fa42..16057356b11 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" @@ -308,7 +309,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(CPU(cpu)->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:05:33 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=1759394575; cv=none; d=zohomail.com; s=zohoarc; b=IjckgsoRRa6TzZWs3Frkb/yhGcSOz6CIznIV3MNIvW47bzcow3GkP7hyRlUp39spzH3Y8E2VkqyAb3ALw/czhQ/wAr3Lzs34CSDJR5CVD5bm3rJTxjYqCTN1zFq+UPqkypUwakNoKxg0KiWy3ff8YICeAhJ2xiPc/1LOKRCDItM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759394575; 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=SpGUqjX5M0j82QXVYXw9oJFFwSK+I6Ya0azNIIXD0n4=; b=EFyJUn3ttRfRFVvlNrvvgwOOaF2QJY/OBHefAjBYNFoQYtsRPswOtubq5iCSY5ZTCTkoz65H+AYsu2QpnmDV0noMYB4xEy8B3EWOLO8/etuTkA8ff5VRrqA9kB0Q3zZngEHWY0CBbWILGwSYhjvcJfPmnRey3ya0obRn6u4w+zE= 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 1759394575800786.1427679404912; Thu, 2 Oct 2025 01:42:55 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1135414.1472558 (Exim 4.92) (envelope-from ) id 1v4Etb-0001h5-FP; Thu, 02 Oct 2025 08:42:39 +0000 Received: by outflank-mailman (output) from mailman id 1135414.1472558; Thu, 02 Oct 2025 08:42:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1v4Etb-0001gw-A8; Thu, 02 Oct 2025 08:42:39 +0000 Received: by outflank-mailman (input) for mailman id 1135414; Thu, 02 Oct 2025 08:42:38 +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 1v4Eta-00006C-4U for xen-devel@lists.xenproject.org; Thu, 02 Oct 2025 08:42:38 +0000 Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [2a00:1450:4864:20::32f]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id bac68477-9f6b-11f0-9809-7dc792cee155; Thu, 02 Oct 2025 10:42:29 +0200 (CEST) Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-46e42deffa8so7640465e9.0 for ; Thu, 02 Oct 2025 01:42:29 -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-46e6917a73csm25459055e9.2.2025.10.02.01.42.27 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 02 Oct 2025 01:42:28 -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: bac68477-9f6b-11f0-9809-7dc792cee155 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759394549; x=1759999349; 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=SpGUqjX5M0j82QXVYXw9oJFFwSK+I6Ya0azNIIXD0n4=; b=hgfPwNutior5kyVPDm+mroxuFc9q0bWflim/zloKmtn3DOy+nAALa08rj3eoVNob81 qi+n9NPMCO5f7MjD7aWt2d/cNaPBJ3uY+uGUJ4g/3PUDIVJzB38oLQwnRCgA0YmC4jOe 7THba++Mku7mU/hr6HTHbOHgeGTZflt6AV8zS8iUBnpjh+UjBNcglMiGSV5wIHuTtK8l c+dZuvj8j6FB97W5cVfoWau74WLquy1NRDlVrvauBTlv8vY0PrXWojgpkrCXjg2sCFTX RMHFo+lhVFU2IIb2KDMFG1ODe7cz2EBUZ1qhoLzf1I6mFavoTgB+7OJaR52nyk5trc5s 3ZRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759394549; x=1759999349; 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=SpGUqjX5M0j82QXVYXw9oJFFwSK+I6Ya0azNIIXD0n4=; b=vG3h49RbU8zuBX0s8BPQ04ZG33/PO4j/5dC14YB1zK1p9xv+4SNoYBLL2v+al4KzjW AlmG7X3UaaC37vQL3RUF8HWzSCpQzf9fo8qaINMBP7hawkE4wot+HfRtyWctqH/cmWpn MP+zRqLhEIORegi1X+Dp+nrByUPnrQ7K80CoCmuLXwnsOLMONDOWI6SnnPGeIz6svZ2/ D47D6NF/358KPjt79sI0RtktENNbtff3Zf+YfkXxNlQdFoYJVtVSnPR/grZ4N206F+x9 Y/FNOc8xktEqPGDwp2Hi1buP0Ryw5O1Ssz5/Zc6l+eCXjmSVv+so6sS6g0UJthnh+Ndq 9f9Q== X-Forwarded-Encrypted: i=1; AJvYcCVzge1vTUIs/V80eDwhDp5zWCtv7rYwxv6o1QV7bMp2ZANwNa8pm2du2jBNAPbkPiERPUXLdq65d1M=@lists.xenproject.org X-Gm-Message-State: AOJu0YzX17RVjpFFUArgZSBzKOPl0SnJ+uvPCMRgq999j/79JyzGPw1K rU+pEcIqqpnWxD2udwzDcxJqZxuumyzZfMOHXqr514zop+qW7Lzxm54hH7uNqcwPj/I= X-Gm-Gg: ASbGncu+a6A+y1JVrVWAUAQbI5MVoENV0bQhQmH7k8NTb85JcI7XCl0UqYXJj9unE4o H1UE6A9roHqhnhA8PGBdLlgQ+n5q9F/mJhPEqT35/nq3BZNYzbh9P/qhmxz+Cy5fUxnHAAOfJyz 3hrdi+RCytAfcZVQm05Z/iICn49sHNvG9rXMP+k0Sx8SEpAG3xIxE1autoKmrOuXaplu5BzYeEy Gry7UkV1SnGoRgT57flhlNZnpP3IA2yVazvlWdJA8lcy6hKr1pCn6ywY/ePm+OmTpFZoK+J2Nsl RxME9hZQYVMujn8uQ9fQcEOO7Isr01lig6u11WV13/ITHiFATF7/Dnq1gxcwrYuysS25t75X4kU MhJlP+KQrWF8+Vsy6HKMGkV5fNhYRJnBCKArbMABuccTU21JpKw2zE5PRJwqwFhw2ud5UpBGDQs NY5MEy0O9uiXoXQ5XHiPBFNmKOwGy9yg== X-Google-Smtp-Source: AGHT+IHnMMvrULFyoGLvyWEYNdN7opPAO0EOueQAPseRRuabHvxN0jtL5dWb3pgTDAuMakOX0VTtNw== X-Received: by 2002:a5d:588f:0:b0:3e2:4a3e:d3e5 with SMTP id ffacd0b85a97d-425577f362dmr4449090f8f.22.1759394548791; Thu, 02 Oct 2025 01:42:28 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-s390x@nongnu.org, kvm@vger.kernel.org, xen-devel@lists.xenproject.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Paolo Bonzini , Peter Xu , David Hildenbrand Subject: [PATCH v4 05/17] system/physmem: Remove cpu_physical_memory_is_io() Date: Thu, 2 Oct 2025 10:41:50 +0200 Message-ID: <20251002084203.63899-6-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251002084203.63899-1-philmd@linaro.org> References: <20251002084203.63899-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: 1759394577900116600 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 c2829ab407a..4745aaacd8f 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:05:33 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=1759394570; cv=none; d=zohomail.com; s=zohoarc; b=DdVh9ykRmDhSI/oStAFVf2tRMBCyXE7ANAai1VzRZjWiEY69djHzU6hklGN5SMH19A4acdCwpPfrrmvV3SfaFdnpFgDPeNAKFFdXE9vmIrR6mpSeWOTqmIlRMY4iGv/u9U06IA+YXUR2s8s/uD5ZgoKmSqfbWYESVe5g26quqH8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759394570; 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=Q36ac4tAhT01s84agsdvLvLQt0ctAJzIb51YlTVbcXM=; b=fX0ZC2LrMxU/aMdLKNWFG1M5cFvHUZyNGrMV1p0OJAjlg6or+Vnw0eS+nCqdPDfNI96oW1JH7V+dTTAPF3XT78eErps6YiI13xS7rZTCHWeLYDU03qOA2waIhTk2LLlGQmV0yzshqSSIQUkz6MFo96pFdtbAMOpV2BuDFqBIkKs= 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 1759394570549595.1196692070198; Thu, 2 Oct 2025 01:42:50 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1135406.1472538 (Exim 4.92) (envelope-from ) id 1v4EtX-00018f-W5; Thu, 02 Oct 2025 08:42:35 +0000 Received: by outflank-mailman (output) from mailman id 1135406.1472538; Thu, 02 Oct 2025 08:42:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1v4EtX-00018U-Sw; Thu, 02 Oct 2025 08:42:35 +0000 Received: by outflank-mailman (input) for mailman id 1135406; Thu, 02 Oct 2025 08:42:34 +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 1v4EtW-000821-N4 for xen-devel@lists.xenproject.org; Thu, 02 Oct 2025 08:42:34 +0000 Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [2a00:1450:4864:20::335]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id bdaa504c-9f6b-11f0-9d14-b5c5bf9af7f9; Thu, 02 Oct 2025 10:42:34 +0200 (CEST) Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-46e48d6b95fso6166885e9.3 for ; Thu, 02 Oct 2025 01:42:34 -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-4255d869d50sm2773210f8f.0.2025.10.02.01.42.32 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 02 Oct 2025 01:42: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: bdaa504c-9f6b-11f0-9d14-b5c5bf9af7f9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759394554; x=1759999354; 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=Q36ac4tAhT01s84agsdvLvLQt0ctAJzIb51YlTVbcXM=; b=J5E/dVbM32FM5Py0Mw8G6vIgPou/sYSbJr6oVw1Js4AQsZi9zomVxCvdOlkNblAEbS LevBGWC5c2iqlJMT2d7nzbGvRllKfT3Z7RVsO4Ff+dgbbMYZP2Rl9wOIhgX6cCM0wtmq k1ZLQAel5ZEXODc+ASJ9OBp27whWzhlImCpbXdwlmEDsb3x5vg2K++s+Ul5fyrOfhsf8 +T2kJS3nreQ5mA9AEgNgsSmg2G66HUDvzKt3xzlyT+CHNCy0moB+qE37rf2IrR5OTNvr Z8wJWp+XIn8vqUXn1FPTFIDUZkJKozzHiojsDBpm4mO4M2l7LJekYRmr6+6hvaw+mMYx VhtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759394554; x=1759999354; 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=Q36ac4tAhT01s84agsdvLvLQt0ctAJzIb51YlTVbcXM=; b=V71wSpNp8lSpYy9bM/UJRnnWCXAGykyKsnAJh6zi+mkzXTO2SSdBne/HaKzGSpjHG9 I6Cx/QgMieumEWj/M9ck7ionKjURGkuJABbGbiS5NJBLG6wTsNRRJW5yVdWkCYIot6ih Jyuk2F4z39EYplX19czPwo9X0bNqRiE/qL7F9VBGveHzKHxR3xLRUnZIZkHxfsW9Itri 7AIlGXbBJh7QSdarjMDRcGyailNfr0V2uPusdf5HL3IDDR28Xjj9Ml0qSaAAHfAd2FkC TrZJISLIhE9Slwdrux9+/w16U7i2GqzNap5XLdPGkr4HGTqlcRnyteKKIbmbsTpl104N F9nw== X-Forwarded-Encrypted: i=1; AJvYcCVWjLSWfeqfDe7/t0i3x5z+1/pTYjhmKY71MjTd3/gy+WPNexXOaDwK/S2SxK2JvZePwb1M9+8cYPI=@lists.xenproject.org X-Gm-Message-State: AOJu0Yxdmv/4hXs/weY216N1pqa6v4ROiMDrnF+MAD7x5h4zzMWmjmOg NLNZA6YG1hLV0kdX0l/jE58/g0Ll35SRquQkaLv/bNKXWyvv6S2KuZqHxhzVKLzp8QU= X-Gm-Gg: ASbGncshFwGnGty49AkMScrrow46mVu1rHGQFjmhmSuz4nUOYZkxnzhWiwsQqyLdwxR QtuQXhHVAvpoA+eMrGyZH8mlGsJR7LdJqKCK3zAomHZF5xNO+DQPz2OHXzVMtZUKq2TnkBWyUuF wnT2EM8FDoY54DQuYgoMo8nMZ4SNHfKEFWMnfxxCIsW2lV3QQhLLoi1gyu/R5bLWKldG+Nug0ys jLSwB9baNhy+llZN/wC2GXwN/rHfypeW4fznUI8XRqmgAzH3byEhPIlkeokKHnPZEt5tAjOI7LG VrT6hD0/DVxJUfMSXaDIykC2IXk107jlkJfCg23C+BiduoVzMGQYSgHYg1E+s1qxw7bqUYlJXP4 ZS35Bl98+5Uyo4OfnBsvuC0ZmG1A5zbyVkjvWOZ4+7Raa4m8xDqpiEdQcplzfwjjDaF6Za3IYHU dOU4TPFuYXm9xWHGB7NmFl/buMb7Xrg8U0VlxIMMZj X-Google-Smtp-Source: AGHT+IGvW2QY4XT4rE3gnCvd4C2svQ9D2UQ58ymAoAfIs0dUKEvFj1XA9d+49KzTkmba3O5b3qx94Q== X-Received: by 2002:a05:600c:524f:b0:45b:8adf:cf2b with SMTP id 5b1f17b1804b1-46e61267b13mr46680795e9.21.1759394553640; Thu, 02 Oct 2025 01:42:33 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-s390x@nongnu.org, kvm@vger.kernel.org, xen-devel@lists.xenproject.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Paolo Bonzini , Peter Xu , David Hildenbrand Subject: [PATCH v4 06/17] system/physmem: Pass address space argument to cpu_flush_icache_range() Date: Thu, 2 Oct 2025 10:41:51 +0200 Message-ID: <20251002084203.63899-7-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251002084203.63899-1-philmd@linaro.org> References: <20251002084203.63899-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: 1759394571906116600 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 1b2b0e5ce1e..19c7ff393c4 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 4745aaacd8f..29ac80af887 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:05:33 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=1759394733; cv=none; d=zohomail.com; s=zohoarc; b=UYibohdlhhV6NKvjI8HI+GY78Ljfy9foBcCY9YL3lWa3iqYnKCxFeqeYqEyesXhyYGr9I8612EfCnZAItvmLzeSjOruO68O4GS2EVD5PKRRUXWHuXM3UJEgZentEggkjxh2XIpuvCHMufyCu2SJM0JmK6mruVP65EJ2gaGNaxIY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759394733; 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=sPyvtamk/7TWz3NLD4QWdvW1Is4VocR+bm6o/kbYsjI=; b=n/zvyuZHNGe7F0PcFPPgoYLDSr09jWh4F+9S38D9NqVcEfvEJwqPeAPuK4kWFmjLl/qhep+v8tj47TeAM2u3OqCQdd/it4YofCNyIRgJJNaWmzksZnxBowabJ+R7ThrJkY4Fz+pcASj7E9Kxe95zQTiH7iLlaFiWEb+Zy3vtV58= 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 1759394733621128.05128681998337; Thu, 2 Oct 2025 01:45:33 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v4EuF-0006w3-Jd; Thu, 02 Oct 2025 04:43:20 -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 1v4Eu4-0006qf-HA for qemu-devel@nongnu.org; Thu, 02 Oct 2025 04:43:08 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v4Etl-0000uK-R2 for qemu-devel@nongnu.org; Thu, 02 Oct 2025 04:43:08 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-46e4f2696bdso8989925e9.0 for ; Thu, 02 Oct 2025 01:42:44 -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-4255d8f50b2sm2597515f8f.56.2025.10.02.01.42.37 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 02 Oct 2025 01:42:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759394559; x=1759999359; 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=sPyvtamk/7TWz3NLD4QWdvW1Is4VocR+bm6o/kbYsjI=; b=dMEAFdACXcEqjjETcDlkDp8e8gSrlBhEEKTJwhA/GTEIVnWmHgG1Gwkc+ZUYOhicnu n81knu2stpnjrsllTVZjRjol3EjFFXocKuVC5vKNK21GpYgT3jpmEF9/A6GaLRUNi5dI YEKrCz8T+lp35DQsQ5NryLbPrhx37DP19oMMhDMXrUVPk12dnQDQFLvryLHS+MI/vYF8 f7JJD+PqHmC4+9A+ZaGaGtacWdSNNn222QLrxQWCsdiII69ukNpHFRmzVoo2Ngqsn6vZ rC4NCgC8efcltxsha6nmBkOopKmNCWtqBIEwqkfpfZZ4UVj9rxLHBxFdD2qZAi9I6GD+ UO5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759394559; x=1759999359; 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=sPyvtamk/7TWz3NLD4QWdvW1Is4VocR+bm6o/kbYsjI=; b=epHGVeRynPwb2vq0kXZZclc5t8pit0sWyqm6jjOgTeSVIt5I/gOMersEpvbf+0Cut4 pdKQWCtwyJdgDVXyyVnRnXButNUp1euBzAmwgz3z20e9esb2sCwBVdBbuyrxUI4wY0zy jz2gY0AlZhSAwOpeEGmKkid21UauqqMgJ16VeV1rhChzNEY10HZolk2JMz3kqevrqiSm zx3zXzSz5UryIG0ZkzWjefd9znKSO6ZuuD8h0pz15075GrTCNwqFubUwx3MVfR4v3mDz pZWa2QaxgQ0rQnypBhtHOwZILL9vcYipiSo036OeehaMEOuS3ksfwxAJIJwH64qrVBvk ByYg== X-Gm-Message-State: AOJu0YyKT7kSVZvAGG7GftljAbdB8EG9hGniEvIyBu2F/as1gIJJq2KK CTcgu6echyC2o+Q90/MrGkP5TVP5BFSYB5iQyshcxl5+l8l6M3TxmV/FZKQjB0SGztHp+8PQRDA ai7BY5CGGGg== X-Gm-Gg: ASbGncst73oO6GATL+seWNLZ5PmtM41UNBQQ9dEvE8ySzmVp7/grFk/Oc0ElarnssZo MS6JtK31+bproCAydnsa6xMPMBdHDQOPYOhqHPPlck+nYTMhygtp5qm00bmMUAs0iz8OQJMjnvG V/Ny33s55Yc/tpkbfPdda4FFsbXawrnskglo45bKGnBH5HuyMmAIq4xGORbxc1ycV8TwsgOr7xg a4ZVPYs36jWvhuieptYaZSZmTXgRRbgE3043Hw7H/g7cf1blrd7vrowMnN7cZB9veEMFb4BjdaI ZmLhKBU9ksGsYJJxGMvloGPqXULQqw20AZGToxr/bWFHDT3P/RAvKxgeG/SAUjJgD/oYOObp4Kg /mk+XJ9xkBMG/jqGjMCXo/gEJN/cwY4OrjJZJKuNhq5xVAjGZW5/0iGx8H4JklZQbopgUYpfMzv Uc1K5GFVSZNGxf79625rv/y33bGkO0ZsIauOvm7eqO X-Google-Smtp-Source: AGHT+IGiO2MQIF6Yep6y2/isH2QW+nXbG00es5/W6noyWTP2pD3nWUiti/7EsFpua85fKefjjBmssQ== X-Received: by 2002:a05:600c:4fc6:b0:46e:1a07:7bd5 with SMTP id 5b1f17b1804b1-46e61285d7dmr48438525e9.29.1759394558687; Thu, 02 Oct 2025 01:42:38 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-s390x@nongnu.org, kvm@vger.kernel.org, xen-devel@lists.xenproject.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , Richard Henderson , Halil Pasic , Christian Borntraeger , Jason Herne , Eric Farman , Matthew Rosato , David Hildenbrand , Ilya Leoshkevich Subject: [PATCH v4 07/17] hw/s390x/sclp: Replace [cpu_physical_memory -> address_space]_r/w() Date: Thu, 2 Oct 2025 10:41:52 +0200 Message-ID: <20251002084203.63899-8-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251002084203.63899-1-philmd@linaro.org> References: <20251002084203.63899-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::334; envelope-from=philmd@linaro.org; helo=mail-wm1-x334.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, T_SPF_HELO_TEMPERROR=0.01, T_SPF_TEMPERROR=0.01 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: 1759394735789116600 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 Reviewed-by: Richard Henderson Reviewed-by: Eric Farman --- hw/s390x/sclp.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c index 16057356b11..d7cb99482b2 100644 --- a/hw/s390x/sclp.c +++ b/hw/s390x/sclp.c @@ -304,6 +304,7 @@ int sclp_service_call(S390CPU *cpu, uint64_t sccb, uint= 32_t code) SCLPDeviceClass *sclp_c =3D SCLP_GET_CLASS(sclp); SCCBHeader header; g_autofree SCCB *work_sccb =3D NULL; + AddressSpace *as =3D CPU(cpu)->as; =20 /* first some basic checks on program checks */ if (env->psw.mask & PSW_MASK_PSTATE) { @@ -318,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)) { @@ -331,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); @@ -345,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:05:33 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=1759394578; cv=none; d=zohomail.com; s=zohoarc; b=UD43MyHADeSxuYXyUlxB5sP1Fwa/KMU/yif2DpWVtuDRsI5qr3BJjKY3z/COOEzmKjBEv/7EXVof+6oJBBFycMZ/KKbDNabdO4d7x5rlm+JoTZ1B/wppzdbl9CtyY+5mQ9Y4rpFxcNKh+rsVyuRRjA+hpWtIPShzsknhJiQ0+9s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759394578; 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=/V6bK/dS4q8NfIVc1IYGAX2Y2n9tYdVPl2PhRG623tw=; b=UZ3zxooSV6PxXeFUAsLXrqWuybQc8AwYqvglN15kCBbir+HeMRH5NWjQ9O2LtSZ2x6NMx3hQIf/08Hy2MO5fXmXe6YGauEr2egXVpiXE5so6ULfT6yvrIr8DbDQ0zuJZDwLgBf8kHPHazz+ZctirMJ4ktPE1164q/EM8k1r1Umo= 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 1759394578277982.6665919962385; Thu, 2 Oct 2025 01:42:58 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1135423.1472567 (Exim 4.92) (envelope-from ) id 1v4Eti-00029y-NC; Thu, 02 Oct 2025 08:42:46 +0000 Received: by outflank-mailman (output) from mailman id 1135423.1472567; Thu, 02 Oct 2025 08:42:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1v4Eti-00029p-K9; Thu, 02 Oct 2025 08:42:46 +0000 Received: by outflank-mailman (input) for mailman id 1135423; Thu, 02 Oct 2025 08:42:44 +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 1v4Etg-000821-Mm for xen-devel@lists.xenproject.org; Thu, 02 Oct 2025 08:42:44 +0000 Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [2a00:1450:4864:20::32b]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id c3907010-9f6b-11f0-9d14-b5c5bf9af7f9; Thu, 02 Oct 2025 10:42:44 +0200 (CEST) Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-46e34bd8eb2so7584335e9.3 for ; Thu, 02 Oct 2025 01:42:44 -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-46e6b23d4c5sm17135895e9.17.2025.10.02.01.42.42 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 02 Oct 2025 01:42:42 -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: c3907010-9f6b-11f0-9d14-b5c5bf9af7f9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759394563; x=1759999363; 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=/V6bK/dS4q8NfIVc1IYGAX2Y2n9tYdVPl2PhRG623tw=; b=wjIMPQyHxlPceyp90fAWmX382DiFtaVI3OHiK/b546ZFiWCBz4qSYiT44mKyYUHXRT UOt+qthBSQgg9wNngP1ShbhsVbopR4g4cWto6lKhrdvLvoDuvq3sIcqAJGu2yXUb8p9r QZGuP7WHe1VNgyG859ph2RzLj3pTlVMdHOicxZDGDkNNTsl7UOoz9+kzmL2cn/hDQISr kfxFqQUgL3xw0lokQOvt8v7hAd/pfqiay9cnx0aCpS9tBpRK+l7frNpnVjz4hShCPps5 wYA/ge3r+ienoB+TlmbYJlnMHOz0wQFauYdV8cppAx6YsfJTUZkYvQxz7aY/X5jebtqX J/JA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759394563; x=1759999363; 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=/V6bK/dS4q8NfIVc1IYGAX2Y2n9tYdVPl2PhRG623tw=; b=UnBli8QratGzc4HCgchGrbSKHZRPUnESD8SoF6XgCCEE5B2dmf6U1zhmuwgSsWYeUG 8mM69CGDw6ObTaXX9MaDoRwzJgGl4o8imLTr/9363hrNF477fO0XhLaI4Kd+EMg07bnm CfvKEgIxerkhEN8n8IvCpJ6POYZ2i/4w/W5kaLaJym+CxN9FyRr4/uMKCg4kzBc60FPT rkiNkblTlYmxS5UjRQNS5v58zLeot0GVBGWzj36+ED9bpL5k+7eoZFot+GtHBIQR6/KT g6arTw1IQNWWEJRZh9fcyyuEWp/aDrBAbmw33qGLB3UalaqPGtR59Nm/Dj9b9LqYKLOg 19yw== X-Forwarded-Encrypted: i=1; AJvYcCXEJqpRVadDKHDSS4sowvhkEIRDjSEM25p57iho9pJ4AMt8bwdB8WbYQyR6ST3y0tfybNwIDAQvr6Y=@lists.xenproject.org X-Gm-Message-State: AOJu0YxdGWbfusGscSPEFqh5zq5zq01Z7YhBt64JX03yKoEbu3Fu8JCx h/vIDp84Z9EWeRwDAJKaxrMUPiZTeTRuP04CsBAJ+cewhpJsOSqxVfr4k9zRjYI0lbdhAqW1byw ae7vi6scW4A== X-Gm-Gg: ASbGnctwlykpHWnNkPxb4eA2hS8CuFStSYnFB7mcRlrZgwUuRcg/Csr8QjeHFJKTcEP RP0mhsvqaXuy8X2WYo5leSHOYN/0Te7DD5n4WT0u6+kZdGaT5ZbrzqJaKOBKrMIfnjjEvKlZjbS u0e4vKKtFfGOtdqWhp6fc4E11g97ql6LnA+9fpnOfz5czEhMB1wjo1rwBxEOkFj1NVueIxB5Pet tVZ/WX/vLfhyUXZ+dad+bM6uN+I6TIiBK1ytnCeFayhf9M5eMr8ywpNGPyjFumDC5s4St7OpsdB znbp6xzu0pwQKQGLt/Iz7whZ80yOZywrjlsupuy2pDt+6fQTiG20JD4G6ms67MHRyI9NO5GkdrE /Gm4i6fjt70L84ElWOUsBwrodW66g/ojECv7t1QLaggnRKSm9NZZjtl53MxYMSFB/sP7GbxdO3q HtqY+Ovd5okCxTK7GvIWA4NzrBROEZvA== X-Google-Smtp-Source: AGHT+IFyxE2f+paPHZWS7atlHQE5YorXbC8H3ZNAWMF66wQjW+bist3zGSpvkgOszGdSmrRhuBdazg== X-Received: by 2002:a05:600c:1d15:b0:46e:46c7:b79a with SMTP id 5b1f17b1804b1-46e6125d269mr48068925e9.2.1759394563460; Thu, 02 Oct 2025 01:42:43 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-s390x@nongnu.org, kvm@vger.kernel.org, xen-devel@lists.xenproject.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , Richard Henderson , David Hildenbrand , Ilya Leoshkevich Subject: [PATCH v4 08/17] target/s390x/mmu: Replace [cpu_physical_memory -> address_space]_rw() Date: Thu, 2 Oct 2025 10:41:53 +0200 Message-ID: <20251002084203.63899-9-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251002084203.63899-1-philmd@linaro.org> References: <20251002084203.63899-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: 1759394579924116600 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->as points to &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 Reviewed-by: Richard Henderson --- target/s390x/mmu_helper.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/target/s390x/mmu_helper.c b/target/s390x/mmu_helper.c index 00946e9c0fe..7bcf1810bca 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" @@ -542,11 +543,13 @@ int s390_cpu_virt_mem_rw(S390CPU *cpu, vaddr laddr, u= int8_t ar, void *hostbuf, if (ret) { trigger_access_exception(&cpu->env, ret, tec); } else if (hostbuf !=3D NULL) { + AddressSpace *as =3D CPU(cpu)->as; + /* 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:05:33 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=1759394788; cv=none; d=zohomail.com; s=zohoarc; b=SpGWIBBdVcAm2jCIjYUidHHnHb06aHxneSjSERjX9A2LhjoSjuifq+8JfK3VloVwAlhDgiZYwpFPwIUyWDpCWCFBtEYuSgRqvixmpCFJZBIEYRx7nneiPFKAOArSxYIqPDbdkphyXeT2GHwIQGU0YyLal+BigEbYW2gFmUzfE2Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759394788; 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=qZW6KOJbHUgA0vcevzhPmMJNHgyRN0rHSvzpaRdIptI=; b=C9BJ/2IvpzGLIwpID53VelZZeUIfykKFERwo3t2McnaREEOF/jLEyNRqeBN9/fjYEO7GJLgO01RTR8NYcprGJ0N7BRpAFHV5KO/eCFpD5Q/FrquBgYhCKBti6xyhYGaR0q+VyOe4f0LRH/ligBAnM0VbDtfJnYDOcZyr5QskXWI= 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 1759394788546103.38162573303987; Thu, 2 Oct 2025 01:46:28 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1135491.1472662 (Exim 4.92) (envelope-from ) id 1v4Ex5-0006IO-5i; Thu, 02 Oct 2025 08:46:15 +0000 Received: by outflank-mailman (output) from mailman id 1135491.1472662; Thu, 02 Oct 2025 08:46:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1v4Ex4-0006Ho-Ur; Thu, 02 Oct 2025 08:46:14 +0000 Received: by outflank-mailman (input) for mailman id 1135491; Thu, 02 Oct 2025 08:46:14 +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 1v4Etn-00006C-A8 for xen-devel@lists.xenproject.org; Thu, 02 Oct 2025 08:42:51 +0000 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [2a00:1450:4864:20::430]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id c662c32b-9f6b-11f0-9809-7dc792cee155; Thu, 02 Oct 2025 10:42:48 +0200 (CEST) Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-3ee12a63af1so426829f8f.1 for ; Thu, 02 Oct 2025 01:42:48 -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-4255d8f4abcsm2621643f8f.53.2025.10.02.01.42.47 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 02 Oct 2025 01:42:47 -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: c662c32b-9f6b-11f0-9809-7dc792cee155 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759394568; x=1759999368; 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=qZW6KOJbHUgA0vcevzhPmMJNHgyRN0rHSvzpaRdIptI=; b=Nfr/gWxh+OuzODYudtQIe1nmIj7NtnpWw+CVLDXzJFNren1ySbyIb5MTcTqISnEhTs 1+9fjhVVFYgP0Gc6rtF6EoxfkrbaZySg/rFQ661eepNgj1ner4SC8cPeY8FPk9wXeNNJ XrjzLrgLoi/g4q+dxbuYxCOEG2UHmOcxtFE/kKn0SxDompgupQTXKN/mXPXTBvqMPTi3 Ktwh2Ee2RN3gs9Q+tI3YedtB0MrpUYCsMmKj+sggn5uZrW+nkpYNgLFbr6jABBfSGJRA z7vqnqXTm7n2yRfbnVUaa+Yl3jFffMuIkD1GiACoY4dbsdlur2ssLFW81Hg5U9VyVZlu sa8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759394568; x=1759999368; 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=qZW6KOJbHUgA0vcevzhPmMJNHgyRN0rHSvzpaRdIptI=; b=DfRJF33xzTOGn0sCzvrRqYDHFFJjaUgLxueBdXhvECZVEWlE0EVrKMVFL5s7lCDS91 HHH8l0t5UmR8/SHZbPrLI9WBH1j/ChRArnkxwZsXQemv1DhBoaq6i7EEYIMiRgwLQHzW gK8ls9baQ1Op2JGhcHbWn0HLvOp7ohkhpcuHYna2jyX7p913jQVTUbnYD1VgdmLCYFvC jL2wJBmW/2s946tveEriVSMnRlATnX1wY/PowZNB2tVI7d4goYQxtO8h6/mnIYyPZOTh jm6cJ/6Ed142q4+abBeQun3unEkko//TSp///O+ZhizR8AG2eQWW2127BfVb+RHpeFoJ ZbIA== X-Forwarded-Encrypted: i=1; AJvYcCVUO3ss1/zYBLsrZhN3kqP3N4yDU4Kj3wZNRchUUGZT/wY/s72vfJWjVlehZ8wxNqrwIE1i1gLiJ94=@lists.xenproject.org X-Gm-Message-State: AOJu0Yz5URFsQCScnk29HGWQlPLLsjIlFshUz5/P7ltJEn/3btWo1DAm 9/vKkFCZ2xO74pjZWRrikg/yofBXuRw0qtuyci/FPTNiWuCX8JgFJiwSAT8fJNGORLk= X-Gm-Gg: ASbGncuCgL3XueP9FOIM9Zd124By0Qjm3QrW35Ir3alrcJF9nkKafSEB0q7FpbFXCGR fMw7VhnFZNGfbEUbMnANhDsk+CQn3OpB9irNf+Lowzwa8fcwNwSZxonOeucMYROaft2ZBPPfBo+ jyq3T7/VobvkqK01V7zlCJjEBPPc1PQNx81kLYI6wbMmtpLAeel9ScEHf/zmn+n3Hj1f2/UyJjH 2FK28KyEmkhPioj2SxPKhDQoz64M3ewO7In/nH7UlE/wq7EqO5PiboVjPChVzIQXfPt5UYXdkRF FRGCTR1+ctP+YxnxfuJTJxg5D5+dwAOldWMzr6R0B/ZzJJEfMY5FeaEQpRu0QMRvXnCOqiIKUh1 TaZVZX2zTg0G7FbMotBT4DWnryeMRlVPbZcBx8/rQf0dMfY8MDttlMyuhVCl2EeXVYCLpRCZFZO spyDb10JfjgnZ67KFhoawf5Uj/5gqi3w== X-Google-Smtp-Source: AGHT+IFq5U4u2A5oX9CLBB2lvkndRGUc5Ro2dPOckjD4hsAueX9T9m8XX4dTf+0cKHrb84/7PaVvaw== X-Received: by 2002:a05:6000:420a:b0:3e5:5822:ec9d with SMTP id ffacd0b85a97d-425578154f6mr3598474f8f.41.1759394568264; Thu, 02 Oct 2025 01:42:48 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-s390x@nongnu.org, kvm@vger.kernel.org, xen-devel@lists.xenproject.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Sunil Muthuswamy Subject: [PATCH v4 09/17] target/i386/whpx: Replace legacy cpu_physical_memory_rw() call Date: Thu, 2 Oct 2025 10:41:54 +0200 Message-ID: <20251002084203.63899-10-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251002084203.63899-1-philmd@linaro.org> References: <20251002084203.63899-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: 1759394790311116600 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 Reviewed-by: Richard Henderson --- 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:05:33 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=1759394792; cv=none; d=zohomail.com; s=zohoarc; b=EA1uHyuHL3bl4rmb3feUB4aWkdHCBM8sxoA/iQi3KRLkfk3dIUj0Mw0RO49Q7jwiP54ju16xsuZ6830gYPYoQ6HEGWfTw68hBLdvzveeEgMjaLT0Dv8zg5ogV0pkF58kcRGrmJ7+2iFCDWEfdaN4t5an5vK7fBsn1BkwKgQq6HY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759394792; 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=I2a+b3m6nNjsik0uExia3oDVD3UfHkSBuHgsktxpBbI=; b=LwnUzVcOXOnGdI4BwCU5UB9LlJ/WJ22P1Ghdw59J0i5OQ5mAaZdV6BDigxyUiqnnWtG/SexGurh8LWWOEcyHJxBdYNxQEYXL+FnuqTk6MAVj7T0g9JP3wJO9oL/5ZL35wFlLV/3Q2OhuYbQgz8wEZ9memiUprP+mmdf4pYFJ43U= 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 17593947927028.713254510952424; Thu, 2 Oct 2025 01:46:32 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1135482.1472658 (Exim 4.92) (envelope-from ) id 1v4Ex4-0006Cn-Jw; Thu, 02 Oct 2025 08:46:14 +0000 Received: by outflank-mailman (output) from mailman id 1135482.1472658; Thu, 02 Oct 2025 08:46:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1v4Ex4-0006Bx-Cb; Thu, 02 Oct 2025 08:46:14 +0000 Received: by outflank-mailman (input) for mailman id 1135482; Thu, 02 Oct 2025 08:46:12 +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 1v4Etr-00006C-Jy for xen-devel@lists.xenproject.org; Thu, 02 Oct 2025 08:42:55 +0000 Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [2a00:1450:4864:20::436]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id c9522fc4-9f6b-11f0-9809-7dc792cee155; Thu, 02 Oct 2025 10:42:53 +0200 (CEST) Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-3f0ae439b56so420629f8f.3 for ; Thu, 02 Oct 2025 01:42: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-4255d8f4ccesm2549112f8f.59.2025.10.02.01.42.52 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 02 Oct 2025 01:42:52 -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: c9522fc4-9f6b-11f0-9809-7dc792cee155 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759394573; x=1759999373; 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=I2a+b3m6nNjsik0uExia3oDVD3UfHkSBuHgsktxpBbI=; b=xDibLJZyekyTWOWocExJygtlGqR56x29PmYu4aaPkDstiv1NmLeh/Sf8Xbw83HuAZN evyJXBvZ8SE2FN9t3wkV4yJZpRFsstzVCD3TtvVt6F/IviE2zrhJ8gDjDssvJitKh0gJ 28F/d84tJ82WcNxQ/fpy2DJi3gONz5vJBSMBumLnHjeQC/SEORYSrEqgirmDe5Ghqx4Q XF3hLsQEKlHPglGbR1zZX7VpMb3u9mlCBrn5hh5/iNrnAu6W4gkxDUchkqizHmoepT+k l+btBznonJ7TVQLc0zTsxE6B23Rp+MgwaquDf8TbtyqE/2uqYkYxuIr9Qduhol6j5lJN MIHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759394573; x=1759999373; 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=I2a+b3m6nNjsik0uExia3oDVD3UfHkSBuHgsktxpBbI=; b=csEn6QOGyGeLuxyKuFioxDBdJkmrKfqWSZo9DlAdCoN1maw7rl/CEASylsqJqHuf+N JVe6/0cGEXp4M2/X+p6fsgiD8IiBOSpNQTl/Xp/NNnp60KdbS4f3Nkpi13+4pLBrrscM kH/N+Zn/XaPQRp+5Ni2EpYM/4dSUU+XElY03XpgdBgInjRoC081l88RWO18nBEgtnGbU gXN6ElTfGDdS1NAwYy7IMuUozhXI549OhT6ZdA4GCunRIsi6lOCfzpSCymYBtiA3c4EF +jLR0gQ/tvKtDWK3RSUse/4ru0sHljSACL+vTm8/rug5ffM+uPegM3rwrL0YAN/DnUcz Sw3g== X-Forwarded-Encrypted: i=1; AJvYcCXSmRdw2h5hN7qWH7rxsqgCgz38xmUYomvDC07Cyq+LvWLDvjGN522FIH0L8DrNjOWY28faihkpbqE=@lists.xenproject.org X-Gm-Message-State: AOJu0Yy9M6HcU0cV5sy/KovJ7alP+WxasFfZgxTPlNwP33/1WQfF1ood mcsuXnWxgvIWx48aU62EAOrjynyfiiSOVp8+jPv8oZrzjR+kaZAgX3+hV+EKwAgNa2g= X-Gm-Gg: ASbGncvWS3JtdH8EjjBO3vpZWoOFkGgELV3IDLyopiE59GaFWagcAwZP4daC+VfjfSF ILeE4ydTWNZoeAyOdGWrrO70oerdOpjzpaNfTK8N+MRI/0Q0oWSXjpE1LIpWHZzGp1p0kZHinYw zj3wfpLHRsYXzXCNWO2lYYbku/E3m6Njip972O1nrmYnZqrSW4Cy4amBWA6GT5XEWswzJlfW+fl 1Lm2EA4kx6kq5zYKJ3C+Bih9sOTa6b8W2mieSzDv2q6Q3TkXu2WZy9BJCWOzBR8MUcsueYhKRIu 7imtiL37F1rNQhyutq9fzRIwvCr45ePcz7i/v9zQFMrCT3jlTsJIAuRXqewUaA4Vixg8O8Tr3jm MDGJ1oG1uckECXC0tGExIajUib4jCxMTFc/TqjclzyC5teRB/B4wja8WI22OUuqD0dMUbZhs7Ec +S+d0OKPm/1S4yvLA5DKbk/MMJdOeRUg== X-Google-Smtp-Source: AGHT+IESawsv8TF9fv7ok0vuTUFPZED2UOH0cc0J9xvSMsVxP3h1RuI1snQ8dRbG23dqFBECTN2WSg== X-Received: by 2002:a05:6000:288a:b0:3fb:ddb3:f121 with SMTP id ffacd0b85a97d-425578191afmr4750845f8f.45.1759394573033; Thu, 02 Oct 2025 01:42:53 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-s390x@nongnu.org, kvm@vger.kernel.org, xen-devel@lists.xenproject.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , David Woodhouse , Paul Durrant , Paolo Bonzini , Marcelo Tosatti Subject: [PATCH v4 10/17] target/i386/kvm: Replace legacy cpu_physical_memory_rw() call Date: Thu, 2 Oct 2025 10:41:55 +0200 Message-ID: <20251002084203.63899-11-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251002084203.63899-1-philmd@linaro.org> References: <20251002084203.63899-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: 1759394794381116600 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 Reviewed-by: Richard Henderson --- 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:05:33 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=1759394786; cv=none; d=zohomail.com; s=zohoarc; b=XyAS6CoIC6JxZ8T/aSDQOkmfW543v/AKAZ0P0aLZ/i5IlmTGmJmcNjcd2EBlHJniyvIDfRC24FRlkTCmFcsh+9N6wscJwGIskiynA4hHzcxtk5E06EJS5qKdg1+qI+s3lzYbxrMaxhDDf+uKIRX689ESaCopi8S/SinmuvcF0ms= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759394786; 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=W71XKN8BDb9kJ6RH2tt1PLzXlP9jppatkbhtyR1OYg0=; b=ST3XT0SKNTnCw+1KUAXMc3sYVeHx48iWaY7ekt/ZOu1cNp9pBBnTERmcwxaSnCKlyBUKNy+nyZjvoiMLITs8OIAFPxqhvK+wfnMrBEBTMvmToGb9q1UY6hE/Q3T3wS7aFyGOVsTbzwOb7NCChN1w8MFSlD4GbesnAcpWhhonGQM= 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 1759394786149741.3917561693697; Thu, 2 Oct 2025 01:46:26 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1135467.1472607 (Exim 4.92) (envelope-from ) id 1v4Ewx-0004Uo-Tm; Thu, 02 Oct 2025 08:46:07 +0000 Received: by outflank-mailman (output) from mailman id 1135467.1472607; Thu, 02 Oct 2025 08:46:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1v4Ewx-0004RX-HH; Thu, 02 Oct 2025 08:46:07 +0000 Received: by outflank-mailman (input) for mailman id 1135467; Thu, 02 Oct 2025 08:46:06 +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 1v4Etv-000821-7b for xen-devel@lists.xenproject.org; Thu, 02 Oct 2025 08:42:59 +0000 Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [2a00:1450:4864:20::336]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id cc19fdd3-9f6b-11f0-9d14-b5c5bf9af7f9; Thu, 02 Oct 2025 10:42:58 +0200 (CEST) Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-46e37d6c21eso4996385e9.0 for ; Thu, 02 Oct 2025 01:42:58 -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-46e61a029a0sm71252835e9.13.2025.10.02.01.42.57 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 02 Oct 2025 01:42:57 -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: cc19fdd3-9f6b-11f0-9d14-b5c5bf9af7f9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759394578; x=1759999378; 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=W71XKN8BDb9kJ6RH2tt1PLzXlP9jppatkbhtyR1OYg0=; b=mEEwC0Ytg3RNjH8coCMIR2KbDTCy+Q/SbrY/VwbVNg+hiB/FgAsM6UhCa7gCu0kpqf O3rPz/DG/5N4/gtdG0IuQr7O8jjrr4b9vsdVjYVuOUYpHnaeLnZwrhD5FcmogPuVHRgT I5duiYkSKfEUb+rGEtELNypYw/WM6gBRFYhjOzkq1Pmt7/TiM7AwyR3SzCyQZucveltv PYnyh2OegafQMB5YYmB0O5r2P+B2I8VrwDMkzvBlCsIekTn6C2ejcHGOr4yyCShjGt16 Zt6gnRyii6XFcUSkiWu+bbbTSxSqltnC9HBDt90xIlVN0YyvVw5fRuzRRW0+QdyVrAtL lICg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759394578; x=1759999378; 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=W71XKN8BDb9kJ6RH2tt1PLzXlP9jppatkbhtyR1OYg0=; b=iMuwJqw+8ExbGqQC+rS377521MtvSmx1QBLjDrKPUPeEK5GxCiyC3/0oBaynOkDnfx NZJZsjAiHiNcty0X4CvZ0QQMMpOIzHLkCOgaxr8lQdZneRdS0qo2YTk0KUv33bGDA2Tr qqk7MQBd2HjpTFukP729raLAnJJDTV9LzuU351gp10ZxssI0itt7U1DYEU08tggrGQH5 7xgw8YzIeUqLFsGFuMKGVydajTsnLkb8BUAHJVq1B8bAwn2uBLPU4bjm6kil5YHB+9/z fk1kgEn7PaCnAENzZL7pdg7zfzEkc78Xffk3VZKD++8cNh7fTy1wQ5CRpDFYT0BMH2Fj TbLw== X-Forwarded-Encrypted: i=1; AJvYcCWRpo45MCBWU/nH2mGH2U86WXuAErrFmQlh3U0keWwjsVy7y9i67ew6xm/Cty8uWv9E3XmBBKlO88o=@lists.xenproject.org X-Gm-Message-State: AOJu0YyvsdoTmO99ekC2HP4uAPF0aw1QqFDIZMZ/RLLwDpzzyA2Bgi1M iaL/HUqioy5m4d66cgLecwXLxXImcJNqi/FiQGRWJoH+qQiIJwWZcjsDH7Ni4rQLHTs= X-Gm-Gg: ASbGncsLnmN329QHuK9Q8asFEJdgo6tDJ0jySjZ1UO2rPLJGmmGqqt9xWniigRq2tVv DLak5d2tnUaOl0jUumL8BXVLQCOmUNZPMz2VQCeEuGoyO/eqCu+i0TPSxosR1zop2h8ltyWklEw AAqIhVBPJefL7u8LKsR3rAuF1Uxnr1330PPjkkoeAj2c+a0/jYjriTPVjZaCji+wBbzfwTz7cs8 JjkgOeUpteCCl078STrf2UxQG4TjfA4hupWRKoUM76o3+NugLHeIrQCWWnHsqHjjEVdtPvUQamc vDjt5w6IA1ut2MDDVKmJkWvU9DE+vu7rSb9ykLIklynWGxniRfIb07B6Y1e0mHBcocS1DbMjw5n NBOqDDCVZg5RKTCHU0Btj7dCnjbuK/hXN1W5SFg3BhzgFQkaSkqTVmu5BXtT1pJcUQotdJJDQ7K fAi7LxJJQNYjTmR+UVngsd7L3ZTF32FQ== X-Google-Smtp-Source: AGHT+IF+vQnTZyjnghBewujCyKQZ3vteqHFK+eM/Ja5h6DC+kmKBchs84xyaNt6pAje4wwu2ECUb3w== X-Received: by 2002:a05:600c:37c4:b0:46e:3d41:5fed with SMTP id 5b1f17b1804b1-46e6127cf3cmr49323625e9.11.1759394577925; Thu, 02 Oct 2025 01:42:57 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-s390x@nongnu.org, kvm@vger.kernel.org, xen-devel@lists.xenproject.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Reinoud Zandijk Subject: [PATCH v4 11/17] target/i386/nvmm: Inline cpu_physical_memory_rw() in nvmm_mem_callback Date: Thu, 2 Oct 2025 10:41:56 +0200 Message-ID: <20251002084203.63899-12-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251002084203.63899-1-philmd@linaro.org> References: <20251002084203.63899-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: 1759394788255116600 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- 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:05:33 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=1759394772; cv=none; d=zohomail.com; s=zohoarc; b=QW4fHmOyFQAbPl4IoiMPYWGkgmAG+/HOviGkUH4xu+1z0o8zLkQRov0wwGUkbGXi8gofeRJZYgc0c5/TjI75E8mpuq+z8VXMbSLBZfjRAILibJl1pmJ7BuxOLfwDZjGKzRumQe7elyTM3n8cunr1nZBmoakT+dcWeJojJFenkmg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759394772; 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=P5PC+1TlVBTyXto+jnsJwdDvPaPiKj+lxKbw9om1DB0=; b=J5UjfDBGjpwSS461f5W/z+exVFhHjLt3ALLjrc6/jdY6eVRokh7Wo5nWPf97G0G6w2f0lkFeXThYA3MkUUXgO31qE/Tdxf/6MzqAlGkcH2ffJgE0H78wg/PSYV4KTxjoRPc4DGYOz2Jf+GouY3c3Al2Iok/gSJhqOXyx7D7NkQk= 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 175939477232158.41506005258577; Thu, 2 Oct 2025 01:46:12 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v4EuP-00073q-UW; Thu, 02 Oct 2025 04:43: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 1v4EuL-0006zq-10 for qemu-devel@nongnu.org; Thu, 02 Oct 2025 04:43:25 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v4Eu6-0000xJ-OJ for qemu-devel@nongnu.org; Thu, 02 Oct 2025 04:43:24 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-46e2e6a708fso4533685e9.0 for ; Thu, 02 Oct 2025 01:43:06 -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-46e6917a867sm24739885e9.5.2025.10.02.01.43.01 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 02 Oct 2025 01:43:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759394583; x=1759999383; 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=P5PC+1TlVBTyXto+jnsJwdDvPaPiKj+lxKbw9om1DB0=; b=ikxfc83AXsiQ2LGEkbWgWu7L7Lcps85g4z5kijxpW4PNywrPwGHCwQ2AVPOv8RDSmT YRaXGgZPp/1WOhzQsvEPn9CZV0Nmw5nCQebVf41tbBj6/q7SskhKJkMiRSjhx3My0pJ/ yVXlnKj438PGTt+VDNh5wQoOwBn3KLkX85Ct2lkQ513vqUF1H/nqhdn2fB45kIdV23vs Br0rB+ybifP8F0QZipqlrTmt4DNQX1i6sWoid2CiLxKMQaml+KGz5J2y+hqkDCW0dbCz XO5bf5Q9UF6NkbWCjdWUp/+uS2lqkBiywyQc3eBplcF7tsY5R4SNwVTxO10ZC9/4rFLI H5Vg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759394583; x=1759999383; 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=P5PC+1TlVBTyXto+jnsJwdDvPaPiKj+lxKbw9om1DB0=; b=duQr27nf1gQSTNAf9ebh7ciKyk0cB0mZEipOodKaVBQYcRcS69AjqHwi8ZEBl4tnNx qik2uNfZYMvW6c9WnctfJW7qv6uqdiye7zphdY2BgCAn4WF5D6tbCuoTPqdse4VTFyI1 gur1q4fn0Wq3ZuD8Uv6X0WcnNiuXRmgPPoEnUu+b9RiBzh49YD+RSZi7WDMa65Ai2YhH 9+LS9MPFAzDt0t+XlDuhVb/QDZaRpLP3FEXgR8qsIblP7VVN+xpVLRmjsUQ19vntxrcw IejDnqhoxgTKdMk2aK5nnOdJvuy7zxPzKeGYTpAmUj/X1ejtk9qDamOGmaCMXhqwG4Iz J0LQ== X-Gm-Message-State: AOJu0YxKso3Rinp7sC+W2WKYUq6tulq4j9qIMFeB5fATK8nBygv/XfNi xYhZqKCcbM06eJ0ux+LQEeN3jRWlrhuThCu+T3/5u7qC01y95ZIR74yiDGqbf+k4exCorLIqBcy TvGqrFGJ3Ow== X-Gm-Gg: ASbGncsvsn6wwJ9j/niOIf4+AnPRGYlK4Htibkan0ymy1+hZRp2+HCZP6/WNdh2EY2w yecAit8n+WismgVyC3PXd5z7edJeIVudVYeljlH4shmWhTnvHFAvWeh67OkoGfC7k1A7FHG0ucF AmrA8mycVC99BuwOfTmmC4TpID3cQsfL+v6SrFXKcuIqF5K7qfoJEiPUGxjrUioEDxwYw44jPiB k1Z4NHySVwazrwCny9jmgR4MTMoZo16a8P2oRjp1B43/+DBXyhLUc1mLSNhlFqvZR50Q3y/eMl8 OuePeyJgTEJhX2addsyedAMFw5Ikvjn/VCeikSDB7jF8fVvcpB0wQooqfdb1ZncV2Agan06IJcS Om/UqvwrTkp3qoT2JXM0dRcvSIHWoQMPZv+HjSQ8Mm5mbZSm/EdT/yJBe/Q1CjpV3/qKnle0yNg t1FG1hb8qGsJcOmH1wqhejzEWG6QRcxw== X-Google-Smtp-Source: AGHT+IG8Ma/4I60woYQn+sfaatxOnQXHwssxQgt8liAn1/sRa9HXbIzN6+J2l9ZCi0NeEjgUws6OFQ== X-Received: by 2002:a05:600c:8119:b0:46e:4883:27d with SMTP id 5b1f17b1804b1-46e6128617amr48211715e9.30.1759394582729; Thu, 02 Oct 2025 01:43:02 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-s390x@nongnu.org, kvm@vger.kernel.org, xen-devel@lists.xenproject.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Stefano Stabellini , Anthony PERARD , Paul Durrant , "Edgar E. Iglesias" Subject: [PATCH v4 12/17] hw/xen/hvm: Inline cpu_physical_memory_rw() in rw_phys_req_item() Date: Thu, 2 Oct 2025 10:41:57 +0200 Message-ID: <20251002084203.63899-13-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251002084203.63899-1-philmd@linaro.org> References: <20251002084203.63899-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::32c; envelope-from=philmd@linaro.org; helo=mail-wm1-x32c.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: 1759394774325116600 cpu_physical_memory_rw() is legacy, replace by address_space_rw(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- 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:05:33 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=1759394737; cv=none; d=zohomail.com; s=zohoarc; b=kIybYS1Z+5kw4oFP2uA+nQIivIkxYo5UCAOGtHC2pCqNQD26lLSmnfLAtFmshCJs7CnW6UvhnX995AnN6eW8jExtZNt2d3b4syrlt6/LIv3wrj5bvShd+hz4DKKMQz1T/kbAvzuNy3Ol/DXEWiPtogbpXR235wq92GhjzyrPn0Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759394737; 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=VaFs+E7RwXKG3PK6PiXPvBWe0XSzQsXZvT65+7chMhk=; b=gqcvWw4LW6JaR9ivG9Svi9q3q7y9QJY/O6fkQ6EmJ4aZJkGpH+zvS63l0SkXZhV9GVHbGNASAlmxkeG6z98pCRqd1mTrudJlZS9Onko5WaMb/SeD3WLAP6yr0HuZ29Km2cJFjr/tjZA9kBucHfp5RQkXKpSDq5ysnQw3i0DqWqE= 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 1759394737401709.9915070273297; Thu, 2 Oct 2025 01:45:37 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v4Euh-0007IJ-Hj; Thu, 02 Oct 2025 04:43:47 -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 1v4Eub-0007FZ-ID for qemu-devel@nongnu.org; Thu, 02 Oct 2025 04:43:42 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v4EuG-0000y4-EG for qemu-devel@nongnu.org; Thu, 02 Oct 2025 04:43:41 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-46e6674caa5so3671865e9.0 for ; Thu, 02 Oct 2025 01:43:10 -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-46e693c2ea5sm24632555e9.16.2025.10.02.01.43.06 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 02 Oct 2025 01:43:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759394588; x=1759999388; 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=VaFs+E7RwXKG3PK6PiXPvBWe0XSzQsXZvT65+7chMhk=; b=Xjcg5oVzFs1nf8DzRVel52JeuN7Je7Kk9qOjBqw7Oa0T67f7kxBLT7wK7LW6wlzUB3 VMo9iJ7r8wlj5/sDtCtd3WsewMFPH8M4M1zofmqkTrJKfWVGNenxFBbotXREY8LPGoM/ Vc0UNF710mvVFqKVBHVc/SffZjGkVVx9BXMX0ytnMYNaoCNkjTWDQG4FMDxpTEdX5S3E ZN/peuYO7ulT0fvE9LQa/5FH/AiaIl72zMoxX5xepsV3AmZFlHL564LV7fBfiBjEO1og 9xmTCRc8oYJsMTUGSPnHdUwyBTsm7BzWlUfws8xCABbMDrzYwISOgVVZvAm16xd2X2lb +9ig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759394588; x=1759999388; 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=VaFs+E7RwXKG3PK6PiXPvBWe0XSzQsXZvT65+7chMhk=; b=Q/galttmR9yRRnNuPWhZWTcbd1jwM581x/2t/rVx7RwR+/zsMGV8EFZgNSUw8DLuAm QFJ2Mh/AcLFbxa6nMniBgs8IpROZZpUBpqqPIinrkv+Aw4fPr3eBmBAbQMTfvWzcvBP+ bx5NXNoDE8i16gz+qUDAtw+Ucecj5AMYpMjBVC9Y0mz8EFSQUhSUNrE3E8FOzmxDI12Q i5gFhyqTuN3CZHycs9rKiSugV3T4I5rMMal4+BCLNmcLK7fSFztU77/9/MjiHy0/hOn9 xEsElB9oE1E6bURtwCjHsUyeL/XE8lPP3kcsyJRVATBUtnf5J+wh9XZGuz3s6/kIqJvg BnnA== X-Gm-Message-State: AOJu0YwG4vrJdbSS/za68Dz3n4/115vPOWJna3fw9qPecJ9nqoWSUYdr DXBEEw/G/zV3fV+9f6bAnr8kR+OWTRm97yhG36Z+OAODpj5mTbAtNhk1F4lfR8PdFs/yoK9p5ut FIhz4wjFiuw== X-Gm-Gg: ASbGncu1GMoWmiyKBtNKDYsZemL9320pD1qELtqZba/QegaFbb25AAC/qSyShHXxO9n mCwEUvIn8KGZKnc0NJPB0dUClcTOnDRRtTIPNwIxbCDQYNMfI0dv7tU/gSHGnJNdeNUedV7thUH cWxAW0tnWyyIxEDs9NYAQ8TDlJ+8bPZDqopJlTNoLlKbJB3JSPf6CLeWSdpjMFyS2nXnLi6K10k rSbffJtrONbBO4T/mmHThuF7lQx0WE/iHkfwzXsPO84lru4iZ2T5hDmABaCke/AbvRpsAzgY3Av 38KY3Z8a16+Z4/1BKSa31vJ+KYmD584taft1Yrsz2/d++bw/zVwLxKlkcPvOzxi7LAk2UlCnCfI Z+EI36XO3bvoPjFVLVHeQILUfVvS+Fs1ci6W6dqZOwF/jXF6KsMClhJFgamGHNcO8r8o/Fq6zgK dE6mwhOXt40YFylA/IwUq6n+jJzkh0iw== X-Google-Smtp-Source: AGHT+IH3oBDcFkCrZW4zdMmmdzvura7CGJv+T+de06uu1CRKlNDCaUMsAj1fOdp2bPK62ElNJTRC7Q== X-Received: by 2002:a05:600c:408a:b0:46d:38c4:1ac9 with SMTP id 5b1f17b1804b1-46e68ba134bmr12450485e9.2.1759394587659; Thu, 02 Oct 2025 01:43:07 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-s390x@nongnu.org, kvm@vger.kernel.org, xen-devel@lists.xenproject.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Paolo Bonzini , Peter Xu , David Hildenbrand Subject: [PATCH v4 13/17] system/physmem: Un-inline cpu_physical_memory_read/write() Date: Thu, 2 Oct 2025 10:41:58 +0200 Message-ID: <20251002084203.63899-14-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251002084203.63899-1-philmd@linaro.org> References: <20251002084203.63899-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::334; envelope-from=philmd@linaro.org; helo=mail-wm1-x334.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: 1759394739728116601 In order to remove cpu_physical_memory_rw() in a pair of commits, and due to a cyclic dependency between "exec/cpu-common.h" and "system/memory.h", un-inline cpu_physical_memory_read() and cpu_physical_memory_write() as a prerequired step. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- 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 29ac80af887..d5d320c8070 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:05:33 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=1759394755; cv=none; d=zohomail.com; s=zohoarc; b=AU9uZt339FZBtWw/zawXnEgbNtCFmH6O+SNVTVPudyZyb0kWSXQT/MmPK3fIAa3CAdrt7RymwzGaqnz8YD0at7yjwTIzrRROONgyvzbIQPwxgsgkI8mPEmsXFqKPrOr7Qk7Obey09Gz8y/FoVcJ8pG+6HRsRtYyX1nXgezcodLc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759394755; 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=32KTyTEIv4S+xafyswExVd2MIXheWFL9qAvbf+ZRZFI=; b=F/4RmMISzhQwdGsbn+gh6v0H4IiT5ByAFnDGg/Exson9Xs35j8irJPqfjpLAwoNYSGrbj3jNHtL4isFkBfGK7cYmy5WU1htUQpxm+4DzQnJaIwMEKwSYgZHNj+juhtBx2RLhj4xlCw0PT/4B4G2EIIvw47ZukcMBte5Gk8ngDyk= 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 1759394755483503.8101828379488; Thu, 2 Oct 2025 01:45:55 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v4Eul-0007JX-Sx; Thu, 02 Oct 2025 04:43:51 -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 1v4Eud-0007G6-EE for qemu-devel@nongnu.org; Thu, 02 Oct 2025 04:43:43 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v4EuJ-0000yw-8Y for qemu-devel@nongnu.org; Thu, 02 Oct 2025 04:43:41 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-46e3ea0445fso3918025e9.1 for ; Thu, 02 Oct 2025 01:43: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 5b1f17b1804b1-46e61a0204fsm73877065e9.14.2025.10.02.01.43.11 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 02 Oct 2025 01:43:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759394592; x=1759999392; 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=32KTyTEIv4S+xafyswExVd2MIXheWFL9qAvbf+ZRZFI=; b=N4vLp1jgJQnysNWp4hvGNLttNpS/WSQET3UdlcXyy04EMyAUqMZ6jQwEeyolWQeKOW sWw/nBmC8XvVfvxTA74WPJn6YtZ6BU/BfffOsqFGOGHQXmHAbYz9GEgd1wBCbENtOwql k0C1RHQQmL5Iubsq5UU+Xm80+rjymxBoAEYeEuDGhxBMgDi0hjQeRTePm7yIb6uAxwrh ttxv57U5uuBr8nFm6jZzgvLaZKMDwlygs/dE20xI4G6jhkfk2fc+K4cQexukQI2T6LyP TFF9s4ZD68tDpAhFhmLhyOLtlp4XnUjqmP2tmbNFWo0h2aGTkPeXL2dbgiAqE8InhIEu lWmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759394592; x=1759999392; 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=32KTyTEIv4S+xafyswExVd2MIXheWFL9qAvbf+ZRZFI=; b=qfis2Nz2XJjQXmR+l9KGGPyLBFewU67eBZJExNbeV7UQFvcn3jUVUxCpZU5WUEBJXe Ef6LwTdHgJwfpeBCqOiIFmH35RHO51H/csyOXRSRCC9ve8o0IraSQBIWGxJcVzTRksD4 EyOe01uI9P82MGetcsRJDkuzBF7dRKDZ/FbY1VHOtYMUBKtZ2cw5JzG3mirASbMX/rIq 8+m68oOSyIgN/HlJFCCZTvLEGevYr9+c+bP4qGnsOyu2+8PkuqWhEdxoDNICSoFSjTIA Qr8tq6ZhUM0NKVENuD2FsKdCK1dUHTsc9sKW6SFYeq+MaOmIdjmuHZVXAX0/I2315wmT p0xg== X-Gm-Message-State: AOJu0Yzr8tjfFJumbSx9RX8jjwYxEYx53kQ7ys9V6jXgD7TZJzVlfhZR ENgcjd4jlBheU78jX8Q1Jo4yuTH1YexOXhr8vS3N8qDmLzrtyaag8Lqb7qExflXg+3fZ/Vbx5bn I7S3M91hbIw== X-Gm-Gg: ASbGncuOLCK482REdK2mDXkW3dZh0dT+ao+Iaye4IN3Wydnkn7divXqJdLfFui1aimj lEIofoDMl5maDhCS407tCxRgUZdnx5In4q+iLqtRt851pOZ8ap7f3HfvR0EoyRvOjkeD922VtT5 y4uK9ndWnhUUIHRGx4TfApjJAc40f2cG1tRxz69hKg4i+SuVqzA8me2Eek39jGskJKlnTOk2ZNQ RsXFqnlxB1A8a8IGRD62pMGRu1f3yD4WHvW2NeqoC0KhPbrUK127YwEuWarbE6/2C4cD7/IMzvj D/ZGZ7uwUrmn2/KEYlSMRtdab1rgaxOCRNw8pJ18PwakJVqFj9Nt0Z7RyecgkYaR1NIS19/w1NO Jiah6ty+H+EcdBhqRJDmUCBi4L9YCC4O4qJUC95wKX3g1yk2OfPEAGe670bwDsL21a/QhuuP/sj T0gcJ+2DNALErf/5Aa8tyIqg0ChVwnCA== X-Google-Smtp-Source: AGHT+IEZQOIEqlGUv6pO69td5pzAzxUa79bMkjYW9qkw21+3BvVHY7MhQ8EnUXVp5wD/RikWOGCbpQ== X-Received: by 2002:a05:600c:8b37:b0:46e:4329:a4d1 with SMTP id 5b1f17b1804b1-46e61202280mr56814795e9.4.1759394592450; Thu, 02 Oct 2025 01:43:12 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-s390x@nongnu.org, kvm@vger.kernel.org, xen-devel@lists.xenproject.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Paolo Bonzini , Peter Xu , David Hildenbrand Subject: [PATCH v4 14/17] system/physmem: Avoid cpu_physical_memory_rw when is_write is constant Date: Thu, 2 Oct 2025 10:41:59 +0200 Message-ID: <20251002084203.63899-15-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251002084203.63899-1-philmd@linaro.org> References: <20251002084203.63899-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::334; envelope-from=philmd@linaro.org; helo=mail-wm1-x334.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: 1759394757914116600 Following the mechanical changes of commit adeefe01671 ("Avoid cpu_physical_memory_rw() with a constant is_write argument"), replace: - cpu_physical_memory_rw(, is_write=3Dfalse) -> address_space_read() - cpu_physical_memory_rw(, is_write=3Dtrue) -> address_space_write() Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- scripts/coccinelle/exec_rw_const.cocci | 12 ------------ system/physmem.c | 6 ++++-- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/scripts/coccinelle/exec_rw_const.cocci b/scripts/coccinelle/ex= ec_rw_const.cocci index 1a202969519..35ab79e6d74 100644 --- a/scripts/coccinelle/exec_rw_const.cocci +++ b/scripts/coccinelle/exec_rw_const.cocci @@ -62,18 +62,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; diff --git a/system/physmem.c b/system/physmem.c index d5d320c8070..23932b63d77 100644 --- a/system/physmem.c +++ b/system/physmem.c @@ -3190,12 +3190,14 @@ void cpu_physical_memory_rw(hwaddr addr, void *buf, =20 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:05:33 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=1759394778; cv=none; d=zohomail.com; s=zohoarc; b=i3nLXvWPEs9FJ3zn/y/EtUGp7JCtpOhdC1o0HgCSkBYm7Zf1OW0yUfvo8d9V53g7zLEwkBIxtQx3VipH57I//OtDuBgAixSlwM84FdYWWd49wR0HPgojPUFFQ4K6yw9IOIgumvc71aiTAGMr2IMAZwZm2UcIIJI2UegoTH/JZ5U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759394778; 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=QAgjr5yIgrIO789GqXuRF0t/EGl13bmDgqvJGL/31ds=; b=TImsgnNR9pVSNVbQJ41dJ086paN/Lllfk3lp/0HJ5S6kxT6ojBqLGBd8X6z/yhSOl67NMw9n4ESJwEAjUcYmb0vp2UJuYDZhdrZSGNYflYz1aZKPCTz/5S56OrQziPVg8I/UFE5ginuVBFoIczN4BNsgLi4IPkoGDpgvpFyHsGA= 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 1759394778229842.8795319154844; Thu, 2 Oct 2025 01:46:18 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1135460.1472588 (Exim 4.92) (envelope-from ) id 1v4Eww-0004Ca-Gh; Thu, 02 Oct 2025 08:46:06 +0000 Received: by outflank-mailman (output) from mailman id 1135460.1472588; Thu, 02 Oct 2025 08:46: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 1v4Eww-0004CR-DV; Thu, 02 Oct 2025 08:46:06 +0000 Received: by outflank-mailman (input) for mailman id 1135460; Thu, 02 Oct 2025 08:46: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 1v4EuE-000821-AV for xen-devel@lists.xenproject.org; Thu, 02 Oct 2025 08:43:18 +0000 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [2a00:1450:4864:20::430]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id d7a6b1a1-9f6b-11f0-9d14-b5c5bf9af7f9; Thu, 02 Oct 2025 10:43:17 +0200 (CEST) Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-3f0ae439bc3so350974f8f.1 for ; Thu, 02 Oct 2025 01:43:17 -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-4255d8e9762sm2651528f8f.38.2025.10.02.01.43.16 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 02 Oct 2025 01:43:16 -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: d7a6b1a1-9f6b-11f0-9d14-b5c5bf9af7f9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759394597; x=1759999397; 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=QAgjr5yIgrIO789GqXuRF0t/EGl13bmDgqvJGL/31ds=; b=RDcXuWFqtpO/bPeOzKAIyye2IDhzqQx8Jnpfzp4OI5oGo3Kj5tjlMYLMdsX1qsFFze 1zhL/J535NeayNio03a6XMOH/7/nzIGvyaBzGcxraNlsmj5QwJ20wqRIzsFvwT/+TrNl 9DvtfqPHaZ73VuqS4TJMJnDtvy2J4PjLMxvgrwXHpL2NjFFmjX72PRIFYMSNR7FfJTZy kE2PD+G8aW9vF4pSSr92EopmOGLcdhZbXK1D0wilLhUPZmHQZmGex8Ovmn/dwLMvu1Ys Hd5aDB1KA7y8Ja5MyZFHM/YSqy5kPeVWBW0rXg4chommlZm7wMAudmOKoS+ceVA+JeTi VNVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759394597; x=1759999397; 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=QAgjr5yIgrIO789GqXuRF0t/EGl13bmDgqvJGL/31ds=; b=uOHAPe0yN8uQ2yK5b7nTuNPmuRyGhYJ0iAeB/4DVK25fPIyDeHw2QKSdBtEr66XTSJ OynasNO8c7kzuQuyAmcFBzqtR5ZHrhuHAPSBMWBYWU4c1oc0KGEHJuVXVegIuuLlPLG3 Ty1o1FOgSEUq+1XtQshq1FRkA3DI3YHtrlEKwQROMjUmQNaIGqclqKHjZRdI+CUfOc8K yf66/zx/c8yKuhSAFhpBh6zqjqs0TuC3k2ESMD1tQC8apHWKAB4Xbj+9b586rTUbnWLd DH0S0zLkQHd9dXWf3prBLC2zONI3QdEpZwemkF06gaBj8ixSYj5YRv+oQ09f2NcLf4aD LAlg== X-Forwarded-Encrypted: i=1; AJvYcCVOMgsl7SIlkeHiv/JIaT/iL8eq5meKj1OiJQMFQFLJ0xat/EpGntOON7uU/a352FhPX5UsLKdCcjE=@lists.xenproject.org X-Gm-Message-State: AOJu0YzUfDqdNYJcwSg37hVcKP0hjpT6/mkatl6mw6wZzF3YltH/bvKe RcIaE/L0WnzOTSON1E+nAVIp+LUFfb3TKOeHE3lu3bCRIcd1mU2Mwzowr8YEVpM8iA8= X-Gm-Gg: ASbGncuAUsDT0wfs5DqowqVVHNntizsd4uuDi710Yko1/MfxUKzpqRqooRMF/6YtAPO Lvled78SUSdI75YgdfFi1nTnYEV8IUALgDUHu1hCRe4dYe3SE8cK+BI7LS5w2d8ohrd6MW+OIEX yBBWveM5jdi3Oboek05iHnG0WtoAYVRemkuEJYsJTDPnAmimTGIy+wpPL03rNd4+hzGUk727ZOf IDp+v3Xad61o4ran8PxxLUITYupiPz870HgwrZsJzjCs9cT8Nns52BduOxggvXDtVRv0+dUbNv/ fn/O443evSSl/8m4oETgCy2emxbN/ioc+gDr1INg90GOftKjerW9NQAvTPaLc+Oe8bvKFVt44ow T9XfiGs//lvOag35rMg2Y72NgADCo4gctp6CsqUhogCF+qe3c3OYX81ISScU3DPpzie5rsewcEr p68dqP/kER+0gHrerb3pB1FTcQcmGTBg== X-Google-Smtp-Source: AGHT+IF85XkLg0BRzQXNPalgqzyMpny7LwvkrLwLebNjcVy2x5/oJ5wUtocULaWC8zMsTAEaZEeQKw== X-Received: by 2002:a05:6000:609:b0:3d7:2284:b20 with SMTP id ffacd0b85a97d-425577ecfe7mr4915156f8f.3.1759394597239; Thu, 02 Oct 2025 01:43:17 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-s390x@nongnu.org, kvm@vger.kernel.org, xen-devel@lists.xenproject.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Paolo Bonzini , Peter Xu , David Hildenbrand Subject: [PATCH v4 15/17] system/physmem: Remove legacy cpu_physical_memory_rw() Date: Thu, 2 Oct 2025 10:42:00 +0200 Message-ID: <20251002084203.63899-16-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251002084203.63899-1-philmd@linaro.org> References: <20251002084203.63899-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: 1759394780229116600 The legacy cpu_physical_memory_rw() method is no more used, remove it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- docs/devel/loads-stores.rst | 4 +--- scripts/coccinelle/exec_rw_const.cocci | 10 ---------- include/exec/cpu-common.h | 2 -- system/physmem.c | 7 ------- 4 files changed, 1 insertion(+), 22 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 35ab79e6d74..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) | @@ -81,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 23932b63d77..0ff7349fbbf 100644 --- a/system/physmem.c +++ b/system/physmem.c @@ -3181,13 +3181,6 @@ MemTxResult address_space_set(AddressSpace *as, hwad= dr 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) { address_space_read(&address_space_memory, addr, --=20 2.51.0 From nobody Sat Oct 4 22:05:33 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=1759394792; cv=none; d=zohomail.com; s=zohoarc; b=dey+WpdDibcCoy4Yqk6TOUgK1fAS5CQKzbtbOxu0HRK5xCXryNgpuo5rX09zXEQsuq3OzcdfezamtnXdJB+68Sn/+LJQSK5aEtVybGENwERCE/Zra4xkekXnLcAuyKHhlEMIxDADzExWtepEBvz9DSTf45cgi50PUTxzVR3RlJs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759394792; 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=h9bjNs8nbmPHtqp1O3nLNnIUYP6MFEbM89LgRhzC8Oo=; b=VMGpge+adsqREQmHORtsM3UyYgRM870AoIN8KSdMTgH+zphhSzgxQdPH/hgWtlznh6WNnCmNSEAgZ3msMoxJzIUctWTAHHp9asptiEPQHlksx/akPzWk+vL9LpmVUhI/9gIfqbtlTCgYpb7jfKnR/GapKpSj+qCszxOM3jKlZGc= 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 1759394792810540.6392312727149; Thu, 2 Oct 2025 01:46:32 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1135476.1472634 (Exim 4.92) (envelope-from ) id 1v4Ex1-0005Ka-1I; Thu, 02 Oct 2025 08:46:11 +0000 Received: by outflank-mailman (output) from mailman id 1135476.1472634; Thu, 02 Oct 2025 08:46: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 1v4Ex0-0005J3-LD; Thu, 02 Oct 2025 08:46:10 +0000 Received: by outflank-mailman (input) for mailman id 1135476; Thu, 02 Oct 2025 08:46:09 +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 1v4EuJ-000821-6p for xen-devel@lists.xenproject.org; Thu, 02 Oct 2025 08:43:23 +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 da9abe38-9f6b-11f0-9d14-b5c5bf9af7f9; Thu, 02 Oct 2025 10:43:22 +0200 (CEST) Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-3ee12a63af1so427231f8f.1 for ; Thu, 02 Oct 2025 01:43:22 -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-46e5c3eca22sm54562995e9.4.2025.10.02.01.43.21 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 02 Oct 2025 01:43:21 -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: da9abe38-9f6b-11f0-9d14-b5c5bf9af7f9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759394602; x=1759999402; 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=h9bjNs8nbmPHtqp1O3nLNnIUYP6MFEbM89LgRhzC8Oo=; b=ILJSkoAsGlVVd3mE8qpsb4hz0g4nNw+IgrD4AqC3+KbcJawhFMx2C5SkAdOHwYGx9w YfWZuenPxPQ38WS90gODtjh+rybtDKuhNg2cTjQ3GG/SUHgB5u1PDSmiVlNWIB7URuIk ZXdIvAD1hR78Ij7g3hrUBizJ8hbLHja1ASxF8SznI4PnS8qF9rZDq2vyCBoejgQvwq2S HG0PQBROJHPd0JgaJw2az5xeYx2bBy4X3MRRDSMRhXiekdWBGQaJFKSyC8JRywZDuh34 BmKWVz/YPqlvyslzVIuiNhqtMQw2nytWSiOzmFxLuvyOJZXnJ14f5b4lMJfYctA1RJPh tk9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759394602; x=1759999402; 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=h9bjNs8nbmPHtqp1O3nLNnIUYP6MFEbM89LgRhzC8Oo=; b=aYzkHgSr8QnpKygbjJQqn6fi8QwlB2HP5Soscxy00vjuXvjtvjwdU0R6sYDi4DS7V8 0EanXkRV1v5mTR+y5Ph5W1O/9KdHQ15BdPNvgt0W6IWvSLjjYWbQ3d9+/h3TbCpbwBhg hZ6bLMN+WBm5hzi6o4rBP4+2SCsNCQBzy0ZEkarlPu8efro1ky/RvRoKB/HkvsJbdWkv AJLEHQBIJV7OEUodyviFVSIUqX7LOhS2VjtUtOhkNmEDTsJ9+fzvCejHVm77Bm0c+w+B 8dm3DdoC/xutqjdOAKcUt4iwwZ2IZC9Eb5xwxO5asdoZc9ukluC7tBjh8XDMfxgIpt4v XGEA== X-Forwarded-Encrypted: i=1; AJvYcCUmUBm3ySChWojsQWFg2+TFlCAcFuZ3M7ZIAjQLBIZifTSDLcw+6FPoIIzoSwDaTWpevDGHebuy1VE=@lists.xenproject.org X-Gm-Message-State: AOJu0YzSicjuhyPG05JhDZVLqhh0nPoMIQrtAHu3C7fNPZmdcezst88D X9DWfVeLuxoP+0jOBnMrOUrSHaZsgsHQV/jmVUf8bDp1BevhYCQ6SFPjtdC8mR62bHLjMwLOq8D abnt4isq0Qg== X-Gm-Gg: ASbGncuvhjIpeYHu8FYvPsCAmjhHUYoFmHfpWMNmC4wkitRNO/Vuk5x5mIqTuQ+tO+h VA9IYsUEszVjqkIICWvuDTyKaigit2HEAToU0yNlGi2nWBtNw5PAjRHPnerPb1tc7DV/m9LEwE/ uXyJTGsNGei7eU8+TApGaOm3MCunVQc9s7RMqQSemxojOqt1ivQqctbXFHB8D0pXpaAlvz8ZY0S SG7q6TiA1+WdaKDIgxYTepvZoKYVJipXDrIJRckbnDiTp4bqRqvKh2KoU9UFRl5yuV8LadFgYvz JgQxWbYc/NblGLplOygRg6C26s34W2ALoJ5WJEsVHGCZXgxZQiJyStqbHIzCk0dXY9rzE8jp2xT 9G9qCFk+bhaEOTzjgHwsCvuWPUdktayP5mkYWoUR6P1ur5IRWpllUvz1tPdrRC22afrqR3DxjVB 2YbUTbgxpW+064xURAEN7bIUIYNEjbBw== X-Google-Smtp-Source: AGHT+IGyb5rK3wU2eYffbepInpQ5nRpyDFkLvUQpXIwaKbJPhsQ9zk9+/o3WwrGqdXtMXrkY9srT5g== X-Received: by 2002:a05:6000:40cc:b0:3fd:eb15:77a with SMTP id ffacd0b85a97d-425577ee891mr3832972f8f.6.1759394602152; Thu, 02 Oct 2025 01:43:22 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-s390x@nongnu.org, kvm@vger.kernel.org, xen-devel@lists.xenproject.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , "Michael S. Tsirkin" , Stefano Garzarella Subject: [PATCH v4 16/17] hw/virtio/vhost: Replace legacy cpu_physical_memory_*map() calls Date: Thu, 2 Oct 2025 10:42:01 +0200 Message-ID: <20251002084203.63899-17-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251002084203.63899-1-philmd@linaro.org> References: <20251002084203.63899-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: 1759394794393116600 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 Reviewed-by: Richard Henderson --- hw/virtio/vhost.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index 6557c58d12a..efa24aee609 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(dev->vdev->dma_as, addr, plen, is_write, + MEMTXATTRS_UNSPECIFIED); } else { return (void *)(uintptr_t)addr; } @@ -466,7 +468,8 @@ 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(dev->vdev->dma_as, buffer, len, is_write, + access_len); } } =20 --=20 2.51.0 From nobody Sat Oct 4 22:05:33 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=1759394788; cv=none; d=zohomail.com; s=zohoarc; b=Gf1b2Wm6R/ayGE+PX1FwPgqeneNOu0++FiftZb4ZXRLA59uEbi1qNYmZ2aKwB8HM7cqJbtk9NJ8TDr9LHyTfXP0ih1u9pei6NSA5jDaAjRQJ6eNE5HdOW+5omNmGJVW5shTHG5YIG5oetvj6vrWynuNMvcleEXSTNO4ZThIIyEA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759394788; 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=sizE8fixTdjMLNdHvH96mSdoNGp/FmemDWUp22VSw54=; b=goq/sG1Xp5OjlhIofwzL22/ne7Un3bwQsiwqyPOrfRHDBjw8obg/Oh9nnxZz4NLiw5YGNUwE25HIZqfclSx/fEM3TApC3JwboRmvSm5q+q5GFHJ2hzuKwR6ws1UrJhpA10RF+/fYDOulkNLyWLbqBVaQzHOOUp5RNSEY8H6kzgg= 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 1759394788217414.6350961180383; Thu, 2 Oct 2025 01:46:28 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1135481.1472645 (Exim 4.92) (envelope-from ) id 1v4Ex2-0005hg-4K; Thu, 02 Oct 2025 08:46:12 +0000 Received: by outflank-mailman (output) from mailman id 1135481.1472645; Thu, 02 Oct 2025 08:46:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1v4Ex1-0005fu-VZ; Thu, 02 Oct 2025 08:46:11 +0000 Received: by outflank-mailman (input) for mailman id 1135481; Thu, 02 Oct 2025 08:46:11 +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 1v4EuP-00006C-2E for xen-devel@lists.xenproject.org; Thu, 02 Oct 2025 08:43:29 +0000 Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [2a00:1450:4864:20::335]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id dd69c319-9f6b-11f0-9809-7dc792cee155; Thu, 02 Oct 2025 10:43:27 +0200 (CEST) Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-46e384dfde0so7881915e9.2 for ; Thu, 02 Oct 2025 01:43:27 -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-46e693bd655sm26669815e9.14.2025.10.02.01.43.26 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 02 Oct 2025 01:43:26 -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: dd69c319-9f6b-11f0-9809-7dc792cee155 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759394607; x=1759999407; 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=sizE8fixTdjMLNdHvH96mSdoNGp/FmemDWUp22VSw54=; b=iECfgEh3AzeBxuudwgLQs2r6Vhy7zA+ROH/bBhO3XwBL0/AxJL10l8d/P3ndi72ZHS h5PHF30B+Teeu5KFgNxj3NaiXOkTsmC8o+QoL3Y6Rm61djyBGe/XxUYiGKs3ZNU0vblK osksOpCb8D+BZbbXrDExtsMcTJbyBkKOk5jXdbNzx8ckLIzSMoU7YfPJ2pNhdOm9J31P nGvzOYLQxqJ7YsL4RQoj1kqCJ6wkq9nskLw6oJQzcyTdiP+RtSmyUGjnckKqtD8v9IEy WCCAnTNJSYi24sDO6efNWuZDXNb55jgWCy3tuaiJ/26Qak0okXSLdQDcIxzSFGmVpRdr yKTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759394607; x=1759999407; 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=sizE8fixTdjMLNdHvH96mSdoNGp/FmemDWUp22VSw54=; b=gFCvg2SjmeFPMfrL/TmquxyGKT2qNU7M1y5sAahmgGitX4yOjfkiRHoSenQo50vsWy EYoeYd/oPMnqgK7HhcUiE7cFyBVZc9xAv+1fDrNDVYTqDun58sZBEMSkDmDwbPuwVD6q U26sOasgKmJWMAGLoZKfLRP5mRT/9AOlLmRSYw6SjD0f4QoHzvcJsdY0FT8p//e2sRu2 WSCmvMNW1ZqXY+qyukGPmsCbyz9adZGlmhycIl0IqnHk81f2uRB+/grnJXPIj7K3BoJ5 rDTvhMojagSu/Pfoa/xOK/WGa+LqGWtjwmLywGE5pV1++U8kno6Bfxnr/lgPa2K+hmq7 4qRA== X-Forwarded-Encrypted: i=1; AJvYcCXBWO+2azKuOJ8XVQ6hfgv7UGrY5XR5rYnd3gprsuFeYyAnpMrFIpLNj59b8c9rU8ZOXxhlW/OVwoE=@lists.xenproject.org X-Gm-Message-State: AOJu0Yw/Nmhc+rwQuLb5W2kWH/oPXP3qdVwnZq2pAjN2iBqpPBoEMFHm DnX6SBTbJd4ue9K9abkidFxqo6kbgwQww3s7luYVr67jwiQA8jIpLevvjmfCFixDpy4= X-Gm-Gg: ASbGnctH225ANBZ2KoNIabrdHEs7B5JD0Rgw5Tg3jIOyn9sbkTH5dJnjm6Zr7RWgmZE nDo3R40ipo6uFG5bS27CvNhbgUSAzZAs9Oy/CEWTpaprA6RtOVsnqX8Tf/LKHbX6LlfmWUjP+gg u6Gz2opnt6HrrnsWt2hThxWu6p3VlJR/UR2AsKFwp6pcqc4Mz0ZGIc0uO8E0h7qBlVN8f84554S sAtFRMdHOdW+L0Iqdo8U9sH1bBawyGZzgMtzhpTAJNZ1czvTm9sYp+E/trkME6hibgJc7UP6TkZ JARNHhVc7NiTXJzMkjk8hHs5ylfSQKs/ZTyekNwXcWGsJp5lZjolNCcvJplSShSxL+RzD7pAgiu ybtDeF3rlLFcb6BhEpnXdG1F0atORHcsrcETSXZcAINT63tRJgc6a7Fat5rAUwRMfucmxGXN8B+ beQsPwckeIjuNhXAqzeMAo8CIIg96fzA== X-Google-Smtp-Source: AGHT+IF9YgQxjGmfBS/VLSZ9Yn1NV8aiLQRYv9H/Rha4by/slLu+GOg0yeUsYkmlZm+Qs2ADprJnow== X-Received: by 2002:a05:600c:5289:b0:46e:6d5f:f59 with SMTP id 5b1f17b1804b1-46e6d5f1183mr8939815e9.4.1759394606884; Thu, 02 Oct 2025 01:43:26 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-s390x@nongnu.org, kvm@vger.kernel.org, xen-devel@lists.xenproject.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , "Michael S. Tsirkin" Subject: [PATCH v4 17/17] hw/virtio/virtio: Replace legacy cpu_physical_memory_map() call Date: Thu, 2 Oct 2025 10:42:02 +0200 Message-ID: <20251002084203.63899-18-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251002084203.63899-1-philmd@linaro.org> References: <20251002084203.63899-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: 1759394790464116600 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 Reviewed-by: Richard Henderson --- 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