Skip to content

Commit 85e8dd3

Browse files
committed
Merge remote-tracking branch 'stable/linux-6.8.y' into v6.8+
2 parents c295de1 + 4fa38f4 commit 85e8dd3

3 files changed

Lines changed: 131 additions & 663 deletions

File tree

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
22
VERSION = 6
33
PATCHLEVEL = 8
4-
SUBLEVEL = 3
4+
SUBLEVEL = 4
55
EXTRAVERSION =
66
NAME = Hurr durr I'ma ninja sloth
77

include/linux/workqueue.h

Lines changed: 3 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -391,13 +391,6 @@ enum {
391391
WQ_MAX_ACTIVE = 512, /* I like 512, better ideas? */
392392
WQ_UNBOUND_MAX_ACTIVE = WQ_MAX_ACTIVE,
393393
WQ_DFL_ACTIVE = WQ_MAX_ACTIVE / 2,
394-
395-
/*
396-
* Per-node default cap on min_active. Unless explicitly set, min_active
397-
* is set to min(max_active, WQ_DFL_MIN_ACTIVE). For more details, see
398-
* workqueue_struct->min_active definition.
399-
*/
400-
WQ_DFL_MIN_ACTIVE = 8,
401394
};
402395

403396
/*
@@ -440,33 +433,11 @@ extern struct workqueue_struct *system_freezable_power_efficient_wq;
440433
* alloc_workqueue - allocate a workqueue
441434
* @fmt: printf format for the name of the workqueue
442435
* @flags: WQ_* flags
443-
* @max_active: max in-flight work items, 0 for default
436+
* @max_active: max in-flight work items per CPU, 0 for default
444437
* remaining args: args for @fmt
445438
*
446-
* For a per-cpu workqueue, @max_active limits the number of in-flight work
447-
* items for each CPU. e.g. @max_active of 1 indicates that each CPU can be
448-
* executing at most one work item for the workqueue.
449-
*
450-
* For unbound workqueues, @max_active limits the number of in-flight work items
451-
* for the whole system. e.g. @max_active of 16 indicates that that there can be
452-
* at most 16 work items executing for the workqueue in the whole system.
453-
*
454-
* As sharing the same active counter for an unbound workqueue across multiple
455-
* NUMA nodes can be expensive, @max_active is distributed to each NUMA node
456-
* according to the proportion of the number of online CPUs and enforced
457-
* independently.
458-
*
459-
* Depending on online CPU distribution, a node may end up with per-node
460-
* max_active which is significantly lower than @max_active, which can lead to
461-
* deadlocks if the per-node concurrency limit is lower than the maximum number
462-
* of interdependent work items for the workqueue.
463-
*
464-
* To guarantee forward progress regardless of online CPU distribution, the
465-
* concurrency limit on every node is guaranteed to be equal to or greater than
466-
* min_active which is set to min(@max_active, %WQ_DFL_MIN_ACTIVE). This means
467-
* that the sum of per-node max_active's may be larger than @max_active.
468-
*
469-
* For detailed information on %WQ_* flags, please refer to
439+
* Allocate a workqueue with the specified parameters. For detailed
440+
* information on WQ_* flags, please refer to
470441
* Documentation/core-api/workqueue.rst.
471442
*
472443
* RETURNS:

0 commit comments

Comments
 (0)