Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e9da73d6 authored by Andrea Arcangeli's avatar Andrea Arcangeli Committed by Linus Torvalds
Browse files

thp: compound_lock 



Add a new compound_lock() needed to serialize put_page against
__split_huge_page_refcount().

Signed-off-by: default avatarAndrea Arcangeli <aarcange@redhat.com>
Acked-by: default avatarRik van Riel <riel@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a826e422

include/linux/mm.h

+34 −0
Original line number Original line Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/mm_types.h>

#include <linux/mm_types.h>

#include <linux/range.h>

#include <linux/range.h>

#include <linux/pfn.h>

#include <linux/pfn.h>

#include <linux/bit_spinlock.h>





struct mempolicy;

struct mempolicy;

struct anon_vma;

struct anon_vma;
@@ -305,6 +306,39 @@ static inline int is_vmalloc_or_module_addr(const void *x) 
}

}

#endif

#endif





static inline void compound_lock(struct page *page)

{

#ifdef CONFIG_TRANSPARENT_HUGEPAGE

	bit_spin_lock(PG_compound_lock, &page->flags);

#endif

}



static inline void compound_unlock(struct page *page)

{

#ifdef CONFIG_TRANSPARENT_HUGEPAGE

	bit_spin_unlock(PG_compound_lock, &page->flags);

#endif

}



static inline unsigned long compound_lock_irqsave(struct page *page)

{

	unsigned long uninitialized_var(flags);

#ifdef CONFIG_TRANSPARENT_HUGEPAGE

	local_irq_save(flags);

	compound_lock(page);

#endif

	return flags;

}



static inline void compound_unlock_irqrestore(struct page *page,

					      unsigned long flags)

{

#ifdef CONFIG_TRANSPARENT_HUGEPAGE

	compound_unlock(page);

	local_irq_restore(flags);

#endif

}



static inline struct page *compound_head(struct page *page)

static inline struct page *compound_head(struct page *page)

{

{

	if (unlikely(PageTail(page)))

	if (unlikely(PageTail(page)))

include/linux/page-flags.h

+11 −1
Original line number Original line Diff line number Diff line
@@ -107,6 +107,9 @@ enum pageflags { 
#endif

#endif

#ifdef CONFIG_MEMORY_FAILURE

#ifdef CONFIG_MEMORY_FAILURE

	PG_hwpoison,		/* hardware poisoned page. Don't touch */

	PG_hwpoison,		/* hardware poisoned page. Don't touch */

#endif

#ifdef CONFIG_TRANSPARENT_HUGEPAGE

	PG_compound_lock,

#endif

#endif

	__NR_PAGEFLAGS,

	__NR_PAGEFLAGS,
@@ -397,6 +400,12 @@ static inline void __ClearPageTail(struct page *page) 
#define __PG_MLOCKED		0

#define __PG_MLOCKED		0

#endif

#endif





#ifdef CONFIG_TRANSPARENT_HUGEPAGE

#define __PG_COMPOUND_LOCK		(1 << PG_compound_lock)

#else

#define __PG_COMPOUND_LOCK		0

#endif



/*

/*

 * Flags checked when a page is freed.  Pages being freed should not have

 * Flags checked when a page is freed.  Pages being freed should not have

 * these flags set.  It they are, there is a problem.

 * these flags set.  It they are, there is a problem.
@@ -406,7 +415,8 @@ static inline void __ClearPageTail(struct page *page) 
	 1 << PG_private | 1 << PG_private_2 | \

	 1 << PG_private | 1 << PG_private_2 | \

	 1 << PG_buddy	 | 1 << PG_writeback | 1 << PG_reserved | \

	 1 << PG_buddy	 | 1 << PG_writeback | 1 << PG_reserved | \

	 1 << PG_slab	 | 1 << PG_swapcache | 1 << PG_active | \

	 1 << PG_slab	 | 1 << PG_swapcache | 1 << PG_active | \

	 1 << PG_unevictable | __PG_MLOCKED | __PG_HWPOISON)

	 1 << PG_unevictable | __PG_MLOCKED | __PG_HWPOISON | \

	 __PG_COMPOUND_LOCK)





/*

/*

 * Flags checked when a page is prepped for return by the page allocator.

 * Flags checked when a page is prepped for return by the page allocator.