From patchwork Tue Jul 5 16:18:12 2016 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: 71398 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp442698qgy; Tue, 5 Jul 2016 11:11:58 -0700 (PDT) X-Received: by 10.55.16.232 with SMTP id 101mr25727685qkq.151.1467742318505; Tue, 05 Jul 2016 11:11:58 -0700 (PDT) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id w30si3062031qtd.46.2016.07.05.11.11.58 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 05 Jul 2016 11:11:58 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:56946 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKUpB-0002w5-Vd for patch@linaro.org; Tue, 05 Jul 2016 14:11:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56578) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKT3D-00078M-Ei for qemu-devel@nongnu.org; Tue, 05 Jul 2016 12:18:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bKT3A-0001wH-Oh for qemu-devel@nongnu.org; Tue, 05 Jul 2016 12:18:19 -0400 Received: from mail-wm0-x236.google.com ([2a00:1450:400c:c09::236]:37630) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKT3A-0001wC-I3 for qemu-devel@nongnu.org; Tue, 05 Jul 2016 12:18:16 -0400 Received: by mail-wm0-x236.google.com with SMTP id a66so159711553wme.0 for ; Tue, 05 Jul 2016 09:18:16 -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=bCR89TmBpvhWUEGgBJiPi4th4igDyBVDzPNfho3xMTM=; b=HrugLY8AFDK6MYpTBYNaAZmOGWSKmgj5mdktfT3g5Qm32gT/TuDBAXrkP3DsE/hiZi DJBJn+iAw095K8B0aivQqpaBhReqgtDjUnoPARy9MMPOMji+MwL8utvstGZgzyMivKHH gAYXXxbFcsvr6cluGbW4vDk0OIJX0QjTALllQ= 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=bCR89TmBpvhWUEGgBJiPi4th4igDyBVDzPNfho3xMTM=; b=DGthUrR+robV3zbhD196XdwbMSlDqqwXwsaJgLZGz1diJG51H3MuB+aWAy0Y31xVxh PER2/O4CNh76gFXafmzH62XjtEp0qMHBg9JhuyHGMMAjZO7KgMMTpWVvZPwtq/AJFJ1o 3DpHZusXI381tvpo+jL1dsVMgUbfwkPihF/jV4LkM757249YnThkyhV3fYV0+q/WWgGA Qaa1hvtwv4DlA3uVWERN4ZU+Z7+gMgJ5NsP9wn3H0Dcx7YgheY4yPXbUnKCCY696/v/4 TYy3QHYTPJeTUBQhwZLCVrbxdAh0EmyEX5n7DkO0DpJnuQ/uIQOk0yGzOJ3AC+k8LIuk +kzw== X-Gm-Message-State: ALyK8tK3cekTERKKPSEsxED9yZfexm/XDwlENYfjRTVLnieLYNILo9RzecJnAL2Xu7Io+W8N X-Received: by 10.194.95.74 with SMTP id di10mr16569362wjb.52.1467735495939; Tue, 05 Jul 2016 09:18:15 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id bc9sm1565971wjc.45.2016.07.05.09.18.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Jul 2016 09:18:13 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 897393E0501; Tue, 5 Jul 2016 17:18:17 +0100 (BST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: mttcg@listserver.greensocs.com, qemu-devel@nongnu.org, fred.konrad@greensocs.com, a.rigo@virtualopensystems.com, serge.fdrv@gmail.com, cota@braap.org, bobby.prani@gmail.com, rth@twiddle.net Date: Tue, 5 Jul 2016 17:18:12 +0100 Message-Id: <1467735496-16256-3-git-send-email-alex.bennee@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1467735496-16256-1-git-send-email-alex.bennee@linaro.org> References: <1467735496-16256-1-git-send-email-alex.bennee@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:400c:c09::236 Subject: [Qemu-devel] [PATCH v2 2/6] 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, Peter Crosthwaite , claudio.fontana@huawei.com, mark.burton@greensocs.com, jan.kiszka@siemens.com, pbonzini@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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 --- translate-all.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- 2.7.4 diff --git a/translate-all.c b/translate-all.c index 96efe48..97e834a 100644 --- a/translate-all.c +++ b/translate-all.c @@ -1126,10 +1126,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) { @@ -1138,6 +1134,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