Skip to content

Commit 83b884e

Browse files
yangshiguangopsiff
authored andcommitted
mm: slub: avoid wake up kswapd in set_track_prepare
commit 850470a8413a8a78e772c4f6bd9fe81ec6bd5b0f upstream. set_track_prepare() can incur lock recursion. The issue is that it is called from hrtimer_start_range_ns holding the per_cpu(hrtimer_bases)[n].lock, but when enabled CONFIG_DEBUG_OBJECTS_TIMERS, may wake up kswapd in set_track_prepare, and try to hold the per_cpu(hrtimer_bases)[n].lock. Avoid deadlock caused by implicitly waking up kswapd by passing in allocation flags, which do not contain __GFP_KSWAPD_RECLAIM in the debug_objects_fill_pool() case. Inside stack depot they are processed by gfp_nested_mask(). Since ___slab_alloc() has preemption disabled, we mask out __GFP_DIRECT_RECLAIM from the flags there. The oops looks something like: BUG: spinlock recursion on CPU#3, swapper/3/0 lock: 0xffffff8a4bf29c80, .magic: dead4ead, .owner: swapper/3/0, .owner_cpu: 3 Hardware name: Qualcomm Technologies, Inc. Popsicle based on SM8850 (DT) Call trace: spin_bug+0x0 _raw_spin_lock_irqsave+0x80 hrtimer_try_to_cancel+0x94 task_contending+0x10c enqueue_dl_entity+0x2a4 dl_server_start+0x74 enqueue_task_fair+0x568 enqueue_task+0xac do_activate_task+0x14c ttwu_do_activate+0xcc try_to_wake_up+0x6c8 default_wake_function+0x20 autoremove_wake_function+0x1c __wake_up+0xac wakeup_kswapd+0x19c wake_all_kswapds+0x78 __alloc_pages_slowpath+0x1ac __alloc_pages_noprof+0x298 stack_depot_save_flags+0x6b0 stack_depot_save+0x14 set_track_prepare+0x5c ___slab_alloc+0xccc __kmalloc_cache_noprof+0x470 __set_page_owner+0x2bc post_alloc_hook[jt]+0x1b8 prep_new_page+0x28 get_page_from_freelist+0x1edc __alloc_pages_noprof+0x13c alloc_slab_page+0x244 allocate_slab+0x7c ___slab_alloc+0x8e8 kmem_cache_alloc_noprof+0x450 debug_objects_fill_pool+0x22c debug_object_activate+0x40 enqueue_hrtimer[jt]+0xdc hrtimer_start_range_ns+0x5f8 ... Signed-off-by: yangshiguang <[email protected]> Fixes: 5cf909c ("mm/slub: use stackdepot to save stack trace in objects") Cc: [email protected] Signed-off-by: Vlastimil Babka <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> (cherry picked from commit 243b705a90ed8449f561a271cf251fd2e939f3db)
1 parent f2f20b3 commit 83b884e

File tree

1 file changed

+20
-10
lines changed

1 file changed

+20
-10
lines changed

mm/slub.c

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -935,19 +935,19 @@ static struct track *get_track(struct kmem_cache *s, void *object,
935935
}
936936

937937
#ifdef CONFIG_STACKDEPOT
938-
static noinline depot_stack_handle_t set_track_prepare(void)
938+
static noinline depot_stack_handle_t set_track_prepare(gfp_t gfp_flags)
939939
{
940940
depot_stack_handle_t handle;
941941
unsigned long entries[TRACK_ADDRS_COUNT];
942942
unsigned int nr_entries;
943943

944944
nr_entries = stack_trace_save(entries, ARRAY_SIZE(entries), 3);
945-
handle = stack_depot_save(entries, nr_entries, GFP_NOWAIT);
945+
handle = stack_depot_save(entries, nr_entries, gfp_flags);
946946

947947
return handle;
948948
}
949949
#else
950-
static inline depot_stack_handle_t set_track_prepare(void)
950+
static inline depot_stack_handle_t set_track_prepare(gfp_t gfp_flags)
951951
{
952952
return 0;
953953
}
@@ -969,9 +969,9 @@ static void set_track_update(struct kmem_cache *s, void *object,
969969
}
970970

971971
static __always_inline void set_track(struct kmem_cache *s, void *object,
972-
enum track_item alloc, unsigned long addr)
972+
enum track_item alloc, unsigned long addr, gfp_t gfp_flags)
973973
{
974-
depot_stack_handle_t handle = set_track_prepare();
974+
depot_stack_handle_t handle = set_track_prepare(gfp_flags);
975975

976976
set_track_update(s, object, alloc, addr, handle);
977977
}
@@ -1872,9 +1872,9 @@ static inline bool free_debug_processing(struct kmem_cache *s,
18721872
static inline void slab_pad_check(struct kmem_cache *s, struct slab *slab) {}
18731873
static inline int check_object(struct kmem_cache *s, struct slab *slab,
18741874
void *object, u8 val) { return 1; }
1875-
static inline depot_stack_handle_t set_track_prepare(void) { return 0; }
1875+
static inline depot_stack_handle_t set_track_prepare(gfp_t gfp_flags) { return 0; }
18761876
static inline void set_track(struct kmem_cache *s, void *object,
1877-
enum track_item alloc, unsigned long addr) {}
1877+
enum track_item alloc, unsigned long addr, gfp_t gfp_flags) {}
18781878
static inline void add_full(struct kmem_cache *s, struct kmem_cache_node *n,
18791879
struct slab *slab) {}
18801880
static inline void remove_full(struct kmem_cache *s, struct kmem_cache_node *n,
@@ -3822,9 +3822,14 @@ static void *___slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node,
38223822
* For debug caches here we had to go through
38233823
* alloc_single_from_partial() so just store the
38243824
* tracking info and return the object.
3825+
*
3826+
* Due to disabled preemption we need to disallow
3827+
* blocking. The flags are further adjusted by
3828+
* gfp_nested_mask() in stack_depot itself.
38253829
*/
38263830
if (s->flags & SLAB_STORE_USER)
3827-
set_track(s, freelist, TRACK_ALLOC, addr);
3831+
set_track(s, freelist, TRACK_ALLOC, addr,
3832+
gfpflags & ~(__GFP_DIRECT_RECLAIM));
38283833

38293834
return freelist;
38303835
}
@@ -3856,7 +3861,8 @@ static void *___slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node,
38563861
goto new_objects;
38573862

38583863
if (s->flags & SLAB_STORE_USER)
3859-
set_track(s, freelist, TRACK_ALLOC, addr);
3864+
set_track(s, freelist, TRACK_ALLOC, addr,
3865+
gfpflags & ~(__GFP_DIRECT_RECLAIM));
38603866

38613867
return freelist;
38623868
}
@@ -4344,8 +4350,12 @@ static noinline void free_to_partial_list(
43444350
unsigned long flags;
43454351
depot_stack_handle_t handle = 0;
43464352

4353+
/*
4354+
* We cannot use GFP_NOWAIT as there are callsites where waking up
4355+
* kswapd could deadlock
4356+
*/
43474357
if (s->flags & SLAB_STORE_USER)
4348-
handle = set_track_prepare();
4358+
handle = set_track_prepare(__GFP_NOWARN);
43494359

43504360
spin_lock_irqsave(&n->list_lock, flags);
43514361

0 commit comments

Comments
 (0)