From patchwork Fri Jan 27 10:39:09 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: 92626 Delivered-To: patch@linaro.org Received: by 10.182.3.34 with SMTP id 2csp151739obz; Fri, 27 Jan 2017 03:14:45 -0800 (PST) X-Received: by 10.55.31.24 with SMTP id f24mr7254265qkf.221.1485515685430; Fri, 27 Jan 2017 03:14:45 -0800 (PST) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id j93si3314132qte.15.2017.01.27.03.14.44 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 27 Jan 2017 03:14:45 -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]:44426 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cX4UM-0003c5-TN for patch@linaro.org; Fri, 27 Jan 2017 06:14:42 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48929) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cX3wQ-0003Qr-Ms for qemu-devel@nongnu.org; Fri, 27 Jan 2017 05:39:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cX3wP-0003ZM-QG for qemu-devel@nongnu.org; Fri, 27 Jan 2017 05:39:38 -0500 Received: from mail-wm0-x22e.google.com ([2a00:1450:400c:c09::22e]:37904) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cX3wP-0003Yl-KQ for qemu-devel@nongnu.org; Fri, 27 Jan 2017 05:39:37 -0500 Received: by mail-wm0-x22e.google.com with SMTP id r144so130017789wme.1 for ; Fri, 27 Jan 2017 02:39:37 -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=vp8ExxcF58dNAqavMaLO29LPlP1rgbh1h1jw9l7kNOk=; b=FctvRZmJQVC+tHjHMiTg0AhqcAK9bQFq9D7mQz4iR7W5lE+PvpVaXwzMBOF6qxC9PG qkdi90Ip6t2bhztE5pAuBX8Q7u4Zt7Zsdq+t+i8YCIt15r0b+WEtyocL7YqrJCoBH356 9jEYodJxXMMOsoZFyGJlVffXiMrxM8+wCXS1Q= 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=vp8ExxcF58dNAqavMaLO29LPlP1rgbh1h1jw9l7kNOk=; b=Uv8vtTLxJ/EssQ8Iv6SjtlI5G+uQQVmRdi55SYcYOAbWCY4A6wRM4CYUH5U11epk4b 2jrkO2o1s1T5hY1lAT9kx6DMJahfU7v/xtC112Jz1xXX+FQDb+LjJkU3zKiQPVnQDAbV p4PGo/PcFP5s/aie4Hhl7W2oHJ2jVBowNhep4l8P3OuLtgFwhWZCNIjyHvH4iK5h657g NCnivdOm2ej4UJHpkbGwnnlyURMw9o09YmEe/HTCulLkUH8Lujr2eK3P1gagpxQOeQK7 7ze7S5z9p/kbXXN3RzLq5gibVJPKamwFJbcGo4G1HakpAZH0U1USROVH0SV1L16UlRne esGQ== X-Gm-Message-State: AIkVDXLaBcOjPrrHNLrw/Q+SB7rpMjFNbHTkDc8ugH9F+2T2sl2au0VGb7RCKdy6TqwjUM27 X-Received: by 10.223.171.65 with SMTP id r1mr6707617wrc.38.1485513575698; Fri, 27 Jan 2017 02:39:35 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id v67sm7151648wrc.45.2017.01.27.02.39.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 27 Jan 2017 02:39:29 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 6A22F3E3767; Fri, 27 Jan 2017 10:39:23 +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: Fri, 27 Jan 2017 10:39:09 +0000 Message-Id: <20170127103922.19658-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170127103922.19658-1-alex.bennee@linaro.org> References: <20170127103922.19658-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 v8 12/25] 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 ecd1ec08d3..e3d9f3fe21 100644 --- a/cpus.c +++ b/cpus.c @@ -1346,6 +1346,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) { @@ -1456,6 +1461,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;