From patchwork Mon Feb 13 12:10:03 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: 93851 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp1064056qgi; Mon, 13 Feb 2017 04:12:41 -0800 (PST) X-Received: by 10.55.16.215 with SMTP id 84mr161861qkq.181.1486987961533; Mon, 13 Feb 2017 04:12:41 -0800 (PST) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id t15si7063602qke.295.2017.02.13.04.12.41 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 13 Feb 2017 04:12:41 -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]:56170 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cdFUk-0006cZ-Rf for patch@linaro.org; Mon, 13 Feb 2017 07:12:38 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53639) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cdFSP-0005Mw-0n for qemu-devel@nongnu.org; Mon, 13 Feb 2017 07:10:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cdFSN-0002cY-Kl for qemu-devel@nongnu.org; Mon, 13 Feb 2017 07:10:12 -0500 Received: from mail-wm0-x234.google.com ([2a00:1450:400c:c09::234]:37152) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cdFSN-0002bz-FO for qemu-devel@nongnu.org; Mon, 13 Feb 2017 07:10:11 -0500 Received: by mail-wm0-x234.google.com with SMTP id v77so91993082wmv.0 for ; Mon, 13 Feb 2017 04:10:11 -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=MNMMpZ7CLH2YhoCMoa2yqR3KUTAfrtWXrDKURceoQMU=; b=Zj7PZZb72XrmmmQDL+F3ZorQ1j+7tPQ2T3g4+gDN4mZ9JK6TCnMnc/jR+NAMK6NpwP FlsQnPVSu/NK4KRLxWJ5/u6KY6WOIFpmD0epz+Sjf+eo+1UqB2hmah89wae7Mv5/dJJ9 GB/V/XczElVoNyAIuILnRdC5ps8syo9+xQm30= 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=MNMMpZ7CLH2YhoCMoa2yqR3KUTAfrtWXrDKURceoQMU=; b=V+h95UP+5maIBdxjhZlVWYOfOzHPqWZfFSpiah7AqXwJGty64W0SdJT+EM4T+5elj+ TtzZNYbwS+I+KTY/fz8ipY7ruBUI41HslBlKjALpy4udS2XryU+LKE6mcnoJTERCVpBz G+5wQRotFbRVHccVg8ejSHNsVkHSSv1ttXCNyi4xkmfXUUhoBXjQLnB/8pLM7Eqndl9f 6U58FSq9wDD3C7HULVgG8ncxpsJMZYMrKK2dhPjehlEry67Vpz4vAct2XEnbzGNLRCgq LmH2p/iUSZIfjIy7hhcBcXFmjzpmsrwDYv5nHHJRFD01/uD5qlbCQkGWU3uRqLunPcHW Pbow== X-Gm-Message-State: AMke39kIEun7jK40jngDaVgq39YO5kWS+uvFav025B/WvT3293nNR/DFjdxEv1NQOjaDbU/M X-Received: by 10.28.65.196 with SMTP id o187mr17629247wma.37.1486987810416; Mon, 13 Feb 2017 04:10:10 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id q4sm13659082wrc.35.2017.02.13.04.10.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 Feb 2017 04:10:06 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id EF1163E0BC4; Mon, 13 Feb 2017 12:10:17 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org, rth@twiddle.net Date: Mon, 13 Feb 2017 12:10:03 +0000 Message-Id: <20170213121017.12907-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170213121017.12907-1-alex.bennee@linaro.org> References: <20170213121017.12907-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::234 Subject: [Qemu-devel] [PATCH v12 10/24] 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: mttcg@listserver.greensocs.com, nikunj@linux.vnet.ibm.com, Peter Crosthwaite , jan.kiszka@siemens.com, mark.burton@greensocs.com, a.rigo@virtualopensystems.com, qemu-devel@nongnu.org, cota@braap.org, serge.fdrv@gmail.com, pbonzini@redhat.com, bobby.prani@gmail.com, =?utf-8?q?Alex_Benn=C3=A9e?= , bamvor.zhangjian@linaro.org, fred.konrad@greensocs.com 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 f810259c41..9bac061c9b 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);