From patchwork Wed Feb 22 17:13:06 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: 94340 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp1016929qgi; Wed, 22 Feb 2017 09:24:40 -0800 (PST) X-Received: by 10.200.3.230 with SMTP id z38mr33028608qtg.181.1487784280152; Wed, 22 Feb 2017 09:24:40 -0800 (PST) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id d10si1381482qtb.20.2017.02.22.09.24.39 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 22 Feb 2017 09:24:40 -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]:54242 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cgaeb-00087M-Iq for patch@linaro.org; Wed, 22 Feb 2017 12:24:37 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35504) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cgaTl-0006cy-3A for qemu-devel@nongnu.org; Wed, 22 Feb 2017 12:13:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cgaTk-0000UN-8J for qemu-devel@nongnu.org; Wed, 22 Feb 2017 12:13:25 -0500 Received: from mail-wr0-x236.google.com ([2a00:1450:400c:c0c::236]:35755) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cgaTk-0000U1-2c for qemu-devel@nongnu.org; Wed, 22 Feb 2017 12:13:24 -0500 Received: by mail-wr0-x236.google.com with SMTP id s27so6628444wrb.2 for ; Wed, 22 Feb 2017 09:13:24 -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=CA/YR7EAaCKD4q4u47pSYiaP+x94dIrQZlJd2kFEZWI=; b=bSfZG/Wbij6vuGSLLb4xqekymmxDdNSPKF4HipNaO6+C/vFOKXkkG6xR2yn7JcIEaw LNj07dmWEHZ5VLNNzHlm5AQLyheyONT8Ed5+eyEhmwh1p0thhvR2LcyIzPBbOR9notag VgEPZxNwbb7kzEtTmSxDoHLA7v51L7+D1Ahic= 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=CA/YR7EAaCKD4q4u47pSYiaP+x94dIrQZlJd2kFEZWI=; b=RWCds760qJKVRwhii3PlKbZErCFgldtj/hVADGoDiGilZrTREg3ZRqBBmvRolyvhFQ mEOuqe5/qfhOyVVS6IBV+Ve+WFUcL7rgRpXu42SjkY9bj232ajQmB5dkgD+fW0Wsegkx 7dTzPrrjgkuQ5SWuvr74Ghg6WxH84tfIjE3bN1VEGOdY3yNw05/4db06eLl1OWmUKsd4 RAB0JqCzkzqlqfhORTa2cM8nPX/j1OyCtLz9rfnRVtgIXRQbtyUsuTl/b5yvw71BVJXM 1RU3VQerf2V6JJUlRa9m3+kCabHaSLfs8yibDJiwNVME2bKWbHfibiGASJFPQf39OE9E ukFw== X-Gm-Message-State: AMke39mSuaYbPQaOV0b1+xYji4DvTpmzLnqq6YkiE2QrHI1k0jev+ksApVpCuVBufHH5Fh1x X-Received: by 10.223.153.174 with SMTP id y43mr25316896wrb.55.1487783603044; Wed, 22 Feb 2017 09:13:23 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id w30sm2498567wrb.5.2017.02.22.09.13.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Feb 2017 09:13:19 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id ECCE63E03B2; Wed, 22 Feb 2017 17:13:27 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: rth@twiddle.net, peter.maydell@linaro.org Date: Wed, 22 Feb 2017 17:13:06 +0000 Message-Id: <20170222171327.26624-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170222171327.26624-1-alex.bennee@linaro.org> References: <20170222171327.26624-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:c0c::236 Subject: [Qemu-devel] [PATCH v13 03/24] 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: 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" From: Pranith Kumar The recent patch enabling lock assertions uncovered the missing lock acquisition in cpu_exec_step(). This patch adds them. Signed-off-by: Pranith Kumar Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- cpu-exec.c | 4 ++++ 1 file changed, 4 insertions(+) -- 2.11.0 diff --git a/cpu-exec.c b/cpu-exec.c index 142a5862fc..ec84fdb3d7 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)