From nobody Fri Nov 7 22:56:50 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548809618638664.6910078711717; Tue, 29 Jan 2019 16:53:38 -0800 (PST) Received: from localhost ([127.0.0.1]:57816 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1goe8E-0003Mb-JS for importer@patchew.org; Tue, 29 Jan 2019 19:53:34 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35030) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1goe36-0007sr-1I for qemu-devel@nongnu.org; Tue, 29 Jan 2019 19:48:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1goe35-0000dr-42 for qemu-devel@nongnu.org; Tue, 29 Jan 2019 19:48:15 -0500 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:52641) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1goe34-0000da-VY for qemu-devel@nongnu.org; Tue, 29 Jan 2019 19:48:15 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id AC055220AB; Tue, 29 Jan 2019 19:48:14 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Tue, 29 Jan 2019 19:48:14 -0500 Received: from localhost (flamenco.cs.columbia.edu [128.59.20.216]) by mail.messagingengine.com (Postfix) with ESMTPA id 45C6AE4559; Tue, 29 Jan 2019 19:48:14 -0500 (EST) 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=RCtl4PDV3GHK6v+cBYUfeXzymy4IjwgK/VkY5crAIfU=; b=pggT/0m1zlgK QlwYrFpooIqyCFyyWBKr7lpe9aPmU4c+pjPL2Zfydgoa3YK5zoT0Z/7xxMyb2mfE qJoH1g/4Pb6GMaR3Kja/+eb/VVjk2EpdvhkOS3Sn5tSpsUMnwHMGdrgPA7fAEHMr OKB+BLM/YCGYofs3stRuS6g67Z1XjDs= 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=fm1; bh=RCtl4PDV3GHK6v+cBYUfeXzymy4IjwgK/VkY5crAI fU=; b=t/SE962KgLQxJpAI/lxo/YAPTf0KfEfPc1Upmn6icoZEbezqtd63dRqec 2ieK1U3qUOGPNIGDwiLEfkAWDyWwyXHS0E6aI7spH/IH+ALvCR/HhfePSRGOyHq8 629QPtMmLLsMjzrDjXRhTBhK42rlqHT/NRCwcbR6+VIgvx5Eenj/9r1kFpOeBnzB Rg+WuCI36sI9xOMj3OxvrbiGKVCJLChPqma63QKB5aBZ5ILleTIaSGqxzHqSEtwQ MXIM8yzan0zQBqaafhLRqJU5yA+cTMutLaJcAY/9QTAH6g1BMaXH4aVr/J6f3yx/ r0qoajgmEbNHy+aehYFAiBbS3Jszw== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedtledrjeefgddvkecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfhuthenuceurghilhhouhhtmecufedt tdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujfgurhephffvufffkffojg hfgggtgfesthekredtredtjeenucfhrhhomhepfdfgmhhilhhiohcuifdrucevohhtrgdf uceotghothgrsegsrhgrrghprdhorhhgqeenucfkphepuddvkedrheelrddvtddrvdduie enucfrrghrrghmpehmrghilhhfrhhomheptghothgrsegsrhgrrghprdhorhhgnecuvehl uhhsthgvrhfuihiivgeptd X-ME-Proxy: From: "Emilio G. Cota" To: qemu-devel@nongnu.org Date: Tue, 29 Jan 2019 19:47:04 -0500 Message-Id: <20190130004811.27372-7-cota@braap.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190130004811.27372-1-cota@braap.org> References: <20190130004811.27372-1-cota@braap.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 66.111.4.25 Subject: [Qemu-devel] [PATCH v6 06/73] cpu: introduce process_queued_cpu_work_locked 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 , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" This completes the conversion to cpu_mutex_lock/unlock in the file. Reviewed-by: Richard Henderson Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Emilio G. Cota --- cpus-common.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/cpus-common.c b/cpus-common.c index 85a61eb970..99662bfa87 100644 --- a/cpus-common.c +++ b/cpus-common.c @@ -337,20 +337,19 @@ void async_safe_run_on_cpu(CPUState *cpu, run_on_cpu_= func func, queue_work_on_cpu(cpu, wi); } =20 -void process_queued_cpu_work(CPUState *cpu) +/* Called with the CPU's lock held */ +static void process_queued_cpu_work_locked(CPUState *cpu) { struct qemu_work_item *wi; bool has_bql =3D qemu_mutex_iothread_locked(); =20 - qemu_mutex_lock(&cpu->lock); if (QSIMPLEQ_EMPTY(&cpu->work_list)) { - qemu_mutex_unlock(&cpu->lock); return; } while (!QSIMPLEQ_EMPTY(&cpu->work_list)) { wi =3D QSIMPLEQ_FIRST(&cpu->work_list); QSIMPLEQ_REMOVE_HEAD(&cpu->work_list, node); - qemu_mutex_unlock(&cpu->lock); + cpu_mutex_unlock(cpu); if (wi->exclusive) { /* Running work items outside the BQL avoids the following dea= dlock: * 1) start_exclusive() is called with the BQL taken while ano= ther @@ -376,13 +375,19 @@ void process_queued_cpu_work(CPUState *cpu) qemu_mutex_unlock_iothread(); } } - qemu_mutex_lock(&cpu->lock); + cpu_mutex_lock(cpu); if (wi->free) { g_free(wi); } else { atomic_mb_set(&wi->done, true); } } - qemu_mutex_unlock(&cpu->lock); qemu_cond_broadcast(&cpu->cond); } + +void process_queued_cpu_work(CPUState *cpu) +{ + cpu_mutex_lock(cpu); + process_queued_cpu_work_locked(cpu); + cpu_mutex_unlock(cpu); +} --=20 2.17.1