From patchwork Mon Feb 6 15:31:00 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: 93449 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp1759197qgi; Mon, 6 Feb 2017 07:43:08 -0800 (PST) X-Received: by 10.200.51.186 with SMTP id c55mr9481753qtb.270.1486395788629; Mon, 06 Feb 2017 07:43:08 -0800 (PST) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id h46si736510qte.232.2017.02.06.07.43.08 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 06 Feb 2017 07:43:08 -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]:49079 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1calRc-0006IN-8F for patch@linaro.org; Mon, 06 Feb 2017 10:43:08 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37257) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1calG8-0005mt-6w for qemu-devel@nongnu.org; Mon, 06 Feb 2017 10:31:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1calG7-0008Uv-DT for qemu-devel@nongnu.org; Mon, 06 Feb 2017 10:31:16 -0500 Received: from mail-wm0-x230.google.com ([2a00:1450:400c:c09::230]:34939) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1calG7-0008UC-85 for qemu-devel@nongnu.org; Mon, 06 Feb 2017 10:31:15 -0500 Received: by mail-wm0-x230.google.com with SMTP id b65so125312847wmf.0 for ; Mon, 06 Feb 2017 07:31:15 -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=av4gMMgvuDSl6FJK8iQ1tiaOStJwI1QMfYQWes5qzEqEYj2SPWs1VX6yi1yNE0FQv/ jgArtpaD5JT35lXdKFvDUzGlLjYQ6wAjmJVniOM0mnNZLKsC6pQ9rFAYgW89njrxRmYL LiUfDUOjT3Fo/P4cUkW1Gq6YxknmQFTqrdgs8= 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=bsed33GRWDqUHzQ4bD3GOQXm4XB/FHafm8arDyiWjWbNvYc8dOwQUK1Y9ZS4rWNdVg XtG+SGiOfx64LbIlDggz3GQ7XqaAUMgULrv3qWqeLBKr/+YcqxzcAkBc7gWkdhAt7Jpx 9PyGfeo1Iea0Ykl8jgD7TZivGVdKvPX653w8tBAohRpjD53sPq/cOwbV7rFBpLFXDDFN 6Yhr9DfAxnUF0Plkdbdf6O8HYjo5J3PW9kAH/6r9SUcr6S33LWJJ4hIQL/cweglBo8Hp 7J8U24jq+f2unpivKnGq10X5mPjT8HgYQHrNDhm+6Tkw345MklpoVs+qB8NTd7Y6Sc88 epag== X-Gm-Message-State: AMke39kKktYPrPExdlhelXkUIZ0BAp7LEXM1z4wNYPQq0oO0uxb8WPXZj1dGpluO4ZNa946q X-Received: by 10.28.64.213 with SMTP id n204mr9998085wma.12.1486395074275; Mon, 06 Feb 2017 07:31:14 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id w204sm13466105wmd.17.2017.02.06.07.31.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Feb 2017 07:31:08 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 6292B3E2A20; Mon, 6 Feb 2017 15:31:14 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org, rth@twiddle.net Date: Mon, 6 Feb 2017 15:31:00 +0000 Message-Id: <20170206153113.27729-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170206153113.27729-1-alex.bennee@linaro.org> References: <20170206153113.27729-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::230 Subject: [Qemu-devel] [PATCH v10 10/23] 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);