Patch "mm: exclude HugeTLB pages from THP page_mapped() logic" has been added to the 4.5-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
mm: exclude HugeTLB pages from THP page_mapped() logic
to the 4.5-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
mm-exclude-hugetlb-pages-from-thp-page_mapped-logic.patch
and it can be found in the queue-4.5 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
66ee95d16a7f1b7b4f1dd74a2d81c6e19dc29a14Mon Sep 17 00:00:00 2001
From: Steve Capper <[email protected]>
Date: Thu, 28 Apr 2016 16:18:24 -0700
Subject: mm: exclude HugeTLB pages from THP page_mapped() logic
From: Steve Capper <[email protected]>
commit 66ee95d16a7f1b7b4f1dd74a2d81c6e19dc29a14 upstream.
HugeTLB pages cannot be split, so we use the compound_mapcount to track rmaps.
Currently page_mapped() will check the compound_mapcount, but will also go through the constituent pages of a THP compound page and query the individual _mapcount's too.
Unfortunately, page_mapped() does not distinguish between HugeTLB and THP compound pages and assumes that a compound page always needs to have HPAGE_PMD_NR pages querying.
For most cases when dealing with HugeTLB this is just inefficient, but for scenarios where the HugeTLB page size is less than the pmd block size (e.g. when using contiguous bit on ARM) this can lead to crashes.
This patch adjusts the page_mapped function such that we skip the unnecessary THP reference checks for HugeTLB pages.
--- include/linux/mm.h | 2 ++ 1 file changed, 2 insertions(+)
include/linux/mm.h +2 -0
@@ -1010,6 +1010,8 @@ static inline bool page_mapped(struct pa page =compound_head (page);if (atomic_read (compound_mapcount_ptr (page)) >=0 )return true; +if (PageHuge (page)) +return false;for (i =0 ; i <hpage_nr_pages (page); i++) {if (atomic_read (&page[i]._mapcount) >=0 )return true;
Patches currently in stable-queue which might be from [email protected] are
queue-4.5/mm-exclude-hugetlb-pages-from-thp-page_mapped-logic.patch