From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 496B4C43216 for ; Tue, 10 Aug 2021 17:59:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2AA4360232 for ; Tue, 10 Aug 2021 17:59:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237831AbhHJR7P (ORCPT ); Tue, 10 Aug 2021 13:59:15 -0400 Received: from mail.kernel.org ([198.145.29.99]:51490 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237569AbhHJRyp (ORCPT ); Tue, 10 Aug 2021 13:54:45 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 82CDE60EB7; Tue, 10 Aug 2021 17:44:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1628617467; bh=Lw+74Gj3kID0KRiShxi8a0HyLBFVscSu8HmSEZ4Z5DI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=P5VquYFPpBSHTa1u/xAmCd+8O1BUCLSP+JgKyG+rGoWxiHzcBAHNsaMz474RFK+aL OokZvy0+DFDGFDwX60pIBYaeucGDmPhk9JAIczUZxdOqVSiYKB8XA0qGls6CFbZjCd D3Ezo5+syAUrruC4v5dnCquVlYEtl/DqmwSA2UaI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hao Xu , Jens Axboe , Sasha Levin Subject: [PATCH 5.13 072/175] io-wq: fix lack of acct->nr_workers < acct->max_workers judgement Date: Tue, 10 Aug 2021 19:29:40 +0200 Message-Id: <20210810173003.309630971@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210810173000.928681411@linuxfoundation.org> References: <20210810173000.928681411@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: X-Mailing-List: linux-kernel@vger.kernel.org From: Hao Xu [ Upstream commit 21698274da5b6fc724b005bc7ec3e6b9fbcfaa06 ] There should be this judgement before we create an io-worker Fixes: 685fe7feedb9 ("io-wq: eliminate the need for a manager thread") Signed-off-by: Hao Xu Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- fs/io-wq.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/fs/io-wq.c b/fs/io-wq.c index e00ac0969470..400fba839734 100644 --- a/fs/io-wq.c +++ b/fs/io-wq.c @@ -281,9 +281,17 @@ static void create_worker_cb(struct callback_head *cb) { struct create_worker_data *cwd; struct io_wq *wq; + struct io_wqe *wqe; + struct io_wqe_acct *acct; cwd = container_of(cb, struct create_worker_data, work); - wq = cwd->wqe->wq; + wqe = cwd->wqe; + wq = wqe->wq; + acct = &wqe->acct[cwd->index]; + raw_spin_lock_irq(&wqe->lock); + if (acct->nr_workers < acct->max_workers) + acct->nr_workers++; + raw_spin_unlock_irq(&wqe->lock); create_io_worker(wq, cwd->wqe, cwd->index); kfree(cwd); } -- 2.30.2