From patchwork Thu Mar 24 21:56:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: sergey.fedorov@linaro.org X-Patchwork-Id: 601824 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 ozlabs.org (Postfix) with ESMTPS id 3qWL2M6R1Cz9s1h for ; Fri, 25 Mar 2016 08:59:55 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b=E+drDjZl; dkim-atps=neutral Received: from localhost ([::1]:52977 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ajDII-0004U2-6K for incoming@patchwork.ozlabs.org; Thu, 24 Mar 2016 17:59:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45346) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ajDGB-00006M-IC for qemu-devel@nongnu.org; Thu, 24 Mar 2016 17:57:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ajDGA-0008Sy-HF for qemu-devel@nongnu.org; Thu, 24 Mar 2016 17:57:43 -0400 Received: from mail-lb0-x22c.google.com ([2a00:1450:4010:c04::22c]:35407) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ajDGA-0008Sp-9T for qemu-devel@nongnu.org; Thu, 24 Mar 2016 17:57:42 -0400 Received: by mail-lb0-x22c.google.com with SMTP id bc4so39330399lbc.2 for ; Thu, 24 Mar 2016 14:57:42 -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; bh=KOB4Cz+Ue6huax43IWXCQYmVtjyV24r16JYxIdScXd4=; b=E+drDjZldM4dLBmdTZASY7b/DTeWYReRLvW/xJRJj8stzez2BNF3412f5RRuGbEel9 +5ZKaJO6mzcITXkNUkLcETVKtRu553KOJV//rYpVJE3JLZ3Sk4XdBveGHDMllJABoC/Y stI45QbGitEDIxkAgqGbCiR/wcGJYytYFHKj0= 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; bh=KOB4Cz+Ue6huax43IWXCQYmVtjyV24r16JYxIdScXd4=; b=GUq4eXxjf/HcSoG9wu/JxwDQ9mWREbzdWNbXWXou4Ag7R/ESRQye5v2mBtG15J1Dt5 j6SgO4GNhF6hz9h4iUvG9xz3kyOmDRBVOf8u6x5Wo2Zfm5JHOyyVdl7l3mhtnEd5k0ow lMOjFHUDARC9lubsYdLOVxUAH1m8PSYO0hVDEiskLweSSvd9GJPJpzhWSGouj25A0rgZ dv/d3nVN09tjISEWsN/ZnpxjZiUHTbDJSqd6T/9xtWwcFIZ4V+7duM1PIRPhWO5OsTwB oDYdaPpKM0ilCULFi4SVlEO24FxI2tia9Ue9V9Y43D17qRsP+HBwVU+LrqBpjlOM7shs lK1A== X-Gm-Message-State: AD7BkJJYhMTLJWSlPWBIS90LEdGmfNOkNzEXSllunSjHFp8q5/v4UC9M4sGiWR/gsx8r1omn X-Received: by 10.112.78.97 with SMTP id a1mr3532244lbx.99.1458856661478; Thu, 24 Mar 2016 14:57:41 -0700 (PDT) Received: from sergey-laptop.Dlink (broadband-46-188-121-115.2com.net. [46.188.121.115]) by smtp.gmail.com with ESMTPSA id a14sm1547144lfe.7.2016.03.24.14.57.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 24 Mar 2016 14:57:40 -0700 (PDT) From: sergey.fedorov@linaro.org To: qemu-devel@nongnu.org Date: Fri, 25 Mar 2016 00:56:43 +0300 Message-Id: <1458856607-3275-5-git-send-email-sergey.fedorov@linaro.org> X-Mailer: git-send-email 2.7.3 In-Reply-To: <1458856607-3275-1-git-send-email-sergey.fedorov@linaro.org> References: <1458856607-3275-1-git-send-email-sergey.fedorov@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:4010:c04::22c Cc: Sergey Fedorov , Peter Crosthwaite , Paolo Bonzini , Sergey Fedorov , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson Subject: [Qemu-devel] [PATCH v2 4/8] tcg: Init TB's direct jumps before making it visible X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Sergey Fedorov Initialize TB's direct jump list data fields and reset the jumps before tb_link_page() puts it into the physical hash table and the physical page list. So TB is completely initialized before it becomes visible. Signed-off-by: Sergey Fedorov Signed-off-by: Sergey Fedorov --- Notes: Changes in v2: * Tweaked a comment translate-all.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/translate-all.c b/translate-all.c index e54afb89e414..6e4d9de06fa0 100644 --- a/translate-all.c +++ b/translate-all.c @@ -1132,19 +1132,6 @@ static void tb_link_page(TranslationBlock *tb, tb_page_addr_t phys_pc, tb->page_addr[1] = -1; } - assert(((uintptr_t)tb & 3) == 0); - tb->jmp_list_first = (uintptr_t)tb | 2; - tb->jmp_list_next[0] = (uintptr_t)NULL; - tb->jmp_list_next[1] = (uintptr_t)NULL; - - /* init original jump addresses */ - if (tb->jmp_reset_offset[0] != TB_JMP_RESET_OFFSET_INVALID) { - tb_reset_jump(tb, 0); - } - if (tb->jmp_reset_offset[1] != TB_JMP_RESET_OFFSET_INVALID) { - tb_reset_jump(tb, 1); - } - #ifdef DEBUG_TB_CHECK tb_page_check(); #endif @@ -1252,6 +1239,20 @@ TranslationBlock *tb_gen_code(CPUState *cpu, ROUND_UP((uintptr_t)gen_code_buf + gen_code_size + search_size, CODE_GEN_ALIGN); + /* init jump list */ + assert(((uintptr_t)tb & 3) == 0); + tb->jmp_list_first = (uintptr_t)tb | 2; + tb->jmp_list_next[0] = (uintptr_t)NULL; + tb->jmp_list_next[1] = (uintptr_t)NULL; + + /* init original jump addresses wich has been set during tcg_gen_code() */ + if (tb->jmp_reset_offset[0] != TB_JMP_RESET_OFFSET_INVALID) { + tb_reset_jump(tb, 0); + } + if (tb->jmp_reset_offset[1] != TB_JMP_RESET_OFFSET_INVALID) { + tb_reset_jump(tb, 1); + } + /* check next page if needed */ virt_page2 = (pc + tb->size - 1) & TARGET_PAGE_MASK; phys_page2 = -1;