From patchwork Fri Oct 19 01:06:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emilio Cota X-Patchwork-Id: 986447 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="r2e+IJpf"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="KuWJbcGT"; 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 42bpQx2T9lz9sBq for ; Fri, 19 Oct 2018 12:36:09 +1100 (AEDT) Received: from localhost ([::1]:46040 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gDJhu-0005GI-SA for incoming@patchwork.ozlabs.org; Thu, 18 Oct 2018 21:36:06 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59413) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gDJFw-000508-VN 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-0003ON-Ap for qemu-devel@nongnu.org; Thu, 18 Oct 2018 21:07:09 -0400 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:38915) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gDJFk-00035s-IE 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 9152E2298C; Thu, 18 Oct 2018 21:06:37 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Thu, 18 Oct 2018 21:06:37 -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=cgFC/XFnNzX6peGQwRTxkjCGBQlGlMlHeArxc0Ia9yI=; b=r2e+I JpfDp+SaMlBwBVAIjHhkww+pkasjb3JK0+PFd3/3sP4tTHECjAPmsBErTa1RevMT AUt00ZEBeCsfa0iLje5X92//GIVL8u/QHbeTNYz/dCAVxCq3bG9rvGyT4mxtC6dr RJAfD6x3+oCHjzA6vtgOuapE5qTeTySI1jvUBM= 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=cgFC/XFnNzX6peGQwRTxkjCGBQlGl MlHeArxc0Ia9yI=; b=KuWJbcGTSlH+erkNry4uEkM5xVP0sSqQm4WxTeZrI5jUS aBXOaBiqiGqqmOJYKpyjtiCiiq+vFyEuleQOFoSohFRljSQieLKhOZ94EhvfxjO/ Vrsjnc/Alr6nnH7N+i0/Qp3u49S4BvnpONBj/yy6VgKIr8d+kaSXdPrGSL+xAKrn wbHlVVzETFdE0+sDseuTGSrMZs9L/nKM1aPLZy4cvSDU2iQEUWo4/5oIW8xELGNs rH313Wsv8du2tcshZ8fJuyq62du7hEPiUl9nQ8Y6WKeVRu1qfXpDOYC4Hoo8Gkdf v+fYZ36Ag+os4xrGfIWCdf/OZUORns9N+G/kExQCA== 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 542C6102E4; 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:18 -0400 Message-Id: <20181019010625.25294-50-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 49/56] mips: 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 , Aleksandar Markovic , Aurelien Jarno 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: Aurelien Jarno Cc: Aleksandar Markovic Signed-off-by: Emilio G. Cota --- target/mips/cpu.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/target/mips/cpu.c b/target/mips/cpu.c index e30aec6851..ea30c3c474 100644 --- a/target/mips/cpu.c +++ b/target/mips/cpu.c @@ -19,6 +19,7 @@ */ #include "qemu/osdep.h" +#include "qemu/main-loop.h" #include "qapi/error.h" #include "cpu.h" #include "internal.h" @@ -51,12 +52,14 @@ static void mips_cpu_synchronize_from_tb(CPUState *cs, TranslationBlock *tb) env->hflags |= tb->flags & MIPS_HFLAG_BMASK; } -static bool mips_cpu_has_work(CPUState *cs) +static bool mips_cpu_has_work_locked(CPUState *cs) { MIPSCPU *cpu = MIPS_CPU(cs); CPUMIPSState *env = &cpu->env; bool has_work = false; + g_assert(qemu_mutex_iothread_locked()); + /* Prior to MIPS Release 6 it is implementation dependent if non-enabled interrupts wake-up the CPU, however most of the implementations only check for interrupts that can be taken. */ @@ -92,6 +95,21 @@ static bool mips_cpu_has_work(CPUState *cs) return has_work; } +static bool mips_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 = mips_cpu_has_work_locked(cs); + qemu_mutex_unlock_iothread(); + return ret; + } + return mips_cpu_has_work_locked(cs); +} + /* CPUClass::reset() */ static void mips_cpu_reset(CPUState *s) {