From patchwork Thu Apr 21 14:57:18 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: 613153 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 3qrMsq1jtTz9t40 for ; Fri, 22 Apr 2016 01:21:35 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b=GlFjMlBO; dkim-atps=neutral Received: from localhost ([::1]:42895 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1atGQ9-0004up-7l for incoming@patchwork.ozlabs.org; Thu, 21 Apr 2016 11:21:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37271) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1atG2z-0005vr-C8 for qemu-devel@nongnu.org; Thu, 21 Apr 2016 10:57:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1atG2w-0005DO-MC for qemu-devel@nongnu.org; Thu, 21 Apr 2016 10:57:37 -0400 Received: from mail-lb0-x229.google.com ([2a00:1450:4010:c04::229]:36256) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1atG2w-0005DB-BW for qemu-devel@nongnu.org; Thu, 21 Apr 2016 10:57:34 -0400 Received: by mail-lb0-x229.google.com with SMTP id ys16so28565879lbb.3 for ; Thu, 21 Apr 2016 07:57:34 -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=dSsni82umQGuNOLv5GsjYNUkcxhBAAx2bkxveOtLfps=; b=GlFjMlBOp73LMDBdjWRDEoDZ6xQ8fiS3pPEiWPVk8ug2gbgbBZPwYCz8xlJK79XT0G p3WRSDoDmrnit1r7vtfp85SaGjrZmempzfj0J9wWmre6Le/qh0sUS9ApM7AAmyhicL90 E2tslXcWF7QpWWUkt7bZ28v8h1qiSXkN3dfCQ= 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=dSsni82umQGuNOLv5GsjYNUkcxhBAAx2bkxveOtLfps=; b=YXL4+iY1rMerxy8owuN3nxL8HTVYT73Fl8JdleBOhFjmEfIeFiILVvnrUtJwghukX8 jjcsR6jB2q4RloeQyAsqk6XyJIaWqVNwqPiTZpjJhh6wIeY+6l/S4hSSdGDtvtnFK48n rPq2QGfatUteHhfjSyEkFcb+++UeaK+DaLJjGlJ/5u5A7/tnipn2wkZjvYD4ECjNw1cH lxm8aN+J8iTEb5uHUMxq6jjbaFAopwnO4H9UIaMXmJk49Xrv0M6ZGDaF92BrCwxztsV8 Eghxm4wqiHnwdJuDzshfe1TWE1FdkVC99gN8+1QPfys/PBMoVPmKaD7cAgA579ZYcK8R 0qNw== X-Gm-Message-State: AOPr4FVXRwysr61YJJvpR222waskCiDLvjZtELECSXdI9TJqo7i4LtREHS/wbvkXRa7azDTL X-Received: by 10.112.73.72 with SMTP id j8mr6809608lbv.143.1461250653113; Thu, 21 Apr 2016 07:57:33 -0700 (PDT) Received: from localhost.localdomain ([195.91.132.170]) by smtp.gmail.com with ESMTPSA id i1sm631327lbs.22.2016.04.21.07.57.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 21 Apr 2016 07:57:32 -0700 (PDT) From: Sergey Fedorov To: qemu-devel@nongnu.org Date: Thu, 21 Apr 2016 17:57:18 +0300 Message-Id: <1461250642-27729-2-git-send-email-sergey.fedorov@linaro.org> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1461250642-27729-1-git-send-email-sergey.fedorov@linaro.org> References: <1461250642-27729-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:c04::229 Subject: [Qemu-devel] [PATCH v4 1/5] 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 8329ea60eeda..0d5d9449dc6b 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; @@ -784,8 +785,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; } @@ -1019,6 +1022,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; @@ -1047,6 +1051,7 @@ static void build_page_bitmap(PageDesc *p) tb = tb->page_next[n]; } } +#endif /* Called with mmap_lock held for user mode emulation. */ TranslationBlock *tb_gen_code(CPUState *cpu, @@ -1296,6 +1301,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) { @@ -1333,8 +1339,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,