From patchwork Tue Jul 12 20:13:43 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: 9226197 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 31AE3604DB for ; Tue, 12 Jul 2016 20:19:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 22D08277D9 for ; Tue, 12 Jul 2016 20:19:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 17A3227CCB; Tue, 12 Jul 2016 20:19:48 +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 B8C3F277D9 for ; Tue, 12 Jul 2016 20:19:47 +0000 (UTC) Received: from localhost ([::1]:43207 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bN49i-0007Pa-UX for patchwork-qemu-devel@patchwork.kernel.org; Tue, 12 Jul 2016 16:19:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43038) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bN44c-0001nR-8T for qemu-devel@nongnu.org; Tue, 12 Jul 2016 16:14:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bN44Z-0008GE-Sm for qemu-devel@nongnu.org; Tue, 12 Jul 2016 16:14:29 -0400 Received: from mail-lf0-x22a.google.com ([2a00:1450:4010:c07::22a]:33905) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bN44Z-0008G9-Kx for qemu-devel@nongnu.org; Tue, 12 Jul 2016 16:14:27 -0400 Received: by mail-lf0-x22a.google.com with SMTP id h129so22907579lfh.1 for ; Tue, 12 Jul 2016 13:14:27 -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 :mime-version:content-transfer-encoding; bh=u9BYBcLPx+5Y1XZ4qZyuM9nF/EH1aD6rY7sFK/E957U=; b=MR5PVES+OTHD+8v0CF9TJbBFc/qnb1LdESc+YupzHqmyLTopwcN1jlq+OgejQ8JfM7 cemm2tyMvOm+HhV5vJINDnWCPeWpMbJIDutI7XU3pMcWU8YD1ZYLqsEFHNFyn/e8448n 8DkxAEkHX8BP5bz6g09AS3um+oYVCOv+Tciow= 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:mime-version:content-transfer-encoding; bh=u9BYBcLPx+5Y1XZ4qZyuM9nF/EH1aD6rY7sFK/E957U=; b=VqXZhfUlMt2wOIcgenIkrVRJUNgeitydRYutzEOE8Lv/CemUMzLZ8C335+ejASVWMJ 94Y0KM9QEuBFS9o8/j9vaye20aFgqC0v7UnlGWQyr7TqAsmkF91PeELf4r+kI18LOrfh FWtdd5hIVVffr0S6M9yth8jL89BtPWwV14b+t5DCXuIyRTZtk47QY1Kwm3chPA166hlX Fqs92EzNoo6fNPuJEdl74N8EzqNw4A1TACqHNJDwrxID/UVNZghUTW6LqM2OZmWSyqIC V1S457ZqmlBBAvTMSM/POcwjkUp8kB0+76jhmiLfbYfCRNe+55j4+Qpgx0ISgfoMP2ck /zuA== X-Gm-Message-State: ALyK8tLvqYlKq7gpz/8gkcWNWevy4i9a0KZQcRMBBmkiu4AhXGuX07nfpC5bB/yIxt6PhzLQ X-Received: by 10.25.25.137 with SMTP id 131mr2595925lfz.149.1468354467031; Tue, 12 Jul 2016 13:14:27 -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.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 12 Jul 2016 13:14:26 -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:43 +0300 Message-Id: <1468354426-837-9-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> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:4010:c07::22a Subject: [Qemu-devel] [PATCH v3 08/11] tcg: set up tb->page_addr before insertion 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, claudio.fontana@huawei.com, Sergey Fedorov , patches@linaro.org, jan.kiszka@siemens.com, Peter Crosthwaite , mark.burton@greensocs.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: Alex Bennée This ensures that if we find the TB on the slow path that tb->page_addr is correctly set before being tested. Signed-off-by: Alex Bennée Reviewed-by: Sergey Fedorov Signed-off-by: Sergey Fedorov --- translate-all.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/translate-all.c b/translate-all.c index ee8308209350..b7369fe5bd04 100644 --- a/translate-all.c +++ b/translate-all.c @@ -1119,10 +1119,6 @@ static void tb_link_page(TranslationBlock *tb, tb_page_addr_t phys_pc, { uint32_t h; - /* add in the hash table */ - h = tb_hash_func(phys_pc, tb->pc, tb->flags); - qht_insert(&tcg_ctx.tb_ctx.htable, tb, h); - /* add in the page list */ tb_alloc_page(tb, 0, phys_pc & TARGET_PAGE_MASK); if (phys_page2 != -1) { @@ -1131,6 +1127,10 @@ static void tb_link_page(TranslationBlock *tb, tb_page_addr_t phys_pc, tb->page_addr[1] = -1; } + /* add in the hash table */ + h = tb_hash_func(phys_pc, tb->pc, tb->flags); + qht_insert(&tcg_ctx.tb_ctx.htable, tb, h); + #ifdef DEBUG_TB_CHECK tb_page_check(); #endif