Skip to content

Commit 1fd2a57

Browse files
Tvrtko Ursulingregkh
authored andcommitted
workqueue: Do not warn when cancelling WQ_MEM_RECLAIM work from !WQ_MEM_RECLAIM worker
[ Upstream commit de35994 ] After commit 746ae46 ("drm/sched: Mark scheduler work queues with WQ_MEM_RECLAIM") amdgpu started seeing the following warning: [ ] workqueue: WQ_MEM_RECLAIM sdma0:drm_sched_run_job_work [gpu_sched] is flushing !WQ_MEM_RECLAIM events:amdgpu_device_delay_enable_gfx_off [amdgpu] ... [ ] Workqueue: sdma0 drm_sched_run_job_work [gpu_sched] ... [ ] Call Trace: [ ] <TASK> ... [ ] ? check_flush_dependency+0xf5/0x110 ... [ ] cancel_delayed_work_sync+0x6e/0x80 [ ] amdgpu_gfx_off_ctrl+0xab/0x140 [amdgpu] [ ] amdgpu_ring_alloc+0x40/0x50 [amdgpu] [ ] amdgpu_ib_schedule+0xf4/0x810 [amdgpu] [ ] ? drm_sched_run_job_work+0x22c/0x430 [gpu_sched] [ ] amdgpu_job_run+0xaa/0x1f0 [amdgpu] [ ] drm_sched_run_job_work+0x257/0x430 [gpu_sched] [ ] process_one_work+0x217/0x720 ... [ ] </TASK> The intent of the verifcation done in check_flush_depedency is to ensure forward progress during memory reclaim, by flagging cases when either a memory reclaim process, or a memory reclaim work item is flushed from a context not marked as memory reclaim safe. This is correct when flushing, but when called from the cancel(_delayed)_work_sync() paths it is a false positive because work is either already running, or will not be running at all. Therefore cancelling it is safe and we can relax the warning criteria by letting the helper know of the calling context. Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@igalia.com> Fixes: fca839c ("workqueue: warn if memory reclaim tries to flush !WQ_MEM_RECLAIM workqueue") References: 746ae46 ("drm/sched: Mark scheduler work queues with WQ_MEM_RECLAIM") Cc: Tejun Heo <tj@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Lai Jiangshan <jiangshanlai@gmail.com> Cc: Alex Deucher <alexander.deucher@amd.com> Cc: Christian König <christian.koenig@amd.com Cc: Matthew Brost <matthew.brost@intel.com> Cc: <stable@vger.kernel.org> # v4.5+ Signed-off-by: Tejun Heo <tj@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 6dc6767 commit 1fd2a57

File tree

1 file changed

+13
-9
lines changed

1 file changed

+13
-9
lines changed

kernel/workqueue.c

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2947,23 +2947,27 @@ static int rescuer_thread(void *__rescuer)
29472947
* check_flush_dependency - check for flush dependency sanity
29482948
* @target_wq: workqueue being flushed
29492949
* @target_work: work item being flushed (NULL for workqueue flushes)
2950+
* @from_cancel: are we called from the work cancel path
29502951
*
29512952
* %current is trying to flush the whole @target_wq or @target_work on it.
2952-
* If @target_wq doesn't have %WQ_MEM_RECLAIM, verify that %current is not
2953-
* reclaiming memory or running on a workqueue which doesn't have
2954-
* %WQ_MEM_RECLAIM as that can break forward-progress guarantee leading to
2955-
* a deadlock.
2953+
* If this is not the cancel path (which implies work being flushed is either
2954+
* already running, or will not be at all), check if @target_wq doesn't have
2955+
* %WQ_MEM_RECLAIM and verify that %current is not reclaiming memory or running
2956+
* on a workqueue which doesn't have %WQ_MEM_RECLAIM as that can break forward-
2957+
* progress guarantee leading to a deadlock.
29562958
*/
29572959
static void check_flush_dependency(struct workqueue_struct *target_wq,
2958-
struct work_struct *target_work)
2960+
struct work_struct *target_work,
2961+
bool from_cancel)
29592962
{
2960-
work_func_t target_func = target_work ? target_work->func : NULL;
2963+
work_func_t target_func;
29612964
struct worker *worker;
29622965

2963-
if (target_wq->flags & WQ_MEM_RECLAIM)
2966+
if (from_cancel || target_wq->flags & WQ_MEM_RECLAIM)
29642967
return;
29652968

29662969
worker = current_wq_worker();
2970+
target_func = target_work ? target_work->func : NULL;
29672971

29682972
WARN_ONCE(current->flags & PF_MEMALLOC,
29692973
"workqueue: PF_MEMALLOC task %d(%s) is flushing !WQ_MEM_RECLAIM %s:%ps",
@@ -3208,7 +3212,7 @@ void __flush_workqueue(struct workqueue_struct *wq)
32083212
list_add_tail(&this_flusher.list, &wq->flusher_overflow);
32093213
}
32103214

3211-
check_flush_dependency(wq, NULL);
3215+
check_flush_dependency(wq, NULL, false);
32123216

32133217
mutex_unlock(&wq->mutex);
32143218

@@ -3385,7 +3389,7 @@ static bool start_flush_work(struct work_struct *work, struct wq_barrier *barr,
33853389
}
33863390

33873391
wq = pwq->wq;
3388-
check_flush_dependency(wq, work);
3392+
check_flush_dependency(wq, work, from_cancel);
33893393

33903394
insert_wq_barrier(pwq, barr, work, worker);
33913395
raw_spin_unlock_irq(&pool->lock);

0 commit comments

Comments
 (0)