From patchwork Fri Sep 30 21:26:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 610966 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp1756938pvb; Fri, 30 Sep 2022 14:41:45 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7cRHAQi2VobKp1IN7DAxCjVbUgkXcEQPGGCa4Hq0LUkub+HZleukkCtrVvC7ebTvUxuR6N X-Received: by 2002:a0c:b30b:0:b0:4af:8a8d:5687 with SMTP id s11-20020a0cb30b000000b004af8a8d5687mr8565136qve.77.1664574105143; Fri, 30 Sep 2022 14:41:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664574105; cv=none; d=google.com; s=arc-20160816; b=WqpetAtXPM7akrGiO7GqZdZ6ndNJUWIapd1VGSjaya0vsThZZ833G0OJbTc49HjjMs /Yzw8GTretIl6cwSKAeXriLcNOPoh66R0rHfoAJh1rLj/pcF0Ffnv3cWba+qHnSh8sfY 6FBsO8gP8nOVewBjS+L/ld4YOWzc2I0QN1Br8yu/q0LIcBB6X7ocBUSMO7ZqJTNz7Tbg eq6QzD+ORDqiwVtV9YMdT3yVKz/i3gKYb0PnHvGb8MyHi/aMg9E8qXgvpgcAm7EYLjyZ yD+xJPtiWo5uvreEu7EOErDSzFov4JDMzPAjnP1iiJir6y+EJBPD63LXyoSSXU1Z9s5q Il6A== 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=iNSv5kupswjOCEJBCw0DforCHK3ePnESyn5fLqIud2Q=; b=DSDZQdQ9otngexIRWo2Y5kNcvTcrsVVm57/x4OGETOdRxkmf1mLe7+73GB1TEKm5zs bYEeuUigTsGut4qL2cwUKhsLB2m/87uyo8IeS90Mof8SIguAtj30AZ2zBU+z7nC2DkZy LIInCC0ijJy4aJfYDJl9xgdI8XC3Z4kTAKFjEq3SVoJ9XwW1Rjc2dYgC5phjImv2ZEKn R3dEECVh65hJtbJ9EbsqsdNpxeGgBEFoO8o0b+/5HJpQLq55KAdFuHs5pZ+fQvARYjTz 6SCLNhqD5GpgGYKlyqvBxhxsA8E2OUtbO3PS0/kcw/kga85ZjcvtdyZviTXzMlH1fwFP 76oQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=bwNX081E; 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 gs3-20020a056214226300b004afb6777442si1745070qvb.442.2022.09.30.14.41.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 30 Sep 2022 14:41:45 -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=bwNX081E; 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]:59016 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oeNlQ-0008GP-MQ for patch@linaro.org; Fri, 30 Sep 2022 17:41:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60706) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oeNX2-0006g1-CC for qemu-devel@nongnu.org; Fri, 30 Sep 2022 17:26:52 -0400 Received: from mail-qv1-xf2e.google.com ([2607:f8b0:4864:20::f2e]:45748) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oeNX0-0005PU-IP for qemu-devel@nongnu.org; Fri, 30 Sep 2022 17:26:52 -0400 Received: by mail-qv1-xf2e.google.com with SMTP id m18so3574515qvo.12 for ; Fri, 30 Sep 2022 14:26:50 -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:subject:date; bh=iNSv5kupswjOCEJBCw0DforCHK3ePnESyn5fLqIud2Q=; b=bwNX081EWvP9oo86UkS1k5quV2yfv94BkZQUi5ShkR1a+ury9qyxl09uXMcRtzXsyf +8VkEItMoRQzMfG9mlcTp+DGwdqejSW5iGEzjkOskIPAzx78C+goY8+OPZHLRkWq0COK tOsTlTbFwCfh9Lm/C7JRBPWpVA5eQH25w7eCvQJo0K//isswBAMcmbpJz7A/MgMnWBjU wsK12xb+9dCGpLmVuMm/f+bLF2UonGDoOyfAt9azEDSaHtVEj0Sxb2zrbB4sa3BQTziu dW9FghyV6IZ5aA3KweUPUBlDG9cH71XZyzKtjaiquSrao5Db2jPGbBCg1FjG+QoFrJSK YNBw== 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 :subject:date; bh=iNSv5kupswjOCEJBCw0DforCHK3ePnESyn5fLqIud2Q=; b=gyTbVX3sXIZOYIPE7TRBKsmEaAg8IMK7oTLOVhQoyK6D5Pr7L/EY1MlVf3xr0zKAiS KYG0frkQ43peBeJeyzDkQLBKGwFWJknALjwA+0fi17kG358BuyFlmGVeMQYfS0lIK32e QHqGH7ug9lTjymiqH2r6w2HMrpigUnmO/GXCuKSTTBvkwSXHvATOfIPBr5KqpZ5yySQA fa3pONUZZpZEpSN9Gc3uSPM2XSPa+hcF5ibYFI3ljsa3YonmAXT0XIex/WxOwxD2qXcm xmIN6ui+oe+x9eVPgrFWidfggouJXG7lWS7avB7nPEanQz0MSBAFTiTGTc4FFnKAqRvP ML7g== X-Gm-Message-State: ACrzQf1VwunGGdkzGMQ57aUkDIh4vdVGnw5nM6prnwER96gVTU861x5s umaX+Za+PPiqvhUR68nQcRQyF0r7F6+HDQ== X-Received: by 2002:a0c:9cc2:0:b0:4ac:d5ec:cd5a with SMTP id j2-20020a0c9cc2000000b004acd5eccd5amr8638024qvf.131.1664573209582; Fri, 30 Sep 2022 14:26:49 -0700 (PDT) Received: from stoup.. ([2605:ef80:80a1:5a60:d0d7:468b:5667:114b]) by smtp.gmail.com with ESMTPSA id l18-20020a05620a28d200b006ce813bb306sm3696370qkp.125.2022.09.30.14.26.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Sep 2022 14:26:48 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: peter.maydell@linux.org, alex.bennee@linux.org, =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= Subject: [PATCH v6 10/18] accel/tcg: Remove PageDesc code_bitmap Date: Fri, 30 Sep 2022 14:26:14 -0700 Message-Id: <20220930212622.108363-11-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220930212622.108363-1-richard.henderson@linaro.org> References: <20220930212622.108363-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::f2e; envelope-from=richard.henderson@linaro.org; helo=mail-qv1-xf2e.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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This bitmap is created and discarded immediately. We gain nothing by its existence. Reviewed-by: Alex Bennée Signed-off-by: Richard Henderson Message-Id: <20220822232338.1727934-2-richard.henderson@linaro.org> --- 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 d71d04d338..59432dc558 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -102,21 +102,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; @@ -907,17 +900,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) { @@ -932,7 +914,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 { @@ -1197,11 +1178,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); } } @@ -1246,35 +1225,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. @@ -1295,7 +1245,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 */ @@ -1357,10 +1306,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; } @@ -1731,7 +1678,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 @@ -1827,24 +1773,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