From patchwork Thu Feb 23 18:29: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: 94391 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp340392qgi; Thu, 23 Feb 2017 10:32:05 -0800 (PST) X-Received: by 10.237.42.109 with SMTP id k42mr25076984qtf.52.1487874724974; Thu, 23 Feb 2017 10:32:04 -0800 (PST) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id i93si3874336qtb.262.2017.02.23.10.32.04 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 23 Feb 2017 10:32:04 -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]:60187 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cgyBO-0005Vk-Hc for patch@linaro.org; Thu, 23 Feb 2017 13:32:02 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44207) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cgy91-0004Ex-Sr for qemu-devel@nongnu.org; Thu, 23 Feb 2017 13:29:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cgy8z-0006Mx-TZ for qemu-devel@nongnu.org; Thu, 23 Feb 2017 13:29:35 -0500 Received: from mail-wm0-x22c.google.com ([2a00:1450:400c:c09::22c]:37301) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cgy8z-0006M5-Mx for qemu-devel@nongnu.org; Thu, 23 Feb 2017 13:29:33 -0500 Received: by mail-wm0-x22c.google.com with SMTP id v77so6987026wmv.0 for ; Thu, 23 Feb 2017 10:29:33 -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=Z8cje0QRZqL4UVnAcDQuBzKWRAbCdDXTA9jjGL9ZakyXgRTMvMPHVoLRcChWgWo6Kb wbaraIjfsR4GeJgwWIVL3GgqWmQRr9JkiZWS34BkEBj51UqYAHWL4bZvw9+KWO8W4rlB NOT1RP++CeRiI4iKgdSoemY4ubmflNOWowA9c= 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=iXwgqMFvFMn5x/7HfkqftaT1/07IumWpaeQfLX93s9NhM0zOi/m1AeeBYsdGfAEt1N tU9/QsXGWseWKaJTRp9YUbc6pQA7a7zA7AQp/W6z4msIDuM3pZ5D8FgAXd8oJURKtAte +yotkg/4C9Z9H+o2wjZ191BTHyaZ6ZaeDG3Lt2KVdEbMWuhXKczCcnRB5wt+ztQOct7N Vded6P8V0o4763JsWYDN1nnPdlmBsIdRufd0xE8tRCpxImETO6v8CxXhq6DtkkJ0dSJM NPB/ItCOKJyGF1ef7I0qcBaxomzPvK9DJRbcABNiAxoCkOXG9bDAk+hcVvQGtiGlXR7N EYYA== X-Gm-Message-State: AMke39m7xbJ4Kk9tVb91wsCUYc4Hp8OptiMEBFCo0/pdlCpkZs9nir5/pD7qRp0D8YdYwGO9 X-Received: by 10.28.198.139 with SMTP id w133mr6078188wmf.80.1487874572626; Thu, 23 Feb 2017 10:29:32 -0800 (PST) Received: from zen.linaro.local (host109-151-49-69.range109-151.btcentralplus.com. [109.151.49.69]) by smtp.gmail.com with ESMTPSA id k48sm7003576wrc.47.2017.02.23.10.29.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 Feb 2017 10:29:30 -0800 (PST) Received: from zen.home (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 61DE33E0550; Thu, 23 Feb 2017 18:29:27 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: rth@twiddle.net, peter.maydell@linaro.org Date: Thu, 23 Feb 2017 18:29:06 +0000 Message-Id: <20170223182927.7166-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170223182927.7166-1-alex.bennee@linaro.org> References: <20170223182927.7166-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::22c Subject: [Qemu-devel] [PATCH v14 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)