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 X-Patchwork-Id: 71878 Delivered-To: patches@linaro.org Received: by 10.140.29.52 with SMTP id a49csp653220qga; Tue, 12 Jul 2016 13:14:35 -0700 (PDT) X-Received: by 10.25.150.75 with SMTP id y72mr2469810lfd.92.1468354467334; Tue, 12 Jul 2016 13:14:27 -0700 (PDT) Return-Path: Received: from mail-lf0-x231.google.com (mail-lf0-x231.google.com. [2a00:1450:4010:c07::231]) by mx.google.com with ESMTPS id 205si1080132lfk.248.2016.07.12.13.14.27 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Jul 2016 13:14:27 -0700 (PDT) Received-SPF: pass (google.com: domain of sergey.fedorov@linaro.org designates 2a00:1450:4010:c07::231 as permitted sender) client-ip=2a00:1450:4010:c07::231; 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::231 as permitted sender) smtp.mailfrom=sergey.fedorov@linaro.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: by mail-lf0-x231.google.com with SMTP id h129so22907576lfh.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=YCkYDkoLBNNXeWYwPZ5p1hMtORRFieFMMQ4cvMmYtkWOnL9fkJ/Q3pLLj/SsCjuWEv 2FuTAoK3BoKxI1EC5tuEPqcbgxjn2PuN5SY66ytGnPymHKOEfMRLkLdci70z+S1fBRII ZlHqG5Ohl1P7j7t975NmwrefDtaoucvpKaeyOOKr/MD5RZqMYiBEqrdyXYrwFbjgM2dp faMWOd7k3SVj5JAnDuoU97usm3zBue8Jy863eninsaN77xZRIR9MSV9bsBv2an2621XR AN+/m8e54TACMQ5vuoXUPefUxo7b8Vrs3ULiS2MipXYdIJhO+NzAdowUCIaF6OEG+4zy 0PGQ== X-Gm-Message-State: ALyK8tJZn/PgttVoAd9Cy3yWQSjd+ReTSPP6M/lXCMN8Bp6kMNyljgbszs+hpmiYTLIDnrkl//I= X-Received: by 10.25.25.137 with SMTP id 131mr2595925lfz.149.1468354467031; Tue, 12 Jul 2016 13:14:27 -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 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 Cc: patches@linaro.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , mark.burton@greensocs.com, pbonzini@redhat.com, jan.kiszka@siemens.com, peter.maydell@linaro.org, claudio.fontana@huawei.com, Sergey Fedorov , Peter Crosthwaite Subject: [PATCH v3 08/11] tcg: set up tb->page_addr before insertion 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 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(-) -- 1.9.1 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