Skip to content

workqueue: break affinity initiatively

Lai Jiangshan lkml 4 versions – Applied

Status from this message: The following commit has been merged into the sched/urgent branch of tip:

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v4 Latest8 patches 0 repliesApplied
  2. v38 patches 34 repliesSuperseded
  3. v210 patches 11 repliesSuperseded
Earlier versions · 1
VersionPostedPatchesRepliesStatus
v110 patches14 repliesSuperseded

Changes in v4 from the cover letter

split hotplug callbacks

Patches in v4 Applied

#Subject and filesSizeRepliesApplied
1/8workqueue: split cpuhotplug callbacks for unbound workqueueinclude/linux/cpuhotplug.h include/linux/workqueue.h kernel/cpu.c +1 more+37 -100 replies
2/8workqueue: set pool->attr->cpumask to workers when cpu onlinekernel/workqueue.c+5 -10 replies
3/8workqueue: use cpu_possible_mask instead of cpu_active_mask to break affinitykernel/workqueue.c+1 -10 replies
4/8workqueue: Manually break affinity on pool detachmentkernel/workqueue.c+13 -00 replies
5/8workqueue: introduce wq_unbound_online_cpumaskkernel/workqueue.c+18 -160 replies
6/8workqueue: use wq_unbound_online_cpumask in restore_unbound_workers_cpumask()kernel/workqueue.c+2 -10 replies
7/8workqueue: Manually break affinity on hotplug for unbound poolkernel/workqueue.c+62 -30 replies
8/8workqueue: Fix affinity of kworkers when attaching into poolkernel/workqueue.c+30 -90 replies

Reviews trailers per patch

7 of 8 patches have a Reviewed-by or Acked-by.

PatchTejun HeoPaul E. McKenneyValentin Schneider
1/8
2/8A-b T-b
3/8A-b T-b
4/8A-b T-b
5/8A-b T-b
6/8A-b T-b
7/8A-b T-b
8/8A-b T-b R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 3 reviewers.

Read the v4 thread

Cover letter [PATCH -tip V4 0/8] workqueue: break affinity initiatively

From: Lai Jiangshan <[email protected]>

06249738a41a ("workqueue: Manually break affinity on hotplug") said that scheduler will not force break affinity for us.

But workqueue highly depends on the old behavior. Many parts of the codes relies on it, 06249738a41a ("workqueue: Manually break affinity on hotplug") is not enough to change it, and the commit has flaws in itself too.

It doesn't handle for worker detachment.
It doesn't handle for worker attachement, especially worker creation
which is handled by Valentin Schneider's patch [1].
It doesn't handle for unbound workers which might be possible per-cpu-kthread.

We need to thoroughly update the way workqueue handles affinity in cpu hot[un]plug, what is this patchset intends to do and replace the Valentin Schneider's patch [1]. The equivalent patch is patch 8 here.

The patchset is based on tip/master rather than workqueue tree, because the patchset is a complement for 06249738a41a ("workqueue:
Manually break affinity on hotplug") which is only in tip/master by now.

And TJ acked to route the series through tip.

Changed from V3:
split hotplug callbacks

introduce break_unbound_workers_cpumask() rather than resuing restore_unbound_workers_cpumask().

Changed from V2:
Drop V2's patch4, which causes warning about setting cpumask online&!active to kthread reported by several people:
Dexuan Cui <[email protected]>
kernel test robot <[email protected]>

Drop V2's patch 1, which can also cause warning about setting cpumask online&!active to kthread. restore_unbound_workers_cpumask() is changed when we are bring cpu online. And it cause V2's patch7 (V3's patch5) to be changed accordingly.

Marked patch8 Reviewed-by: Valentin Schneider <[email protected]>

Changed from V1:
Add TJ's acked-by for the whole patchset

Add more words to the comments and the changelog, mainly derived from discussion with Peter.

Update the comments as TJ suggested.

Update a line of code as Valentin suggested.

Add Valentin's ack for patch 10 because "Seems alright to me." and add Valentin's comments to the changelog which is integral.

[1]: https://lore.kernel.org/r/[email protected]
[V1 patchset]: https://lore.kernel.org/lkml/[email protected]/
[V2 patchset]: https://lore.kernel.org/lkml/[email protected]/
[V3 patchset]: https://lore.kernel.org/lkml/[email protected]/

Lai Jiangshan (8):
workqueue: split cpuhotplug callbacks for unbound workqueue
workqueue: set pool->attr->cpumask to workers when cpu online
workqueue: use cpu_possible_mask instead of cpu_active_mask to break
affinity
workqueue: Manually break affinity on pool detachment
workqueue: introduce wq_unbound_online_cpumask
workqueue: use wq_unbound_online_cpumask in
restore_unbound_workers_cpumask()
workqueue: Manually break affinity on hotplug for unbound pool
workqueue: Fix affinity of kworkers when attaching into pool

 include/linux/cpuhotplug.h |   4 +
 include/linux/workqueue.h  |   2 +
 kernel/cpu.c               |   5 +
 kernel/workqueue.c         | 192 +++++++++++++++++++++++++++++--------
 4 files changed, 165 insertions(+), 38 deletions(-)
Signature · 1 line
2.19.1.6.gb485710b