From nobody Wed May 7 15:14:27 2025
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=1664913865; cv=none;
d=zohomail.com; s=zohoarc;
b=M9y5ZSivEiUy+/KTITPGRGvkHbyinkJuL1oiUfA3Yw1U87lHf/3IysNMBttvfVHkMa57pofe2ny8JKqK+DNA704ngmvLpy4Tw9klfQxjoY4L7YHP2+pZjXXD1TYKc7GJ5Q5gFMWowE5o2fwZd56m64ReRl2aG4njc4OtHRjOFt4=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1664913865;
h=Content-Type: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=iNSv5kupswjOCEJBCw0DforCHK3ePnESyn5fLqIud2Q=;
b=J+5iup7qHoPkFp+tBww8fYdn1PMoKq+lWnqLZ7+X9AoLFtpwCnJL4Qvd/I3BjYC07JQwvCp9HdMyuWB/KgelFYX51QRWFG0u2taD+Yw1dy+v5SJ1K9/4OPM/mRopHTDj+D7Wl/pwC7jttcReh6yAmOpLpYYZdTWADcRJmBbvJEg=
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=<richard.henderson@linaro.org> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1664913865759200.6963223509465;
Tue, 4 Oct 2022 13:04:25 -0700 (PDT)
Received: from localhost ([::1]:60808 helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces+importer=patchew.org@nongnu.org>)
id 1ofo9Q-0004lV-J4
for importer@patchew.org; Tue, 04 Oct 2022 16:04:24 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:49316)
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <richard.henderson@linaro.org>)
id 1ofnyK-0001lx-0X
for qemu-devel@nongnu.org; Tue, 04 Oct 2022 15:52:56 -0400
Received: from mail-pl1-x633.google.com ([2607:f8b0:4864:20::633]:34357)
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <richard.henderson@linaro.org>)
id 1ofnyI-0000FZ-8B
for qemu-devel@nongnu.org; Tue, 04 Oct 2022 15:52:55 -0400
Received: by mail-pl1-x633.google.com with SMTP id n7so13567140plp.1
for <qemu-devel@nongnu.org>; Tue, 04 Oct 2022 12:52:53 -0700 (PDT)
Received: from stoup.. ([2602:47:d49d:ec01:526e:3326:a84e:e5e3])
by smtp.gmail.com with ESMTPSA id
u23-20020a1709026e1700b00172973d3cd9sm9293406plk.55.2022.10.04.12.52.52
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 04 Oct 2022 12:52:52 -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=VbtX/RQsgmanSqQVOLThGKAfLkkEHbxl+vzpngM3iHQkbofUCP2RZe+qkzJX6u13o4
IIvIMxZI335xuCdAP0WkX/wfXjfl653bI8CV6pQYiI0gQzK83Ldz6f8WNcOnI6s1i8Ma
XyAe95yGZjdV8eGj0XCgt3SzmAghnVENHTl91G3Nyv3J6kP1Q781cXa470VEyEibkpn3
aNUOKxQxw79RuPrFwBrqWuHrP80fIwE6vfwEaPgWGLyRBD/QU63Us4yxyIZFCNf1ZvoN
uC3gZNQ/i0M6k0V+CoRVDbgXaRk39iV3HntVXQI2MzCXSYaExol38+bIsiA7v+7cHWeP
4SFw==
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=5eGLQs7TYNNWuwQr99iaNnvxaBAiniYItC+2Qw7GFJA01o/O2rYZjiB4uKsllsvdhi
WjZQ4PCGDZ6zzZQA3Sa5+jNI/KWeP3FjDVwLxj2+plXvL3icS48x0SdZ52FKBjkHRB9V
h2XOq3L7nRYNImaitedVTYXl5yH5F7UMlbTc6n71GHnRsjZR57Xh56GsQ0Ve0hM/kwZ3
2bdkmCfAAAkPTlmXNoQNboGlOsWvrB0b2rGOzC4Y3Y7g7tYrcWZ2rlC83RX0eWsoTC0i
El3+rdgp+ofwtjxPRIxTKQ0NIWtSgCDO+Q7lmd05387zpUY9av1J5IJCYrktLsaDtoKi
Auag==
X-Gm-Message-State: ACrzQf3dWRSowa3VWKpaeb0HE52lT3qRz0r79vWE83diWA5eRMZNB8wl
pF/PdTd1I/4dU8xqKqsQiXVALf8eX6cCLA==
X-Google-Smtp-Source:
AMsMyM5pAN/IUWZAhAp1xFHfknkQ3TVE6hWQSg3+tGNbMUfKcwEaO13vbyYZuT/rGtHZAs2d56Ncxg==
X-Received: by 2002:a17:902:dad1:b0:17a:940:9c81 with SMTP id
q17-20020a170902dad100b0017a09409c81mr28263532plx.93.1664913173159;
Tue, 04 Oct 2022 12:52:53 -0700 (PDT)
From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: stefanha@redhat.com,
=?UTF-8?q?Alex=20Benn=C3=A9e?= <alex.bennee@linaro.org>
Subject: [PULL 10/20] accel/tcg: Remove PageDesc code_bitmap
Date: Tue, 4 Oct 2022 12:52:31 -0700
Message-Id: <20221004195241.46491-11-richard.henderson@linaro.org>
X-Mailer: git-send-email 2.34.1
In-Reply-To: <20221004195241.46491-1-richard.henderson@linaro.org>
References: <20221004195241.46491-1-richard.henderson@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=2607:f8b0:4864:20::633;
envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x633.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: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+importer=patchew.org@nongnu.org>
X-ZohoMail-DKIM: pass (identity @linaro.org)
X-ZM-MESSAGEID: 1664913866358100001
This bitmap is created and discarded immediately.
We gain nothing by its existence.
Reviewed-by: Alex Benn=C3=A9e <alex.bennee@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
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
=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;
@@ -907,17 +900,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)
{
@@ -932,7 +914,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 {
@@ -1197,11 +1178,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
@@ -1246,35 +1225,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.
@@ -1295,7 +1245,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 */
@@ -1357,10 +1306,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;
}
@@ -1731,7 +1678,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
@@ -1827,24 +1773,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