From patchwork Fri Jan 27 10:34:43 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: 92587 Delivered-To: patch@linaro.org Received: by 10.182.3.34 with SMTP id 2csp138717obz; Fri, 27 Jan 2017 02:38:19 -0800 (PST) X-Received: by 10.200.36.81 with SMTP id d17mr6532988qtd.99.1485513499563; Fri, 27 Jan 2017 02:38:19 -0800 (PST) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id s26si3228834qte.294.2017.01.27.02.38.19 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 27 Jan 2017 02:38:19 -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]:44225 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cX3v6-0001Yw-Rt for patch@linaro.org; Fri, 27 Jan 2017 05:38:16 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47870) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cX3sB-0007qJ-Dx for qemu-devel@nongnu.org; Fri, 27 Jan 2017 05:35:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cX3s7-00027C-4e for qemu-devel@nongnu.org; Fri, 27 Jan 2017 05:35:15 -0500 Received: from mail-wm0-x235.google.com ([2a00:1450:400c:c09::235]:38424) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cX3s6-00026u-V9 for qemu-devel@nongnu.org; Fri, 27 Jan 2017 05:35:11 -0500 Received: by mail-wm0-x235.google.com with SMTP id r144so129825816wme.1 for ; Fri, 27 Jan 2017 02:35:10 -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=Y2+v1flgVFTMeQ/XkdeqfH3M+QZGMjHF/xurefWed+s=; b=e3rm/Dh/SwAsGwX1VXrPbvLLbSSa5wMo060c5xzLH3AGIRFVvjwzZUeUUtpgjr6AqW 39rHOfV4mXlTQSbZZa4yOnNIBIyjowKA0IbMna594FhVuTCZUakJZeL+HRnj5ZWzckwk i7EhflFPv24ulpjljbU6B4ym7XlD5pNuz1voo= 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=Y2+v1flgVFTMeQ/XkdeqfH3M+QZGMjHF/xurefWed+s=; b=tsqRO2kgExhoJ0eqtHbU04I1mHGd+3fbXI8MA5VvAkpUZRObWDOQIJfjBwgZ+9aPgu dqSQAWPofxfc61Rnwbh+ngj94CAA+Qdf4TUNpTgdw6Usn1eKiGsV0FsHozj4lFTy4FnX lv8Z/c5lzFV2mOeLWcRG39rkSrLg8aS9Pectq2OSm62ys0RWo/ckGs+bonfr3TAR0OtH usSR5eBn4FYI4JS6P934PwhrBBdAVvW5YgvwiHRtSPnXHVQ424S2GHNDzPhjPg76jrVo kTXUOlcxcnGeR7Gcaj0RaTj6ezAnpbHtexyVqoreD+0OGzOOOIyAi3QZAaxbJrG7mzqn 3VIg== X-Gm-Message-State: AIkVDXIGN07K2utxTysucoJk9nsqoWf9zhmeaUGW425MdgBsjiLqLzZSlyC+3Hp93uT9Reev X-Received: by 10.223.154.165 with SMTP id a34mr6688121wrc.193.1485513309895; Fri, 27 Jan 2017 02:35:09 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id q1sm3168171wmd.6.2017.01.27.02.35.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 27 Jan 2017 02:35:07 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id B8FE43E36FC; Fri, 27 Jan 2017 10:35:05 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: Date: Fri, 27 Jan 2017 10:34:43 +0000 Message-Id: <20170127103505.18606-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170127103505.18606-1-alex.bennee@linaro.org> References: <20170127103505.18606-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::235 Subject: [Qemu-devel] [PATCH v8 03/25] mttcg: Add missing tb_lock/unlock() in cpu_exec_step() 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 Crosthwaite , "open list:Overall" , Paolo Bonzini , Pranith Kumar , =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Pranith Kumar The recent patch enabling lock assertions uncovered the missing lock acquisition in cpu_exec_step(). This patch adds them. CC: Richard Henderson CC: Alex Bennée Signed-off-by: Pranith Kumar --- cpu-exec.c | 4 ++++ 1 file changed, 4 insertions(+) -- 2.11.0 diff --git a/cpu-exec.c b/cpu-exec.c index 4188fed3c6..1b8685dc21 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -233,14 +233,18 @@ static void cpu_exec_step(CPUState *cpu) uint32_t flags; cpu_get_tb_cpu_state(env, &pc, &cs_base, &flags); + tb_lock(); tb = tb_gen_code(cpu, pc, cs_base, flags, 1 | CF_NOCACHE | CF_IGNORE_ICOUNT); tb->orig_tb = NULL; + tb_unlock(); /* execute the generated code */ trace_exec_tb_nocache(tb, pc); cpu_tb_exec(cpu, tb); + tb_lock(); tb_phys_invalidate(tb, -1); tb_free(tb); + tb_unlock(); } void cpu_exec_step_atomic(CPUState *cpu)