Received: by 2002:a05:7412:b995:b0:f9:9502:5bb8 with SMTP id it21csp3414524rdb; Wed, 27 Dec 2023 06:51:27 -0800 (PST) X-Google-Smtp-Source: AGHT+IGds+a0pnDAdsMCvnGhZU7qFwL2X+HRQIzjSonO8BX/cHlGEYhTzcYSr6b2DFMdhnt5louR X-Received: by 2002:a05:6402:5bc4:b0:550:e014:5254 with SMTP id gy4-20020a0564025bc400b00550e0145254mr5185851edb.27.1703688687184; Wed, 27 Dec 2023 06:51:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703688687; cv=none; d=google.com; s=arc-20160816; b=QHPX5crVFFMoaDV502P/Awrg6U17GS2GBieZ1dSxnaGMDm0FAcq6dY4yhilYaanFdR jhoYJDmgMi+PXwo/nKYXWSqBJOKXVxgyqmknjUCyMDm2bdkXRBgtlgj6ZDCfdUqpkG+m 7D5n2qdTeJ//G6XACgyNY6O9qIyJ7MjAIHmnZYpM0bYnyrY53uJ/iuhqACyUbtQffeQP mZ1gMvyxcjWGq5YdDeFLZAGM12Ci1pjxI9DImQxQLLfNyGtGCs8tJnBV7kG+ifpNisW1 NDuiUNFdMCnaWu3WYZK2LXqdN6DJXZVA3OtMIUheT8v42NPit72/RqfucwVnumPMfhKX HSwA== 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=dBhAD2KkbriEp2qNC+ghO6AuutHK13Eu3XnJAL8S1+o=; fh=nCHpoOmZzPFKkYnjB6DcQplzE6zNssY94haDgAefa7c=; b=vpWFZxZKbr+LQtUV7Ab+W6JS+xRti+2y0e4B6mzeo8hWqC6CZix/G7uG11LU0uklkX Ep1QZqNAby2hJeuhelRFVErfN68firMJXoW4FbI5rF4S+pNqJid7ondruqI+CWrQeP4e EXjx6Y7+bzXSb6bZCH2QVZVE/Ur1bHKFJkCUr4Kd/mvXHv1ZFu6sYh9NgeZFnLAzN8qN 43F1MIIHgiXfAoOWmis1c3Af+YmZzmUWTWISKFhGEIVfHplwhTcBrPjz3UAYrktsjpNB 0CQ1cXdm1y0NWsui4p6RumobeTG039jAU/Nfe2rwqxiqXmHJQFzK8/KaufFeAvU8oYKf yghg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=ajXoVreg; spf=pass (google.com: domain of linux-kernel+bounces-12067-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-12067-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id l18-20020a056402255200b0055333945e4bsi6554497edb.480.2023.12.27.06.51.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Dec 2023 06:51:27 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-12067-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=ajXoVreg; spf=pass (google.com: domain of linux-kernel+bounces-12067-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-12067-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 am.mirrors.kernel.org (Postfix) with ESMTPS id E88461F2221D for ; Wed, 27 Dec 2023 14:51:26 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 0903147F59; Wed, 27 Dec 2023 14:50:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ajXoVreg" X-Original-To: linux-kernel@vger.kernel.org Received: from mail-pg1-f170.google.com (mail-pg1-f170.google.com [209.85.215.170]) (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 E997847F4D for ; Wed, 27 Dec 2023 14:50:12 +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-pg1-f170.google.com with SMTP id 41be03b00d2f7-5cd5cdba609so3954685a12.0 for ; Wed, 27 Dec 2023 06:50:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1703688612; x=1704293412; 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=dBhAD2KkbriEp2qNC+ghO6AuutHK13Eu3XnJAL8S1+o=; b=ajXoVregn/SHzWsoS+oENP/XcxH1cNJ/lhGGiGn+u8OoZ6nZhZdeu0Y+3ZsbwkCtAa FfsQHWn1kNFAWkcaKbR2AUYoiz+eG0bvc/X5VRz2iIAe/H4ksDuK8S3HGca5+mzKC6SQ lck+4mY2rwWqx4i4JckP4cC48rTklsRxyMp+5HToR0zOuUrQndWcRQw56RSxRkPdjo3q STaqbgPbxNcsj9flTvZg/QWhfV4pta7C8m+vMjXJybcHwr/JDnjpjeKR293koDQ9J6nb XlEAFmIxfwk4bse4Ktv8psX6HsmDdyhtF02sG9Tq0xT/uozeeoGRVehR7FRqtLouiVnZ xy1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703688612; x=1704293412; 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=dBhAD2KkbriEp2qNC+ghO6AuutHK13Eu3XnJAL8S1+o=; b=Q8Y+cmxAmCWtW/AteV0y/tBCmL9ajbPBnaKF9IQBTFX8on8sx+ZXXB6woQYyO7UWF2 1f3IyAshWhrIrezuF4o7sAG9axyUz6fMuvSLTLa4N6itZ1ZjqVOE0X2PHBMCUjtcLgqx Z4hoYUQXufEpyfiMjH4PK7bWdYJiN+mm213ekVh2ebWJivKyPV+180xV6eMCT+ie1KS1 ryp7GHq51EUj1WtOnp8x7HpdVhiSj1SZ5QrIgvgF+Ybd889ObfzCnY7msvs0xG3fV50E NRymNhx4euPINAhhYlHF2kOX5p0B/50CSGFe30XikQmLGZy4og4gWw3mQsm4TL4tXRBB Nrcw== X-Gm-Message-State: AOJu0YzcO+jCuEt3tO3mT4bCRBustoUdyb/npowYxLgGbpwJAkgWmD5e Vn/JuhLeF0nB1DBEm++Ijo4tD1x3CV0= X-Received: by 2002:a05:6a21:99a9:b0:196:16b0:b7b3 with SMTP id ve41-20020a056a2199a900b0019616b0b7b3mr1480281pzb.78.1703688612010; Wed, 27 Dec 2023 06:50:12 -0800 (PST) Received: from localhost ([198.11.176.14]) by smtp.gmail.com with ESMTPSA id f6-20020a056a001ac600b006d9a48882f7sm7651268pfv.118.2023.12.27.06.50.11 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Dec 2023 06:50:11 -0800 (PST) From: Lai Jiangshan To: linux-kernel@vger.kernel.org Cc: Tejun Heo , Naohiro.Aota@wdc.com, Lai Jiangshan , Lai Jiangshan Subject: [PATCH 7/7] workqueue: Rename wq->saved_max_active to wq->max_active Date: Wed, 27 Dec 2023 22:51:43 +0800 Message-Id: <20231227145143.2399-8-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 The name max_active is clearer. Signed-off-by: Lai Jiangshan --- kernel/workqueue.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/kernel/workqueue.c b/kernel/workqueue.c index 382c53f89cb4..0458545642f7 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -298,7 +298,7 @@ struct workqueue_struct { struct worker *rescuer; /* MD: rescue worker */ int nr_drainers; /* WQ: drain in progress */ - int saved_max_active; /* WQ: saved max_active */ + int max_active; /* WQ: percpu or total max_active */ int min_active; /* WQ: pwq min_active */ struct workqueue_attrs *unbound_attrs; /* PW: only for unbound wqs */ @@ -3376,7 +3376,7 @@ static bool start_flush_work(struct work_struct *work, struct wq_barrier *barr, * forward progress. */ if (!from_cancel && - (pwq->wq->saved_max_active == 1 || pwq->wq->rescuer)) { + (pwq->wq->max_active == 1 || pwq->wq->rescuer)) { lock_map_acquire(&pwq->wq->lockdep_map); lock_map_release(&pwq->wq->lockdep_map); } @@ -4159,17 +4159,17 @@ static int pwq_calculate_max_active(struct pool_workqueue *pwq) return 0; if (!(pwq->wq->flags & WQ_UNBOUND)) - return pwq->wq->saved_max_active; + return pwq->wq->max_active; pwq_nr_online_cpus = cpumask_weight_and(pwq->pool->attrs->__pod_cpumask, cpu_online_mask); - max_active = DIV_ROUND_UP(pwq->wq->saved_max_active * pwq_nr_online_cpus, num_online_cpus()); + max_active = DIV_ROUND_UP(pwq->wq->max_active * pwq_nr_online_cpus, num_online_cpus()); /* * To guarantee forward progress regardless of online CPU distribution, * the concurrency limit on every pwq is guaranteed to be equal to or * greater than wq->min_active. */ - return clamp(max_active, pwq->wq->min_active, pwq->wq->saved_max_active); + return clamp(max_active, pwq->wq->min_active, pwq->wq->max_active); } /** @@ -4177,7 +4177,7 @@ static int pwq_calculate_max_active(struct pool_workqueue *pwq) * @pwq: target pool_workqueue * * If @pwq isn't freezing, set @pwq->max_active to the associated - * workqueue's saved_max_active and activate inactive work items + * workqueue's max_active and activate inactive work items * accordingly. If @pwq is freezing, clear @pwq->max_active to zero. */ static void pwq_adjust_max_active(struct pool_workqueue *pwq) @@ -4186,7 +4186,7 @@ static void pwq_adjust_max_active(struct pool_workqueue *pwq) int max_active = pwq_calculate_max_active(pwq); unsigned long flags; - /* for @wq->saved_max_active */ + /* for @wq->max_active */ lockdep_assert_held(&wq->mutex); /* fast exit if unchanged */ @@ -4761,7 +4761,7 @@ struct workqueue_struct *alloc_workqueue(const char *fmt, /* init wq */ wq->flags = flags; - wq->saved_max_active = max_active; + wq->max_active = max_active; wq->min_active = min(max_active, WQ_DFL_MIN_ACTIVE); mutex_init(&wq->mutex); atomic_set(&wq->nr_pwqs_to_flush, 0); @@ -4935,7 +4935,7 @@ void workqueue_set_max_active(struct workqueue_struct *wq, int max_active) mutex_lock(&wq->mutex); wq->flags &= ~__WQ_ORDERED; - wq->saved_max_active = max_active; + wq->max_active = max_active; wq->min_active = min(wq->min_active, max_active); for_each_pwq(pwq, wq) @@ -5990,7 +5990,7 @@ static ssize_t max_active_show(struct device *dev, { struct workqueue_struct *wq = dev_to_wq(dev); - return scnprintf(buf, PAGE_SIZE, "%d\n", wq->saved_max_active); + return scnprintf(buf, PAGE_SIZE, "%d\n", wq->max_active); } static ssize_t max_active_store(struct device *dev, -- 2.19.1.6.gb485710b