From patchwork Tue Mar 7 15:50:51 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: 95014 Delivered-To: patch@linaro.org Received: by 10.140.82.71 with SMTP id g65csp1956445qgd; Tue, 7 Mar 2017 08:16:19 -0800 (PST) X-Received: by 10.28.11.205 with SMTP id 196mr1485223wml.31.1488903379543; Tue, 07 Mar 2017 08:16:19 -0800 (PST) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id j14si3264733wmi.123.2017.03.07.08.16.19 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 07 Mar 2017 08:16:19 -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]:51487 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1clHmc-0007UZ-I6 for patch@linaro.org; Tue, 07 Mar 2017 11:16:18 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48937) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1clHVQ-0000uk-76 for qemu-devel@nongnu.org; Tue, 07 Mar 2017 10:58:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1clHVN-0008BK-3C for qemu-devel@nongnu.org; Tue, 07 Mar 2017 10:58:32 -0500 Received: from mail-wr0-x22f.google.com ([2a00:1450:400c:c0c::22f]:33231) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1clHVM-0008B3-Ty for qemu-devel@nongnu.org; Tue, 07 Mar 2017 10:58:29 -0500 Received: by mail-wr0-x22f.google.com with SMTP id u48so4542538wrc.0 for ; Tue, 07 Mar 2017 07:58:28 -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=lqIJRrk/MiAeLGXU0QWeBzmVS+Q5JNcluDWHVR4aeBE=; b=cLuxv6tYeqV8m4OP/q0qwFVyJAft9a8dRgmBLLwESAy3VB1dM6oYstH7+18h5HIACY uJxZf0nz7jwzEuofQS6Brkz1dSjjkvos/AClet6usyWV1SH46dYnfp0Ou0mbUbcC1Atc MrpCbOWIp43al+23HtRGwRfrsPgFDFPls5+gQ= 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=lqIJRrk/MiAeLGXU0QWeBzmVS+Q5JNcluDWHVR4aeBE=; b=pc//pFAlcDEKSQq2lxuZb6eckfdeD72yQ15r5vCL895D4NdlHmUnYxIJ04TVmh3S8g RqEgLA7kjjF0bpDdJ7sNseHDrEPCxgLHiQKBZ9NoApdBLsASwPuaXZXEv0V6SHOFgnK+ drWIzII9a48nako7nnmQQnVjnv+WRdSyr/IXde0BSRQ3OAOgOBExqha7qsDg42aay9eM 1S3mcP5A/iZox2PErYjwxGfd0SIQ8fUGg9b8GhEYS9sid1V1I0rJtmRzBI0HzipPtv7Z Ia3Oo7kVUWHqAEYGrjS/UrlW5ulx9rX2FxYM2IeUrmwOjgERB9+hhgrb0UsVH65jKSQ/ Vj8Q== X-Gm-Message-State: AMke39mYkvcuwRg1oL3dBJf5D/sVM1ufqmlDgz69/30WjfKn2+avLAq/rIofGMstLf3JXCVa X-Received: by 10.223.161.213 with SMTP id v21mr862218wrv.144.1488902307670; Tue, 07 Mar 2017 07:58:27 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id 65sm495241wri.53.2017.03.07.07.58.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Mar 2017 07:58:26 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 0D7F43E3032; Tue, 7 Mar 2017 15:50:55 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org, rth@twiddle.net, pbonzini@redhat.com Date: Tue, 7 Mar 2017 15:50:51 +0000 Message-Id: <20170307155054.5833-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170307155054.5833-1-alex.bennee@linaro.org> References: <20170307155054.5833-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::22f Subject: [Qemu-devel] [PATCH v3 08/11] target/mips: hold BQL for timer interrupts 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, a.rigo@virtualopensystems.com, qemu-devel@nongnu.org, cota@braap.org, Yongbok Kim , bobby.prani@gmail.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Aurelien Jarno , fred.konrad@greensocs.com Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Yongbok Kim Hold BQL when accessing timer which can cause interrupts Signed-off-by: Yongbok Kim Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée --- target/mips/op_helper.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) -- 2.11.0 diff --git a/target/mips/op_helper.c b/target/mips/op_helper.c index b683fcb025..e5f3ea4042 100644 --- a/target/mips/op_helper.c +++ b/target/mips/op_helper.c @@ -17,6 +17,7 @@ * License along with this library; if not, see . */ #include "qemu/osdep.h" +#include "qemu/main-loop.h" #include "cpu.h" #include "qemu/host-utils.h" #include "exec/helper-proto.h" @@ -827,7 +828,11 @@ target_ulong helper_mftc0_tcschefback(CPUMIPSState *env) target_ulong helper_mfc0_count(CPUMIPSState *env) { - return (int32_t)cpu_mips_get_count(env); + int32_t count; + qemu_mutex_lock_iothread(); + count = (int32_t) cpu_mips_get_count(env); + qemu_mutex_unlock_iothread(); + return count; } target_ulong helper_mftc0_entryhi(CPUMIPSState *env) @@ -1375,7 +1380,9 @@ void helper_mtc0_hwrena(CPUMIPSState *env, target_ulong arg1) void helper_mtc0_count(CPUMIPSState *env, target_ulong arg1) { + qemu_mutex_lock_iothread(); cpu_mips_store_count(env, arg1); + qemu_mutex_unlock_iothread(); } void helper_mtc0_entryhi(CPUMIPSState *env, target_ulong arg1) @@ -1424,7 +1431,9 @@ void helper_mttc0_entryhi(CPUMIPSState *env, target_ulong arg1) void helper_mtc0_compare(CPUMIPSState *env, target_ulong arg1) { + qemu_mutex_lock_iothread(); cpu_mips_store_compare(env, arg1); + qemu_mutex_unlock_iothread(); } void helper_mtc0_status(CPUMIPSState *env, target_ulong arg1) @@ -1475,7 +1484,9 @@ void helper_mtc0_srsctl(CPUMIPSState *env, target_ulong arg1) void helper_mtc0_cause(CPUMIPSState *env, target_ulong arg1) { + qemu_mutex_lock_iothread(); cpu_mips_store_cause(env, arg1); + qemu_mutex_unlock_iothread(); } void helper_mttc0_cause(CPUMIPSState *env, target_ulong arg1) @@ -2296,12 +2307,16 @@ target_ulong helper_rdhwr_synci_step(CPUMIPSState *env) target_ulong helper_rdhwr_cc(CPUMIPSState *env) { + int32_t count; check_hwrena(env, 2, GETPC()); #ifdef CONFIG_USER_ONLY - return env->CP0_Count; + count = env->CP0_Count; #else - return (int32_t)cpu_mips_get_count(env); + qemu_mutex_lock_iothread(); + count = (int32_t)cpu_mips_get_count(env); + qemu_mutex_unlock_iothread(); #endif + return count; } target_ulong helper_rdhwr_ccres(CPUMIPSState *env)