From nobody Tue Feb 10 11:13:08 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=1765982084; cv=none; d=zohomail.com; s=zohoarc; b=J3u7Zg4UXomr6/Pk4Ovvp2C6STSztGgOtKd1chWfxsxCaVUGeyYQZAQes9epO4Yo4ufbH0ZbGZ3kAYeNENQ6DEW0u8liDHaw9RtiuRSMfI6MMW9eOxGQInk7c2rmZOpO9EcIDj6V/fGHUGgfWNSxhsR9jkosemnWAFoVFvgUHmc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1765982084; 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=fqLzxUppkUl4lLkDpbtOdJVjT4/H3/NN9CQYq0CLc6M=; b=gV2WWdDQQVZ8Pl57q2ysxgTMi9KVqkGT4PH4DymTgqtO7itJfLkpsGExOEWJassIJEmqVsNj80gXjTwH3STGy5NSYoleGoTjYD8dsi6PCfzrifSCZ++bRNKLZqkCVAqtOKeVd/QsDmuCN6OsB6aovm1ZIJrFI3LACNZRK/Y4Clc= 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 1765982084894748.2517794660325; Wed, 17 Dec 2025 06:34:44 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vVsaX-000205-4Q; Wed, 17 Dec 2025 09:33:13 -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 1vVsZr-0001bp-O3 for qemu-devel@nongnu.org; Wed, 17 Dec 2025 09:32:33 -0500 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 1vVsZm-000765-Fz for qemu-devel@nongnu.org; Wed, 17 Dec 2025 09:32:27 -0500 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-477a219dbcaso51232775e9.3 for ; Wed, 17 Dec 2025 06:32:25 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47bd9936809sm32692345e9.6.2025.12.17.06.32.21 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 17 Dec 2025 06:32:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1765981943; x=1766586743; 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=fqLzxUppkUl4lLkDpbtOdJVjT4/H3/NN9CQYq0CLc6M=; b=QXpTDq2GdubbvkvEfPitHmSDILVDtYSxY6hv3mU516BO2XmW/kIYKyTJepGiHE7gU2 aHcUFy/pzHcNUm1tmkNtOXuJb6KnUq2oFxaYQ1311q4iIm2ePxr08cPaLkGWPj6l2DUU O8wyWYnJ2+mVpSCUprj3xGxIIbJL66o3HzueCwTFnoNTNVCFzWAf7uvth5uQCcOEecn3 cIWMHlmKsI1EDYWxViE3DHyxAxOE54XavK4i1IvFyXkx1+miX+FAXbzmZvteAeTTBBBG RhDRZyELQ6g35A7rmeOx066Gwtw111Q7AB01mnYw23YzfGaEGGjmxoNB4FYQS9Q8XWvN GQrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765981943; x=1766586743; 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=fqLzxUppkUl4lLkDpbtOdJVjT4/H3/NN9CQYq0CLc6M=; b=ExOjx1LYbYEvkbO10ZsH8QiJ2reBgrdaO9byfk/CAqDEP85+wzmUg4TfHgq0y1pGG8 IGLRnTIbAVpYiJ8HnnZ+9rtMYWJ0DEz7TnNVosB4/OFv6J+7GT+Ma3INUQisjGgdeyqS tl341Ubt9k+VPggDlBxlNRwt6q/94Dj/FqmUIe3eqziUin90OMVOnYn7eh7mnZI/FFIY Q6cdbb015pPfZpI5qDTzxLe3CjdXBQhEqQALUSuSwfU0HfV6oVApH+hlmpaSu7h7G89h /U3vfj/evfCzg0VNRK5EPNdIiI1LTJ5gNRCONKKoaX39gn69QZG9KUiyc6mGuwegJkn3 EeQg== X-Gm-Message-State: AOJu0YzRztVK+yKhMVDWpd6sKdhfviIX99Z0/x7Nx72kynCsk3cIZdqM Wig789NCrf2CmbSB20SFapmDw52165Lsc2dVnl7NWVE4iMxelSCKE+4rnHkB4MZHe4b4DZWPLZK /GtjyfG9VYA== X-Gm-Gg: AY/fxX4B6U7JVtX4tKiJlZ4QoV228eJ6LQ1rqaOodFc/bJwGygIk+H9NFZ1Fzhq6EYi +qc9PMuLrL2PdtjslNgfyApOV1fOJ/a6h9tsV4cdFuXI/MXW59RGWx6asWysMsrGMt031X4rrEE +leGWozsCr0QVdT9psY7a94ZwoqKZRxS5Bake4MnMRTeExgStazwQ6M0dkHfuI/A9URiip3wpo9 M/Wvgguckqh3+BLqTX1LI7bb370m1HoyKMwECNLOBXTbJiLqFuEyQzRqk5eFJQVROy0Vh1sdvll ULXHEkaL0mD4RdGepeDLl5QxN5xZ3RqMDqnEc4Mjmb4oGRfKe52GHpOLHGnMBla2/cG3OeblrS8 q6wA0C6pAMTUa6jUuhfzcBwB4vxc/Jhg1pyVUZJ4dG+LH4BljD2tAC4CK0zxqHhWBnU2YTKWlwl bj33y45mJeKhjGNvWpELlLrven/d9Iuaiw417x6aIg25Su24p23XwFXGv3F/cu X-Google-Smtp-Source: AGHT+IFoxo+TUGh02vEzLyb5bAM8cofU9QlTOJGWq9LzgozqJeytl50qEz4YfJUGXmLq82W8VNnw6w== X-Received: by 2002:a05:600c:3f18:b0:477:93f7:bbc5 with SMTP id 5b1f17b1804b1-47a992e2ed8mr144511625e9.10.1765981943462; Wed, 17 Dec 2025 06:32:23 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Anton Johansson , qemu-arm@nongnu.org, Mark Cave-Ayland , Paolo Bonzini , "Michael S. Tsirkin" , Artyom Tarasenko , Peter Maydell , David Hildenbrand , Peter Xu , Pierrick Bouvier Subject: [PATCH 04/14] system/memory: Remove address_space_stl_notdirty and stl_phys_notdirty Date: Wed, 17 Dec 2025 15:31:40 +0100 Message-ID: <20251217143150.94463-5-philmd@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251217143150.94463-1-philmd@linaro.org> References: <20251217143150.94463-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, 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: 1765982087165154100 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