From patchwork Thu Jan 19 17:04:52 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: 91996 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp385902qgi; Thu, 19 Jan 2017 09:23:08 -0800 (PST) X-Received: by 10.55.45.129 with SMTP id t123mr8488708qkh.311.1484846588217; Thu, 19 Jan 2017 09:23:08 -0800 (PST) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id 20si3013207qki.280.2017.01.19.09.23.07 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 19 Jan 2017 09:23:08 -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]:49890 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cUGQU-0005n2-0s for patch@linaro.org; Thu, 19 Jan 2017 12:23:06 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38806) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cUG9O-0007ai-6i for qemu-devel@nongnu.org; Thu, 19 Jan 2017 12:05:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cUG9N-0007rx-A7 for qemu-devel@nongnu.org; Thu, 19 Jan 2017 12:05:26 -0500 Received: from mail-wm0-x235.google.com ([2a00:1450:400c:c09::235]:33386) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cUG9N-0007rH-4g for qemu-devel@nongnu.org; Thu, 19 Jan 2017 12:05:25 -0500 Received: by mail-wm0-x235.google.com with SMTP id d140so7375919wmd.0 for ; Thu, 19 Jan 2017 09:05:25 -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=2ZFKaGvhcOEjBYVdqKP252w9pJSosDZ4s5+A0XtQauY=; b=IipbZntgwv5bvBrJwjhRSa3owP2RAivHCnoGMguTBRg4fRMgyZ4Ydv72amvleZQS3m OSn8zDgwR/isW5Q51b+f2kYs6r4MflFJJssgKN3jJ6SCkZv2cY1zvzYaGfxF1rZh0XFp dNYc9b6RhV3AB9xASmkKyz5r45sk6gXbaKitA= 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=2ZFKaGvhcOEjBYVdqKP252w9pJSosDZ4s5+A0XtQauY=; b=kGxC4Sh+J+nPxtavuUaaOf0VyC7zU/0n3nlTY+oob/tdtFgJ/sOY7oEboGecNQfiE1 D3zmTh+o+ZasRMHCH1xRHnI5vAbtwBubVpIu6yuMpGmuuh0pGWq2mLsGbxAcKW+ASRyK LGGiLL/xpaS9QNbNqGhV9LFvyAJfzDrmkrgsQ4LN90sqEBMjby2tvPGUePXDUIYbdwaO 5XBhcXEHp9o+ptj14me9N849pk1bTEqikzJH273674d+a8LQ+q1nLW9C5NW2YLsnhz45 OBvjGDfdYmY3dxz/ooVdn50w59EOl2SXsjwANCovYbkVdYmuhAVPjQxFwB0SpEN5/ddQ xvXg== X-Gm-Message-State: AIkVDXL6uG/u6mP809i0D6SaAJhCDXqU0H5cz/Pr2b0gPREfX+/o4Aba39EtPoHCbMy18kfc X-Received: by 10.28.46.74 with SMTP id u71mr7506154wmu.136.1484845524185; Thu, 19 Jan 2017 09:05:24 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id r5sm54526997wme.23.2017.01.19.09.05.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Jan 2017 09:05:16 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 9B0723E2A29; Thu, 19 Jan 2017 17:05:08 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: mttcg@listserver.greensocs.com, qemu-devel@nongnu.org, fred.konrad@greensocs.com, a.rigo@virtualopensystems.com, cota@braap.org, bobby.prani@gmail.com, nikunj@linux.vnet.ibm.com Date: Thu, 19 Jan 2017 17:04:52 +0000 Message-Id: <20170119170507.16185-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170119170507.16185-1-alex.bennee@linaro.org> References: <20170119170507.16185-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 v7 12/27] 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: peter.maydell@linaro.org, claudio.fontana@huawei.com, Peter Crosthwaite , jan.kiszka@siemens.com, mark.burton@greensocs.com, serge.fdrv@gmail.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , bamvor.zhangjian@linaro.org, rth@twiddle.net 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 Reviewed-by: Richard Henderson --- cpus.c | 9 +++++++++ 1 file changed, 9 insertions(+) -- 2.11.0 diff --git a/cpus.c b/cpus.c index 32e9ff4b34..4a66c88ebe 100644 --- a/cpus.c +++ b/cpus.c @@ -1343,6 +1343,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) { @@ -1413,6 +1418,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;