Skip to content

Commit eb3240f

Browse files
yangshiguanggregkh
authored andcommitted
mm: slub: avoid wake up kswapd in set_track_prepare
commit 850470a 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 <yangshiguang@xiaomi.com> Fixes: 5cf909c ("mm/slub: use stackdepot to save stack trace in objects") Cc: stable@vger.kernel.org Signed-off-by: Vlastimil Babka <vbabka@suse.cz> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 28bdebd commit eb3240f

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
@@ -926,19 +926,19 @@ static struct track *get_track(struct kmem_cache *s, void *object,
926926
}
927927

928928
#ifdef CONFIG_STACKDEPOT
929-
static noinline depot_stack_handle_t set_track_prepare(void)
929+
static noinline depot_stack_handle_t set_track_prepare(gfp_t gfp_flags)
930930
{
931931
depot_stack_handle_t handle;
932932
unsigned long entries[TRACK_ADDRS_COUNT];
933933
unsigned int nr_entries;
934934

935935
nr_entries = stack_trace_save(entries, ARRAY_SIZE(entries), 3);
936-
handle = stack_depot_save(entries, nr_entries, GFP_NOWAIT);
936+
handle = stack_depot_save(entries, nr_entries, gfp_flags);
937937

938938
return handle;
939939
}
940940
#else
941-
static inline depot_stack_handle_t set_track_prepare(void)
941+
static inline depot_stack_handle_t set_track_prepare(gfp_t gfp_flags)
942942
{
943943
return 0;
944944
}
@@ -960,9 +960,9 @@ static void set_track_update(struct kmem_cache *s, void *object,
960960
}
961961

962962
static __always_inline void set_track(struct kmem_cache *s, void *object,
963-
enum track_item alloc, unsigned long addr)
963+
enum track_item alloc, unsigned long addr, gfp_t gfp_flags)
964964
{
965-
depot_stack_handle_t handle = set_track_prepare();
965+
depot_stack_handle_t handle = set_track_prepare(gfp_flags);
966966

967967
set_track_update(s, object, alloc, addr, handle);
968968
}
@@ -1890,9 +1890,9 @@ static inline bool free_debug_processing(struct kmem_cache *s,
18901890
static inline void slab_pad_check(struct kmem_cache *s, struct slab *slab) {}
18911891
static inline int check_object(struct kmem_cache *s, struct slab *slab,
18921892
void *object, u8 val) { return 1; }
1893-
static inline depot_stack_handle_t set_track_prepare(void) { return 0; }
1893+
static inline depot_stack_handle_t set_track_prepare(gfp_t gfp_flags) { return 0; }
18941894
static inline void set_track(struct kmem_cache *s, void *object,
1895-
enum track_item alloc, unsigned long addr) {}
1895+
enum track_item alloc, unsigned long addr, gfp_t gfp_flags) {}
18961896
static inline void add_full(struct kmem_cache *s, struct kmem_cache_node *n,
18971897
struct slab *slab) {}
18981898
static inline void remove_full(struct kmem_cache *s, struct kmem_cache_node *n,
@@ -3849,9 +3849,14 @@ static void *___slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node,
38493849
* For debug caches here we had to go through
38503850
* alloc_single_from_partial() so just store the
38513851
* tracking info and return the object.
3852+
*
3853+
* Due to disabled preemption we need to disallow
3854+
* blocking. The flags are further adjusted by
3855+
* gfp_nested_mask() in stack_depot itself.
38523856
*/
38533857
if (s->flags & SLAB_STORE_USER)
3854-
set_track(s, freelist, TRACK_ALLOC, addr);
3858+
set_track(s, freelist, TRACK_ALLOC, addr,
3859+
gfpflags & ~(__GFP_DIRECT_RECLAIM));
38553860

38563861
return freelist;
38573862
}
@@ -3883,7 +3888,8 @@ static void *___slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node,
38833888
goto new_objects;
38843889

38853890
if (s->flags & SLAB_STORE_USER)
3886-
set_track(s, freelist, TRACK_ALLOC, addr);
3891+
set_track(s, freelist, TRACK_ALLOC, addr,
3892+
gfpflags & ~(__GFP_DIRECT_RECLAIM));
38873893

38883894
return freelist;
38893895
}
@@ -4394,8 +4400,12 @@ static noinline void free_to_partial_list(
43944400
unsigned long flags;
43954401
depot_stack_handle_t handle = 0;
43964402

4403+
/*
4404+
* We cannot use GFP_NOWAIT as there are callsites where waking up
4405+
* kswapd could deadlock
4406+
*/
43974407
if (s->flags & SLAB_STORE_USER)
4398-
handle = set_track_prepare();
4408+
handle = set_track_prepare(__GFP_NOWARN);
43994409

44004410
spin_lock_irqsave(&n->list_lock, flags);
44014411

0 commit comments

Comments
 (0)