From nobody Fri Dec 19 09:10:07 2025 Received: from mail-oa1-f52.google.com (mail-oa1-f52.google.com [209.85.160.52]) (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 AA9AB49633 for ; Tue, 2 Jul 2024 04:12:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719893549; cv=none; b=XMc+GnFjPCKfIEA4jKJ3xYgVkoEGVUmDI7ZB2odb2hkfyFBT+QyPNHPIrC1QkYya4mFbAprrc9KBSTjuXNpnP3/1OEJqqMtUVPQSd/XH+Njbll7BUpBrSowC5b405aFqFC97T7bs/de4Vf02gS/gMEieQxcDLnf7NGhZWPuXfno= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719893549; c=relaxed/simple; bh=2JOeR7fENn6vQvRJ0I6IcJoBl0wuu+rGXpaa+IZPSs8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=D0fHt2mYw4zFPkzyibTBsZ1JjXEZJCmwbljkX+35XS7n2+p1REIGKr/qNsC1Tt1ZzjdQQY3FrwKYGdXGr/8FxNMrI7VshgEYzlNjvC48vu/OMmaWb9K11xRZKlfWf+5x2PNz4EpeUjrBe6BEZrfWWXcagi3yUTTaN29IBOJF3+k= 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=K0m4AxPi; arc=none smtp.client-ip=209.85.160.52 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="K0m4AxPi" Received: by mail-oa1-f52.google.com with SMTP id 586e51a60fabf-25da8a19acaso1711331fac.2 for ; Mon, 01 Jul 2024 21:12:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719893546; x=1720498346; 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=MHleub4mTrFQ67+iGWbwKzDxzdJV1cPZuDZmtYlZDR0=; b=K0m4AxPifYojef7iYAh5Gi+IXc2nO9871+ouHJ1JWeNIQxP6X1OEXcFn+r1MM9A9vn EW6qzac5yd/T43kSG+92X5qqpmZ/f9fF4Eew5FinSONI13r0C0EcvXGeEkfzkbbhLMJc 3fQ0h3ls4VEwThX8Buasfdal2E79aSLPxkXC1ttHx9POz2SwKiQb0oNvdLbfPLkcg0nD keTGnrxHn5MmkXLYts6E4r818V00b4iRLMSAU5HnN4CuE++Hhgz/S11lK/QdhOaLensh HPbj9id5kcLboK/TSr7+JaXGDJbglR7uNBp3aheBaIYXom8D+yuab1ghKBX6LH2SqkWF TefQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719893546; x=1720498346; 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=MHleub4mTrFQ67+iGWbwKzDxzdJV1cPZuDZmtYlZDR0=; b=HqSZsRaGc3WkJ3TGMhrCULga4iHrHraEO4XCfp+JEE+SCVE4++Hix2DdxRJOWa0vjm b9eMaQMUkpKFFC1dSl9dkf4/uFzxwac+v3vv/6XuRoQqax6QBCcI6CpFcZfWyyweZMDc mGnH5WeOtTL1vjqkeRkgYr3SBvmbzemLDE4w3Qk2D5/DdBKuCZsBdKpE+MhdmYjQDdPv z9ktGNBWgMKLYiVh9kpcq2fWGQ4AzKVQbdK64jaT7eEELgwCDdfrpek+6E8tMsGf9s3y XWsMTJrKYh4yjQHF1I0SgHeaCDEvg82bgfTc5Ybg24wtAAOC3kDmhoNPV67XMNw48S/a I+5w== X-Gm-Message-State: AOJu0Yz/qUtRD8fjY8JoPwbaoAxz8kdDYXP50J7pdMvuiN8G2QNi4c1W w7JbbPbdWwRV7vCKlAIelmi62h9/jodavmYYk2Veu5pDwwRaEDMszR+CDw== X-Google-Smtp-Source: AGHT+IHxoa0cbbZvmF/M6jub10PdERSR4mAqHILNcKZX+NqO4q2QM0Cy6F69HJl9DSAheOiwi4QuJw== X-Received: by 2002:a05:6870:d1c8:b0:259:8805:b634 with SMTP id 586e51a60fabf-25db36cd02amr6985728fac.49.1719893546109; Mon, 01 Jul 2024 21:12:26 -0700 (PDT) Received: from localhost ([47.88.5.130]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-708045a69a6sm7377734b3a.165.2024.07.01.21.12.25 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Jul 2024 21:12:25 -0700 (PDT) From: Lai Jiangshan To: linux-kernel@vger.kernel.org Cc: Lai Jiangshan , Waiman Long , Tejun Heo , Lai Jiangshan Subject: [PATCH 1/2] workqueue: Update cpumasks after only applying it successfully Date: Tue, 2 Jul 2024 12:14:55 +0800 Message-Id: <20240702041456.629328-2-jiangshanlai@gmail.com> X-Mailer: git-send-email 2.19.1.6.gb485710b In-Reply-To: <20240702041456.629328-1-jiangshanlai@gmail.com> References: <20240702041456.629328-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 Make workqueue_unbound_exclude_cpumask() and workqueue_set_unbound_cpumask() only update wq_isolated_cpumask and wq_requested_unbound_cpumask when workqueue_apply_unbound_cpumask() returns successfully. Fixes: fe28f631fa94("workqueue: Add workqueue_unbound_exclude_cpumask() to = exclude CPUs from wq_unbound_cpumask") Cc: Waiman Long Signed-off-by: Lai Jiangshan Acked-by: Waiman Long --- kernel/workqueue.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/kernel/workqueue.c b/kernel/workqueue.c index dc9acf8ecd0c..a3f9ff4fe657 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -6853,9 +6853,6 @@ int workqueue_unbound_exclude_cpumask(cpumask_var_t e= xclude_cpumask) lockdep_assert_cpus_held(); mutex_lock(&wq_pool_mutex); =20 - /* Save the current isolated cpumask & export it via sysfs */ - cpumask_copy(wq_isolated_cpumask, exclude_cpumask); - /* * If the operation fails, it will fall back to * wq_requested_unbound_cpumask which is initially set to @@ -6867,6 +6864,10 @@ int workqueue_unbound_exclude_cpumask(cpumask_var_t = exclude_cpumask) if (!cpumask_equal(cpumask, wq_unbound_cpumask)) ret =3D workqueue_apply_unbound_cpumask(cpumask); =20 + /* Save the current isolated cpumask & export it via sysfs */ + if (!ret) + cpumask_copy(wq_isolated_cpumask, exclude_cpumask); + mutex_unlock(&wq_pool_mutex); free_cpumask_var(cpumask); return ret; @@ -7202,7 +7203,6 @@ static int workqueue_set_unbound_cpumask(cpumask_var_= t cpumask) cpumask_and(cpumask, cpumask, cpu_possible_mask); if (!cpumask_empty(cpumask)) { apply_wqattrs_lock(); - cpumask_copy(wq_requested_unbound_cpumask, cpumask); if (cpumask_equal(cpumask, wq_unbound_cpumask)) { ret =3D 0; goto out_unlock; @@ -7211,6 +7211,8 @@ static int workqueue_set_unbound_cpumask(cpumask_var_= t cpumask) ret =3D workqueue_apply_unbound_cpumask(cpumask); =20 out_unlock: + if (!ret) + cpumask_copy(wq_requested_unbound_cpumask, cpumask); apply_wqattrs_unlock(); } =20 --=20 2.19.1.6.gb485710b From nobody Fri Dec 19 09:10:07 2025 Received: from mail-ot1-f48.google.com (mail-ot1-f48.google.com [209.85.210.48]) (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 880DF5A0FE for ; Tue, 2 Jul 2024 04:12:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719893552; cv=none; b=QbmOxt1FIFidJUS7lCi23nJZyadyvXOqFPFSyAHsOInJW3yFb41NFiLDAQHxZ0tHvflAw4KS/bGp+IUndpz+aEKg4zoJ4dM2cWUpVWd1NH3B+v9qt7/Drd812rHTBP3UliB3k0OVNW9u3mB7aT9cIZporXW8kR3Etz32WXapH0s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719893552; c=relaxed/simple; bh=d9D77y0p71i8HH+N5bc+JYRyqBwg+cABo2Fllx5tVPE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=oyVmbQKqt/G16o3Zf+djB22hovHxBhEgyV9oeiXmSJ8K1CUkbPx74tcws8oEe3eMynIIs6jQkd9nQeOX1oUzGajYEIJXFCen/aKGSrQ0zHNRVE9Nxge+P8+gHEDrgpZOh5SbY/jRhrgsUJqH7xgsTm8An+1rT4Y0P4JgHR9JXaw= 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=NhctQyFU; arc=none smtp.client-ip=209.85.210.48 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="NhctQyFU" Received: by mail-ot1-f48.google.com with SMTP id 46e09a7af769-702003e213eso1826366a34.3 for ; Mon, 01 Jul 2024 21:12:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719893550; x=1720498350; 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=8oH7C0ySMktpef1FHPyy60fyeYjwvUSz+ek4mpdhRp4=; b=NhctQyFUm3GVf61QJkoQjbKtM0RNg9iD4YUFZ3O6eMf63Jv4LOZ1llK66uFqmwF2Vx f/nXwvRUiPBIjlRPISENRfWFIVke9cV48w17UvH/SVzI7ms5x2p11rMKe4Z57sD0VGzP 1bmVGyiQPMA+OI1FbW/4tWzoSyMlHQZ0TGIZZKGH479zafrb4HuRMQzQ2DOb7Ol1KETv Z1e5Ew7rOzfvv6qtrJuNcXfYn56eYk5zYcgLelkMKg1czA999y0+jaCr+tfD//cnQWkp ucWMo9XitH85Nw8XafJ3aPSd0QSqkCPvvoc5mXO5Ax30Q8eDsHMyPBPXjBFYfVoWW/qP qCmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719893550; x=1720498350; 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=8oH7C0ySMktpef1FHPyy60fyeYjwvUSz+ek4mpdhRp4=; b=Dp7XBEKJLsKHG3WPSlsUZhEyX0MS8GZIjV/4gZczPq6qdwmWjT4xdsvPm/7qGTFiEW Miq0FruvN6WLEsy8m2+5Cse7BaAdWwsIQzqfrI3/r02hKo+JFgH2qQVcnt4EGlPlTu5b RagCTnmId3BdYCY7qJS+z/EDR/Ok1rEdi29K21Y7a2RE9TDltZr6m70NngklfJ0RUJWs V6Fb+P82B6uFVkGCRF/fU02TWSDxA+7rgHfFmKKLqSVnJ7wCjWCLpqxK4TMn6hfLMQQ/ Y944aWnIhHmNHUAuBoxJV4d0QhzHygvC6C2shlsl4Og95JQ997c9Mnizv/Bz3dD3QTJg bFAg== X-Gm-Message-State: AOJu0Yx0R5W3DvA3eb071jtUqXdpU2PeTLNisu0pvnMdiFz5fRsXzL6a f7TB+GFuKA5UxUtAo9rNcMU+Yo0UUGP42FiX02jzrTrtyBGe06FGOOiXVA== X-Google-Smtp-Source: AGHT+IE2k8MTAdtb6NSKS7+v5pIAn6NQhoE++UiWLLwpnvOpBvxjPjlU2UImE/kdeskjWzpghsX0wg== X-Received: by 2002:a05:6358:7e89:b0:19f:54a7:4f0b with SMTP id e5c5f4694b2df-1a6acde1b96mr764237755d.19.1719893550139; Mon, 01 Jul 2024 21:12:30 -0700 (PDT) Received: from localhost ([47.88.5.130]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2c9618a9c03sm198705a91.7.2024.07.01.21.12.29 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Jul 2024 21:12:29 -0700 (PDT) From: Lai Jiangshan To: linux-kernel@vger.kernel.org Cc: Lai Jiangshan , Waiman Long , Tejun Heo , Lai Jiangshan Subject: [PATCH 2/2] workqueue: Simplify goto statement Date: Tue, 2 Jul 2024 12:14:56 +0800 Message-Id: <20240702041456.629328-3-jiangshanlai@gmail.com> X-Mailer: git-send-email 2.19.1.6.gb485710b In-Reply-To: <20240702041456.629328-1-jiangshanlai@gmail.com> References: <20240702041456.629328-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 Use a simple if-statement to replace the cumbersome goto-statement in workqueue_set_unbound_cpumask(). Cc: Waiman Long Signed-off-by: Lai Jiangshan Acked-by: Waiman Long --- kernel/workqueue.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/kernel/workqueue.c b/kernel/workqueue.c index a3f9ff4fe657..7a33f958dcb2 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -7202,15 +7202,10 @@ static int workqueue_set_unbound_cpumask(cpumask_va= r_t cpumask) */ cpumask_and(cpumask, cpumask, cpu_possible_mask); if (!cpumask_empty(cpumask)) { + ret =3D 0; apply_wqattrs_lock(); - if (cpumask_equal(cpumask, wq_unbound_cpumask)) { - ret =3D 0; - goto out_unlock; - } - - ret =3D workqueue_apply_unbound_cpumask(cpumask); - -out_unlock: + if (!cpumask_equal(cpumask, wq_unbound_cpumask)) + ret =3D workqueue_apply_unbound_cpumask(cpumask); if (!ret) cpumask_copy(wq_requested_unbound_cpumask, cpumask); apply_wqattrs_unlock(); --=20 2.19.1.6.gb485710b