Commit 668f9abb authored by David Rientjes's avatar David Rientjes Committed by Linus Torvalds
Browse files

mm: close PageTail race 



Commit bf6bddf1 ("mm: introduce compaction and migration for
ballooned pages") introduces page_count(page) into memory compaction
which dereferences page->first_page if PageTail(page).

This results in a very rare NULL pointer dereference on the
aforementioned page_count(page).  Indeed, anything that does
compound_head(), including page_count() is susceptible to racing with
prep_compound_page() and seeing a NULL or dangling page->first_page
pointer.

This patch uses Andrea's implementation of compound_trans_head() that
deals with such a race and makes it the default compound_head()
implementation.  This includes a read memory barrier that ensures that
if PageTail(head) is true that we return a head page that is neither
NULL nor dangling.  The patch then adds a store memory barrier to
prep_compound_page() to ensure page->first_page is set.

This is the safest way to ensure we see the head page that we are
expecting, PageTail(page) is already in the unlikely() path and the
memory barriers are unfortunately required.

Hugetlbfs is the exception, we don't enforce a store memory barrier
during init since no race is possible.

Signed-off-by: default avatarDavid Rientjes <rientjes@google.com>
Cc: Holger Kiehl <Holger.Kiehl@dwd.de>
Cc: Christoph Lameter <cl@linux.com>
Cc: Rafael Aquini <aquini@redhat.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Michal Hocko <mhocko@suse.cz>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Rik van Riel <riel@redhat.com>
Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent aa15aa0e

drivers/block/aoe/aoecmd.c

+2 −2
Original line number Diff line number Diff line
@@ -874,7 +874,7 @@ bio_pageinc(struct bio *bio) 
		/* Non-zero page count for non-head members of

		 * compound pages is no longer allowed by the kernel.

		 */

		page = compound_trans_head(bv.bv_page);

		page = compound_head(bv.bv_page);

		atomic_inc(&page->_count);

	}

}
@@ -887,7 +887,7 @@ bio_pagedec(struct bio *bio) 
	struct bvec_iter iter;



	bio_for_each_segment(bv, bio, iter) {

		page = compound_trans_head(bv.bv_page);

		page = compound_head(bv.bv_page);

		atomic_dec(&page->_count);

	}

}

drivers/vfio/vfio_iommu_type1.c

+2 −2
Original line number Diff line number Diff line
@@ -186,12 +186,12 @@ static bool is_invalid_reserved_pfn(unsigned long pfn) 
	if (pfn_valid(pfn)) {

		bool reserved;

		struct page *tail = pfn_to_page(pfn);

		struct page *head = compound_trans_head(tail);

		struct page *head = compound_head(tail);

		reserved = !!(PageReserved(head));

		if (head != tail) {

			/*

			 * "head" is not a dangling pointer

			 * (compound_trans_head takes care of that)

			 * (compound_head takes care of that)

			 * but the hugepage may have been split

			 * from under us (and we may not hold a

			 * reference count on the head page so it can

fs/proc/page.c

+2 −3
Original line number Diff line number Diff line
@@ -121,9 +121,8 @@ u64 stable_page_flags(struct page *page) 
	 * just checks PG_head/PG_tail, so we need to check PageLRU/PageAnon

	 * to make sure a given page is a thp, not a non-huge compound page.

	 */

	else if (PageTransCompound(page) &&

		 (PageLRU(compound_trans_head(page)) ||

		  PageAnon(compound_trans_head(page))))

	else if (PageTransCompound(page) && (PageLRU(compound_head(page)) ||

					     PageAnon(compound_head(page))))

		u |= 1 << KPF_THP;



	/*

include/linux/huge_mm.h

+0 −41
Original line number Diff line number Diff line
@@ -157,46 +157,6 @@ static inline int hpage_nr_pages(struct page *page) 
		return HPAGE_PMD_NR;

	return 1;

}

/*

 * compound_trans_head() should be used instead of compound_head(),

 * whenever the "page" passed as parameter could be the tail of a

 * transparent hugepage that could be undergoing a

 * __split_huge_page_refcount(). The page structure layout often

 * changes across releases and it makes extensive use of unions. So if

 * the page structure layout will change in a way that

 * page->first_page gets clobbered by __split_huge_page_refcount, the

 * implementation making use of smp_rmb() will be required.

 *

 * Currently we define compound_trans_head as compound_head, because

 * page->private is in the same union with page->first_page, and

 * page->private isn't clobbered. However this also means we're

 * currently leaving dirt into the page->private field of anonymous

 * pages resulting from a THP split, instead of setting page->private

 * to zero like for every other page that has PG_private not set. But

 * anonymous pages don't use page->private so this is not a problem.

 */

#if 0

/* This will be needed if page->private will be clobbered in split_huge_page */

static inline struct page *compound_trans_head(struct page *page)

{

	if (PageTail(page)) {

		struct page *head;

		head = page->first_page;

		smp_rmb();

		/*

		 * head may be a dangling pointer.

		 * __split_huge_page_refcount clears PageTail before

		 * overwriting first_page, so if PageTail is still

		 * there it means the head pointer isn't dangling.

		 */

		if (PageTail(page))

			return head;

	}

	return page;

}

#else

#define compound_trans_head(page) compound_head(page)

#endif



extern int do_huge_pmd_numa_page(struct mm_struct *mm, struct vm_area_struct *vma,

				unsigned long addr, pmd_t pmd, pmd_t *pmdp);
@@ -226,7 +186,6 @@ static inline int split_huge_page(struct page *page) 
	do { } while (0)

#define split_huge_page_pmd_mm(__mm, __address, __pmd)	\

	do { } while (0)

#define compound_trans_head(page) compound_head(page)

static inline int hugepage_madvise(struct vm_area_struct *vma,

				   unsigned long *vm_flags, int advice)

{

include/linux/mm.h

+12 −2
Original line number Diff line number Diff line
@@ -399,8 +399,18 @@ static inline void compound_unlock_irqrestore(struct page *page, 


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

{

	if (unlikely(PageTail(page)))

		return page->first_page;

	if (unlikely(PageTail(page))) {

		struct page *head = page->first_page;



		/*

		 * page->first_page may be a dangling pointer to an old

		 * compound page, so recheck that it is still a tail

		 * page before returning.

		 */

		smp_rmb();

		if (likely(PageTail(page)))

			return head;

	}

	return page;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE