Skip to content

Commit 522ffe2

Browse files
yangshiguanggregkh
authored andcommitted
mm: slub: avoid wake up kswapd in set_track_prepare
[ Upstream commit 850470a ] 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: Sasha Levin <sashal@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent ad2df86 commit 522ffe2

1 file changed

Lines changed: 20 additions & 10 deletions

File tree

mm/slub.c

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

773773
#ifdef CONFIG_STACKDEPOT
774-
static noinline depot_stack_handle_t set_track_prepare(void)
774+
static noinline depot_stack_handle_t set_track_prepare(gfp_t gfp_flags)
775775
{
776776
depot_stack_handle_t handle;
777777
unsigned long entries[TRACK_ADDRS_COUNT];
778778
unsigned int nr_entries;
779779

780780
nr_entries = stack_trace_save(entries, ARRAY_SIZE(entries), 3);
781-
handle = stack_depot_save(entries, nr_entries, GFP_NOWAIT);
781+
handle = stack_depot_save(entries, nr_entries, gfp_flags);
782782

783783
return handle;
784784
}
785785
#else
786-
static inline depot_stack_handle_t set_track_prepare(void)
786+
static inline depot_stack_handle_t set_track_prepare(gfp_t gfp_flags)
787787
{
788788
return 0;
789789
}
@@ -805,9 +805,9 @@ static void set_track_update(struct kmem_cache *s, void *object,
805805
}
806806

807807
static __always_inline void set_track(struct kmem_cache *s, void *object,
808-
enum track_item alloc, unsigned long addr)
808+
enum track_item alloc, unsigned long addr, gfp_t gfp_flags)
809809
{
810-
depot_stack_handle_t handle = set_track_prepare();
810+
depot_stack_handle_t handle = set_track_prepare(gfp_flags);
811811

812812
set_track_update(s, object, alloc, addr, handle);
813813
}
@@ -1738,9 +1738,9 @@ static inline bool free_debug_processing(struct kmem_cache *s,
17381738
static inline void slab_pad_check(struct kmem_cache *s, struct slab *slab) {}
17391739
static inline int check_object(struct kmem_cache *s, struct slab *slab,
17401740
void *object, u8 val) { return 1; }
1741-
static inline depot_stack_handle_t set_track_prepare(void) { return 0; }
1741+
static inline depot_stack_handle_t set_track_prepare(gfp_t gfp_flags) { return 0; }
17421742
static inline void set_track(struct kmem_cache *s, void *object,
1743-
enum track_item alloc, unsigned long addr) {}
1743+
enum track_item alloc, unsigned long addr, gfp_t gfp_flags) {}
17441744
static inline void add_full(struct kmem_cache *s, struct kmem_cache_node *n,
17451745
struct slab *slab) {}
17461746
static inline void remove_full(struct kmem_cache *s, struct kmem_cache_node *n,
@@ -3234,9 +3234,14 @@ static void *___slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node,
32343234
* For debug caches here we had to go through
32353235
* alloc_single_from_partial() so just store the
32363236
* tracking info and return the object.
3237+
*
3238+
* Due to disabled preemption we need to disallow
3239+
* blocking. The flags are further adjusted by
3240+
* gfp_nested_mask() in stack_depot itself.
32373241
*/
32383242
if (s->flags & SLAB_STORE_USER)
3239-
set_track(s, freelist, TRACK_ALLOC, addr);
3243+
set_track(s, freelist, TRACK_ALLOC, addr,
3244+
gfpflags & ~(__GFP_DIRECT_RECLAIM));
32403245

32413246
return freelist;
32423247
}
@@ -3262,7 +3267,8 @@ static void *___slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node,
32623267
goto new_objects;
32633268

32643269
if (s->flags & SLAB_STORE_USER)
3265-
set_track(s, freelist, TRACK_ALLOC, addr);
3270+
set_track(s, freelist, TRACK_ALLOC, addr,
3271+
gfpflags & ~(__GFP_DIRECT_RECLAIM));
32663272

32673273
return freelist;
32683274
}
@@ -3550,8 +3556,12 @@ static noinline void free_to_partial_list(
35503556
unsigned long flags;
35513557
depot_stack_handle_t handle = 0;
35523558

3559+
/*
3560+
* We cannot use GFP_NOWAIT as there are callsites where waking up
3561+
* kswapd could deadlock
3562+
*/
35533563
if (s->flags & SLAB_STORE_USER)
3554-
handle = set_track_prepare();
3564+
handle = set_track_prepare(__GFP_NOWARN);
35553565

35563566
spin_lock_irqsave(&n->list_lock, flags);
35573567

0 commit comments

Comments
 (0)