From nobody Mon Feb 9 23:59:51 2026 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=1766589382; cv=none; d=zohomail.com; s=zohoarc; b=Nixy8pyqh554J9EuxrY+7l3SJft0tuC8A2YTyiAFzbEx+CHnz+ILNdUl5FcvZqZNsQHJPa6m0QrMflKZKBcoHzRIbD0tPjIN9lyG6wuyGyyFYw+4M0oXHb08zv4sZu6Qtatqhz7SaH8j5xrmTfyS3MhymKmWvWsQYX+rse3oZvQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1766589382; 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=B1b6x18riFiHnFkkcqn+CtPN4j8BBN9191Tesnu/1k0=; b=hyGL1LkN5eAMSsESxPT75juASzM9Oa2OXP75uQ2y9YqLxee5vhemYXMWoKNcwLQfo1adAvS4I5b+hDyKRWTq6gO359GD6UtyR8zHdcJRxOEEwRmuYvKTrAAqUhEwABQny6D67y7+Sq/E8hF/5OYOH6U7dQM/8gHJHvaSWOqr0Pg= 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 1766589382312648.5496500966539; Wed, 24 Dec 2025 07:16:22 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vYQak-0003pE-1C; Wed, 24 Dec 2025 10:15:58 -0500 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 1vYQZc-0002Pp-HS for qemu-devel@nongnu.org; Wed, 24 Dec 2025 10:14:53 -0500 Received: from mail-ed1-x52e.google.com ([2a00:1450:4864:20::52e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vYQZZ-00033x-4E for qemu-devel@nongnu.org; Wed, 24 Dec 2025 10:14:46 -0500 Received: by mail-ed1-x52e.google.com with SMTP id 4fb4d7f45d1cf-64bea6c5819so6260199a12.3 for ; Wed, 24 Dec 2025 07:14:44 -0800 (PST) Received: from localhost.localdomain (188.171.88.92.rev.sfr.net. [92.88.171.188]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b8080e2177csm782017566b.68.2025.12.24.07.14.40 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 24 Dec 2025 07:14:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1766589283; x=1767194083; 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=B1b6x18riFiHnFkkcqn+CtPN4j8BBN9191Tesnu/1k0=; b=spiv030viaOWA6OU7NT5FMY9cfOHxzGiyYsqM6HS/MrDgkUyKWHVm9HxVodg0m2Xm1 Z6zJOTKboOmT01s+izUb7CmXi+1rCeBiy2pfnVt/soR43I+sES+O0oEYcgug5aDZMK35 DHVvVSzj6YE0ImVwI5Di3bQQLC/6KNIJyRloMxCEAMioTyN9/kr3DsT2Ry4XvKIr5O1k S+o9VYR+bl0MFlb0QAvqNDESYS4Mqnqmtm7+X7n695cuLCYjs/aY/y1TUlk/A7fQGdZJ qddpJXTcq9WrMDd7Ke+6N3bfdVkPOjaeEeZJGMsE+88QEkj5EsBUv6l/vDzF7GVRAT3l 9YZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766589283; x=1767194083; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=B1b6x18riFiHnFkkcqn+CtPN4j8BBN9191Tesnu/1k0=; b=YkrRZsn8Lgsbwn7Y+e6t1aLwxStuc88JY2JmOVBv+9m68heWBQwtbrjA5UNmWr3TN4 IfFILyum0EqNFpv1lDsvPg3Hih8SD9lhOUl+ubKcgA6NS/HXbC72Nu+iclSWy9dGssen RgvjB4ciFAxEq6anaITLIOMNKBzkTvkj6+Jf70xjKT3pqOoE7bjOeS/buZZWwWcMJ9w2 lOwZgYZ0PG4k8bLVY43TkGZpPVigUZIbfOf8d19G0AOab0ct/XFE3d9+AxZobg/vxJdB kL83/FKx3iy9j/VEOrZld+BcowjAcMJiYuyrYtlIQzBhgP0oC4ztrQIE308fYc53t3N+ w0xw== X-Gm-Message-State: AOJu0Yxw6d2zODMHC+SO3caVF2YLKvtBkhrZ+QlBgqmeKXQrwRu7sFmT AuKwF6l9V8x5RCApirSaIXQQdYcCvBXuQqGqvREgtQOSvIZ1c8K4tdFxePechE3Q1bu+6Y3co0B BLCPn/qE= X-Gm-Gg: AY/fxX7lQOQEqbqFb91t4EafEPcFBLutTHwEt7rfL9C1ggP3JhGuTxzcw8iuFxVJut/ tBCD0Q8a9TXKxpW/YEVtqssm8mUrsvT+tl7EkjnxhvefBT/o/HYAtfUIneGXF9+eY8xhR546FkL 47GWhHBCTBA3NtcNa3QCh0vSsi0LF+j22OBZu2lzd0zfdwPik0t23FeV6apIuqbNj/mtVXrnV68 0wFhqMmb610t7IZfOKfi2kgSmlW1qOtt2K8J+kHD8mBuekwB2e5qbjmMHzuZ4osNARYUKUxpgFA 69lJ4Zh6ZR7rpS7CMYXkAcfRDdT20ATxToGYvUra8duJTpPBBE2hA30PLY95Of5qAMEJqPFIFe6 /rjfgJ87K19nmKtk+mII1rJMtiT2kDfR36moYOqruWiY/pWIa/R5VawiWmtW9KOAw6KcD8wc/Zn O+GrlZfNWncIHFAR9mcFSDqq44eQUSpIJHHy3idgTBkKh0YsA67b4OwDU= X-Google-Smtp-Source: AGHT+IGTA1F9pGUvnOxUvBAxEuM5CajhpP2d4b0KJNCfBuEsjq+HRDLQvm8HHAx9wQXKy+k4QHriRw== X-Received: by 2002:a17:906:c109:b0:b80:325d:99e2 with SMTP id a640c23a62f3a-b803705ddb6mr1961657066b.33.1766589283089; Wed, 24 Dec 2025 07:14:43 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Manos Pitsidianakis , Andrew Jeffery , qemu-arm@nongnu.org, Peter Xu , Jiaxun Yang , Weiwei Li , Jamin Lin , Mark Cave-Ayland , "Michael S. Tsirkin" , Pierrick Bouvier , Anton Johansson , David Hildenbrand , qemu-riscv@nongnu.org, Steven Lee , Paolo Bonzini , Daniel Henrique Barboza , Troy Lee , Palmer Dabbelt , Zhao Liu , Liu Zhiwei , Peter Maydell , Artyom Tarasenko , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Alistair Francis , Joel Stanley , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PATCH 4/9] system/memory: Remove address_space_stl_notdirty and stl_phys_notdirty Date: Wed, 24 Dec 2025 16:13:45 +0100 Message-ID: <20251224151351.86733-5-philmd@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251224151351.86733-1-philmd@linaro.org> References: <20251224151351.86733-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 (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::52e; envelope-from=philmd@linaro.org; helo=mail-ed1-x52e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1766589384280158500 stl_phys_notdirty() was added in commit 8df1cd076cc ("physical memory access functions") as a (premature?) optimisation for the CODE path. Meanwhile 20 years passed, we might never have understood / used it properly; the code evolved and now the recommended way to access the CODE path is via the cpu_ld/st_mmu*() API. Remove both address_space_stl_notdirty() and stl_phys_notdirty() leftovers. Suggested-by: Pierrick Bouvier Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Reviewed-by: Richard Henderson --- include/system/memory.h | 6 ------ include/exec/memory_ldst.h.inc | 2 -- system/memory_ldst.c.inc | 39 ---------------------------------- 3 files changed, 47 deletions(-) diff --git a/include/system/memory.h b/include/system/memory.h index 3bd5ffa5e0d..e69171de05a 100644 --- a/include/system/memory.h +++ b/include/system/memory.h @@ -2850,12 +2850,6 @@ MemTxResult address_space_write_rom(AddressSpace *as= , hwaddr addr, #define ARG1_DECL AddressSpace *as #include "exec/memory_ldst.h.inc" =20 -static inline void stl_phys_notdirty(AddressSpace *as, hwaddr addr, uint32= _t val) -{ - address_space_stl_notdirty(as, addr, val, - MEMTXATTRS_UNSPECIFIED, NULL); -} - #define SUFFIX #define ARG1 as #define ARG1_DECL AddressSpace *as diff --git a/include/exec/memory_ldst.h.inc b/include/exec/memory_ldst.h.inc index 7270235c600..173164fee3a 100644 --- a/include/exec/memory_ldst.h.inc +++ b/include/exec/memory_ldst.h.inc @@ -25,8 +25,6 @@ uint32_t glue(address_space_ldl, SUFFIX)(ARG1_DECL, hwaddr addr, MemTxAttrs attrs, MemTxResult *result); uint64_t glue(address_space_ldq, SUFFIX)(ARG1_DECL, hwaddr addr, MemTxAttrs attrs, MemTxResult *result); -void glue(address_space_stl_notdirty, SUFFIX)(ARG1_DECL, - hwaddr addr, uint32_t val, MemTxAttrs attrs, MemTxResult *result); void glue(address_space_stw, SUFFIX)(ARG1_DECL, hwaddr addr, uint16_t val, MemTxAttrs attrs, MemTxResult *result); void glue(address_space_stl, SUFFIX)(ARG1_DECL, diff --git a/system/memory_ldst.c.inc b/system/memory_ldst.c.inc index 333da209d1a..b45bfecd137 100644 --- a/system/memory_ldst.c.inc +++ b/system/memory_ldst.c.inc @@ -261,45 +261,6 @@ uint16_t glue(address_space_lduw_be, SUFFIX)(ARG1_DECL, DEVICE_BIG_ENDIAN); } =20 -/* warning: addr must be aligned. The ram page is not masked as dirty - and the code inside is not invalidated. It is useful if the dirty - bits are used to track modified PTEs */ -void glue(address_space_stl_notdirty, SUFFIX)(ARG1_DECL, - hwaddr addr, uint32_t val, MemTxAttrs attrs, MemTxResult *result) -{ - uint8_t *ptr; - MemoryRegion *mr; - hwaddr l =3D 4; - hwaddr addr1; - MemTxResult r; - uint8_t dirty_log_mask; - bool release_lock =3D false; - - RCU_READ_LOCK(); - mr =3D TRANSLATE(addr, &addr1, &l, true, attrs); - if (l < 4 || !memory_access_is_direct(mr, true, attrs)) { - release_lock |=3D prepare_mmio_access(mr); - - r =3D memory_region_dispatch_write(mr, addr1, val, MO_32, attrs); - } else { - ptr =3D qemu_map_ram_ptr(mr->ram_block, addr1); - stl_p(ptr, val); - - dirty_log_mask =3D memory_region_get_dirty_log_mask(mr); - dirty_log_mask &=3D ~(1 << DIRTY_MEMORY_CODE); - physical_memory_set_dirty_range(memory_region_get_ram_addr(mr) + a= ddr, - 4, dirty_log_mask); - r =3D MEMTX_OK; - } - if (result) { - *result =3D r; - } - if (release_lock) { - bql_unlock(); - } - RCU_READ_UNLOCK(); -} - /* warning: addr must be aligned */ static inline void glue(address_space_stl_internal, SUFFIX)(ARG1_DECL, hwaddr addr, uint32_t val, MemTxAttrs attrs, --=20 2.52.0