From patchwork Wed Aug 12 16:40:58 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 506700 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id B125E14018C for ; Thu, 13 Aug 2015 02:44:20 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=quTSwHYF; dkim-atps=neutral Received: from localhost ([::1]:39482 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZPZ8U-0007e2-KU for incoming@patchwork.ozlabs.org; Wed, 12 Aug 2015 12:44:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55351) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZPZ5b-0001ok-IK for qemu-devel@nongnu.org; Wed, 12 Aug 2015 12:41:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZPZ5X-0008AL-K2 for qemu-devel@nongnu.org; Wed, 12 Aug 2015 12:41:19 -0400 Received: from mail-wi0-x22f.google.com ([2a00:1450:400c:c05::22f]:36566) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZPZ5X-00089u-Cn for qemu-devel@nongnu.org; Wed, 12 Aug 2015 12:41:15 -0400 Received: by wicja10 with SMTP id ja10so120030168wic.1 for ; Wed, 12 Aug 2015 09:41:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=SX7zD9jszpwUi2Hs96cON72xe8+YD9soF33AmFX/UYg=; b=quTSwHYFTWZDO4PlRbz1uqKzWT9BX/8ymj1vIVnWJLdAQZs7ZqIcCj9eaniFh29A7z rvDEVh5pNXIg5Obcbfi4b57RneSgjL72jH7YjQA6AIQRK2L9Gij9l36yIy/7wT7vWoNi FYh9ZIM2piSMK7FNF0qu/0GQnhi71G6ODMD15+9OSxtmVCNc4wY1EAqmVRgvtthhCvgG nTGd+rq6udHqc0eubI8sVOKYT8epIuFP9bp1ZT7V/w7Z90lxGMx+d345XhhQq0axIS8A o5qPI0fNjRvWmNCo+QJXzyL9ZTESWAKpaoC9pVSv5dYTfBlp30ma0+BZEOih1R8f9NUS i0Xg== X-Received: by 10.194.57.166 with SMTP id j6mr67320156wjq.29.1439397674437; Wed, 12 Aug 2015 09:41:14 -0700 (PDT) Received: from 640k.lan (dynamic-adsl-94-39-138-45.clienti.tiscali.it. [94.39.138.45]) by smtp.gmail.com with ESMTPSA id fa8sm9125466wib.14.2015.08.12.09.41.13 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Aug 2015 09:41:13 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 12 Aug 2015 18:40:58 +0200 Message-Id: <1439397664-70734-7-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1439397664-70734-1-git-send-email-pbonzini@redhat.com> References: <1439397664-70734-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c05::22f Cc: mttcg@greensocs.com, fred.konrad@greensocs.com Subject: [Qemu-devel] [PATCH 06/10] tcg: code_bitmap is not used by user-mode emulation 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 More #ifdefs are not nice, but this clarifies why its usage is not protected by tb_lock. Signed-off-by: Paolo Bonzini --- translate-all.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/translate-all.c b/translate-all.c index a6bff72..7aa5664 100644 --- a/translate-all.c +++ b/translate-all.c @@ -765,11 +765,15 @@ void tb_free(TranslationBlock *tb) static inline void invalidate_page_bitmap(PageDesc *p) { +#ifdef CONFIG_SOFTMMU if (p->code_bitmap) { g_free(p->code_bitmap); p->code_bitmap = NULL; } p->code_write_count = 0; +#else + assert(p->code_bitmap == NULL); +#endif } /* Set to NULL all the 'first_tb' fields in all PageDescs. */ @@ -1001,6 +1005,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; @@ -1029,6 +1034,7 @@ static void build_page_bitmap(PageDesc *p) tb = tb->page_next[n]; } } +#endif TranslationBlock *tb_gen_code(CPUState *cpu, target_ulong pc, target_ulong cs_base, @@ -1202,6 +1208,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) { @@ -1239,8 +1246,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 static void tb_invalidate_phys_page(tb_page_addr_t addr, uintptr_t pc, void *puc, bool locked)