From patchwork Wed Jun 14 05:23:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9785359 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 0047C60325 for ; Wed, 14 Jun 2017 05:27:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F3AD02834A for ; Wed, 14 Jun 2017 05:27:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E609328589; Wed, 14 Jun 2017 05:27:11 +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 686442834A for ; Wed, 14 Jun 2017 05:27:11 +0000 (UTC) Received: from localhost ([::1]:46460 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dL0pi-0004ZQ-Dx for patchwork-qemu-devel@patchwork.kernel.org; Wed, 14 Jun 2017 01:27:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45053) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dL0mA-0001ud-Ky for qemu-devel@nongnu.org; Wed, 14 Jun 2017 01:23:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dL0m9-0007P3-PP for qemu-devel@nongnu.org; Wed, 14 Jun 2017 01:23:30 -0400 Received: from mail-qt0-x242.google.com ([2607:f8b0:400d:c0d::242]:35973) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dL0m9-0007Om-L4 for qemu-devel@nongnu.org; Wed, 14 Jun 2017 01:23:29 -0400 Received: by mail-qt0-x242.google.com with SMTP id s33so39071596qtg.3 for ; Tue, 13 Jun 2017 22:23:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=BDeY2Hfy7TzSI98fi+mQOeW9gC39d9J3xKiiNJqZoXM=; b=ueK7r83g84md0/i5dWL8/d1Z6tQ0FSRw4DzaxbJWOlZqVmx3WR6Jp3vay0n4/7z7rE NK5+hpNORuNXdtp59f0TFo5uWKzZn0gsThvdtLpXDsrnC3AvedxYkDsu/gcF47hyVjJu BQv8n3SnUHOBYAmhAcajcWeigRgEwjVEdZqrA3xuh3UtZ4gdwCKxx07RJIiTbZfbLd5u /eyqpo/bqmNojLGv+XoJyQTZgnf2ygMrzpc5W7A/zjKbXWYWjpVDnikeJfR4ps+3A7AF WGl5ZL7g2AA4K6AT7vOvjI9eJUS5y9XVRypR7uQIMeqLmgTkUKXXOI5BkPu0mR77HupA TGoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=BDeY2Hfy7TzSI98fi+mQOeW9gC39d9J3xKiiNJqZoXM=; b=hK4zblN8VhUIS41mAvCd0uo8SFkNZ6YLBtzrDlwxYu0teN3LiF26KruwcH+qxjLV8y 92w1OBjgiguf2CKn9dNJU7REv1jVPfkYUMKvUGJwZIHGzy0JmLE6yS3bQFwffcVEj6ar nX+m11cjqDn9KrzUupEpAtV37ZsQwYaNId1F9c0vL3qzLfQfG9uzbQ7m0/DhxWNpnsvf yPLk8P/bBM7p46n9lIPViHWBYgaGN3+cULPWrNyqyk8wjv9XZv0pd18PFgDOdnWcJh+S vQsKYEdcYT7Y2gtxNkqjvVu1TgYbKRIdsE7CuGGGSwzN19HdEYtkYM+Hy7mCpxdagsid u88g== X-Gm-Message-State: AKS2vOziVzgtJ6gjm7cfLCmCem2mntY/YU/XvI8Lpm/5T66eUHkmiqNT Je6sIxeHerdq5o3615M= X-Received: by 10.200.48.162 with SMTP id v31mr4808602qta.84.1497417809003; Tue, 13 Jun 2017 22:23:29 -0700 (PDT) Received: from bigtime.twiddle.net.com (97-113-165-157.tukw.qwest.net. [97.113.165.157]) by smtp.gmail.com with ESMTPSA id 34sm10959480qtp.17.2017.06.13.22.23.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 Jun 2017 22:23:28 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 13 Jun 2017 22:23:11 -0700 Message-Id: <20170614052311.13785-11-rth@twiddle.net> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170614052311.13785-1-rth@twiddle.net> References: <20170614052311.13785-1-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::242 Subject: [Qemu-devel] [PULL 10/10] tcg: Remove tb_htable_lookup from helper_lookup_tb_ptr 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 Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP This appears to induce lockups, or maybe livelocks, while booting an Alpha Linux kernel. The assumption is that there is a bug elsewhere within QEMU, but reverting the patch allows normal work to continue in the meantime. Signed-off-by: Richard Henderson --- tcg-runtime.c | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/tcg-runtime.c b/tcg-runtime.c index 7fa90ce..cc3bbaf 100644 --- a/tcg-runtime.c +++ b/tcg-runtime.c @@ -147,30 +147,24 @@ uint64_t HELPER(ctpop_i64)(uint64_t arg) void *HELPER(lookup_tb_ptr)(CPUArchState *env, target_ulong addr) { CPUState *cpu = ENV_GET_CPU(env); - TranslationBlock *tb; - target_ulong cs_base, pc; - uint32_t flags; + unsigned int hash = tb_jmp_cache_hash_func(addr); + TranslationBlock *tb = atomic_rcu_read(&cpu->tb_jmp_cache[hash]); + void *ret = tcg_ctx.code_gen_epilogue; - tb = atomic_rcu_read(&cpu->tb_jmp_cache[tb_jmp_cache_hash_func(addr)]); if (likely(tb)) { + target_ulong cs_base, pc; + uint32_t flags; + cpu_get_tb_cpu_state(env, &pc, &cs_base, &flags); - if (likely(tb->pc == addr && tb->cs_base == cs_base && - tb->flags == flags)) { - goto found; - } - tb = tb_htable_lookup(cpu, addr, cs_base, flags); - if (likely(tb)) { - atomic_set(&cpu->tb_jmp_cache[tb_jmp_cache_hash_func(addr)], tb); - goto found; + if (tb->pc == addr && tb->cs_base == cs_base && tb->flags == flags) { + ret = tb->tc_ptr; + qemu_log_mask_and_addr(CPU_LOG_EXEC, addr, + "Chain %p [%d: " TARGET_FMT_lx "] %s\n", + ret, cpu->cpu_index, addr, + lookup_symbol(addr)); } } - return tcg_ctx.code_gen_epilogue; - found: - qemu_log_mask_and_addr(CPU_LOG_EXEC, addr, - "Chain %p [%d: " TARGET_FMT_lx "] %s\n", - tb->tc_ptr, cpu->cpu_index, addr, - lookup_symbol(addr)); - return tb->tc_ptr; + return ret; } void HELPER(exit_atomic)(CPUArchState *env)