From nobody Sun Feb 8 12:37:26 2026 Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) (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 173BE537FB for ; Fri, 8 Mar 2024 09:40:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709890838; cv=none; b=Ix/woTAeI3hDCBgteNtdagBYDX3DGa7VhZQkSzNOk1mx81HL/FhHE4diG9QOTqxk4BYrXqe0D5VnI5kQ8hUkFYAsh4ltYrMLr/nrPX4M9ocWxpoqKp6YoDdrLWaSQ8cDc0AILkcCTFA2UFwi8Nt4YKXxsJo/h5PdAgNZhGUEVB8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709890838; c=relaxed/simple; bh=TfCEx/cMmnXx0f0SqmccleKorZLVMxlT9yGrsWUUDf8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=PZQewFKkymE7e1ISGI4uuIWWBJ7ZTmdHZ9inKcd5bdtiLW/H3mbtjTGGR2bu7DqpBkRDlXaTCGgA0BTC2fVCauz2cmcGzWjTluxul36TVJSeY6ac4aj4q+9Vq+5Q5qk2MTIkq2z5IoYbOz+UV/Td2DSPIGHjAx1KLr0Y1lHRXGk= 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=DVECx4yQ; arc=none smtp.client-ip=209.85.210.173 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="DVECx4yQ" Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-6e622b46f45so563336b3a.1 for ; Fri, 08 Mar 2024 01:40:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709890836; x=1710495636; 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=mkA8EskXvnyqySxL+sveNVRb40uEpQ//fvo+W4nBex0=; b=DVECx4yQXzEqAWorFenBelyTfvTJzZljzeH5x4RZ7QChE/wWRsCI1rzzu0OqfGBy3W Mbv18UIY/QhbmxtgEci/GTOpkwvs5qna9Pg0Jka/xSdKhUcwFJ8jJ2IkuCyfh3zRPYm/ VwsAKuBdCh5dEtHd3HDJUKqfexgYePkxOBlLwL91iMnu6QY8aYPhh62kJRRo0FVJUg34 ej6pSwdi4qVDAE0Q3is4AkG0cb7AzsyM5+ppxYLlMxTYnZUn3Sd75WToToMDzfngdrh0 LAoKp2soV/GURt39VkaG97lNqPOiSAKZuw0abO/ixc3CgdlOj+BO5C1OkqDosE50138F b+RQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709890836; x=1710495636; 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=mkA8EskXvnyqySxL+sveNVRb40uEpQ//fvo+W4nBex0=; b=IMjObbURYytOq+IslBmMGXqmMZ6Vb8CaCHEf2gP+dBoiAztjqsOE9MGIbF4rmlPxQH z1GiGcEKTzCUeMA4D6XjzBqfzarkMJCOn1y9EJAYMItqmkfDm5Ps+bvndgx3kZMwNEge WzdojHaiv9JU/i55MB4uyxqnt/Lk2KW83p8VNZG+6LqJy7vR1bJD1kU39P9tiPc+xd11 Efu1iousr9rHnjDGBLHDyd6Zxh0oxyoynteTMWRUUp4B8KurI7fjN8iPR7RI55F6CtpL V3saK98gDW7XlBE602KVMBCTLQqxc8s54KVuzKlJt7iRnNJHKX56xmIlJfic4xFQVFnp OrcQ== X-Gm-Message-State: AOJu0YwkZMCphhjxbDjT88tVhbE24vI22LCGyAaeDAhVJtQdRruy6VQM Wst1pA5aO6JNgrvvY6PdFGyI4uPDSN2VHd0jBjyOdz6ax+nscHxYeh365AVS X-Google-Smtp-Source: AGHT+IEqkjZiSb72PsFoGZxfC81G5oaveugRna0h3wD9+TQwhAooRu4zZ/8MhptrNrNsIlZefynzqQ== X-Received: by 2002:a05:6a20:e107:b0:1a1:5000:225a with SMTP id kr7-20020a056a20e10700b001a15000225amr11634158pzb.9.1709890835949; Fri, 08 Mar 2024 01:40:35 -0800 (PST) Received: from localhost ([47.254.32.37]) by smtp.gmail.com with ESMTPSA id s59-20020a17090a69c100b0029981c0d5c5sm3109403pjj.19.2024.03.08.01.40.35 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Mar 2024 01:40:35 -0800 (PST) From: Lai Jiangshan To: linux-kernel@vger.kernel.org Cc: Tejun Heo , Lai Jiangshan , Lai Jiangshan Subject: [PATCH 1/4] workqueue: Use INIT_WORK_ONSTACK in workqueue_softirq_dead() Date: Fri, 8 Mar 2024 17:42:50 +0800 Message-Id: <20240308094253.2104-2-jiangshanlai@gmail.com> X-Mailer: git-send-email 2.19.1.6.gb485710b In-Reply-To: <20240308094253.2104-1-jiangshanlai@gmail.com> References: <20240308094253.2104-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 dead_work is a stack variable. Signed-off-by: Lai Jiangshan --- kernel/workqueue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/workqueue.c b/kernel/workqueue.c index a60eb65955e7..3ff91243322d 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -3687,7 +3687,7 @@ void workqueue_softirq_dead(unsigned int cpu) if (!need_more_worker(pool)) continue; =20 - INIT_WORK(&dead_work.work, drain_dead_softirq_workfn); + INIT_WORK_ONSTACK(&dead_work.work, drain_dead_softirq_workfn); dead_work.pool =3D pool; init_completion(&dead_work.done); =20 --=20 2.19.1.6.gb485710b From nobody Sun Feb 8 12:37:26 2026 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) (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 83409535BA for ; Fri, 8 Mar 2024 09:40:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709890845; cv=none; b=qv0aIWUzwkrBqVRBSbZ+Za7EyYWo+AnxLNin+5Wx8SJI1L29cJwrhdMNSt+c4lsq07iAG0Vl/uDZ4NNFGGHCopQZ3aHY9pH20bTqK2vOVMFC+V/9JxuAIn/n5Bpz8XdyeB8Mtwo7KaGmnu255LGVKMw9tkdaq8E4WToqfU41haY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709890845; c=relaxed/simple; bh=+fEt8hcgY3yOz83r2AVEQybAL9hXUGeZf4MjldUvW+U=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=lTmXT3QVwXWJoRZIi66Dxdp4eCrBJhrKyA2R5mjje2BAhwY2CjAdR6p4S2tUUUX0WQrv1K8m3REFndE7VX9+H2x5jKwH/y1BcDahUYMz8alo+suRKIm8qEkbDRD3Wnhaj4s17GjPRFalUxuuTDErCVC2DLpWkrxF+h6EIloHd5I= 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=lr9jUqfb; arc=none smtp.client-ip=209.85.214.178 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="lr9jUqfb" Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-1dd3bdb6e9eso13129045ad.3 for ; Fri, 08 Mar 2024 01:40:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709890842; x=1710495642; 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=FhsbBO/MKoPq3ThrOL/rSkQzCoO2b8EXw4tUZ9iUAk4=; b=lr9jUqfb8DtQ5Wv7/8pRfQE3nRhKOjsju98VEIDTsSF88LnVqr7L+XdK8gS8TSf7NW EX8g4BYmyADX7Pvz/vgIr8JfOa37melqAJvZSWx8fKL81oG+WFM+cPyIupFU1qXh++LK wO8EDAIKBKDPrPgxkqv709Bynm93G6tmajfgcItRpLkSETj676rDMVXsl9nUkmbnavrm inkCIJSGCrCa4pHPVVjSr1bqBYEXVWp6apDcFRrtaiyE6qbZbaCQyK3QXfcF9a/0UVlt QwjrjlvDtVLoUyax4dmzXYJo/0DxpuQukouQ+5cgrVmAChkhyKz8KCZtD35KeNY0j84B nyXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709890842; x=1710495642; 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=FhsbBO/MKoPq3ThrOL/rSkQzCoO2b8EXw4tUZ9iUAk4=; b=XFrSURM9kGAp7cN8W9Feudpw2u+Yl4P6Z6O6z42cmILgM31G+u8JaU8Ju5jPbp2TTa tYKbiSb4X96GLzf36pNYUIXHbbceJBokzcf/LTLgf8gmO1sThf1zkWmWWmlbWId5vLuq 9raSD7uUz7XJoy3G/9eV+QTzHCi6ELVFH2bC7FS+W7uVD4OMmVQFN+3J0xZBXhbFGdeO O7Kd/1DV4/35aK2zXske0PNim0O/WpYhW759FnDHH619IVi9RqtpMFRQQynWmtUhnsHQ rDeScg5Ewq7sRHt7r/vXbhQglhtLC8ChOOkVE1N9tXHcmpVFvD9SPy5p44oLjX/hAU8e ut+w== X-Gm-Message-State: AOJu0YwQk79u43q/fKCG2GtQmoXVHE6FI/H5m/UfwnhQp/8ngx3AxyDV AbvlhD6gHoIk5VZp2VKl2TqAJ0bMKJGdqI0OtLJoBMdMV7ZFyDAOW2rn9Eae X-Google-Smtp-Source: AGHT+IGV2wCyCnyM1hzYm7D9aigr6c53zg3+E1uYF6nNumFDZ328Hlu0BFoBR410Gwte46cHR6YJ8Q== X-Received: by 2002:a17:903:428b:b0:1db:f7f6:a73a with SMTP id ju11-20020a170903428b00b001dbf7f6a73amr9511468plb.25.1709890842371; Fri, 08 Mar 2024 01:40:42 -0800 (PST) Received: from localhost ([198.11.178.15]) by smtp.gmail.com with ESMTPSA id c13-20020a170902b68d00b001dd6958833esm791446pls.242.2024.03.08.01.40.41 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Mar 2024 01:40:41 -0800 (PST) From: Lai Jiangshan To: linux-kernel@vger.kernel.org Cc: Tejun Heo , Lai Jiangshan , Lai Jiangshan Subject: [PATCH 2/4] workqueue: Reorder the fields in struct workqueue_attrs Date: Fri, 8 Mar 2024 17:42:51 +0800 Message-Id: <20240308094253.2104-3-jiangshanlai@gmail.com> X-Mailer: git-send-email 2.19.1.6.gb485710b In-Reply-To: <20240308094253.2104-1-jiangshanlai@gmail.com> References: <20240308094253.2104-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 So that its size is reduced from 40 to 32 in 64bit kernel, and it can be saved more when allocated with kmalloc() in alloc_workqueue_attrs(). Signed-off-by: Lai Jiangshan --- include/linux/workqueue.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h index 158784dd189a..c885a5f6bb93 100644 --- a/include/linux/workqueue.h +++ b/include/linux/workqueue.h @@ -145,13 +145,15 @@ struct workqueue_attrs { int nice; =20 /** - * @cpumask: allowed CPUs + * @affn_strict: affinity scope is strict * - * Work items in this workqueue are affine to these CPUs and not allowed - * to execute on other CPUs. A pool serving a workqueue must have the - * same @cpumask. + * If clear, workqueue will make a best-effort attempt at starting the + * worker inside @__pod_cpumask but the scheduler is free to migrate it + * outside. + * + * If set, workers are only allowed to run inside @__pod_cpumask. */ - cpumask_var_t cpumask; + bool affn_strict; =20 /** * @__pod_cpumask: internal attribute used to create per-pod pools @@ -166,15 +168,13 @@ struct workqueue_attrs { cpumask_var_t __pod_cpumask; =20 /** - * @affn_strict: affinity scope is strict - * - * If clear, workqueue will make a best-effort attempt at starting the - * worker inside @__pod_cpumask but the scheduler is free to migrate it - * outside. + * @cpumask: allowed CPUs * - * If set, workers are only allowed to run inside @__pod_cpumask. + * Work items in this workqueue are affine to these CPUs and not allowed + * to execute on other CPUs. A pool serving a workqueue must have the + * same @cpumask. */ - bool affn_strict; + cpumask_var_t cpumask; =20 /* * Below fields aren't properties of a worker_pool. They only modify how --=20 2.19.1.6.gb485710b From nobody Sun Feb 8 12:37:26 2026 Received: from mail-oi1-f169.google.com (mail-oi1-f169.google.com [209.85.167.169]) (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 802962D05F for ; Fri, 8 Mar 2024 09:40:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709890852; cv=none; b=IGt3JLOb1DmVAZLXXJBfcxMuUvK24mtAQ1qVDHIvIOfTpPpc1wmnB9XV/2d4nObW/X3EVOh8mzz839waPdV6tcCqyVNFGdf39QKfTIB9YO4KYS580K5LeKWf4K8v0win+Z6wItVZVOFnQpac8Jl83OaODv9mcyDXEG9zpq9JpgQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709890852; c=relaxed/simple; bh=CM9/0PUYg/pcfPOkiw4ARx2BYspG8GIKoboQzPF3shk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=JmHvKdPa8KqODzAGTRAQek3MSvnSI47hl+PkJFKn7+I4DvVccqyPcXWk0SExsgS7ePUhkrr3AhNOgJGv/pqjPO2yviehHpyXdtXHzTyheLOMPFGAUG/ozHl8A+tOFK9lNWhj6dyA+snXxzlsOJvpwksN6gBQqz4u7ZfVI4MCjdo= 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=HuKF9ESH; arc=none smtp.client-ip=209.85.167.169 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="HuKF9ESH" Received: by mail-oi1-f169.google.com with SMTP id 5614622812f47-3c1f5e14bdbso681201b6e.1 for ; Fri, 08 Mar 2024 01:40:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709890849; x=1710495649; 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=M1YGEtckg+/ZCVmrYriqUU7Dxf5OvuIpS6SnP93Azw8=; b=HuKF9ESHNbBJ9JMwaPVO61cshc9oIVev6a9ESsAwvE/jCeKmlE7CbN3Zl0xthhtKMT NKGYOX8Z3CdFupckWLjUYDqAg0S+NcFlQahLg39xcpIjuHWu3Ym3KWg3POv+VRr+UFB5 pAnx7Sk9acZUI7TY9pUIXv4U5Jk6FEJ0ucH/W8Wh0/VofXbjFrDozn/D55VYzioU1Kww LdSez7ITYGOKqEBxcoTvVONhmZgWMdsf4sFHPTStsg5/G3XMXtzUI4G23n+BdXRWjvWa WGyd6UsxZNFWljP6lvCScjBZZxb2Fi8cgTADUx8zAYaDjVYOhOF4MDUPb16wPRHmn3iq yzmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709890849; x=1710495649; 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=M1YGEtckg+/ZCVmrYriqUU7Dxf5OvuIpS6SnP93Azw8=; b=FR53Qa9JqzYU3HD1S4NosQvb35S//XmLIB+qh41QHoEZnpiasIu7SlRxeYUqgttD1c 1wIigE3A1GW/j8TZXSiWIcaQaGIoCGXPiE9uRetgTjAqM9a7b34gvvGCjHQ4q0HoJia7 otyasI3YExO68Bv7ATf/NCD9HF3p72cB8iv7RaXHRbNexS2rYWGdsJHgyIgppNanNwVC Co9XyxSSBZsXsoFFc734oit/DDMZ0EHfb8BoNxXpktAIQYtLv9h1q8Pmldg7Azd6YV32 SJV848YtU7u4UOCMduyH7f+nIblhiLjA7m2H3jXw5X4L2nVbaj/gtgFAB8f9QOEwBmc1 Igbw== X-Gm-Message-State: AOJu0YzGUkrxgRXepGKO29KmPj5EuROD5VxTJi28zOx8PNsjHHPt8kqW fAR2jzfA9jvJcvAGfxQ8Z/UWmPWjxoUc4xedaHkB27RiMZpVjzia9ZbDMoov X-Google-Smtp-Source: AGHT+IEWZGsRHoZW64R3bqSd0DJHvVHWTJk2if7Q+BGP/LwlsO5JTi4f6uS82U9N+pPKXIhqBzGtjQ== X-Received: by 2002:a05:6808:48f:b0:3c2:2f44:539a with SMTP id z15-20020a056808048f00b003c22f44539amr1839754oid.50.1709890849034; Fri, 08 Mar 2024 01:40:49 -0800 (PST) Received: from localhost ([198.11.178.15]) by smtp.gmail.com with ESMTPSA id ei30-20020a056a0080de00b006e5359e621csm13788300pfb.182.2024.03.08.01.40.48 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Mar 2024 01:40:48 -0800 (PST) From: Lai Jiangshan To: linux-kernel@vger.kernel.org Cc: Tejun Heo , Lai Jiangshan , Lai Jiangshan Subject: [PATCH 3/4] workqueue: Move attrs->cpumask out of worker_pool's properties when attrs->affn_strict Date: Fri, 8 Mar 2024 17:42:52 +0800 Message-Id: <20240308094253.2104-4-jiangshanlai@gmail.com> X-Mailer: git-send-email 2.19.1.6.gb485710b In-Reply-To: <20240308094253.2104-1-jiangshanlai@gmail.com> References: <20240308094253.2104-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 Allow more pools can be shared when attrs->affn_strict. Signed-off-by: Lai Jiangshan --- include/linux/workqueue.h | 3 +++ kernel/workqueue.c | 13 ++++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h index c885a5f6bb93..86f723579a32 100644 --- a/include/linux/workqueue.h +++ b/include/linux/workqueue.h @@ -180,6 +180,9 @@ struct workqueue_attrs { * Below fields aren't properties of a worker_pool. They only modify how * :c:func:`apply_workqueue_attrs` select pools and thus don't * participate in pool hash calculations or equality comparisons. + * + * If @affn_strict is set, @cpumask isn't a property of a worker_pool + * either. */ =20 /** diff --git a/kernel/workqueue.c b/kernel/workqueue.c index 3ff91243322d..3bb71cfd3e06 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -4517,6 +4517,8 @@ static void wqattrs_clear_for_pool(struct workqueue_a= ttrs *attrs) { attrs->affn_scope =3D WQ_AFFN_NR_TYPES; attrs->ordered =3D false; + if (attrs->affn_strict) + cpumask_copy(attrs->cpumask, cpu_possible_mask); } =20 /* hash value of the content of @attr */ @@ -4525,11 +4527,12 @@ static u32 wqattrs_hash(const struct workqueue_attr= s *attrs) u32 hash =3D 0; =20 hash =3D jhash_1word(attrs->nice, hash); - hash =3D jhash(cpumask_bits(attrs->cpumask), - BITS_TO_LONGS(nr_cpumask_bits) * sizeof(long), hash); + hash =3D jhash_1word(attrs->affn_strict, hash); hash =3D jhash(cpumask_bits(attrs->__pod_cpumask), BITS_TO_LONGS(nr_cpumask_bits) * sizeof(long), hash); - hash =3D jhash_1word(attrs->affn_strict, hash); + if (!attrs->affn_strict) + hash =3D jhash(cpumask_bits(attrs->cpumask), + BITS_TO_LONGS(nr_cpumask_bits) * sizeof(long), hash); return hash; } =20 @@ -4539,11 +4542,11 @@ static bool wqattrs_equal(const struct workqueue_at= trs *a, { if (a->nice !=3D b->nice) return false; - if (!cpumask_equal(a->cpumask, b->cpumask)) + if (a->affn_strict !=3D b->affn_strict) return false; if (!cpumask_equal(a->__pod_cpumask, b->__pod_cpumask)) return false; - if (a->affn_strict !=3D b->affn_strict) + if (!a->affn_strict && !cpumask_equal(a->cpumask, b->cpumask)) return false; return true; } --=20 2.19.1.6.gb485710b From nobody Sun Feb 8 12:37:26 2026 Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) (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 A4C8254729 for ; Fri, 8 Mar 2024 09:40:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709890857; cv=none; b=rcI2oYKarNEmZ1xj+TFEMVG7BDWhRAKIVy7uT6k6hqJ6bRVhvHmJmBrgigt3tSXpcb6bDoL+L44atY9570RczNZEHhs0AgLpEIRDLGSAoT9Q0N37eFvqkxxEWeOdEz9jXiVCL9xEl2GY1l+KnS9TRrXmvUqzzrGxw5Z6pLgizG0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709890857; c=relaxed/simple; bh=C9XK9ZxSXymb1vMc31LtX73tBcw9vGPwzW4aTnLQO/M=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Is1oxysJxbKQGc6X2Gyv5M+B748GKjrOX2tdnkjtefCSra67j/3BTpp/IrLEb2NCxMMNIeVyTAXRzrbTqjDUWV7TZ80tNvEXCKh7T0+xQmkQcGiR43lVEsW5J9quxo87yAiS/q/LjGBIaMK2kjljX/NsqL/YIwzceEzV22/Z9nw= 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=lLVOa8mx; arc=none smtp.client-ip=209.85.216.47 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="lLVOa8mx" Received: by mail-pj1-f47.google.com with SMTP id 98e67ed59e1d1-29abd02d0d9so477944a91.0 for ; Fri, 08 Mar 2024 01:40:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709890854; x=1710495654; 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=2mwwKF7cZe8a4mOKgrVDHuor07KbATDTuF27fGKtoeQ=; b=lLVOa8mxwn22U5jZgmebnBWGZlQPI5jF/AlEhV9NKx9rWUE/yVVZPGoDH8wVCCzJ+1 ajtpy9TjP5z6zSIWZBDd1oFv0cwIgcC7SbomtXnafiKZ5TfFBx/c1Wi98HDeAcRYQgvO eUZzjEB7asgsLrTEeiTmZRQIy8qtBRBDWj6BcBjK0A9baIXkvl5/W5VoW1ktzkiRoT+v SEBbkkg+Wk2CqWu4N3bRnxIaUL1wU1LX527tFcLmgRj0Q08yS15wbFpx3Jqd4QQOZtg/ OD/YdoY+ZcuOiFWhAk6fbjPPR+tCEKn7DXA+EzKN+xiHLVi39vCokwdlZniWor3Ysr+R HS6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709890854; x=1710495654; 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=2mwwKF7cZe8a4mOKgrVDHuor07KbATDTuF27fGKtoeQ=; b=tGqK/T7s3REajNDOMLVAnQnb4v4XeQlShA0sQ2UN4x2ff7gBL+SnSwE53xzYG0xCPV 4Lrtqd3W8FHmmbdkRnqXzbCSjfx5j18hqndBsSqPTNXgibP+PEmNd9JM/0TWUBXQj2hZ CKCCswlcNvo4fRiFUSydVbmzb58ObEgpGtdBGTLGPhlU3EntCS1+PxqDbiqBclc+7jDr fkpQb7KAEeXctW+I2vRBHO11Dm2LQRJMWOHLWrC9tURuEf5C5R9S/g/2qiy8Y9nwts7e JNJ188D4MJ/YPnk8HycY408gQtKsmDSVkmNNm8C6dIgslS7fKN+n3q4np6XqRJy1muS2 e4dw== X-Gm-Message-State: AOJu0Yw7c+uRT52v4N4Xi0E7cMXTeBxV6uOEveSzq/jcEq2EQlaNhRql LtSodJkoCBZjQ7QAd7mDVgPvmjutzLa05tkMP1P/ALrLmOuXdVgCvljVjvcR X-Google-Smtp-Source: AGHT+IGM9lc21mIP4OhnVWKEZ9QWWnWvDTrfxi1fKe8ArvriZhhH4yVjKOrJKMkEMwAWSVLPGJI+OA== X-Received: by 2002:a17:90a:3d45:b0:29b:125c:a97a with SMTP id o5-20020a17090a3d4500b0029b125ca97amr16812237pjf.43.1709890854295; Fri, 08 Mar 2024 01:40:54 -0800 (PST) Received: from localhost ([47.89.225.180]) by smtp.gmail.com with ESMTPSA id h3-20020a17090a2ec300b0029ba7731d38sm1324463pjs.7.2024.03.08.01.40.53 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Mar 2024 01:40:53 -0800 (PST) From: Lai Jiangshan To: linux-kernel@vger.kernel.org Cc: Tejun Heo , Lai Jiangshan , Lai Jiangshan Subject: [PATCH 4/4] workqueue: Use list_last_entry() to get the last idle worker Date: Fri, 8 Mar 2024 17:42:53 +0800 Message-Id: <20240308094253.2104-5-jiangshanlai@gmail.com> X-Mailer: git-send-email 2.19.1.6.gb485710b In-Reply-To: <20240308094253.2104-1-jiangshanlai@gmail.com> References: <20240308094253.2104-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 It is clearer than open code. Signed-off-by: Lai Jiangshan --- kernel/workqueue.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/workqueue.c b/kernel/workqueue.c index 3bb71cfd3e06..7a3392aab395 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -2940,7 +2940,7 @@ static void idle_worker_timeout(struct timer_list *t) unsigned long expires; =20 /* idle_list is kept in LIFO order, check the last one */ - worker =3D list_entry(pool->idle_list.prev, struct worker, entry); + worker =3D list_last_entry(&pool->idle_list, struct worker, entry); expires =3D worker->last_active + IDLE_WORKER_TIMEOUT; do_cull =3D !time_before(jiffies, expires); =20 @@ -2982,7 +2982,7 @@ static void idle_cull_fn(struct work_struct *work) struct worker *worker; unsigned long expires; =20 - worker =3D list_entry(pool->idle_list.prev, struct worker, entry); + worker =3D list_last_entry(&pool->idle_list, struct worker, entry); expires =3D worker->last_active + IDLE_WORKER_TIMEOUT; =20 if (time_before(jiffies, expires)) { --=20 2.19.1.6.gb485710b