Message ID | 20190304181813.8075-62-cota@braap.org |
---|---|
State | New |
Headers | show
Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> 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=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=<UNKNOWN>) 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="FTCcZT9t"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="wx48Inwf"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44Cpmp71QYz9s7h for <incoming@patchwork.ozlabs.org>; Tue, 5 Mar 2019 05:42:50 +1100 (AEDT) Received: from localhost ([127.0.0.1]:58932 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>) id 1h0sY4-0003bl-Tc for incoming@patchwork.ozlabs.org; Mon, 04 Mar 2019 13:42:48 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44890) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <cota@braap.org>) id 1h0sBC-0000T2-O2 for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:19:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <cota@braap.org>) id 1h0sBA-00025A-Cq for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:19:09 -0500 Received: from wout2-smtp.messagingengine.com ([64.147.123.25]:33497) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from <cota@braap.org>) id 1h0sB9-0001M1-TK for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:19:08 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id 788CB3735; Mon, 4 Mar 2019 13:18:29 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Mon, 04 Mar 2019 13:18:29 -0500 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 :mime-version:content-type:content-transfer-encoding; s=mesmtp; bh=YZB7yGnBq58/V414jUN6qq1AHhNzBl43GTYBKA22foc=; b=FTCcZT9t2cWP 6eTvMfkslgtDGxhDg9FeXBzH6xSzZh98F6ZbW7Qp/B0fU2t/SgFI6N4w82LDEnE6 n7tyHZh8pYuNBAGVZz1raMGeEKjDnyNuTi1hBzzzoqG3phBG+pUqLWVBqA1BMwui JU/9p+W6TaYbJwXhEKSrEG01QG+KTMA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; bh=YZB7yGnBq58/V414jUN6qq1AHhNzBl43GTYBKA22f oc=; b=wx48InwfZ+saM/c+LML2bH0tTQ9t3iz5PocKT98L+OvADRsLQzWMOzEaW EjLChBY6Kr/U4yNV6YvAZw7ufNkZvNHLKaG5SSkryLKcoGV5DQCiu9OxYJ+c7Jt3 pBMKIM/OeWdYedmk857INTqg0U1j0lWwuIbIWu+UG5Clqw37gDtmtmRi9X6Z/4jd 2+up9mdGNU8BTmGSARU63KE9pyDyag2V5rK7mzK/MyHH4Z0XXDfk4ost7K2skIg2 SrFZOl+0aPNwyPLMLp5xQYgUxtDghX413DYBjtD4B8ZDd9BJzEn7ef9V6QYZIsSn VZjgIgyW4lqHzQL+2VmW6gTEEktuA== X-ME-Sender: <xms:9Wt9XCFSt6WawBbVz7LEFohOjvJE13fGFFZLaHewX0XjcxkTWrEcMw> X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedutddrfedugdduuddtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffojghfgggtgfesthekredtredtjeenucfhrhhomhepfdfgmhhi lhhiohcuifdrucevohhtrgdfuceotghothgrsegsrhgrrghprdhorhhgqeenucfkphepud dvkedrheelrddvtddrvdduieenucfrrghrrghmpehmrghilhhfrhhomheptghothgrsegs rhgrrghprdhorhhgnecuvehluhhsthgvrhfuihiivgepgeej X-ME-Proxy: <xmx:9Wt9XA1OE8ddc6xNrxIjxveth77s_ho3F5LgmzlIoVU9rZaBJqHp-w> <xmx:9Wt9XIP_yF_OtoOBARZYylzfrFvl46uM0K0Epfj-bP98rkJejh9yWw> <xmx:9Wt9XJVkWSOFVlDeTiKTKhhmhA8BtHrWO9fKrBlZMYzQkR1FVYN4iw> <xmx:9Wt9XNkGm6uyLdGH7FNTcsDDbWPafhUx5hsZ4NxyejEDEnRiEu-Ksw> Received: from localhost (flamenco.cs.columbia.edu [128.59.20.216]) by mail.messagingengine.com (Postfix) with ESMTPA id C1B081033A; Mon, 4 Mar 2019 13:18:28 -0500 (EST) From: "Emilio G. Cota" <cota@braap.org> To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2019 13:18:01 -0500 Message-Id: <20190304181813.8075-62-cota@braap.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190304181813.8075-1-cota@braap.org> References: <20190304181813.8075-1-cota@braap.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 64.147.123.25 Subject: [Qemu-devel] [PATCH v7 61/73] cpu: call .cpu_has_work with the CPU lock held X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Cc: =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org>, Richard Henderson <richard.henderson@linaro.org> Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> |
Series |
[v7,01/73] cpu: convert queued work to a QSIMPLEQ
|
expand
|
diff --git a/include/qom/cpu.h b/include/qom/cpu.h index c92a8c544a..651e1ab4d8 100644 --- a/include/qom/cpu.h +++ b/include/qom/cpu.h @@ -85,7 +85,8 @@ struct TranslationBlock; * @parse_features: Callback to parse command line arguments. * @reset: Callback to reset the #CPUState to its initial state. * @reset_dump_flags: #CPUDumpFlags to use for reset logging. - * @has_work: Callback for checking if there is work to do. + * @has_work: Callback for checking if there is work to do. Called with the + * CPU lock held. * @do_interrupt: Callback for interrupt handling. * @do_unassigned_access: Callback for unassigned access handling. * (this is deprecated: new targets should use do_transaction_failed instead) @@ -808,9 +809,16 @@ const char *parse_cpu_model(const char *cpu_model); static inline bool cpu_has_work(CPUState *cpu) { CPUClass *cc = CPU_GET_CLASS(cpu); + bool ret; g_assert(cc->has_work); - return cc->has_work(cpu); + if (cpu_mutex_locked(cpu)) { + return cc->has_work(cpu); + } + cpu_mutex_lock(cpu); + ret = cc->has_work(cpu); + cpu_mutex_unlock(cpu); + return ret; } /**