From patchwork Thu Apr 28 22:10:54 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: 8975701 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 1C2A2BF29F for ; Thu, 28 Apr 2016 22:11:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 686342015A for ; Thu, 28 Apr 2016 22:11:27 +0000 (UTC) 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.kernel.org (Postfix) with ESMTPS id 8EB2920121 for ; Thu, 28 Apr 2016 22:11:26 +0000 (UTC) Received: from localhost ([::1]:51332 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1avu9d-0006Vl-Dh for patchwork-qemu-devel@patchwork.kernel.org; Thu, 28 Apr 2016 18:11:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32902) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1avu9R-0006Sn-H9 for qemu-devel@nongnu.org; Thu, 28 Apr 2016 18:11:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1avu9O-0006Yt-MT for qemu-devel@nongnu.org; Thu, 28 Apr 2016 18:11:13 -0400 Received: from mail-lf0-x236.google.com ([2a00:1450:4010:c07::236]:33486) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1avu9O-0006Yg-FG for qemu-devel@nongnu.org; Thu, 28 Apr 2016 18:11:10 -0400 Received: by mail-lf0-x236.google.com with SMTP id y84so99616264lfc.0 for ; Thu, 28 Apr 2016 15:11: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=7lxSgqFWJXLMxbQUTfUYCBWfmctEDo61GjxdZW0lg8c=; b=YjgUno/6NZvW/iumTQxMMcFVeYcEzJgx8hn3TeZrKRS2jODjFOb/qN/4x9wFhjLuqV S2/8YQ6GHOsF5K+GphAwTt50faWUPgv41TIxTb0i/xb5KDx9BoKenXSE4wKy5dP1YkAw glirrISYMUdebyxuxwN/oPjmEvBojPJRb4W30= 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=7lxSgqFWJXLMxbQUTfUYCBWfmctEDo61GjxdZW0lg8c=; b=S2Fw/+fJ7EFUzQYlKjpslO3pcnywZ1/I1XxL3/pjv4/SQkF56pJxLyHQ10oWxdad0+ kNU1Ia+svdDY+LdwRBzafalPUzH3ck7Uz1Ql+6Loc2P0o/QAtCcGAKPV8lDXSCfybP93 KR9wn/0hf6xDnkrcH87oKKjBw/hU3BVxIhciuMdgiq1Wca5r5der4KNj+fOUO7WvI7UD VQCyIzLmlwV7i1Neb9LZ15U7yhTcpa3HWFU2wlQzk5RXfOycpnznG2+LwiCyE/SwNnpN hJFlf1/s2NQwT/dH1246+iFo7oSH4NSleP4brLD58HdZ70ZJrQ7Jppcl1AcpYkHPwhe1 9MAg== X-Gm-Message-State: AOPr4FVZ36dmUKN/oUIOTvEDws+mStBO5nAWXrgZ8tud0Ex3x9XBH6/c6fTN6fvPlK6fmRxf X-Received: by 10.25.42.1 with SMTP id q1mr7048925lfq.94.1461881469807; Thu, 28 Apr 2016 15:11:09 -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 xg1sm1925567lbb.10.2016.04.28.15.11.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 28 Apr 2016 15:11:08 -0700 (PDT) From: Sergey Fedorov To: qemu-devel@nongnu.org Date: Fri, 29 Apr 2016 01:10:54 +0300 Message-Id: <1461881459-14297-2-git-send-email-sergey.fedorov@linaro.org> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1461881459-14297-1-git-send-email-sergey.fedorov@linaro.org> References: <1461881459-14297-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::236 Subject: [Qemu-devel] [PATCH v6 1/6] tcg: code_bitmap is not used by user-mode emulation 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: Sergey Fedorov , Peter Crosthwaite , Paolo Bonzini , Sergey Fedorov , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Paolo Bonzini Signed-off-by: Paolo Bonzini [Sergey Fedorov: eliminate the field entirely in user-mode] Signed-off-by: Sergey Fedorov Reviewed-by: Richard Henderson Reviewed-by: Alex Bennée --- Changes in v2: * The field is eliminated entirely in user-mode translate-all.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/translate-all.c b/translate-all.c index d679ad129e10..74fa1b4d271c 100644 --- a/translate-all.c +++ b/translate-all.c @@ -75,8 +75,9 @@ typedef struct PageDesc { /* in order to optimize self modifying code, we count the number of lookups we do to a given page to use a bitmap */ unsigned int code_write_count; +#ifdef CONFIG_SOFTMMU unsigned long *code_bitmap; -#if defined(CONFIG_USER_ONLY) +#else unsigned long flags; #endif } PageDesc; @@ -783,8 +784,10 @@ void tb_free(TranslationBlock *tb) static inline void invalidate_page_bitmap(PageDesc *p) { +#ifdef CONFIG_SOFTMMU g_free(p->code_bitmap); p->code_bitmap = NULL; +#endif p->code_write_count = 0; } @@ -1028,6 +1031,7 @@ void tb_phys_invalidate(TranslationBlock *tb, tb_page_addr_t page_addr) tcg_ctx.tb_ctx.tb_phys_invalidate_count++; } +#ifdef CONFIG_SOFTMMU static void build_page_bitmap(PageDesc *p) { int n, tb_start, tb_end; @@ -1056,6 +1060,7 @@ static void build_page_bitmap(PageDesc *p) tb = tb->page_next[n]; } } +#endif /* add the tb in the target page and protect it if necessary * @@ -1412,6 +1417,7 @@ void tb_invalidate_phys_page_range(tb_page_addr_t start, tb_page_addr_t end, #endif } +#ifdef CONFIG_SOFTMMU /* len must be <= 8 and start must be a multiple of len */ void tb_invalidate_phys_page_fast(tb_page_addr_t start, int len) { @@ -1449,8 +1455,7 @@ void tb_invalidate_phys_page_fast(tb_page_addr_t start, int len) tb_invalidate_phys_page_range(start, start + len, 1); } } - -#if !defined(CONFIG_SOFTMMU) +#else /* Called with mmap_lock held. */ static void tb_invalidate_phys_page(tb_page_addr_t addr, uintptr_t pc, void *puc,