Skip to content

Commit

Permalink
mm/kmemleak: move set_track_prepare() outside raw_spinlocks
Browse files Browse the repository at this point in the history
set_track_prepare() will call __alloc_pages() which attempts to acquire
zone->lock(spinlocks), so move it outside object->lock(raw_spinlocks)
because it's not right to acquire spinlocks while holding raw_spinlocks in
RT mode.

Link: https://lkml.kernel.org/r/[email protected]
Signed-off-by: Liu Shixin <[email protected]>
Acked-by: Catalin Marinas <[email protected]>
Cc: Geert Uytterhoeven <[email protected]>
Cc: Kefeng Wang <[email protected]>
Cc: Patrick Wang <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
  • Loading branch information
Liu Shixin authored and akpm00 committed Nov 30, 2023
1 parent e34dabc commit 9712181
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion mm/kmemleak.c
Original file line number Diff line number Diff line change
Expand Up @@ -1152,6 +1152,7 @@ EXPORT_SYMBOL_GPL(kmemleak_free_percpu);
void __ref kmemleak_update_trace(const void *ptr)
{
struct kmemleak_object *object;
depot_stack_handle_t trace_handle;
unsigned long flags;

pr_debug("%s(0x%px)\n", __func__, ptr);
Expand All @@ -1168,8 +1169,9 @@ void __ref kmemleak_update_trace(const void *ptr)
return;
}

trace_handle = set_track_prepare();
raw_spin_lock_irqsave(&object->lock, flags);
object->trace_handle = set_track_prepare();
object->trace_handle = trace_handle;
raw_spin_unlock_irqrestore(&object->lock, flags);

put_object(object);
Expand Down

0 comments on commit 9712181

Please sign in to comment.