s390/debug: Fix deadlock during unregister
PATCH 1/1 s390/debug: Fix deadlock during unregister
Unregistering an s390dbf debug area while one of the associated debugfs files is being written to can cause a deadlock:
$ echo >.../vmur/level $ rmmod vmur
===================================================
debugfs write
debugfs_file_get()
debug_unregister()
mutex_lock(debug_mutex)
debugfs_remove()
wait for debugfs_file_put()
debug_file_ops.write()
debug_input()
mutex_lock(debug_mutex) ==> DEADLOCKFix this by splitting debug_unregister() into an s390dbf and debugfs part, and running only the s390dbf part with debug_mutex locked.
--- arch/s390/kernel/debug.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
arch/s390/kernel/debug.c +8 -2
@@ -993,8 +993,8 @@ void debug_register_static(debug_info_t *id, int pages_per_area, int nr_areas)mutex_unlock (&debug_mutex); } -/* Remove debugfs entries and remove from internal list. */ -static void _debug_unregister (debug_info_t *id) +/* Remove debugfs entries. */ +static void _debug_unregister_debugfs (debug_info_t *id) {int i;
@@ -1004,6 +1004,11 @@ static void _debug_unregister(debug_info_t *id)debugfs_remove (id->debugfs_entries[i]); }debugfs_remove (id->debugfs_root_entry); +} + +/* Remove from internal list. */ +static void _debug_unregister (debug_info_t *id) +{if (id == debug_area_first) debug_area_first = id->next;if (id == debug_area_last)
@@ -1029,6 +1034,7 @@ void debug_unregister(debug_info_t *id)mutex_lock (&debug_mutex);_debug_unregister (id);mutex_unlock (&debug_mutex); +_debug_unregister_debugfs (id);debug_info_put (id); }
Signature · 1 line
2.53.0
[email protected]
AI reviewSashiko has reviewed this patch and found no issues. It looks great!
Quoted 15 lines
Unregistering an s390dbf debug area while one of the associated debugfs files is being written to can cause a deadlock:
$ echo >.../vmur/level $ rmmod vmur =================================================== debugfs write debugfs_file_get() debug_unregister() mutex_lock(debug_mutex) debugfs_remove() wait for debugfs_file_put() debug_file_ops.write() debug_input() mutex_lock(debug_mutex) ==> DEADLOCK
Quoted 4 lines
Fix this by splitting
debug_unregister()into an s390dbf and debugfs part, and running only the s390dbf part withdebug_mutexlocked.Signed-off-by Peter Oberparleiter <[email protected]>
Sashiko has reviewed this patch and found no issues. It looks great!
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1
Quoted 15 lines · Peter Oberparleiter
Unregistering an s390dbf debug area while one of the associated debugfs files is being written to can cause a deadlock:
$ echo >.../vmur/level $ rmmod vmur =================================================== debugfs write debugfs_file_get() debug_unregister() mutex_lock(debug_mutex) debugfs_remove() wait for debugfs_file_put() debug_file_ops.write() debug_input() mutex_lock(debug_mutex) ==> DEADLOCK
Quoted 7 lines
Fix this by splitting
debug_unregister()into an s390dbf and debugfs part, and running only the s390dbf part withdebug_mutexlocked.Signed-off-by Peter Oberparleiter <[email protected]>--- arch/s390/kernel/debug.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
Vasily Gorbik
maintainerQuoted 15 lines · Peter Oberparleiter
Unregistering an s390dbf debug area while one of the associated debugfs files is being written to can cause a deadlock:
$ echo >.../vmur/level $ rmmod vmur =================================================== debugfs write debugfs_file_get() debug_unregister() mutex_lock(debug_mutex) debugfs_remove() wait for debugfs_file_put() debug_file_ops.write() debug_input() mutex_lock(debug_mutex) ==> DEADLOCK
Quoted 7 lines
Fix this by splitting
debug_unregister()into an s390dbf and debugfs part, and running only the s390dbf part withdebug_mutexlocked.Signed-off-by Peter Oberparleiter <[email protected]>--- arch/s390/kernel/debug.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
Added
and applied, thank you!