Received: by 2002:a05:7412:b995:b0:f9:9502:5bb8 with SMTP id it21csp3414137rdb; Wed, 27 Dec 2023 06:50:36 -0800 (PST) X-Google-Smtp-Source: AGHT+IGgGZyXJ/HOoYQwM52hgB9c7NNWh4brIT6fcy+g9S798ChaSul85HrQGeePmbFwIUiRFtvV X-Received: by 2002:a17:902:c3d1:b0:1d3:35e4:bcd7 with SMTP id j17-20020a170902c3d100b001d335e4bcd7mr9653574plj.34.1703688636252; Wed, 27 Dec 2023 06:50:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703688636; cv=none; d=google.com; s=arc-20160816; b=SACFv3tyjPMILNLPwimW+U/gSH8VUxQBKK9wDwjIeKmpAwPk00PtXUMJ3Q4gPBIVat LH7goiW76iEeqWynqtg2G12KBFyicvm6GLrSoj4IOkTDkMnqlYL86SWJS6p3C9ShlB5s agSb9Cu/j08lGqbNJCYfDfeoeIAwxZ3infFDv4jRz70MNMnqYM0kxvhmuGp+omZgQ0aY SqkYmavfHiZTAOAoX/0apv4orIpxzcOwOZUb9Slkig63v9nkxRk3Pzn+ZLvpSAQaV5FI ImzYvHCsPb8BHwjzhfbmJgQSiYkBzZGRdIHSnlaXRgUyDsFtmc9MS309bDC8zUmYH9Zx xBlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=OEkOlw6eKaiG2LU3fXepVKKsRgGZTje8n42JsBJJYDI=; fh=nCHpoOmZzPFKkYnjB6DcQplzE6zNssY94haDgAefa7c=; b=E7L2z9zksOWUFW+wt+8wZwBwFKDun5vOvnhhbTJIXqrOyZQYlM3c4p3ne+wrkvxCZ6 J89uzkZCNJ/trMrpWe695/FRVilXqcb2M5LaII2RZZ0CRO+SLpaD4a0bPotHbdi5X1Q+ IUZcHPzu2AJ6SaxXn9BJ/GQnd1Y3XGcF+hvec1LLBfCDIXMkc7pTaeZfs4azFlYdeN6d SYuoSrHdnRjWc6HCZfzr2Av/+2jdWv9JUckCxzKZnGfEzyg/8mI2YT1C0964GcZhziZV Bo5XESCqP/Ez32rSTqWiiNTxSm1H6mPTY+bRfKMHAkyVOxy/jrtZgsyrPVtZ+E2QMYPr wQGQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=WF771chD; spf=pass (google.com: domain of linux-kernel+bounces-12063-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-12063-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id a7-20020a170902ecc700b001c383a64ebesi6741481plh.319.2023.12.27.06.50.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Dec 2023 06:50:36 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-12063-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=WF771chD; spf=pass (google.com: domain of linux-kernel+bounces-12063-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-12063-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 4A205B21D42 for ; Wed, 27 Dec 2023 14:50:32 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8060746446; Wed, 27 Dec 2023 14:49:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="WF771chD" X-Original-To: linux-kernel@vger.kernel.org Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C91DB4643A for ; Wed, 27 Dec 2023 14:49:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-1d427518d52so23302385ad.0 for ; Wed, 27 Dec 2023 06:49:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1703688594; x=1704293394; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=OEkOlw6eKaiG2LU3fXepVKKsRgGZTje8n42JsBJJYDI=; b=WF771chDp+6AOt7o9/GeMsCo77s+GKRaYP6fpNgXyn/03IgZzPaYYN9lsxdpDsxoZE yTT7YaYZbGfHbyEwQTxdH8DIFQHwEXMR5AH+CPfTpxH/Dri/fUaBYZ6kbOziGgVkhWZP tGYe1rIdhdpLJRdHDXGjJpigK1GttrVFWcdoBy9aNnRFMjoUTA64ff54AiAkQeHVl/57 HRPcy1Xg2fSGBGOpODQ3trJ7ZH1IwPOlZ8mUuc+v5MmSJmvYYMcqLu904VMdSNBOsh5U BymMMvZPPTNGC9tQkWB6ZwWk8T/ErPf5gH6SAz9FWY9C3eMp2Xbv2lnVqLqKcH8coIrF UBkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703688594; x=1704293394; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OEkOlw6eKaiG2LU3fXepVKKsRgGZTje8n42JsBJJYDI=; b=H54VYtQ+Utq7RaSPFVae2pIRW4r9qOIDqsBZC9U7ZGbDuuPuumxe8AM5y0g6cdVVDm 6lU80f3ocxU93J/DVqcS6gW4zCYcZLCKIDz1CUsK7/xbtaxIB7nkLsOWfWjy/ae8y5Ar L4S60xn7MLiszrpcn7exZJP28Sx2P1xfXoOfIgVLGHIvG22MRM7a1vw9vsKQH6lKTHXQ MAC7oeRc19y+Z2qxwcz9GNdoGHbOppuhuL+x71HLesXyZDteafrY7qA2LkFqcRH8oqjP W/jCaPVbCxDqPBHOHCJRuRxzE0iGztH/ootfD4ZbU5ml+SyJd8vL5t3mH2L5N3d/tqHe 5+LA== X-Gm-Message-State: AOJu0Yyw9wute9xtu5AOAwfhOOtDjJFWEyuHl+3WBY/nOJP2qiZlNoq5 nsMFghOfnqHG1HqQHMJcoxBBrN6N+5g= X-Received: by 2002:a17:902:6846:b0:1d4:81bc:a2c2 with SMTP id f6-20020a170902684600b001d481bca2c2mr1093014pln.2.1703688593655; Wed, 27 Dec 2023 06:49:53 -0800 (PST) Received: from localhost ([47.88.5.130]) by smtp.gmail.com with ESMTPSA id ix9-20020a170902f80900b001cff026df52sm12148249plb.221.2023.12.27.06.49.52 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Dec 2023 06:49:53 -0800 (PST) From: Lai Jiangshan To: linux-kernel@vger.kernel.org Cc: Tejun Heo , Naohiro.Aota@wdc.com, Lai Jiangshan , Lai Jiangshan Subject: [PATCH 3/7] workqueue: Add pwq_calculate_max_active() Date: Wed, 27 Dec 2023 22:51:39 +0800 Message-Id: <20231227145143.2399-4-jiangshanlai@gmail.com> X-Mailer: git-send-email 2.19.1.6.gb485710b In-Reply-To: <20231227145143.2399-1-jiangshanlai@gmail.com> References: <20231227145143.2399-1-jiangshanlai@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Lai Jiangshan Abstract the code of calculating max_active from pwq_adjust_max_active() into pwq_calculate_max_active() to make the logic clearer. Signed-off-by: Lai Jiangshan --- kernel/workqueue.c | 44 +++++++++++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 17 deletions(-) diff --git a/kernel/workqueue.c b/kernel/workqueue.c index 1f52685498f1..3347ba3a734f 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -4136,6 +4136,25 @@ static void pwq_release_workfn(struct kthread_work *work) } } +/** + * pwq_calculate_max_active - Determine max_active to use + * @pwq: pool_workqueue of interest + * + * Determine the max_active @pwq should use. + */ +static int pwq_calculate_max_active(struct pool_workqueue *pwq) +{ + /* + * During [un]freezing, the caller is responsible for ensuring + * that pwq_adjust_max_active() is called at least once after + * @workqueue_freezing is updated and visible. + */ + if ((pwq->wq->flags & WQ_FREEZABLE) && workqueue_freezing) + return 0; + + return pwq->wq->saved_max_active; +} + /** * pwq_adjust_max_active - update a pwq's max_active to the current setting * @pwq: target pool_workqueue @@ -4147,35 +4166,26 @@ static void pwq_release_workfn(struct kthread_work *work) static void pwq_adjust_max_active(struct pool_workqueue *pwq) { struct workqueue_struct *wq = pwq->wq; - bool freezable = wq->flags & WQ_FREEZABLE; + int max_active = pwq_calculate_max_active(pwq); unsigned long flags; /* for @wq->saved_max_active */ lockdep_assert_held(&wq->mutex); - /* fast exit for non-freezable wqs */ - if (!freezable && pwq->max_active == wq->saved_max_active) + /* fast exit if unchanged */ + if (pwq->max_active == max_active) return; /* this function can be called during early boot w/ irq disabled */ raw_spin_lock_irqsave(&pwq->pool->lock, flags); - /* - * During [un]freezing, the caller is responsible for ensuring that - * this function is called at least once after @workqueue_freezing - * is updated and visible. - */ - if (!freezable || !workqueue_freezing) { - pwq->max_active = wq->saved_max_active; + pwq->max_active = max_active; - while (!list_empty(&pwq->inactive_works) && - pwq->nr_active < pwq->max_active) - pwq_activate_first_inactive(pwq); + while (!list_empty(&pwq->inactive_works) && + pwq->nr_active < pwq->max_active) + pwq_activate_first_inactive(pwq); - kick_pool(pwq->pool); - } else { - pwq->max_active = 0; - } + kick_pool(pwq->pool); raw_spin_unlock_irqrestore(&pwq->pool->lock, flags); } -- 2.19.1.6.gb485710b