From patchwork Wed Nov 9 14:57:38 2016 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: 81513 Delivered-To: patch@linaro.org Received: by 10.140.97.165 with SMTP id m34csp239533qge; Wed, 9 Nov 2016 07:00:35 -0800 (PST) X-Received: by 10.157.6.202 with SMTP id 68mr2298otx.93.1478703635117; Wed, 09 Nov 2016 07:00:35 -0800 (PST) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id 95si7812otq.84.2016.11.09.07.00.35 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 09 Nov 2016 07:00:35 -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 dis=NONE) header.from=linaro.org Received: from localhost ([::1]:40430 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c4UMc-0001p9-Gb for patch@linaro.org; Wed, 09 Nov 2016 10:00:34 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41139) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c4UKG-0000cc-Fl for qemu-devel@nongnu.org; Wed, 09 Nov 2016 09:58:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c4UKF-0002Jd-Pr for qemu-devel@nongnu.org; Wed, 09 Nov 2016 09:58:08 -0500 Received: from mail-wm0-x22e.google.com ([2a00:1450:400c:c09::22e]:36802) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1c4UKF-0002JE-JA for qemu-devel@nongnu.org; Wed, 09 Nov 2016 09:58:07 -0500 Received: by mail-wm0-x22e.google.com with SMTP id p190so313282964wmp.1 for ; Wed, 09 Nov 2016 06:58:07 -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=MpS60D8F6AbkhzCSR356l1fwFTme2zQhOdJMFgjjRIc=; b=ILjYCnhrO0SqcAP1r/21DM8AMPqDUQ+yeyQyjcXPk2EWSnz7e4oBCpuVJ0qM0vwNwe jztabllbxJgq8BYQ3zwIgQHyDLbGP53kUwWQ7t328FF5bneszjmyelTNL0Dqk38sXCvB rjIuMYBVL/Fa2dryvttpYtlkvwmRd/N9/ITqs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MpS60D8F6AbkhzCSR356l1fwFTme2zQhOdJMFgjjRIc=; b=cnykepJl1qDOYfLcH2sd+BGVPUyD6rLLD7vhbQczkfi7Zk8Pmfwh95FRZWgw7PvBlY P4p1qWKtkSCEQBKrv4LeqVQ6TPbWVy1RigAC2GzUj2wVsIynwNkceTGS8isCKGW6a8lJ VginGaHfWSl5lMW/n48JPZuAKeFt5zSgimXjaeXTMQfxdPXKoiqjzT3Qx7uoCQoeVliO cLMTkjCDnk7qXo2sxsG3UylnUWWGB/Rt6aSi7MF7f9BUj7utv97+pZp31ojSzzCRgVkx sKsqcjZXLj+7vsSPIHzwmN7ArVs5uFYQRTlAA9sZqnkIJLDbEL78YNLRo9n+UJtiS6Q2 4BRw== X-Gm-Message-State: ABUngve2DCVRaGhM8J9gVDbdolDhsW6f1aGjrjbcV6bwnQtBX2A+1tWQsTqWq6XuyhqzvkDM X-Received: by 10.28.25.134 with SMTP id 128mr19672811wmz.99.1478703486426; Wed, 09 Nov 2016 06:58:06 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id l67sm7403160wmf.20.2016.11.09.06.58.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 Nov 2016 06:58:03 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 7BE1A3E041C; Wed, 9 Nov 2016 14:57:57 +0000 (GMT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: pbonzini@redhat.com Date: Wed, 9 Nov 2016 14:57:38 +0000 Message-Id: <20161109145748.27282-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.10.1 In-Reply-To: <20161109145748.27282-1-alex.bennee@linaro.org> References: <20161109145748.27282-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::22e Subject: [Qemu-devel] [PATCH v6 09/19] tcg: handle EXCP_ATOMIC exception for system emulation 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, peter.maydell@linaro.org, claudio.fontana@huawei.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, bobby.prani@gmail.com, rth@twiddle.net, =?UTF-8?q?Alex=20Benn=C3=A9e?= , fred.konrad@greensocs.com Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Pranith Kumar The patch enables handling atomic code in the guest. This should be preferably done in cpu_handle_exception(), but the current assumptions regarding when we can execute atomic sections cause a deadlock. Signed-off-by: Pranith Kumar [AJB: tweak title] Signed-off-by: Alex Bennée --- cpus.c | 9 +++++++++ 1 file changed, 9 insertions(+) -- 2.10.1 Reviewed-by: Richard Henderson diff --git a/cpus.c b/cpus.c index b8d8b87..1ebe518 100644 --- a/cpus.c +++ b/cpus.c @@ -1315,6 +1315,11 @@ static void *qemu_tcg_rr_cpu_thread_fn(void *arg) if (r == EXCP_DEBUG) { cpu_handle_guest_debug(cpu); break; + } else if (r == EXCP_ATOMIC) { + qemu_mutex_unlock_iothread(); + cpu_exec_step_atomic(cpu); + qemu_mutex_lock_iothread(); + break; } } else if (cpu->stop) { if (cpu->unplug) { @@ -1385,6 +1390,10 @@ static void *qemu_tcg_cpu_thread_fn(void *arg) */ g_assert(cpu->halted); break; + case EXCP_ATOMIC: + qemu_mutex_unlock_iothread(); + cpu_exec_step_atomic(cpu); + qemu_mutex_lock_iothread(); default: /* Ignore everything else? */ break;