lib-stackdepot-add-printk_deferred_enter-exit-guards.patch removed from -mm tree
The quilt patch titled
Subject: lib/stackdepot: add printk_deferred_enter/exit guards
has been removed from the -mm tree. Its filename was
lib-stackdepot-add-printk_deferred_enter-exit-guards.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Andrey Konovalov <[email protected]>
Subject: lib/stackdepot: add printk_deferred_enter/exit guards
Date: Tue, 19 Dec 2023 22:19:50 +0100
Patch series "lib/stackdepot, kasan: fixes for stack eviction series", v3.
A few fixes for the stack depot eviction series ("stackdepot: allow evicting stack traces").
This patch (of 5):
Stack depot functions can be called from various contexts that do allocations, including with console locks taken. At the same time, stack depot functions might print WARNING's or refcount-related failures.
This can cause a deadlock on console locks.
Add printk_deferred_enter/exit guards to stack depot to avoid this.
---
lib/stackdepot.c | 9 +++++++++ 1 file changed, 9 insertions(+)
lib/stackdepot.c renamed from lib/stackdepot.c~lib-stackdepot-add-printk_deferred_enter-exit-guards +9 -0
@@ -506,12 +506,14 @@ depot_stack_handle_t stack_depot_save_fl bucket = &stack_table[hash & stack_hash_mask];read_lock_irqsave (&pool_rwlock, flags); +printk_deferred_enter ();/* Fast path: look the stack trace up without full locking. */ found =find_stack (bucket, entries, nr_entries, hash);if (found) {if (depot_flags &STACK_DEPOT_FLAG_GET )refcount_inc (&found->count); +printk_deferred_exit ();read_unlock_irqrestore (&pool_rwlock, flags); goto exit; }
@@ -520,6 +522,7 @@ depot_stack_handle_t stack_depot_save_flif (new_pool_required) need_alloc = true; +printk_deferred_exit ();read_unlock_irqrestore (&pool_rwlock, flags);/*
@@ -541,6 +544,7 @@ depot_stack_handle_t stack_depot_save_fl }write_lock_irqsave (&pool_rwlock, flags); +printk_deferred_enter (); found =find_stack (bucket, entries, nr_entries, hash);if (!found) {
@@ -562,6 +566,7 @@ depot_stack_handle_t stack_depot_save_fldepot_keep_new_pool (&prealloc); } +printk_deferred_exit ();write_unlock_irqrestore (&pool_rwlock, flags); exit:if (prealloc) {
@@ -600,9 +605,11 @@ unsigned int stack_depot_fetch(depot_stareturn 0 ;read_lock_irqsave (&pool_rwlock, flags); +printk_deferred_enter (); stack =depot_fetch_stack (handle); +printk_deferred_exit ();read_unlock_irqrestore (&pool_rwlock, flags); *entries = stack->entries;
@@ -619,6 +626,7 @@ void stack_depot_put(depot_stack_handle_return ;write_lock_irqsave (&pool_rwlock, flags); +printk_deferred_enter (); stack =depot_fetch_stack (handle);if (WARN_ON (!stack))
@@ -633,6 +641,7 @@ void stack_depot_put(depot_stack_handle_ } out: +printk_deferred_exit ();write_unlock_irqrestore (&pool_rwlock, flags); }EXPORT_SYMBOL_GPL (stack_depot_put);
_
Patches currently in -mm which might be from [email protected] are
kasan-stop-leaking-stack-trace-handles.patch