2024-05-15 22:27:51

by Tejun Heo

[permalink] [raw]
Subject: [GIT PULL] workqueue: Changes for v6.10

The following changes since commit 8c06da67d0bd3139a97f301b4aa9c482b9d4f29e:

Merge tag 'livepatching-for-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching (2024-05-15 13:07:49 -0700)

are available in the Git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git/ tags/wq-for-6.10

for you to fetch changes up to a2a58909cfb5fd5e9f7bb7d954eec0a32fee3f1f:

Merge branch 'for-6.10' into test-merge-for-6.10 (2024-05-15 11:40:33 -1000)

----------------------------------------------------------------
workqueue: Changes for v6.10

- Work items can now be disabled and enabled, and cancel_work_sync() and
disable_work() can be called form atomic contexts for BH work items. This
closes feature gap with tasklet and should allow converting all existing
tasklet users to BH workqueues.

- Improve pool sharing for unbound workqueues with strict affinity.

- Misc changes including doc updates, improved debug annotations and
cleanups.

----------------------------------------------------------------
Allen Pais (1):
workqueue: Introduce enable_and_queue_work() convenience function

Dan Williams (1):
workqueue: Cleanup subsys attribute registration

Kassey Li (1):
workqueue: add function in event of workqueue_activate_work

Kemeng Shi (1):
workqueue: remove unnecessary import and function in wq_monitor.py

Lai Jiangshan (3):
workqueue: Use INIT_WORK_ONSTACK in workqueue_softirq_dead()
workqueue: Move attrs->cpumask out of worker_pool's properties when attrs->affn_strict
workqueue: Use list_last_entry() to get the last idle worker

Tejun Heo (7):
workqueue: Preserve OFFQ bits in cancel[_sync] paths
workqueue: Implement disable/enable for (delayed) work items
workqueue: Remove WORK_OFFQ_CANCELING
workqueue: Remember whether a work item was on a BH workqueue
workqueue: Allow cancel_work_sync() and disable_work() from atomic contexts on BH work items
workqueue: Use "@..." in function comment to describe variable length argument
Merge branch 'for-6.10' into test-merge-for-6.10

Zqiang (1):
workqueue: Add destroy_work_on_stack() in workqueue_softirq_dead()

include/linux/workqueue.h | 54 ++++-
include/trace/events/workqueue.h | 4 +-
kernel/workqueue.c | 453 ++++++++++++++++++++++++---------------
tools/workqueue/wq_monitor.py | 9 +-
4 files changed, 327 insertions(+), 193 deletions(-)

--
tejun


2024-05-16 00:37:17

by Linus Torvalds

[permalink] [raw]
Subject: Re: [GIT PULL] workqueue: Changes for v6.10

On Wed, 15 May 2024 at 15:26, Tejun Heo <[email protected]> wrote:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git/ tags/wq-for-6.10

Hmm.

You seem to have tagged your test-merge, not the actual commit you
*meant* to tag.

I guess it doesn't really matter, but it's ugly and brings in a random
merge commit with no commit message.

Linus

2024-05-16 00:55:54

by Tejun Heo

[permalink] [raw]
Subject: Re: [GIT PULL] workqueue: Changes for v6.10

Hello,

On Wed, May 15, 2024 at 05:36:48PM -0700, Linus Torvalds wrote:
> On Wed, 15 May 2024 at 15:26, Tejun Heo <[email protected]> wrote:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git/ tags/wq-for-6.10
>
> Hmm.
>
> You seem to have tagged your test-merge, not the actual commit you
> *meant* to tag.

Sorry about that. Yeah, I incorrectly tagged a test merge branch.

> I guess it doesn't really matter, but it's ugly and brings in a random
> merge commit with no commit message.

I'll send the corrected pull request right away.

Thanks.

--
tejun

2024-05-16 00:58:09

by Tejun Heo

[permalink] [raw]
Subject: [GIT PULL FIXED] workqueue: Changes for v6.10

The following changes since commit 4cece764965020c22cff7665b18a012006359095:

Linux 6.9-rc1 (2024-03-24 14:10:05 -0700)

are available in the Git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git/ tags/wq-for-6.10

for you to fetch changes up to 51da7f68edae38e81543d57fd71811f7481c0472:

workqueue: Use "@..." in function comment to describe variable length argument (2024-04-22 10:08:04 -1000)

----------------------------------------------------------------
workqueue: Changes for v6.10

- Work items can now be disabled and enabled, and cancel_work_sync() and
disable_work() can be called form atomic contexts for BH work items. This
closes feature gap with tasklet and should allow converting all existing
tasklet users to BH workqueues.

- Improve pool sharing for unbound workqueues with strict affinity.

- Misc changes including doc updates, improved debug annotations and
cleanups.

----------------------------------------------------------------
Allen Pais (1):
workqueue: Introduce enable_and_queue_work() convenience function

Dan Williams (1):
workqueue: Cleanup subsys attribute registration

Kassey Li (1):
workqueue: add function in event of workqueue_activate_work

Kemeng Shi (1):
workqueue: remove unnecessary import and function in wq_monitor.py

Lai Jiangshan (3):
workqueue: Use INIT_WORK_ONSTACK in workqueue_softirq_dead()
workqueue: Move attrs->cpumask out of worker_pool's properties when attrs->affn_strict
workqueue: Use list_last_entry() to get the last idle worker

Tejun Heo (6):
workqueue: Preserve OFFQ bits in cancel[_sync] paths
workqueue: Implement disable/enable for (delayed) work items
workqueue: Remove WORK_OFFQ_CANCELING
workqueue: Remember whether a work item was on a BH workqueue
workqueue: Allow cancel_work_sync() and disable_work() from atomic contexts on BH work items
workqueue: Use "@..." in function comment to describe variable length argument

Zqiang (1):
workqueue: Add destroy_work_on_stack() in workqueue_softirq_dead()

include/linux/workqueue.h | 54 ++++-
include/trace/events/workqueue.h | 4 +-
kernel/workqueue.c | 453 ++++++++++++++++++++++++---------------
tools/workqueue/wq_monitor.py | 9 +-
4 files changed, 327 insertions(+), 193 deletions(-)

--
tejun

2024-05-16 00:59:41

by pr-tracker-bot

[permalink] [raw]
Subject: Re: [GIT PULL] workqueue: Changes for v6.10

The pull request you sent on Wed, 15 May 2024 12:26:26 -1000:

> git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git/ tags/wq-for-6.10

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/3c999d1ae3c75991902a1a7dad0cb62c2a3008b4

Thank you!

--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html

2024-05-16 01:07:33

by Linus Torvalds

[permalink] [raw]
Subject: Re: [GIT PULL] workqueue: Changes for v6.10

On Wed, 15 May 2024 at 17:55, Tejun Heo <[email protected]> wrote:
>
> I'll send the corrected pull request right away.

It's fine, I already merged it.

Mistakes happen, this wasn't a huge pattern of problems with you, and
while I could have just merged the non-merge commit I decided that I'd
rather take the ugly empty merge and get your signature than to pick
the "right" commit and avoid the merge.

Linus

2024-05-16 01:10:20

by pr-tracker-bot

[permalink] [raw]
Subject: Re: [GIT PULL FIXED] workqueue: Changes for v6.10

The pull request you sent on Wed, 15 May 2024 14:57:16 -1000:

> git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git/ tags/wq-for-6.10

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/a2a58909cfb5fd5e9f7bb7d954eec0a32fee3f1f

Thank you!

--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html