From patchwork Tue Aug 16 20:33:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 597506 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:b345:0:0:0:0 with SMTP id w5csp2694772maz; Tue, 16 Aug 2022 13:37:20 -0700 (PDT) X-Google-Smtp-Source: AA6agR6fbeJng3Xus+jSlEbePcrZtxa3TBU4o42O91u2FuhyBycKMyLvY2fQV3JLZXtPtrFpC+SB X-Received: by 2002:ac8:5f08:0:b0:344:5cbe:c0f5 with SMTP id x8-20020ac85f08000000b003445cbec0f5mr10229809qta.356.1660682239987; Tue, 16 Aug 2022 13:37:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660682239; cv=none; d=google.com; s=arc-20160816; b=Oyvul+N3kLri0673QXcCChux4Oyk8EW0+P12ySlcD628cLfxQZAxHi9Zgdo80lZ0J4 Rif1TBxa4AzMRoxfjdWQoN1Kluvuqi9hw114Yt6T9f5Do1SFBC5n8VNwRJ1YxUmOEETh JcD/SGo3mFs6QDI+GjVVE98QHXcgNsdUer1J6jXkesVDMCwHVIE2C+bLNAQg6cppFJcz MVVF5vSw9VxsOKsSr1QqVn+zmjIpO0li2zpewKcRc5GbAmf7benlobHu+5we6oh4bnmp AC6aqVpE2CFW2OaDpcZT67wgae7D3yjrLv67cKiZ4TFXwewsYY+HbvwKjqg/cciRC4+c La3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=P0kR5OrFfppQUIx2J+31AG0d7fIF32ATaR6GWxpzNsw=; b=TScezSG1wjcmYQNgdXjY4oI+fwY4Xe82qEOSUgO7l7jR8ZoVxwrseG7iihc0mPMEz/ obIFMjir5gkAx2Q1EUeC5u1w61JE54TxtvnAfoegEd7empABxheazlLOcw5p45OVZqQI luwgAtpvofLY2trDC/XVMTAi4gd5NyFABLTto+pNZQvPSAa2x8VmhUBCvITmudq2Z22L Kw4VgBYIrM4pXzeYasDZFshex3W9gGW969L88k3RlVgkql1n5RoC7qtvc/sObMfmPrz3 lWrE+Wto5TB4jQqVtfpi3oLJTVKqu8897WlPBbGuKs0XM+SycR9Znzl1dUI1+fKMo1Oz Xf0w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jDu+jYz4; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id u13-20020a05622a17cd00b003436d1e958dsi7115330qtk.372.2022.08.16.13.37.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 16 Aug 2022 13:37:19 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jDu+jYz4; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:58556 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oO3JP-0007aw-Gl for patch@linaro.org; Tue, 16 Aug 2022 16:37:19 -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) 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-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) 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) 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 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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 -#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); } -/* 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 = NULL; - p->code_write_count = 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 = 0; i < V_L2_SIZE; ++i) { page_lock(&pd[i]); pd[i].first_tb = (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 = page_find(tb->page_addr[0] >> TARGET_PAGE_BITS); tb_page_remove(p, tb); - invalidate_page_bitmap(p); if (tb->page_addr[1] != -1) { p = page_find(tb->page_addr[1] >> TARGET_PAGE_BITS); tb_page_remove(p, tb); - invalidate_page_bitmap(p); } } @@ -1245,35 +1224,6 @@ void tb_phys_invalidate(TranslationBlock *tb, tb_page_addr_t page_addr) } } -#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 = 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 == 0) { - /* NOTE: tb_end may be after the end of the page, but - it is not a problem */ - tb_start = tb->pc & ~TARGET_PAGE_MASK; - tb_end = tb_start + tb->size; - if (tb_end > TARGET_PAGE_SIZE) { - tb_end = TARGET_PAGE_SIZE; - } - } else { - tb_start = 0; - tb_end = ((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, TranslationBlock *tb, page_already_protected = p->first_tb != (uintptr_t)NULL; #endif p->first_tb = (uintptr_t)tb | n; - invalidate_page_bitmap(p); #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 phys_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 = existing_tb; } @@ -1736,7 +1683,6 @@ tb_invalidate_phys_page_range__locked(struct page_collection *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_collection *pages, } assert_page_locked(p); - if (!p->code_bitmap && - ++p->code_write_count >= SMC_BITMAP_USE_THRESHOLD) { - build_page_bitmap(p); - } - if (p->code_bitmap) { - unsigned int nr; - unsigned long b; - - nr = start & ~TARGET_PAGE_MASK; - b = 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