Message ID | 20220114081545.245897527@linuxfoundation.org |
---|---|
State | New |
Headers | show
Return-Path: <stable-owner@kernel.org> X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3E75CC433F5 for <stable@archiver.kernel.org>; Fri, 14 Jan 2022 08:20:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240023AbiANIUZ (ORCPT <rfc822;stable@archiver.kernel.org>); Fri, 14 Jan 2022 03:20:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49904 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237006AbiANIUB (ORCPT <rfc822;stable@vger.kernel.org>); Fri, 14 Jan 2022 03:20:01 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D5D0DC06175C; Fri, 14 Jan 2022 00:20:00 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 7A636B823E6; Fri, 14 Jan 2022 08:20:00 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B2912C36AEA; Fri, 14 Jan 2022 08:19:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1642148399; bh=oSB93u3Ms+gNU2+klwKwwo1GhE4IqwsSDKKXBdxIty8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MVPJOXfohPiBuBQWFoK7rIecxq0GGa9LUEdg1Oa9p1uK35Ymxt3XwE6+glGya6WiY r2fSFMug6dtEv/+gogwYP2sLYnGKAy8HT2NOvykyabeWtFQ7QElxt/RJs+dYYIWNXr YoaCe/E3Mos9GhhlQetD58fsqFQ1rDnyARUdTsHU= From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Lai Jiangshan <jiangshanlai@gmail.com>, "Paul E. McKenney" <paulmck@kernel.org>, "Peter Zijlstra (Intel)" <peterz@infradead.org>, Frederic Weisbecker <frederic@kernel.org>, Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@redhat.com>, Sebastian Andrzej Siewior <bigeasy@linutronix.de>, Daniel Bristot de Oliveira <bristot@redhat.com>, Tejun Heo <tj@kernel.org> Subject: [PATCH 5.15 02/41] workqueue: Fix unbind_workers() VS wq_worker_running() race Date: Fri, 14 Jan 2022 09:16:02 +0100 Message-Id: <20220114081545.245897527@linuxfoundation.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220114081545.158363487@linuxfoundation.org> References: <20220114081545.158363487@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: <stable.vger.kernel.org> X-Mailing-List: stable@vger.kernel.org |
Series |
None
|
expand
|
--- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -867,8 +867,17 @@ void wq_worker_running(struct task_struc if (!worker->sleeping) return; + + /* + * If preempted by unbind_workers() between the WORKER_NOT_RUNNING check + * and the nr_running increment below, we may ruin the nr_running reset + * and leave with an unexpected pool->nr_running == 1 on the newly unbound + * pool. Protect against such race. + */ + preempt_disable(); if (!(worker->flags & WORKER_NOT_RUNNING)) atomic_inc(&worker->pool->nr_running); + preempt_enable(); worker->sleeping = 0; }