From patchwork Tue Jul 12 20:13:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: sergey.fedorov@linaro.org X-Patchwork-Id: 9226207 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0C94960868 for ; Tue, 12 Jul 2016 20:28:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F02AF23B3C for ; Tue, 12 Jul 2016 20:28:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E303927D29; Tue, 12 Jul 2016 20:28:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 533D023B3C for ; Tue, 12 Jul 2016 20:28:12 +0000 (UTC) Received: from localhost ([::1]:43258 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bN4Hq-0008Fu-S7 for patchwork-qemu-devel@patchwork.kernel.org; Tue, 12 Jul 2016 16:28:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43098) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bN44g-0001rb-7w for qemu-devel@nongnu.org; Tue, 12 Jul 2016 16:14:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bN44d-0008HL-TG for qemu-devel@nongnu.org; Tue, 12 Jul 2016 16:14:33 -0400 Received: from mail-lf0-x233.google.com ([2a00:1450:4010:c07::233]:33918) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bN44d-0008HB-H9 for qemu-devel@nongnu.org; Tue, 12 Jul 2016 16:14:31 -0400 Received: by mail-lf0-x233.google.com with SMTP id h129so22908692lfh.1 for ; Tue, 12 Jul 2016 13:14:31 -0700 (PDT) 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; bh=1yEyFPEr2pxvnOtoNojlXdmzRQtxJyuoiayaFQXfwaQ=; b=aJgoo4aI0WxShrgoQwFZMdd9mXUEAp3qVY916dnmZhb5CxkB2beT+9QdFBI8bRdMwa o1Yg1Suvt7WZjB/jPwSqUw4o7QqWcTG8ttpZUkaiGfeW6rmZZVPdUENK9VJ0F6jzx8IK XuthBcf87K9txCAQA76gbvj7rkF174BtrR3hM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=1yEyFPEr2pxvnOtoNojlXdmzRQtxJyuoiayaFQXfwaQ=; b=AlQ/mtEd691akcCpBeSlRQS7TXQvSd/gvqVyRP/7D6XGS/Pl1aGqO68W9QFpvd0WEF iIPItJ3zh7UzBcQf4/2wdoTb5NjD06teAzDlEj+M6OZCLHt3KRsfRZ5UOMTX1/7JoNXp Cv6zX2RREPE/Aa0nofU6BVo8xl0f0IUd7dq5m7RFusy4p1uH9K8eaL9V/kngLz5Tljaa mb3ZjDQpe50+3xCtpGYo6wfP9s5YPgAw4poYRPsATvqRlzWNQQTUnXpDL1Qo7XnTpMaR yTGw/RnPJEnX25ijD9hxQSyEpXkwFYJBAFkmACcRuYUs9OT/DjtfsPK1L8G7GjdTuI4z 467g== X-Gm-Message-State: ALyK8tKIPIrCT5YDkIdHNSuABm7b4oTfZrNwyARQ0DH6f5eBhjmim3mvxNlaQNChSshVLsXr X-Received: by 10.25.155.84 with SMTP id d81mr2478236lfe.120.1468354470876; Tue, 12 Jul 2016 13:14:30 -0700 (PDT) Received: from sergey-laptop.Dlink (broadband-46-188-120-37.2com.net. [46.188.120.37]) by smtp.gmail.com with ESMTPSA id g40sm2474029ljg.22.2016.07.12.13.14.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 12 Jul 2016 13:14:30 -0700 (PDT) From: Sergey Fedorov To: qemu-devel@nongnu.org, mttcg@listserver.greensocs.com, fred.konrad@greensocs.com, a.rigo@virtualopensystems.com, serge.fdrv@gmail.com, cota@braap.org, bobby.prani@gmail.com, rth@twiddle.net Date: Tue, 12 Jul 2016 23:13:46 +0300 Message-Id: <1468354426-837-12-git-send-email-sergey.fedorov@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1468354426-837-1-git-send-email-sergey.fedorov@linaro.org> References: <1468354426-837-1-git-send-email-sergey.fedorov@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:4010:c07::233 Subject: [Qemu-devel] [PATCH v3 11/11] tcg: Merge tb_find_slow() and tb_find_fast() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, Sergey Fedorov , patches@linaro.org, claudio.fontana@huawei.com, Peter Crosthwaite , mark.burton@greensocs.com, jan.kiszka@siemens.com, pbonzini@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Sergey Fedorov These functions are not too big and can be merged together. This makes locking scheme more clear and easier to follow. Signed-off-by: Sergey Fedorov Signed-off-by: Sergey Fedorov Reviewed-by: Alex Bennée --- cpu-exec.c | 72 ++++++++++++++++++++++++++------------------------------------ 1 file changed, 30 insertions(+), 42 deletions(-) diff --git a/cpu-exec.c b/cpu-exec.c index 22c672fe03fd..6b01e8ceb0e8 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -278,45 +278,9 @@ static TranslationBlock *tb_find_physical(CPUState *cpu, return qht_lookup(&tcg_ctx.tb_ctx.htable, tb_cmp, &desc, h); } -static TranslationBlock *tb_find_slow(CPUState *cpu, - target_ulong pc, - target_ulong cs_base, - uint32_t flags, - bool *have_tb_lock) -{ - TranslationBlock *tb; - - tb = tb_find_physical(cpu, pc, cs_base, flags); - if (!tb) { - - /* mmap_lock is needed by tb_gen_code, and mmap_lock must be - * taken outside tb_lock. As system emulation is currently - * single threaded the locks are NOPs. - */ - mmap_lock(); - tb_lock(); - *have_tb_lock = true; - - /* There's a chance that our desired tb has been translated while - * taking the locks so we check again inside the lock. - */ - tb = tb_find_physical(cpu, pc, cs_base, flags); - if (!tb) { - /* if no translated code available, then translate it now */ - tb = tb_gen_code(cpu, pc, cs_base, flags, 0); - } - - mmap_unlock(); - } - - /* We add the TB in the virtual pc hash table for the fast lookup */ - atomic_set(&cpu->tb_jmp_cache[tb_jmp_cache_hash_func(pc)], tb); - return tb; -} - -static inline TranslationBlock *tb_find_fast(CPUState *cpu, - TranslationBlock *last_tb, - int tb_exit) +static inline TranslationBlock *tb_find(CPUState *cpu, + TranslationBlock *last_tb, + int tb_exit) { CPUArchState *env = (CPUArchState *)cpu->env_ptr; TranslationBlock *tb; @@ -331,7 +295,31 @@ static inline TranslationBlock *tb_find_fast(CPUState *cpu, tb = atomic_read(&cpu->tb_jmp_cache[tb_jmp_cache_hash_func(pc)]); if (unlikely(!tb || tb->pc != pc || tb->cs_base != cs_base || tb->flags != flags)) { - tb = tb_find_slow(cpu, pc, cs_base, flags, &have_tb_lock); + tb = tb_find_physical(cpu, pc, cs_base, flags); + if (!tb) { + + /* mmap_lock is needed by tb_gen_code, and mmap_lock must be + * taken outside tb_lock. As system emulation is currently + * single threaded the locks are NOPs. + */ + mmap_lock(); + tb_lock(); + have_tb_lock = true; + + /* There's a chance that our desired tb has been translated while + * taking the locks so we check again inside the lock. + */ + tb = tb_find_physical(cpu, pc, cs_base, flags); + if (!tb) { + /* if no translated code available, then translate it now */ + tb = tb_gen_code(cpu, pc, cs_base, flags, 0); + } + + mmap_unlock(); + } + + /* We add the TB in the virtual pc hash table for the fast lookup */ + atomic_set(&cpu->tb_jmp_cache[tb_jmp_cache_hash_func(pc)], tb); } #ifndef CONFIG_USER_ONLY /* We don't take care of direct jumps when address mapping changes in @@ -436,7 +424,7 @@ static inline bool cpu_handle_exception(CPUState *cpu, int *ret) } else if (replay_has_exception() && cpu->icount_decr.u16.low + cpu->icount_extra == 0) { /* try to cause an exception pending in the log */ - cpu_exec_nocache(cpu, 1, tb_find_fast(cpu, NULL, 0), true); + cpu_exec_nocache(cpu, 1, tb_find(cpu, NULL, 0), true); *ret = -1; return true; #endif @@ -620,7 +608,7 @@ int cpu_exec(CPUState *cpu) atomic_mb_set(&cpu->tb_flushed, false); /* reset before first TB lookup */ for(;;) { cpu_handle_interrupt(cpu, &last_tb); - tb = tb_find_fast(cpu, last_tb, tb_exit); + tb = tb_find(cpu, last_tb, tb_exit); cpu_loop_exec_tb(cpu, tb, &last_tb, &tb_exit, &sc); /* Try to align the host and virtual clocks if the guest is in advance */