From patchwork Fri Oct 19 01:06:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emilio Cota X-Patchwork-Id: 986461 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=braap.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=braap.org header.i=@braap.org header.b="zyqhhHJe"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="OupMJIql"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42bph86THbz9sBq for ; Fri, 19 Oct 2018 12:47:36 +1100 (AEDT) Received: from localhost ([::1]:46128 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gDJt0-0007JU-FV for incoming@patchwork.ozlabs.org; Thu, 18 Oct 2018 21:47:34 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59412) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gDJFw-000507-V6 for qemu-devel@nongnu.org; Thu, 18 Oct 2018 21:07:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gDJFl-0003OT-DB for qemu-devel@nongnu.org; Thu, 18 Oct 2018 21:07:09 -0400 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:40869) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gDJFk-00036H-KJ for qemu-devel@nongnu.org; Thu, 18 Oct 2018 21:07:01 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 1A8682299E; Thu, 18 Oct 2018 21:06:38 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Thu, 18 Oct 2018 21:06:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=braap.org; h= from:to:cc:subject:date:message-id:in-reply-to:references; s= mesmtp; bh=4bGzpLYb/4dNvp50r7x0JAjhTMTHnpYkTR6dvybtdE8=; b=zyqhh HJe8ZoL0ADzv2FoCJp/Gj4tzT5mM4C7R9n7gO6UOJ4NOTdiIJ9Umlj40egeQzbDt dfrK+TpNllZYT1jwSoLc9EJcJ269GDxzwiYmsqQg2dXm5kqU+EbNTKl5wj6QIVoh RLRADhfrvUw5x+ijO2p8YxFrV+2lccjdKOFDZI= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-proxy:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm1; bh=4bGzpLYb/4dNvp50r7x0JAjhTMTHn pYkTR6dvybtdE8=; b=OupMJIqlxqw9NmjyYtr8lOUGZiVTN1fTsTeVx7oBhKG2R 3KjGvQ3xlqR0iXuh6+DK8I4rZnLOu9bUtqPxJP3R//oWQWJXDuZXFpNNH9/YSkuQ jj4ZflZAt14ljzAIaTcGIJizrCuj1F0oPmczgvozQs7fPc/EtxXlC7SsYYCGsrvA 6KTqVrzFH4thsM0148nQlpFuGy7HTRzq8dy8Xnm/eT+4HDRosyy7GNGQ41eEt08S HJoczG93e8aRE6ke6/DZkxFdh75p7oc43zQ/AqZ7CRwV7UNvA80eBmN2mR1l6h5F VAUkfabg6xfmi6VV52bAzMfdmS5KRTYGu4VM/ORqQ== X-ME-Sender: X-ME-Proxy: Received: from localhost (flamenco.cs.columbia.edu [128.59.20.216]) by mail.messagingengine.com (Postfix) with ESMTPA id BCF8B102DD; Thu, 18 Oct 2018 21:06:37 -0400 (EDT) From: "Emilio G. Cota" To: qemu-devel@nongnu.org Date: Thu, 18 Oct 2018 21:06:20 -0400 Message-Id: <20181019010625.25294-52-cota@braap.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181019010625.25294-1-cota@braap.org> References: <20181019010625.25294-1-cota@braap.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 66.111.4.29 Subject: [Qemu-devel] [RFC v3 51/56] riscv: acquire the BQL in cpu_has_work 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 , Michael Clark , Palmer Dabbelt , Sagar Karandikar , Bastian Koppelmann Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Soon we will call cpu_has_work without the BQL. Cc: Michael Clark Cc: Palmer Dabbelt Cc: Sagar Karandikar Cc: Bastian Koppelmann Signed-off-by: Emilio G. Cota Reviewed-by: Palmer Dabbelt --- target/riscv/cpu.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index d630e8fd6c..b10995c807 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -18,6 +18,7 @@ */ #include "qemu/osdep.h" +#include "qemu/main-loop.h" #include "qemu/log.h" #include "cpu.h" #include "exec/exec-all.h" @@ -244,11 +245,14 @@ static void riscv_cpu_synchronize_from_tb(CPUState *cs, TranslationBlock *tb) env->pc = tb->pc; } -static bool riscv_cpu_has_work(CPUState *cs) +static bool riscv_cpu_has_work_locked(CPUState *cs) { #ifndef CONFIG_USER_ONLY RISCVCPU *cpu = RISCV_CPU(cs); CPURISCVState *env = &cpu->env; + + g_assert(qemu_mutex_iothread_locked()); + /* * Definition of the WFI instruction requires it to ignore the privilege * mode and delegation registers, but respect individual enables @@ -259,6 +263,21 @@ static bool riscv_cpu_has_work(CPUState *cs) #endif } +static bool riscv_cpu_has_work(CPUState *cs) +{ + if (!qemu_mutex_iothread_locked()) { + bool ret; + + cpu_mutex_unlock(cs); + qemu_mutex_lock_iothread(); + cpu_mutex_lock(cs); + ret = riscv_cpu_has_work_locked(cs); + qemu_mutex_unlock_iothread(); + return ret; + } + return riscv_cpu_has_work_locked(cs); +} + void restore_state_to_opc(CPURISCVState *env, TranslationBlock *tb, target_ulong *data) {