diff options
| author | 2021-01-13 17:56:56 +0000 | |
|---|---|---|
| committer | 2021-01-13 17:56:56 +0000 | |
| commit | cea06d9bf0e035a549226e217022fa51b0c878e5 (patch) | |
| tree | a882062da6ee7f1de90a21cc0e717073cc71cb5d /kernel/workqueue.c | |
| parent | ASoC: SOF: Intel: fix page fault at probe if i915 init fails (diff) | |
| parent | Linux 5.11-rc3 (diff) | |
Merge v5.11-rc3
Diffstat (limited to 'kernel/workqueue.c')
| -rw-r--r-- | kernel/workqueue.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/kernel/workqueue.c b/kernel/workqueue.c index b5295a0b0536..9880b6c0e272 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -3731,17 +3731,24 @@ static void pwq_adjust_max_active(struct pool_workqueue *pwq) * is updated and visible. */ if (!freezable || !workqueue_freezing) { + bool kick = false; + pwq->max_active = wq->saved_max_active; while (!list_empty(&pwq->delayed_works) && - pwq->nr_active < pwq->max_active) + pwq->nr_active < pwq->max_active) { pwq_activate_first_delayed(pwq); + kick = true; + } /* * Need to kick a worker after thawed or an unbound wq's - * max_active is bumped. It's a slow path. Do it always. + * max_active is bumped. In realtime scenarios, always kicking a + * worker will cause interference on the isolated cpu cores, so + * let's kick iff work items were activated. */ - wake_up_worker(pwq->pool); + if (kick) + wake_up_worker(pwq->pool); } else { pwq->max_active = 0; } |
