From nobody Tue Dec 2 01:48:38 2025 Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) (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 43F7E345CB9 for ; Fri, 21 Nov 2025 14:53:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763736834; cv=none; b=c13KeEqtwkOh18vbDEYTtlx3BMxGj6d8OVg7MBqjpSjLPuKk4vc0s2irsSqr0zOvWS8U3UWXFrr2pAlx4oajczWDFpxef9n87tQjDINULeqUQ8HhpvXfiyw2GuJJ1NY5KDe4Eq2Zuz+DOskM7/9Xj77hAQu/x59XOVc9nBxeghM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763736834; c=relaxed/simple; bh=/RWFACrE7ta8w5uDCG4CIvTyekhq3MpL4bkiyTJ3FwA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=p/mEG21rd/2ZFK2OJifSyGlca9oKA3qJF8Lyd7sXgB6h8Bs5a+MrIXlERc7pzx3Ug1oXbFZFIOrdLAyLtu4AunUhLSQuFNP0t4qQQVdBLrH4T/mfjsWyPc0o1reAXAP8ZyzHBmC+QPidomGY1I8vsOJyPXBrsQW8PvNPtOMLBwI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=PWqwueig; arc=none smtp.client-ip=209.85.216.41 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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="PWqwueig" Received: by mail-pj1-f41.google.com with SMTP id 98e67ed59e1d1-3436d6ca17bso2249817a91.3 for ; Fri, 21 Nov 2025 06:53:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1763736831; x=1764341631; 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=+YqoquxtoxaKApcpDx2mUm88KYst5CvhVDV5Vwut5xw=; b=PWqwueiglqZFIX3/T9FqYNoKRlA79/KoG8Vce3BBCBCgtBtMVOZoDbYgCpxgcpm6NZ 6Qkcj6hcT/T6S5wicP84PFdR1klAxMxUJW2kay521l1LhxBhMJA+DEsAurmO3VxftBwV 1zCrvJ7NxEHQioaKiilCgfqGXqZyTlC/ZG2g5mIlr/FRFbhPRHMkoYX3EZZQFHIerN9U poK5rZ69wAElTUOyyvhUCdf9BeNHorPan/BBCT/0l+EOTMb9Keo8mgnbXLHTw5iZE46L 3rOpLDOQz8feg815r6WyB76UPJKcd5SbkqHl1HSMTXEHxGxsE+uD8nYq3Cl9M2OJTdnU /tZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763736831; x=1764341631; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=+YqoquxtoxaKApcpDx2mUm88KYst5CvhVDV5Vwut5xw=; b=VrI/HdrwmN9K/4pMrc+TQlGaZ2KACGoWmsDfwoLT//BZyrwaG+2BM+Olm9K3XFIRaj +7KpYvy2DHhkfVVgAxluukpTJxj0KwqOxgEX6O0gqAUh0ZSvghVTjdnr9Bqv+gDYfL46 ZZNI0KJ89RYBp0A1ToQz1PLV36m3Zc/43DPx2KmPpRKpGcii4MVEYo6S4ZIRGCov+E0m FxYxrBBWtS51y9JEumUuD8DsHExHQ52sh+pNJfx5OiUid90iABq9QzQWR8ye4ZabrG/9 /zfwySwh9d9hg3Ay3YO5STHIpmziL5Dqu3afUuvK6v8wms4qGWcuMQKSRdqDOZUytLe6 RfZA== X-Gm-Message-State: AOJu0YyT2oJOIBX88aclh1r8BAe8db/QN4AzPM6yIez+DI2A8Oo96zRl frwHQ5G7E6KCdPsJtLWB9d26RCTHLAxUO5VXX8iOYxQlgCv+FPGcoGvvqE7Cp+Z+ X-Gm-Gg: ASbGncs5TVSyTNyRsrjtoDLTGFOgvTNVObl4FVonZZoyynRDYJNb88A5Bo5aJ/S3ioH /mi+n2jBcIDWE5RwaIiC0CTw2SF5yDCjy1W/wVsqwjdHYnkjVHpILkWBvcWTj90e4d60m8Rb4II ffWQ0yu5SP0riBMi6iE2fQbAKbs/JOKZinSKhylje27Bhi1SGhrmPiv8cXdn2Om7I7xf9tE0TUL KizrbWw0I3pGNYjovENgbfyMJFIlzoU3nAufSGx2LPm1JT1nz1idTsWiUhJhWGoYdRcqkhbD/vk RN8iIkdDdCSPPcBtCALnxm2lMDKfoT6xcs2/9FR1p4wQlQ7Em+gYTQaKVafxBGM49rljAgZFuVo D2q2tIfs5MnzZz/RaOA+L7ylBusoM+499+ntcoBmTRO6+276PktUngQ0Ta64INVBklObCSbxdoT ndUGVBmb1mAq8= X-Google-Smtp-Source: AGHT+IHlnTvompo3KDRTFF+ohjGY2TAYG+XGSUoETjvNJR/0cvYo1pGz64CRX0roFJqKh+pt3GgHIA== X-Received: by 2002:a17:90b:4d0f:b0:339:d1f0:c740 with SMTP id 98e67ed59e1d1-34733e45877mr2698974a91.1.1763736830918; Fri, 21 Nov 2025 06:53:50 -0800 (PST) Received: from localhost ([240b:4004:a2:7900:ecf3:dec8:8c1e:4f6]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-34726696b52sm5968449a91.1.2025.11.21.06.53.50 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 21 Nov 2025 06:53:50 -0800 (PST) From: Lai Jiangshan To: linux-kernel@vger.kernel.org Cc: Tejun Heo , ying chen , Lai Jiangshan , Lai Jiangshan Subject: [PATCH V3 6/7] workqueue: Limit number of processed works in rescuer per turn Date: Fri, 21 Nov 2025 22:57:19 +0800 Message-Id: <20251121145720.342467-7-jiangshanlai@gmail.com> X-Mailer: git-send-email 2.19.1.6.gb485710b In-Reply-To: <20251121145720.342467-1-jiangshanlai@gmail.com> References: <20251121145720.342467-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: quoted-printable Content-Type: text/plain; charset="utf-8" From: Lai Jiangshan Currently the rescuer keeps looping until all work on a PWQ is done, and this may hurt fairness among PWQs, as the rescuer could remain stuck on one PWQ indefinitely. Introduce RESCUER_BATCH to control the maximum number of work items the rescuer processes in each turn, and move on to other PWQs when the limit is reached. Signed-off-by: Lai Jiangshan --- kernel/workqueue.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/kernel/workqueue.c b/kernel/workqueue.c index 49dce50ff647..9bc155545492 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -117,6 +117,8 @@ enum wq_internal_consts { MAYDAY_INTERVAL =3D HZ / 10, /* and then every 100ms */ CREATE_COOLDOWN =3D HZ, /* time to breath after fail */ =20 + RESCUER_BATCH =3D 16, /* process items per turn */ + /* * Rescue workers are used only on emergencies and shared by * all cpus. Give MIN_NICE. @@ -3456,7 +3458,7 @@ static int worker_thread(void *__worker) goto woke_up; } =20 -static bool assign_rescuer_work(struct pool_workqueue *pwq, struct worker = *rescuer) +static bool assign_rescuer_work(struct pool_workqueue *pwq, struct worker = *rescuer, bool limited) { struct worker_pool *pool =3D pwq->pool; struct work_struct *cursor =3D &pwq->mayday_cursor; @@ -3477,7 +3479,20 @@ static bool assign_rescuer_work(struct pool_workqueu= e *pwq, struct worker *rescu =20 /* try to assign a work to rescue */ list_for_each_entry_safe_from(work, n, &pool->worklist, entry) { - if (get_work_pwq(work) =3D=3D pwq && assign_work(work, rescuer, &n)) { + if (get_work_pwq(work) !=3D pwq) + continue; + /* + * put the cursor, resend mayday for itself and move on to other + * PWQs when the limit is reached. + */ + if (limited && !list_empty(&pwq->wq->maydays)) { + list_add_tail(&cursor->entry, &work->entry); + raw_spin_lock(&wq_mayday_lock); /* for wq->maydays */ + send_mayday(work); + raw_spin_unlock(&wq_mayday_lock); + return false; + } + if (assign_work(work, rescuer, &n)) { pwq->stats[PWQ_STAT_RESCUED]++; /* put the cursor for next search */ list_add_tail(&cursor->entry, &n->entry); @@ -3542,6 +3557,7 @@ static int rescuer_thread(void *__rescuer) struct pool_workqueue *pwq =3D list_first_entry(&wq->maydays, struct pool_workqueue, mayday_node); struct worker_pool *pool =3D pwq->pool; + unsigned int count =3D 0; =20 __set_current_state(TASK_RUNNING); list_del_init(&pwq->mayday_node); @@ -3554,7 +3570,7 @@ static int rescuer_thread(void *__rescuer) =20 WARN_ON_ONCE(!list_empty(&rescuer->scheduled)); =20 - while (assign_rescuer_work(pwq, rescuer)) + while (assign_rescuer_work(pwq, rescuer, ++count > RESCUER_BATCH)) process_scheduled_works(rescuer); =20 /* --=20 2.19.1.6.gb485710b