From patchwork Wed Feb 10 22:10:51 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: 380262 Delivered-To: patch@linaro.org Received: by 2002:a02:b18a:0:0:0:0:0 with SMTP id t10csp1578992jah; Wed, 10 Feb 2021 14:54:30 -0800 (PST) X-Google-Smtp-Source: ABdhPJycgmWYdiMaw5cCyGeO9quUHsRl/2KVw5DHroYXk/gfarWpfNoYcxwsY+n+fYi/nyMH6ST5 X-Received: by 2002:a5b:34e:: with SMTP id q14mr7698873ybp.291.1612997670361; Wed, 10 Feb 2021 14:54:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612997670; cv=none; d=google.com; s=arc-20160816; b=KCuZtFi6442Gb9rrEpJQMbDjPjTw/csjFB23uLVf+Xpoji6UwL3yeYtr2CDQlF5dRC kML2l0ye3hOKpK6VuneFIAF1/d9jeoW7312nSQ4Fl1W70yZ+dXQcmcCSv3Y+NHsy+jNd 38b8ESVufrvNnduUUpxz+5VQXm4s2Yigv/AjSuLNza7Kc9pSZPTA4kYwDLcgSPVTLIfF ZsX4RRfiZrKIl/YVys3rSWYP/ZEdBdxO6GIy5TYsVT69JpxjaL3oHfps6ceMtjEHxH3a vGit3nIKavKOTDUJB9JfPqMuHzzZo+RHbWByDko1BvXwetPOECNs9gMRHRtK0NP0Rzoe kyXw== 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=lUQfSvO41ymeVYxkOJOoiNQ8fcoV5S/zkovOyoqGlLk=; b=i4fHKy7/PGJVCnv7hGSi31A8rY8LjR1NXevCKT3FzxKUomnxQ/106+CGchMuHG7KC9 RolU0uHCu1auXvrDz5+XdP1t3sBhAUBuJMm7ajoFoKM6zD8wk8t/HTEFf5WgIIvhyZCo 986AI3t/R8Uew3apVnROsfWUvLqxjk8WqHeic70dE/L+e7nUXjMDl8qNOPteCs2qQ7NX 9FeieUvNUnfOZ3RQ2F19WXSedRxLFgVd0qB1QQ0JKEJm+45t7aM1Ckcyvarhh2o0p57m 2ecrZvi2S6JqObb7tWCIJwe/rLxIdHuS7Jhklgxw9r3gzSK1/DapZen2ULn+bVCFdndG mFbA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=d2fLenfg; 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 g32si3079442ybi.183.2021.02.10.14.54.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 10 Feb 2021 14:54:30 -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=d2fLenfg; 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]:47010 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9yNR-0001E2-RD for patch@linaro.org; Wed, 10 Feb 2021 17:54:29 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58758) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l9xqG-0006xf-0T for qemu-devel@nongnu.org; Wed, 10 Feb 2021 17:20:12 -0500 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:50660) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l9xqD-0006op-32 for qemu-devel@nongnu.org; Wed, 10 Feb 2021 17:20:11 -0500 Received: by mail-wm1-x32d.google.com with SMTP id 190so3213370wmz.0 for ; Wed, 10 Feb 2021 14:20:08 -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=lUQfSvO41ymeVYxkOJOoiNQ8fcoV5S/zkovOyoqGlLk=; b=d2fLenfgJCtLiAxKfrMG7H3Kcg7om9NxfIh8cOE1LyPfKDGW7kcZq4drgbwvCA/oiT LlAlz/IC0EYILyJwQQWg9HzWsAyv87aktJe8R+ZbIB+2T25+E9uZZYcA50n0CbfyCCGk iLkTD380eH0SCp6shQpqxceAnjqZslItGh22h4CXI7BZsJDLUEScOkVLONFE2gUxVhC7 TS1iB/6xx2dJ/32idjgfIp0cP+YwbilQ+IdKR9g/4P/9pJKizrPYXOmuKYFFyLo2iiwl p77r+774dMBApnYGmTnlMPI8vWbEBtUlwyKvs2Uu+0m9QnXj1HRxw8fveapCoZ1B+u4c 19KA== 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=lUQfSvO41ymeVYxkOJOoiNQ8fcoV5S/zkovOyoqGlLk=; b=PViBdLm/bs9oA2DpoSB0vVG7FtVEBkA8I+AIhs14NjOo3YNh5Ll+ijVW4OK17YgRdM HJjIqTTdH6VCp2TMB5M0mYkUXn2ZcfxG6gV9cmTMYjAaUgq9A4c1Xevzy5prvOJsX3pu 1oJqjoQwWK/udBIo306/pQK6ZyFt9d9Jvfy6fNMmv2+TZdIxsOWrZrkkLpdr3kmrO/9a c+8U2SSZ7Z2vZbMwiXLuemk3Fkcn4sklKvxyZyAAu05CuWK6GovWF6msI4yooX+r4rVB Wu+HqYA/h1oTegS6RriWS6SbertxE3Jiy+O/ocizaVUDOLlXu4ZStiuLoanNNSLsoTCB mrjg== X-Gm-Message-State: AOAM532oSs7weEwAkHcXLfpo53VHq/GjfBUWZNspzQccapbNNIBghC2b ctZ0tS3t3Gfk3e3cvQr5pWsYrg== X-Received: by 2002:a7b:ce95:: with SMTP id q21mr1200190wmj.178.1612995607667; Wed, 10 Feb 2021 14:20:07 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id c62sm5227677wmd.43.2021.02.10.14.20.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Feb 2021 14:20:04 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 718831FFA6; Wed, 10 Feb 2021 22:10:55 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 19/21] accel/tcg: remove CF_NOCACHE and special cases Date: Wed, 10 Feb 2021 22:10:51 +0000 Message-Id: <20210210221053.18050-20-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210210221053.18050-1-alex.bennee@linaro.org> References: <20210210221053.18050-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32d.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 , robhenry@microsoft.com, mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, Paolo Bonzini , kuhn.chenqun@huawei.com, =?utf-8?q?Alex_Benn=C3=A9e?= 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: <20210209182749.31323-11-alex.bennee@linaro.org> --- include/exec/exec-all.h | 3 --- accel/tcg/translate-all.c | 51 ++++++++++++--------------------------- 2 files changed, 15 insertions(+), 39 deletions(-) -- 2.20.1 diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index f933c74c44..e08179de34 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 7e62d8ad97..0666f9ef14 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -409,12 +409,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; } } @@ -1633,8 +1627,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; } @@ -1795,6 +1788,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(); @@ -1814,25 +1809,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) { @@ -1905,7 +1895,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: @@ -2444,16 +2433,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);