From patchwork Fri Feb 24 11:20:48 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: 94437 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp647839qgi; Fri, 24 Feb 2017 03:34:57 -0800 (PST) X-Received: by 10.55.87.194 with SMTP id l185mr1883353qkb.209.1487936097420; Fri, 24 Feb 2017 03:34:57 -0800 (PST) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id c4si5456892qkh.5.2017.02.24.03.34.57 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 24 Feb 2017 03:34:57 -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]:36351 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chE9H-0004DE-0j for patch@linaro.org; Fri, 24 Feb 2017 06:34:55 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45374) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chDw5-00077F-4J for qemu-devel@nongnu.org; Fri, 24 Feb 2017 06:21:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1chDw2-000084-TG for qemu-devel@nongnu.org; Fri, 24 Feb 2017 06:21:17 -0500 Received: from mail-wm0-x233.google.com ([2a00:1450:400c:c09::233]:36504) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1chDw2-00006u-MQ for qemu-devel@nongnu.org; Fri, 24 Feb 2017 06:21:14 -0500 Received: by mail-wm0-x233.google.com with SMTP id v77so11953380wmv.1 for ; Fri, 24 Feb 2017 03:21:14 -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=dWyJpNmgqS0evyAoHyCe4Non0wBoGMPbPppg+SWqTQfcobdnVEYELYbmX6RwO2CvWd Dt5nugTTzjz7VFqfPJNGqeQx2r1jl5+h+tSPphmCEsH4OJzRJ8+ZkncEm3cdwjXD3ZSj HgXzMa1mH8YFvFGYWvxa+o+QZKEuhJeGnQhUU= 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=Pn8MsQI1TK+xSb164mPL3Y3UqYMWfcM47x8pACoqZ5ST1zvGjm2sL8FxuTo1gvEC0Q H+5wP6MhaQ1bbgy9P9au/V5/7lFMJ4QHqUDzTkS5oKoNMcoDCB16T/epfzcsPMM9ucgE RctRqzh1V84PnRgnNtSSTWOuGFDMRj6YSHxrC5U6OwINnKqMS6H13HWV9lUkhuRAtT/N Fq+NAPGm1Gyb9sv4ryFgsheGBPfmeb50NLzFvzhtxdBa3fcOv9X8/dn8WRXhwOHuSXaX HHO3HO0pttxp3Mqniu9bobpAzepaSnGvgVy67YljsDWwoP7KsbdVVXtUfeJKl6gppTJm q3aA== X-Gm-Message-State: AMke39mYXFj8eAvWImZu6/zKrQbE8GnMHoFUXwVcx+dU5GEGVhFtVWlIwjzBdIMpZhlomEdO X-Received: by 10.28.8.213 with SMTP id 204mr2295824wmi.100.1487935273662; Fri, 24 Feb 2017 03:21:13 -0800 (PST) Received: from zen.linaro.local (host5-81-235-77.range5-81.btcentralplus.com. [5.81.235.77]) by smtp.gmail.com with ESMTPSA id w17sm9986116wra.28.2017.02.24.03.21.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 24 Feb 2017 03:21:11 -0800 (PST) Received: from zen.home (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 591563E056A; Fri, 24 Feb 2017 11:21:09 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Fri, 24 Feb 2017 11:20:48 +0000 Message-Id: <20170224112109.3147-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170224112109.3147-1-alex.bennee@linaro.org> References: <20170224112109.3147-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::233 Subject: [Qemu-devel] [PULL 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: Peter Crosthwaite , qemu-devel@nongnu.org, 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. 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)