From patchwork Fri Jul 15 17:58:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sergey Fedorov X-Patchwork-Id: 72127 Delivered-To: patches@linaro.org Received: by 10.140.29.52 with SMTP id a49csp747959qga; Fri, 15 Jul 2016 10:59:25 -0700 (PDT) X-Received: by 10.46.9.141 with SMTP id 135mr1274895ljj.5.1468605550716; Fri, 15 Jul 2016 10:59:10 -0700 (PDT) Return-Path: Received: from mail-lf0-x22c.google.com (mail-lf0-x22c.google.com. [2a00:1450:4010:c07::22c]) by mx.google.com with ESMTPS id 22si7333956lfs.183.2016.07.15.10.59.10 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Jul 2016 10:59:10 -0700 (PDT) Received-SPF: pass (google.com: domain of sergey.fedorov@linaro.org designates 2a00:1450:4010:c07::22c as permitted sender) client-ip=2a00:1450:4010:c07::22c; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: domain of sergey.fedorov@linaro.org designates 2a00:1450:4010:c07::22c as permitted sender) smtp.mailfrom=sergey.fedorov@linaro.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: by mail-lf0-x22c.google.com with SMTP id f93so93475700lfi.2 for ; Fri, 15 Jul 2016 10:59:10 -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=JZJFD124wE7Pu86Ymja79ZKO3d7rxrzyBWn0nURyhCk=; b=VqLd8iSt2JvrnNvqjLYOgVi/2aBVSWVvbk99JNXpo4VHKPO0AUVmdcNl+5n/0EAetH 41tuL+gMDxMH6aG6aqeN23mNlzivyWPMeLp8ZEGFUw2Ob0luzzXAO9ASq582Xll6MfJ3 nuuZFp3OgNfqxMxdZ2uS0DD0AfzamHJXTUyHw= 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=JZJFD124wE7Pu86Ymja79ZKO3d7rxrzyBWn0nURyhCk=; b=WM6JlL4+CfQS7cCANKyzI+7d+YhSMhBapAVtdFO4aJ87/KwQQDuKROHD60vaYs7S6z O4s5wlVuKXKEcflrBHIl7JiEg9KrhUKiRQQAIH6Ry0nUmvgGjnsczZVb/iw8jR7pxM8K uuprLEbC+Mo0smpjPB3CRYwfrsGOnXM8Pk/+UTGgS8SnAoG9ENdWGDNMh8/OjV3FjsU7 V0YZxClSIvUgUMDpe5y+kRIe/r0fHCFDoYMtYy5MyIUdQkISyyOeBW0j5z/k36k/aOwq K6/78r4opSwmcOCjSAA8mX9bP2Fz7fYrIM89qWJ/yFE9X3gY0AFeOpf9IH1RoN6EI9U3 6SZw== X-Gm-Message-State: ALyK8tJMDp/v8nfE0ggY77PCHauMTNDwdkze26teQ6HVIy5OoNen4q6L/KzpVgUmW2LMGhxRFDM= X-Received: by 10.25.150.141 with SMTP id y135mr10322886lfd.66.1468605550412; Fri, 15 Jul 2016 10:59:10 -0700 (PDT) Return-Path: Received: from sergey-laptop.Dlink (broadband-46-188-120-37.2com.net. [46.188.120.37]) by smtp.gmail.com with ESMTPSA id g193sm2113268lfb.14.2016.07.15.10.59.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 15 Jul 2016 10:59:09 -0700 (PDT) From: Sergey Fedorov To: qemu-devel@nongnu.org Cc: patches@linaro.org, Sergey Fedorov , mttcg@listserver.greensocs.com, fred.konrad@greensocs.com, a.rigo@virtualopensystems.com, cota@braap.org, bobby.prani@gmail.com, rth@twiddle.net, mark.burton@greensocs.com, pbonzini@redhat.com, jan.kiszka@siemens.com, peter.maydell@linaro.org, claudio.fontana@huawei.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Sergey Fedorov , Peter Crosthwaite Subject: [PATCH v4 08/12] tcg: set up tb->page_addr before insertion Date: Fri, 15 Jul 2016 20:58:48 +0300 Message-Id: <20160715175852.30749-9-sergey.fedorov@linaro.org> X-Mailer: git-send-email 2.9.1 In-Reply-To: <20160715175852.30749-1-sergey.fedorov@linaro.org> References: <20160715175852.30749-1-sergey.fedorov@linaro.org> MIME-Version: 1.0 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(-) -- 2.9.1 diff --git a/translate-all.c b/translate-all.c index 9db72e8982b1..6156bdcbef42 100644 --- a/translate-all.c +++ b/translate-all.c @@ -1118,10 +1118,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) { @@ -1130,6 +1126,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