Commit 94ef0304 authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by Vlastimil Babka
Browse files

mm: slub: make object_map_lock a raw_spinlock_t 



The variable object_map is protected by object_map_lock. The lock is always
acquired in debug code and within already atomic context

Make object_map_lock a raw_spinlock_t.

Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: default avatarVlastimil Babka <vbabka@suse.cz>
parent 5a836bf6

mm/slub.c

+3 −3
Original line number Diff line number Diff line
@@ -452,7 +452,7 @@ static inline bool cmpxchg_double_slab(struct kmem_cache *s, struct page *page, 


#ifdef CONFIG_SLUB_DEBUG

static unsigned long object_map[BITS_TO_LONGS(MAX_OBJS_PER_PAGE)];

static DEFINE_SPINLOCK(object_map_lock);

static DEFINE_RAW_SPINLOCK(object_map_lock);



static void __fill_map(unsigned long *obj_map, struct kmem_cache *s,

		       struct page *page)
@@ -497,7 +497,7 @@ static unsigned long *get_map(struct kmem_cache *s, struct page *page) 
{

	VM_BUG_ON(!irqs_disabled());



	spin_lock(&object_map_lock);

	raw_spin_lock(&object_map_lock);



	__fill_map(object_map, s, page);
@@ -507,7 +507,7 @@ static unsigned long *get_map(struct kmem_cache *s, struct page *page) 
static void put_map(unsigned long *map) __releases(&object_map_lock)

{

	VM_BUG_ON(map != object_map);

	spin_unlock(&object_map_lock);

	raw_spin_unlock(&object_map_lock);

}



static inline unsigned int size_from_object(struct kmem_cache *s)