From nobody Tue Feb 10 01:14:40 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1493106982216335.49144111438136; Tue, 25 Apr 2017 00:56:22 -0700 (PDT) Received: from localhost ([::1]:47565 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d2vKe-0001Iu-4x for importer@patchew.org; Tue, 25 Apr 2017 03:56:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33771) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d2vIg-0008Fp-4P for qemu-devel@nongnu.org; Tue, 25 Apr 2017 03:54:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d2vIf-0000ji-2Z for qemu-devel@nongnu.org; Tue, 25 Apr 2017 03:54:18 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:35991) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d2vIc-0000fB-Cf; Tue, 25 Apr 2017 03:54:14 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id E873821F1F; Tue, 25 Apr 2017 03:54:03 -0400 (EDT) Received: from frontend2 ([10.202.2.161]) by compute4.internal (MEProxy); Tue, 25 Apr 2017 03:54:03 -0400 Received: from localhost (flamenco.cs.columbia.edu [128.59.20.216]) by mail.messagingengine.com (Postfix) with ESMTPA id 7A76E24811; Tue, 25 Apr 2017 03:54:03 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=braap.org; h=cc :date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s=mesmtp; bh=7Tv sDZZBFRCz/sC2wkCjfkLkAMw2jfzmseFj4+YhzrE=; b=kjieIErS6qZA1jKaRHk Q4rso3YrQpWvohMrVLRhEVyL4MyBvqj2gPDSUkSvqGcOw2EiJB3ncN0oVGayPDsM 2HnSUSQdRiJyQqxKkDqyUcNWIZbv4mgV4seG/8HPHZlyb1fDmE7edS6ZL9Ac9/pK ZxaH8rm7xzcoM0yYVF/ICV2U= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=7TvsDZZBFRCz/sC2wkCjfkLkAMw2jfzmseFj4+Yhz rE=; b=giPtF4EkA/VvRYwDxlrGlcLeSxtqfSOcXhjrkpuTQEhOS4TGr86VzbBNh SMOfDBv3NFpM7QraTryLQIhEli3mgm1uhmKQ+0tCElzfNaZldqYy2q/VefCSveW8 RLLVdH8XSR8LqktVO76eLl9PpHaQikIe2LyTcItTHG7TnqOGmaD3Zvgk4TNI/6Cw cm53vKs4Bo1TQ1//HU9fc3USZW9MCx8Obh5gk9OdX2JiyiWa/SeOWpGuTtuZBljo FtivdjoGyn05KTfuaUwDZuMbxbN/ESNtYLlIKV1+/D7BFWKi6hlzqHKiuHv+KTf5 xxR4dWpdLhgUOewwzoBPN3G/snrbw== X-ME-Sender: X-Sasl-enc: ePeerizF/sFc03+8skmfcqyZu2z64H3tf2JaKdSpLtfA 1493106843 From: "Emilio G. Cota" To: qemu-devel@nongnu.org Date: Tue, 25 Apr 2017 03:53:48 -0400 Message-Id: <1493106839-10438-3-git-send-email-cota@braap.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1493106839-10438-1-git-send-email-cota@braap.org> References: <1493106839-10438-1-git-send-email-cota@braap.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.111.4.28 Subject: [Qemu-devel] [PATCH v2 02/13] exec-all: inline tb_from_jmp_cache 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 , Eduardo Habkost , Peter Crosthwaite , Stefan Weil , Alexander Graf , alex.bennee@linaro.org, qemu-arm@nongnu.org, Pranith Kumar , Paolo Bonzini , Aurelien Jarno , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The inline improves performance, as shown in upcoming commits' logs. This commit is kept separate to ease review, since the inclusion of tb-hash.h might be controversial. The problem here, which was introduced before this commit, is that tb_hash_func() depends on page_addr_t: this defeats the original purpose of tb-hash.h, which was to be self-contained and CPU-agnostic. Signed-off-by: Emilio G. Cota --- cpu-exec.c | 19 ------------------- include/exec/exec-all.h | 24 +++++++++++++++++++++++- 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/cpu-exec.c b/cpu-exec.c index b4adf16..63a56d0 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -309,25 +309,6 @@ static bool tb_cmp(const void *p, const void *d) return false; } =20 -TranslationBlock *tb_from_jmp_cache(CPUArchState *env, target_ulong vaddr) -{ - CPUState *cpu =3D ENV_GET_CPU(env); - TranslationBlock *tb; - target_ulong cs_base, pc; - uint32_t flags; - - if (unlikely(atomic_read(&cpu->exit_request))) { - return NULL; - } - cpu_get_tb_cpu_state(env, &pc, &cs_base, &flags); - tb =3D atomic_rcu_read(&cpu->tb_jmp_cache[tb_jmp_cache_hash_func(vaddr= )]); - if (likely(tb && tb->pc =3D=3D vaddr && tb->cs_base =3D=3D cs_base && - tb->flags =3D=3D flags)) { - return tb; - } - return NULL; -} - static TranslationBlock *tb_htable_lookup(CPUState *cpu, target_ulong pc, target_ulong cs_base, diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index 18b80bc..bd76987 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -367,7 +367,29 @@ struct TranslationBlock { void tb_free(TranslationBlock *tb); void tb_flush(CPUState *cpu); void tb_phys_invalidate(TranslationBlock *tb, tb_page_addr_t page_addr); -TranslationBlock *tb_from_jmp_cache(CPUArchState *env, target_ulong vaddr); + +/* tb_hash_func() in tb-hash.h needs tb_page_addr_t, defined above */ +#include "tb-hash.h" + +static inline +TranslationBlock *tb_from_jmp_cache(CPUArchState *env, target_ulong vaddr) +{ + CPUState *cpu =3D ENV_GET_CPU(env); + TranslationBlock *tb; + target_ulong cs_base, pc; + uint32_t flags; + + if (unlikely(atomic_read(&cpu->exit_request))) { + return NULL; + } + cpu_get_tb_cpu_state(env, &pc, &cs_base, &flags); + tb =3D atomic_rcu_read(&cpu->tb_jmp_cache[tb_jmp_cache_hash_func(vaddr= )]); + if (likely(tb && tb->pc =3D=3D vaddr && tb->cs_base =3D=3D cs_base && + tb->flags =3D=3D flags)) { + return tb; + } + return NULL; +} =20 #if defined(USE_DIRECT_JUMP) =20 --=20 2.7.4