From patchwork Tue Apr 26 10:41:14 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: 614908 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 3qvKTW3ZxMz9s5M for ; Tue, 26 Apr 2016 20:44:15 +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=MXaGvQLS; dkim-atps=neutral Received: from localhost ([::1]:37368 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1av0TV-0003Xh-Hx for incoming@patchwork.ozlabs.org; Tue, 26 Apr 2016 06:44:13 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53824) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1av0R2-0007AB-0L for qemu-devel@nongnu.org; Tue, 26 Apr 2016 06:41:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1av0Qx-0006DP-8e for qemu-devel@nongnu.org; Tue, 26 Apr 2016 06:41:39 -0400 Received: from mail-lf0-x229.google.com ([2a00:1450:4010:c07::229]:36058) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1av0Qx-0006DL-0n for qemu-devel@nongnu.org; Tue, 26 Apr 2016 06:41:35 -0400 Received: by mail-lf0-x229.google.com with SMTP id u64so11164929lff.3 for ; Tue, 26 Apr 2016 03:41: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=MXaGvQLSVTu877p+dRTFCa4NZXcDrpx32UT3sW6YcLPx71OM7PYPeI/KyA8MsPow3V C9GbnIr72RV2v3lTunzsCwbQpcTTruTISKLCPnRFnvuFCAGtYlsP9Er2j5vb0ehKRj6x 7X8/7y7S6MECZXGbPuNkpVhzzZ/D6wTDIzCb0= 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=J42Azk3DZa/vgV7WbcA+zLXycC7XzN0Vq4AeM9rDmWsULA25wDRvX0IWHJ7Fab6u3f g94BqEgQ876khhWkqI+mfsnYNtNnSI5Kuju7w3RNFv03ud5N0Ey9Ot+AEkCVXeYR16X3 a/ER+MD7ozKY7bNKGVXSgKVkVdyxRT1fyZ2Upb11UZC6G80a61P1OUQGChX6BIaSPbO1 73wIAYH7H3JA3RVFNWaBfpsg/PMZtijIynbwB6BabTsUyxl6PGidCEeadNpeNQRdNWxm LtyMPaCMDAIKuQkEv9vhfAOqHtURkOhfdyoURnrScvxmwQ/EeXdxbSUX7KSTQ3oQTGMt A0Ug== X-Gm-Message-State: AOPr4FU9s2NXsMOAvhRtN9Qfl82qZoGjAP6yU8qa58QaeAWRx+8lSSAmQRc8gbs0Eic/GqPg X-Received: by 10.112.161.200 with SMTP id xu8mr1025324lbb.106.1461667294224; Tue, 26 Apr 2016 03:41:34 -0700 (PDT) Received: from localhost.localdomain ([195.91.132.170]) by smtp.gmail.com with ESMTPSA id l124sm5325654lfg.40.2016.04.26.03.41.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 26 Apr 2016 03:41:33 -0700 (PDT) From: Sergey Fedorov To: qemu-devel@nongnu.org Date: Tue, 26 Apr 2016 13:41:14 +0300 Message-Id: <1461667279-5229-2-git-send-email-sergey.fedorov@linaro.org> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1461667279-5229-1-git-send-email-sergey.fedorov@linaro.org> References: <1461667279-5229-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::229 Subject: [Qemu-devel] [PATCH v5 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+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,