From patchwork Mon Apr 10 12:55:16 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: 97116 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp1348189qgd; Mon, 10 Apr 2017 05:55:50 -0700 (PDT) X-Received: by 10.200.51.252 with SMTP id d57mr50666765qtb.96.1491828950478; Mon, 10 Apr 2017 05:55:50 -0700 (PDT) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id j190si13377280qkd.82.2017.04.10.05.55.50 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 10 Apr 2017 05:55:50 -0700 (PDT) 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]:34324 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cxYrE-0002Vr-6z for patch@linaro.org; Mon, 10 Apr 2017 08:55:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53429) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cxYqr-0002UG-Vs for qemu-devel@nongnu.org; Mon, 10 Apr 2017 08:55:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cxYqo-00037F-8T for qemu-devel@nongnu.org; Mon, 10 Apr 2017 08:55:25 -0400 Received: from mail-wm0-x233.google.com ([2a00:1450:400c:c09::233]:38577) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cxYqo-00036I-20 for qemu-devel@nongnu.org; Mon, 10 Apr 2017 08:55:22 -0400 Received: by mail-wm0-x233.google.com with SMTP id t189so36720387wmt.1 for ; Mon, 10 Apr 2017 05:55:21 -0700 (PDT) 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=alyA6K6F3H9r0EdK+k2yUh1nqXj00TH+nUOCN4ad40o=; b=EXQ6Oz6BCR/ZWEPvxCHRK28qk/B+u7gwCKBG0kqC1cHBGgUoTtAZAaX6Hlnhf2Jbmg +Fjoy0d46aQ67po7UI71ACEzVHv8XrmvEcIfydu639Kt+F0TGROiTAWWbqlHE4vZGMqK xTTxpuOjSaLa2yvaQ/rfX+3kCumUmvOasHPRE= 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=alyA6K6F3H9r0EdK+k2yUh1nqXj00TH+nUOCN4ad40o=; b=tiy3R4jS35ad9gEP2uGlUFUuxJKtPqPa7pvVEjq5UUJYU+NZLYeF4QUYT8PQ+04CCE 8Buh0d0/r4pml+iq2+6zvF8bxnsolFaNBLPi8Zuslkocys0vsusZjSoE+cJzUHuSLghV hJIWNYuohtjCkiifgLBEAVYZWvaAqmhnLmCR43kQU+BIKrSomROPI5aKaVMZ7vyk9zgx Q2YfExy8ZKMWLDo8vhcePEJ11NxDr9fgODfUH4E+buTgq3SstdOYjHbvenT2zFhrZb0R RCf/xad8hpbCUtwg3FBWWmG3288OMXgg6AzdD/HM7sXt4LTr+PeOSjHf1DZgqbTwn1Sr wlfA== X-Gm-Message-State: AN3rC/4xnIT6HeM04OXrFkq5ysVzTX/QR7k1gZgjkYe6EZXCSr28qMGt OKsuJPBcMLzgCov6 X-Received: by 10.28.71.87 with SMTP id u84mr10009045wma.101.1491828919968; Mon, 10 Apr 2017 05:55:19 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id x65sm8281495wmg.3.2017.04.10.05.55.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Apr 2017 05:55:18 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 1C7A13E0FC7; Mon, 10 Apr 2017 13:55:25 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 10 Apr 2017 13:55:16 +0100 Message-Id: <20170410125524.21008-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170410125524.21008-1-alex.bennee@linaro.org> References: <20170410125524.21008-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/11] target/i386/misc_helper: wrap BQL around another IRQ generator 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: Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, Eduardo Habkost , Richard Henderson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Anything that calls into HW emulation must be protected by the BQL. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Acked-by: Eduardo Habkost -- 2.11.0 diff --git a/target/i386/misc_helper.c b/target/i386/misc_helper.c index ca2ea09f54..628f64aad5 100644 --- a/target/i386/misc_helper.c +++ b/target/i386/misc_helper.c @@ -18,6 +18,7 @@ */ #include "qemu/osdep.h" +#include "qemu/main-loop.h" #include "cpu.h" #include "exec/helper-proto.h" #include "exec/exec-all.h" @@ -156,7 +157,9 @@ void helper_write_crN(CPUX86State *env, int reg, target_ulong t0) break; case 8: if (!(env->hflags2 & HF2_VINTR_MASK)) { + qemu_mutex_lock_iothread(); cpu_set_apic_tpr(x86_env_get_cpu(env)->apic_state, t0); + qemu_mutex_unlock_iothread(); } env->v_tpr = t0 & 0x0f; break;