From patchwork Thu Feb 18 09:47:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 384374 Delivered-To: patch@linaro.org Received: by 2002:a02:c80e:0:0:0:0:0 with SMTP id p14csp3535383jao; Thu, 18 Feb 2021 01:59:11 -0800 (PST) X-Google-Smtp-Source: ABdhPJyDCyNk+bkNKTHjtDNKrTYiiFE83mGBOL9Iwu2TX+cl1C6hywkgA9oyMgY2sD4EP6LciIhc X-Received: by 2002:a5b:98a:: with SMTP id c10mr5492796ybq.406.1613642351545; Thu, 18 Feb 2021 01:59:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1613642351; cv=none; d=google.com; s=arc-20160816; b=w2aeO7O57o6UBro6Njk8IV7fWbAMfS73TxCzZb5Bbe672+HaR77NhYhgzQs4hcGu5K Jozm+4dXtEqG1QyK/7D8E5sv7hlfRNjjcYeJp0TdulljyiRKWmVqNqc/9x+iRWTks5OX 8Q1mFPx3W1wnLvnbeaVJ56buYf5bW0wkPqi2viCPj/4gGHx/PUhGRtSGxKmP5Y59/484 UPUFesVWvFvcUQ6zqD3K9nRYZAuJiUPU4LRBAnsjimNXJBSuFU+BJkgJRjWLH57M8GMu Xi4lpdQBxhoQvX3+VPIcktwXVs0NkemHhlhmXGi+11sXuzD4/Ts4ZfPWal5VzgxGw8yz IcYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to:from :dkim-signature; bh=82V7f/olgmCGUJKKkrUSBKvz0iIm47HIR/CWbYHF7lk=; b=Zw6Wn6hWhU4hKyo6V5I7Xo+BmQ3691976h7pkq/T8Ey3s7OEQRo4myGznuxzfVA+hw bMRIWbUSpOiLs3H84G2KgBJxc89Gi8xrnWRFG3v0qnFY/JqH0DVj15tQkmNc9w5DbPwt VJwOKB53gYYtJwaVLh+PwQxIDl8NuKvPtKU+IynLVLTPMgm/Xk+iWjhwOSQr2t8K/Vw2 BY/pdriZ76uSe7BmkJUMNNi8PHjLH1cT3mjcEQSmKgGlFSYgRfch7dym57iggUaJzGYW p2WWH85DO6Vu9hjqlfoy14LxBd0KoRWfQvs7k/F3AjdcBWmvRRyywKj6+9GL/aQFUQid RYLg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=DSfFJZ4h; 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=fail (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 e59si5605221ybi.158.2021.02.18.01.59.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 18 Feb 2021 01:59:11 -0800 (PST) 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=fail header.i=@linaro.org header.s=google header.b=DSfFJZ4h; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:36350 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lCg5W-0004OH-U7 for patch@linaro.org; Thu, 18 Feb 2021 04:59:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:54296) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lCfzW-0004UM-2x for qemu-devel@nongnu.org; Thu, 18 Feb 2021 04:52:58 -0500 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:35154) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lCfzP-0000zx-9u for qemu-devel@nongnu.org; Thu, 18 Feb 2021 04:52:53 -0500 Received: by mail-wm1-x330.google.com with SMTP id n10so2410592wmq.0 for ; Thu, 18 Feb 2021 01:52:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=82V7f/olgmCGUJKKkrUSBKvz0iIm47HIR/CWbYHF7lk=; b=DSfFJZ4hNipRSOrhVCLln5V4QfPs+pjv5ScV5r0D5eoKn1gVf3G5f2d/0ySYjcOlFz 6MziG5tKDAfd4KS0N1kvP78EIqyoy438U+/O/Ds6zkx3aLQR1YD5S9SZ4bIZ5uVlUerk IrgDWDT4fG6BTlODg8+HR+bw5/QSS1QmJeePbFKFKyiGhE23UAXL7x5Swc39K9UD/dL8 1PqiKYUs5WXG5jCQQ7WpjhPEa645A7pUmiCnyg28xGrLFkNroLu8L0WgnB8ih1CrVEhY m3amJS60fDiCT0mtq/GaVovMXt/69c6bQSxy/v76WEL0iep0jDt8TrYpfFukBbFSFZXC gRlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=82V7f/olgmCGUJKKkrUSBKvz0iIm47HIR/CWbYHF7lk=; b=qcCPzMVqmb2uPdMbcS6K1guItEh5nXagYs2YBg9g2jTbHK40soC823SCHE3RLMip6J tEGJvyBgXZWRNh23W4JPojtK+1pakHKH6TOL1j+uBiMVlE5AJT8+hgxSuu27090x/aqe OMTC+W2a9dnMWgBMJB976iK8fHAbMgwtN776aOB4D9tWtWrYcZ8WtDcwaJejJPUnYNWa YbP0RL9qhVC3lmdXv6i4kA7t1ZdCx7U6BQygh9CJx2SoIsIOB7CavVYAn4xop0fBzUCK uSq5kL/hZV53d2qXGOwAvaxCwtZAwGefvUfLHoQU3FxFSBZnvrWHN/6MDbgeCVW74uha cXBQ== X-Gm-Message-State: AOAM5305fOi39qerTLgFx/81iQJdinaWn6erwTk6bNtfIiZRxyD9KScC Cr+dvQENtP/JzJb5XposBFfneA== X-Received: by 2002:a1c:e142:: with SMTP id y63mr2754338wmg.163.1613641969980; Thu, 18 Feb 2021 01:52:49 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id m23sm6669575wmc.31.2021.02.18.01.52.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Feb 2021 01:52:46 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C07A41FFA9; Thu, 18 Feb 2021 09:47:08 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 19/23] accel/tcg: remove CF_NOCACHE and special cases Date: Thu, 18 Feb 2021 09:47:02 +0000 Message-Id: <20210218094706.23038-20-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210218094706.23038-1-alex.bennee@linaro.org> References: <20210218094706.23038-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x330.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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Henderson , =?utf-8?q?Alex_Benn?= =?utf-8?b?w6ll?= , qemu-devel@nongnu.org, Paolo Bonzini Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Now we no longer generate CF_NOCACHE blocks we can remove a bunch of the special case handling for them. While we are at it we can remove the unused tb->orig_tb field and save a few bytes on the TB structure. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Message-Id: <20210213130325.14781-20-alex.bennee@linaro.org> -- 2.20.1 diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index d30c7a84f6..665fe68607 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -454,7 +454,6 @@ struct TranslationBlock { uint32_t cflags; /* compile flags */ #define CF_COUNT_MASK 0x00007fff #define CF_LAST_IO 0x00008000 /* Last insn may be an IO access. */ -#define CF_NOCACHE 0x00010000 /* To be freed after execution */ #define CF_USE_ICOUNT 0x00020000 #define CF_INVALID 0x00040000 /* TB is stale. Set with @jmp_lock held */ #define CF_PARALLEL 0x00080000 /* Generate code for a parallel context */ @@ -469,8 +468,6 @@ struct TranslationBlock { struct tb_tc tc; - /* original tb when cflags has CF_NOCACHE */ - struct TranslationBlock *orig_tb; /* first and second physical page containing code. The lower bit of the pointer tells the index in page_next[]. The list is protected by the TB's page('s) lock(s) */ diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index 72b3c663c5..464b3c3394 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -410,12 +410,6 @@ bool cpu_restore_state(CPUState *cpu, uintptr_t host_pc, bool will_exit) TranslationBlock *tb = tcg_tb_lookup(host_pc); if (tb) { cpu_restore_state_from_tb(cpu, tb, host_pc, will_exit); - if (tb_cflags(tb) & CF_NOCACHE) { - /* one-shot translation, invalidate it immediately */ - tb_phys_invalidate(tb, -1); - tcg_tb_remove(tb); - tb_destroy(tb); - } return true; } } @@ -1634,8 +1628,7 @@ static void do_tb_phys_invalidate(TranslationBlock *tb, bool rm_from_page_list) phys_pc = tb->page_addr[0] + (tb->pc & ~TARGET_PAGE_MASK); h = tb_hash_func(phys_pc, tb->pc, tb->flags, tb_cflags(tb) & CF_HASH_MASK, tb->trace_vcpu_dstate); - if (!(tb->cflags & CF_NOCACHE) && - !qht_remove(&tb_ctx.htable, tb, h)) { + if (!qht_remove(&tb_ctx.htable, tb, h)) { return; } @@ -1796,6 +1789,8 @@ tb_link_page(TranslationBlock *tb, tb_page_addr_t phys_pc, { PageDesc *p; PageDesc *p2 = NULL; + void *existing_tb = NULL; + uint32_t h; assert_memory_lock(); @@ -1815,25 +1810,20 @@ tb_link_page(TranslationBlock *tb, tb_page_addr_t phys_pc, tb->page_addr[1] = -1; } - if (!(tb->cflags & CF_NOCACHE)) { - void *existing_tb = NULL; - uint32_t h; - - /* add in the hash table */ - h = tb_hash_func(phys_pc, tb->pc, tb->flags, tb->cflags & CF_HASH_MASK, - tb->trace_vcpu_dstate); - qht_insert(&tb_ctx.htable, tb, h, &existing_tb); + /* add in the hash table */ + h = tb_hash_func(phys_pc, tb->pc, tb->flags, tb->cflags & CF_HASH_MASK, + tb->trace_vcpu_dstate); + qht_insert(&tb_ctx.htable, tb, h, &existing_tb); - /* 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; + /* 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; } if (p2 && p2 != p) { @@ -1906,7 +1896,6 @@ TranslationBlock *tb_gen_code(CPUState *cpu, tb->cs_base = cs_base; tb->flags = flags; tb->cflags = cflags; - tb->orig_tb = NULL; tb->trace_vcpu_dstate = *cpu->trace_dstate; tcg_ctx->tb_cflags = cflags; tb_overflow: @@ -2445,16 +2434,6 @@ void cpu_io_recompile(CPUState *cpu, uintptr_t retaddr) /* Generate a new TB executing the I/O insn. */ cpu->cflags_next_tb = curr_cflags() | CF_LAST_IO | n; - if (tb_cflags(tb) & CF_NOCACHE) { - if (tb->orig_tb) { - /* Invalidate original TB if this TB was generated in - * cpu_exec_nocache() */ - tb_phys_invalidate(tb->orig_tb, -1); - } - tcg_tb_remove(tb); - tb_destroy(tb); - } - qemu_log_mask_and_addr(CPU_LOG_EXEC, tb->pc, "cpu_io_recompile: rewound execution of TB to " TARGET_FMT_lx "\n", tb->pc);