Skip to content

Commit 7543c3e

Browse files
LeviYeoReumChristoph Hellwig
authored andcommitted
dma-debug: fix a possible deadlock on radix_lock
radix_lock() shouldn't be held while holding dma_hash_entry[idx].lock otherwise, there's a possible deadlock scenario when dma debug API is called holding rq_lock(): CPU0 CPU1 CPU2 dma_free_attrs() check_unmap() add_dma_entry() __schedule() //out (A) rq_lock() get_hash_bucket() (A) dma_entry_hash check_sync() (A) radix_lock() (W) dma_entry_hash dma_entry_free() (W) radix_lock() // CPU2's one (W) rq_lock() CPU1 situation can happen when it extending radix tree and it tries to wake up kswapd via wake_all_kswapd(). CPU2 situation can happen while perf_event_task_sched_out() (i.e. dma sync operation is called while deleting perf_event using etm and etr tmc which are Arm Coresight hwtracing driver backends). To remove this possible situation, call dma_entry_free() after put_hash_bucket() in check_unmap(). Reported-by: Denis Nikitin <denik@chromium.org> Closes: https://lists.linaro.org/archives/list/coresight@lists.linaro.org/thread/2WMS7BBSF5OZYB63VT44U5YWLFP5HL6U/#RWM6MLQX5ANBTEQ2PRM7OXCBGCE6NPWU Signed-off-by: Levi Yun <yeoreum.yun@arm.com> Signed-off-by: Christoph Hellwig <hch@lst.de>
1 parent e42b1a9 commit 7543c3e

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

kernel/dma/debug.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1052,9 +1052,13 @@ static void check_unmap(struct dma_debug_entry *ref)
10521052
}
10531053

10541054
hash_bucket_del(entry);
1055-
dma_entry_free(entry);
1056-
10571055
put_hash_bucket(bucket, flags);
1056+
1057+
/*
1058+
* Free the entry outside of bucket_lock to avoid ABBA deadlocks
1059+
* between that and radix_lock.
1060+
*/
1061+
dma_entry_free(entry);
10581062
}
10591063

10601064
static void check_for_stack(struct device *dev,

0 commit comments

Comments
 (0)