From patchwork Thu Jan 19 17:04:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 91993 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp383984qgi; Thu, 19 Jan 2017 09:19:04 -0800 (PST) X-Received: by 10.55.64.73 with SMTP id n70mr4003848qka.186.1484846343998; Thu, 19 Jan 2017 09:19:03 -0800 (PST) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id d31si3010701qkh.193.2017.01.19.09.19.03 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 19 Jan 2017 09:19:03 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:49868 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cUGMX-0001iX-Eu for patch@linaro.org; Thu, 19 Jan 2017 12:19:01 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38773) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cUG9M-0007Yx-Qd for qemu-devel@nongnu.org; Thu, 19 Jan 2017 12:05:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cUG9J-0007pO-IO for qemu-devel@nongnu.org; Thu, 19 Jan 2017 12:05:24 -0500 Received: from mail-wm0-x236.google.com ([2a00:1450:400c:c09::236]:37195) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cUG9J-0007oj-CY for qemu-devel@nongnu.org; Thu, 19 Jan 2017 12:05:21 -0500 Received: by mail-wm0-x236.google.com with SMTP id c206so2820960wme.0 for ; Thu, 19 Jan 2017 09:05:21 -0800 (PST) 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=zHeDdh7LS/qfaOBi0Wrx/3dwOaXRkrY7AoKsyWB2WWc=; b=Au/J7QgPZr2cxr6IOxMjbOMIg/nGTFY8Byd9W6PINSWDZYPOhgbLZwhEJ+3TRdlo30 v0oKCAIvmve7yImFbyKX/iMEEpsjE+lWiBBoYvU6mFR9HvpOpafVe5lrsXV86MCbKY8p zqxogG9ZOXIDKSvzVU9hxsdk5lCBLiipgxcMk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zHeDdh7LS/qfaOBi0Wrx/3dwOaXRkrY7AoKsyWB2WWc=; b=N7jOyu1Et00AmcjyQ2fYkup/v4uXNETr8pva3MvU0G3/0xAu07RaqR6/HKOn/S93zz x02vmlQyU6c3Y1gsq6koQaCXdhPj7DjidoGZe2aGWdPjEOREVcXmIAGyNUy+nNWOX/ar yCQx9OtoaKOpok+Qg6hsKBRAvIJHld/GupwK1PSOCpXBjjvFmKeprPuXdwMTBqIPnQbU YCJUhsLV+Cy4jAKURmK0uE8ZdTeS5UON0rUA5ekTGUY7x6tuIbi2Fg30w6eYhY6ICJKP pjfV4VlSnTBuPdiV2UoZHsygR+PhhR4F+6cF/b7kOBnvrpmIecjM6KOYRJyy1U44KTjY RK6Q== X-Gm-Message-State: AIkVDXK50bF3jJE2hjRdRu8qFVoYLMjVCfvMts2IixsCiHZ3TdvGPUjgGffTY4+40v9cV+Xr X-Received: by 10.28.141.78 with SMTP id p75mr7172669wmd.114.1484845520348; Thu, 19 Jan 2017 09:05:20 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id k11sm14041141wmb.18.2017.01.19.09.05.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Jan 2017 09:05:14 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 768023E2A23; Thu, 19 Jan 2017 17:05:08 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: mttcg@listserver.greensocs.com, qemu-devel@nongnu.org, fred.konrad@greensocs.com, a.rigo@virtualopensystems.com, cota@braap.org, bobby.prani@gmail.com, nikunj@linux.vnet.ibm.com Date: Thu, 19 Jan 2017 17:04:50 +0000 Message-Id: <20170119170507.16185-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170119170507.16185-1-alex.bennee@linaro.org> References: <20170119170507.16185-1-alex.bennee@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:400c:c09::236 Subject: [Qemu-devel] [PATCH v7 10/27] tcg: enable tb_lock() for SoftMMU 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: peter.maydell@linaro.org, claudio.fontana@huawei.com, Peter Crosthwaite , jan.kiszka@siemens.com, mark.burton@greensocs.com, serge.fdrv@gmail.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , bamvor.zhangjian@linaro.org, rth@twiddle.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" tb_lock() has long been used for linux-user mode to protect code generation. By enabling it now we prepare for MTTCG and ensure all code generation is serialised by this lock. The other major structure that needs protecting is the l1_map and its PageDesc structures. For the SoftMMU case we also use tb_lock() to protect these structures instead of linux-user mmap_lock() which as the name suggests serialises updates to the structure as a result of guest mmap operations. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- v4 - split from main tcg: enable thread-per-vCPU patch v7 - fixed up with Pranith's tcg_debug_assert() changes --- translate-all.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) -- 2.11.0 diff --git a/translate-all.c b/translate-all.c index 41b36f04c6..87e9d00d14 100644 --- a/translate-all.c +++ b/translate-all.c @@ -75,7 +75,7 @@ * mmap_lock. */ #ifdef CONFIG_SOFTMMU -#define assert_memory_lock() do { /* nothing */ } while (0) +#define assert_memory_lock() tcg_debug_assert(have_tb_lock) #else #define assert_memory_lock() tcg_debug_assert(have_mmap_lock()) #endif @@ -135,9 +135,7 @@ TCGContext tcg_ctx; bool parallel_cpus; /* translation block context */ -#ifdef CONFIG_USER_ONLY __thread int have_tb_lock; -#endif static void page_table_config_init(void) { @@ -159,40 +157,29 @@ static void page_table_config_init(void) assert(v_l2_levels >= 0); } -#ifdef CONFIG_USER_ONLY #define assert_tb_locked() tcg_debug_assert(have_tb_lock) #define assert_tb_unlocked() tcg_debug_assert(!have_tb_lock) -#else -#define assert_tb_locked() do { /* nothing */ } while (0) -#define assert_tb_unlocked() do { /* nothing */ } while (0) -#endif void tb_lock(void) { -#ifdef CONFIG_USER_ONLY assert_tb_unlocked(); qemu_mutex_lock(&tcg_ctx.tb_ctx.tb_lock); have_tb_lock++; -#endif } void tb_unlock(void) { -#ifdef CONFIG_USER_ONLY assert_tb_locked(); have_tb_lock--; qemu_mutex_unlock(&tcg_ctx.tb_ctx.tb_lock); -#endif } void tb_lock_reset(void) { -#ifdef CONFIG_USER_ONLY if (have_tb_lock) { qemu_mutex_unlock(&tcg_ctx.tb_ctx.tb_lock); have_tb_lock = 0; } -#endif } static TranslationBlock *tb_find_pc(uintptr_t tc_ptr);