From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from stravinsky.debian.org (stravinsky.debian.org [82.195.75.108]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3B6DD395AD8 for ; Wed, 5 Aug 2026 14:53:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=82.195.75.108 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785941596; cv=none; b=dG/u7ObjKkUa7srq8CxuSjoWj1hEHA6YXRfSw5/HPdv5FTbqjpCNwBRXdRKqACp6UB47lPofv0i7jaLpvnkwNLNT9J6VDnrlpoldtoMFIg4b7owVoUifuHuGBRAmazxw4MBfDU4O3cO9zFvosFDnYa6s3LdQWXTjPTNoo397hlg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785941596; c=relaxed/simple; bh=xAi6kBvuYIEmt9A/cEOJxNoq7olclmWn2J2Xbsqx1Uk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=OjvZ55YkGBCG8uHnYwEYtmymYHhQzZ1xx8KabNnpkriSyYelN9r6cG7AzZQI3nmuqMUxwmGLFSgFUWGKT59t4Avwnp9uj+Dv3NvlxPttn7PP4MdZjSqwFf6Got2EkHPIlnKfhkic8MfobtUXJKaMMkDy/R1OiU2UE2UiNHCy1Ug= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=debian.org; spf=pass smtp.mailfrom=debian.org; dkim=pass (2048-bit key) header.d=debian.org header.i=@debian.org header.b=uic0qvZc; arc=none smtp.client-ip=82.195.75.108 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=debian.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=debian.org header.i=@debian.org header.b="uic0qvZc" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debian.org; s=smtpauto.stravinsky; h=X-Debian-User:Cc:To:In-Reply-To:References: Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description; bh=dsT+GcKDMTZBRR1yFtKozWTonjVk/c9llDhBHWOpwqU=; b=uic0qvZcfZA+PzrPVssDQQHiE6 9iwth+xjAxeL1gP7pj6SzVkPDnPO+/Fctn6MHRWcbq1wHNIvetg1U6TDYrY+K633ZVg7Dc0sB1ZDU rEkCRRLsfyGJQmUxm1X3APiG21RbxywHkzMmyWi6gpcqIJft/UcuUtdjYS9JAHWF+Y2bnXMebZfCt nTxFO9okWvecpYbfGRuDU623duK/sXu9sr4oFgIIZRTUkivGPrWjkwPwGGZ9EDK5NqcxbdifRwe7x ctXKUqg9XvSV5IhenERLajrIYnIMhLWpRyZU7hQ4Pf4MzzetmSfeIFIiIpmC8WhEwcyWoKKy6JHps 0ZyXG4Qg==; Received: from authenticated-user by stravinsky.debian.org with esmtpsa (TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.96) (envelope-from ) id 1wrczV-00DzfY-0C; Wed, 05 Aug 2026 14:53:09 +0000 From: Breno Leitao Date: Wed, 05 Aug 2026 07:52:29 -0700 Subject: [PATCH v2 2/9] workqueue: factor out alloc_and_link_percpu_pwqs() Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260805-wq-pool-refactor-v2-2-fd498d01d695@debian.org> References: <20260805-wq-pool-refactor-v2-0-fd498d01d695@debian.org> In-Reply-To: <20260805-wq-pool-refactor-v2-0-fd498d01d695@debian.org> To: Tejun Heo , Lai Jiangshan Cc: linux-kernel@vger.kernel.org, marco.crivellari@suse.com, Breno Leitao , kernel-team@meta.com X-Mailer: b4 0.16-dev-f8e9d X-Developer-Signature: v=1; a=openpgp-sha256; l=2147; i=leitao@debian.org; h=from:subject:message-id; bh=xAi6kBvuYIEmt9A/cEOJxNoq7olclmWn2J2Xbsqx1Uk=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBqc05Kh2SVGB2zD2EwXH27JClBEaWbif5d2DE3l /HldOweCt+JAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCanNOSgAKCRA1o5Of/Hh3 bfP6D/99w9EVNW+Gf3hQGdyZpaCSWshCqPBV6oArP4Atuqm/DiYpGc+Kr32ZDr09RGUzCRiwuWl zn0eOn9n7i4sJQShlgMR+EQuDfFxTdtzZF3Z6uhqnM8fou6HCwB5MH6BpO0bGqiyuROfamof6sV dZkkxb+1MsAbqw0YS+EP3l3aMSwN73I8yT1CHT2JWgt+wuhDEjwCK6HTqi+I4QNZdAnxcBnSWir thlrj1TLoXFy09vTCOzrm/MZ+gvqZuMvzIbYGfaZWDlLtwlT5SFtVWnYLgHg4ona0UCyccNsHwU C/bv47/nDi1TFT7CXNYDWObmFSeS7+I3NIwrh4kbtb+Fda+l2YCLY4E5WEHwF4Jf5Fmm5njnwSG shpd3azINv69R0YAn1lNyPDGOr9TJT+dlIa2TMOONFQK4q2o5Si1jwL78SjSg75vsBVCbVmUYNv ecfrv6ECwZ4iaVfYqaJX6Sp6cV9/Dpo3D0ffBViWQyRmE75IBI2pDu+mu0VVekJC5FcT3jwx1A0 edj51aIZcHQKER8bPfaNOXBy7FQzpQwUaa98Xa+Y6sQiTFjZ2OwOpBH5qkCKMQ2ybDeOBbJKz0X 9PJKzjbk9aX9R+IEwUflogt66Svesxe1wnp5qey+bwFm7D2Xf2Fv8WaeGnSjDNKwOERyRxf+LJK 4kKEgObi/OSBkQQ== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D X-Debian-User: leitao Move the per-cpu pwq allocation loop out of alloc_and_link_pwqs() into a helper. The inner allocation-failure path now returns -ENOMEM and the caller jumps to the existing enomem cleanup, equivalent to the previous goto. No functional change. Signed-off-by: Breno Leitao --- kernel/workqueue.c | 43 ++++++++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 19 deletions(-) diff --git a/kernel/workqueue.c b/kernel/workqueue.c index 63a39bb3f5e47..b386a457c0381 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -5666,6 +5666,28 @@ static void unbound_wq_update_pwq(struct workqueue_struct *wq, int cpu) put_pwq_unlocked(old_pwq); } +static int alloc_and_link_percpu_pwqs(struct workqueue_struct *wq) +{ + int cpu; + + for_each_possible_cpu(cpu) { + struct pool_workqueue **pwq_p = per_cpu_ptr(wq->cpu_pwq, cpu); + struct worker_pool *pool = get_percpu_pool(wq, cpu); + + *pwq_p = kmem_cache_alloc_node(pwq_cache, GFP_KERNEL, pool->node); + if (!*pwq_p) + return -ENOMEM; + + init_pwq(*pwq_p, wq, pool); + + mutex_lock(&wq->mutex); + link_pwq(*pwq_p); + mutex_unlock(&wq->mutex); + } + + return 0; +} + static int alloc_and_link_pwqs(struct workqueue_struct *wq) { bool highpri = wq->flags & WQ_HIGHPRI; @@ -5678,25 +5700,8 @@ static int alloc_and_link_pwqs(struct workqueue_struct *wq) goto enomem; if (!(wq->flags & WQ_UNBOUND)) { - for_each_possible_cpu(cpu) { - struct pool_workqueue **pwq_p = per_cpu_ptr(wq->cpu_pwq, cpu); - struct worker_pool *pool = get_percpu_pool(wq, cpu); - - *pwq_p = kmem_cache_alloc_node(pwq_cache, GFP_KERNEL, - pool->node); - if (!*pwq_p) - goto enomem; - - init_pwq(*pwq_p, wq, pool); - - mutex_lock(&wq->mutex); - link_pwq(*pwq_p); - mutex_unlock(&wq->mutex); - } - return 0; - } - - if (wq->flags & __WQ_ORDERED) { + ret = alloc_and_link_percpu_pwqs(wq); + } else if (wq->flags & __WQ_ORDERED) { struct pool_workqueue *dfl_pwq; ret = apply_workqueue_attrs_locked(wq, ordered_wq_attrs[highpri]); -- 2.53.0-Meta