From nobody Tue Feb 10 11:17:09 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=1660682290; cv=none; d=zohomail.com; s=zohoarc; b=ie5tHA1GacGH86bqjhOgU857VQaFSzh555kwpoLfSZJyZRjjONPtbz6TiXjUiiIB93D7EQj2PgBfAPr7bMZWSd+T5Ni8yXLdnj9EYlVkaR6VOJ1SZVAaUU8WphB8kHTeCrv74kZ40TpzODbqjFZuLHTBbqiR5gWgqDfxcV78V1k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1660682290; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=P0kR5OrFfppQUIx2J+31AG0d7fIF32ATaR6GWxpzNsw=; b=Kl5830FzHI+/XkeVQa7KxP4bCH6WlDum/26nMFmhvm62k/r6QvGxPQZ+LHwZfTt2AXTnd4MlYb/kgY3UM8QeZ3wuwaRdmHXI9XDj8iJL0wok0EGUMOc8wgMWifdUawjjrc4RP2pBKUuU7GTeqtUGBJgF4yujDb/DVDBugkC+Cpc= 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 1660682290919992.1731227976039; Tue, 16 Aug 2022 13:38:10 -0700 (PDT) Received: from localhost ([::1]:52670 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oO3KD-0001sU-V4 for importer@patchew.org; Tue, 16 Aug 2022 16:38:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39552) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oO3Gl-0004oS-7l for qemu-devel@nongnu.org; Tue, 16 Aug 2022 16:34:36 -0400 Received: from mail-oa1-x2d.google.com ([2001:4860:4864:20::2d]:42753) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oO3GW-0004VN-4j for qemu-devel@nongnu.org; Tue, 16 Aug 2022 16:34:33 -0400 Received: by mail-oa1-x2d.google.com with SMTP id 586e51a60fabf-f2a4c51c45so12942369fac.9 for ; Tue, 16 Aug 2022 13:34:19 -0700 (PDT) Received: from stoup.. ([2605:ef80:80f6:61fa:9bc2:5095:d612:5e22]) by smtp.gmail.com with ESMTPSA id y23-20020a056870b01700b0010ef8ccde67sm2285220oae.13.2022.08.16.13.34.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Aug 2022 13:34:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=P0kR5OrFfppQUIx2J+31AG0d7fIF32ATaR6GWxpzNsw=; b=jDu+jYz4gf98nV/1Py6PijqPBrkbQAzfGS/cFjfdwSNAFZdyUOmJ2En7tO0oGXxkr4 WzkUgsZcM4ZN1/OknmcVtsmhKUYr/xaoNcf07C9hql9nCJe6PDCKB9KZMOPSJBizHZV3 tzJ7gw0MuGJ1ZHyiHFx4/moQEG0vCUKz9mctSSIUDOect58YRB7HS+F2kSUHhIprGprq soPGgzP1FL9rJLpDHaswRk+R1hsxvvaaPo0F1hOS1eD8ljgfQQR1TJO1gEQIZ68cJ+1C pqD2YTVK+k9T8aaIVBplD/6cGHBBX5yLcwzoQ8fZRfRPJJVSgRxpw1LAlJgfN4bhy49t 48YA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=P0kR5OrFfppQUIx2J+31AG0d7fIF32ATaR6GWxpzNsw=; b=aeJmzchTbC3uEoqN22pCVtflrHKQT8SDK3TRFdQEuAHiE2xZobUkYDiFowqozA/rRb pIJUTMF2wiqAE7nfv095z8JYUWKcAPWQxgjIhXldHQ9ZyVh9uOE23ayeztKBWLLxI8ZC scxhnen+/eCco6lroyYKubEntuQLWw05urnijbD4sdKSMb0y/vP7yib0nLqTcV/zjIs8 2X3wZBikJCoiJoUFyxBLDn+dXBOK/0pfqLo1ErqaF0gSifGEs13tFN2xnXhucpGxiFb3 YplWSmdLhi+kPceRkMi6nK3lIhyEJ7S8SQ11DZmTS5gnEipXDM0m+MZZwWeHwyTSXV98 GmrQ== X-Gm-Message-State: ACgBeo0lnmhoX0xhX7ma2XH2h6sJmO5i7LFY1sTKxRjn0lCr/zltEMK2 zyzZG+jtlkr8KGnSgIXs2vA5wt7qp5i2KQ== X-Google-Smtp-Source: AA6agR5VdOESR8O/KgNOBlcYWic/VDZmnT/z5DEGU4Qfz7pO1llaSCcWJjFlj379xHNriN4O0tikwg== X-Received: by 2002:a05:6870:f69e:b0:100:fc8b:b3bf with SMTP id el30-20020a056870f69e00b00100fc8bb3bfmr159114oab.136.1660682059010; Tue, 16 Aug 2022 13:34:19 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, alex.bennee@linaro.org, iii@linux.ibm.com Subject: [PATCH v2 06/33] accel/tcg: Remove PageDesc code_bitmap Date: Tue, 16 Aug 2022 15:33:33 -0500 Message-Id: <20220816203400.161187-7-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220816203400.161187-1-richard.henderson@linaro.org> References: <20220816203400.161187-1-richard.henderson@linaro.org> MIME-Version: 1.0 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=2001:4860:4864:20::2d; envelope-from=richard.henderson@linaro.org; helo=mail-oa1-x2d.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, T_SCC_BODY_TEXT_LINE=-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" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1660682293211100001 Content-Type: text/plain; charset="utf-8" This bitmap is created and discarded immediately. We gain nothing by its existence. Signed-off-by: Richard Henderson --- accel/tcg/translate-all.c | 78 ++------------------------------------- 1 file changed, 4 insertions(+), 74 deletions(-) diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index b83161a081..298277a590 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -101,21 +101,14 @@ #define assert_memory_lock() tcg_debug_assert(have_mmap_lock()) #endif =20 -#define SMC_BITMAP_USE_THRESHOLD 10 - typedef struct PageDesc { /* list of TBs intersecting this ram page */ uintptr_t first_tb; -#ifdef CONFIG_SOFTMMU - /* in order to optimize self modifying code, we count the number - of lookups we do to a given page to use a bitmap */ - unsigned long *code_bitmap; - unsigned int code_write_count; -#else +#ifdef CONFIG_USER_ONLY unsigned long flags; void *target_data; #endif -#ifndef CONFIG_USER_ONLY +#ifdef CONFIG_SOFTMMU QemuSpin lock; #endif } PageDesc; @@ -906,17 +899,6 @@ void tb_htable_init(void) qht_init(&tb_ctx.htable, tb_cmp, CODE_GEN_HTABLE_SIZE, mode); } =20 -/* call with @p->lock held */ -static inline void invalidate_page_bitmap(PageDesc *p) -{ - assert_page_locked(p); -#ifdef CONFIG_SOFTMMU - g_free(p->code_bitmap); - p->code_bitmap =3D NULL; - p->code_write_count =3D 0; -#endif -} - /* Set to NULL all the 'first_tb' fields in all PageDescs. */ static void page_flush_tb_1(int level, void **lp) { @@ -931,7 +913,6 @@ static void page_flush_tb_1(int level, void **lp) for (i =3D 0; i < V_L2_SIZE; ++i) { page_lock(&pd[i]); pd[i].first_tb =3D (uintptr_t)NULL; - invalidate_page_bitmap(pd + i); page_unlock(&pd[i]); } } else { @@ -1196,11 +1177,9 @@ static void do_tb_phys_invalidate(TranslationBlock *= tb, bool rm_from_page_list) if (rm_from_page_list) { p =3D page_find(tb->page_addr[0] >> TARGET_PAGE_BITS); tb_page_remove(p, tb); - invalidate_page_bitmap(p); if (tb->page_addr[1] !=3D -1) { p =3D page_find(tb->page_addr[1] >> TARGET_PAGE_BITS); tb_page_remove(p, tb); - invalidate_page_bitmap(p); } } =20 @@ -1245,35 +1224,6 @@ void tb_phys_invalidate(TranslationBlock *tb, tb_pag= e_addr_t page_addr) } } =20 -#ifdef CONFIG_SOFTMMU -/* call with @p->lock held */ -static void build_page_bitmap(PageDesc *p) -{ - int n, tb_start, tb_end; - TranslationBlock *tb; - - assert_page_locked(p); - p->code_bitmap =3D bitmap_new(TARGET_PAGE_SIZE); - - PAGE_FOR_EACH_TB(p, tb, n) { - /* NOTE: this is subtle as a TB may span two physical pages */ - if (n =3D=3D 0) { - /* NOTE: tb_end may be after the end of the page, but - it is not a problem */ - tb_start =3D tb->pc & ~TARGET_PAGE_MASK; - tb_end =3D tb_start + tb->size; - if (tb_end > TARGET_PAGE_SIZE) { - tb_end =3D TARGET_PAGE_SIZE; - } - } else { - tb_start =3D 0; - tb_end =3D ((tb->pc + tb->size) & ~TARGET_PAGE_MASK); - } - bitmap_set(p->code_bitmap, tb_start, tb_end - tb_start); - } -} -#endif - /* add the tb in the target page and protect it if necessary * * Called with mmap_lock held for user-mode emulation. @@ -1294,7 +1244,6 @@ static inline void tb_page_add(PageDesc *p, Translati= onBlock *tb, page_already_protected =3D p->first_tb !=3D (uintptr_t)NULL; #endif p->first_tb =3D (uintptr_t)tb | n; - invalidate_page_bitmap(p); =20 #if defined(CONFIG_USER_ONLY) /* translator_loop() must have made all TB pages non-writable */ @@ -1356,10 +1305,8 @@ tb_link_page(TranslationBlock *tb, tb_page_addr_t ph= ys_pc, /* remove TB from the page(s) if we couldn't insert it */ if (unlikely(existing_tb)) { tb_page_remove(p, tb); - invalidate_page_bitmap(p); if (p2) { tb_page_remove(p2, tb); - invalidate_page_bitmap(p2); } tb =3D existing_tb; } @@ -1736,7 +1683,6 @@ tb_invalidate_phys_page_range__locked(struct page_col= lection *pages, #if !defined(CONFIG_USER_ONLY) /* if no code remaining, no need to continue to use slow writes */ if (!p->first_tb) { - invalidate_page_bitmap(p); tlb_unprotect_code(start); } #endif @@ -1832,24 +1778,8 @@ void tb_invalidate_phys_page_fast(struct page_collec= tion *pages, } =20 assert_page_locked(p); - if (!p->code_bitmap && - ++p->code_write_count >=3D SMC_BITMAP_USE_THRESHOLD) { - build_page_bitmap(p); - } - if (p->code_bitmap) { - unsigned int nr; - unsigned long b; - - nr =3D start & ~TARGET_PAGE_MASK; - b =3D p->code_bitmap[BIT_WORD(nr)] >> (nr & (BITS_PER_LONG - 1)); - if (b & ((1 << len) - 1)) { - goto do_invalidate; - } - } else { - do_invalidate: - tb_invalidate_phys_page_range__locked(pages, p, start, start + len, - retaddr); - } + tb_invalidate_phys_page_range__locked(pages, p, start, start + len, + retaddr); } #else /* Called with mmap_lock held. If pc is not 0 then it indicates the --=20 2.34.1