From: "tip-bot2 for Lai Jiangshan" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Lai Jiangshan <laijs@linux.alibaba.com>,
"Peter Zijlstra (Intel)" <peterz@infradead.org>,
Valentin Schneider <valentin.schneider@arm.com>,
Tejun Heo <tj@kernel.org>,
"Paul E. McKenney" <paulmck@kernel.org>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: sched/urgent] workqueue: Use cpu_possible_mask instead of cpu_active_mask to break affinity
Date: Fri, 22 Jan 2021 17:41:36 -0000 [thread overview]
Message-ID: <161133729644.414.3800664867137502999.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20210111152638.2417-4-jiangshanlai@gmail.com>
The following commit has been merged into the sched/urgent branch of tip:
Commit-ID: 547a77d02f8cfb345631ce23b5b548d27afa0fc4
Gitweb: https://git.kernel.org/tip/547a77d02f8cfb345631ce23b5b548d27afa0fc4
Author: Lai Jiangshan <laijs@linux.alibaba.com>
AuthorDate: Mon, 11 Jan 2021 23:26:33 +08:00
Committer: Peter Zijlstra <peterz@infradead.org>
CommitterDate: Fri, 22 Jan 2021 15:09:41 +01:00
workqueue: Use cpu_possible_mask instead of cpu_active_mask to break affinity
The scheduler won't break affinity for us any more, and we should
"emulate" the same behavior when the scheduler breaks affinity for
us. The behavior is "changing the cpumask to cpu_possible_mask".
And there might be some other CPUs online later while the worker is
still running with the pending work items. The worker should be allowed
to use the later online CPUs as before and process the work items ASAP.
If we use cpu_active_mask here, we can't achieve this goal but
using cpu_possible_mask can.
Fixes: 06249738a41a ("workqueue: Manually break affinity on hotplug")
Signed-off-by: Lai Jiangshan <laijs@linux.alibaba.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Valentin Schneider <valentin.schneider@arm.com>
Acked-by: Tejun Heo <tj@kernel.org>
Tested-by: Paul E. McKenney <paulmck@kernel.org>
Tested-by: Valentin Schneider <valentin.schneider@arm.com>
Link: https://lkml.kernel.org/r/20210111152638.2417-4-jiangshanlai@gmail.com
---
kernel/workqueue.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 9880b6c..1646331 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -4920,7 +4920,7 @@ static void unbind_workers(int cpu)
raw_spin_unlock_irq(&pool->lock);
for_each_pool_worker(worker, pool)
- WARN_ON_ONCE(set_cpus_allowed_ptr(worker->task, cpu_active_mask) < 0);
+ WARN_ON_ONCE(set_cpus_allowed_ptr(worker->task, cpu_possible_mask) < 0);
mutex_unlock(&wq_pool_attach_mutex);
next prev parent reply other threads:[~2021-01-22 17:56 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-11 15:26 [PATCH -tip V4 0/8] workqueue: break affinity initiatively Lai Jiangshan
2021-01-11 15:26 ` [PATCH -tip V4 1/8] workqueue: split cpuhotplug callbacks for unbound workqueue Lai Jiangshan
2021-01-11 15:26 ` [PATCH -tip V4 2/8] workqueue: set pool->attr->cpumask to workers when cpu online Lai Jiangshan
2021-01-11 15:26 ` [PATCH -tip V4 3/8] workqueue: use cpu_possible_mask instead of cpu_active_mask to break affinity Lai Jiangshan
2021-01-22 17:41 ` tip-bot2 for Lai Jiangshan [this message]
2021-01-11 15:26 ` [PATCH -tip V4 4/8] workqueue: Manually break affinity on pool detachment Lai Jiangshan
2021-01-11 15:26 ` [PATCH -tip V4 5/8] workqueue: introduce wq_unbound_online_cpumask Lai Jiangshan
2021-01-11 15:26 ` [PATCH -tip V4 6/8] workqueue: use wq_unbound_online_cpumask in restore_unbound_workers_cpumask() Lai Jiangshan
2021-01-11 15:26 ` [PATCH -tip V4 7/8] workqueue: Manually break affinity on hotplug for unbound pool Lai Jiangshan
2021-01-11 15:26 ` [PATCH -tip V4 8/8] workqueue: Fix affinity of kworkers when attaching into pool Lai Jiangshan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=161133729644.414.3800664867137502999.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=laijs@linux.alibaba.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=paulmck@kernel.org \
--cc=peterz@infradead.org \
--cc=tj@kernel.org \
--cc=valentin.schneider@arm.com \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).