The patch titled
Subject: rmap: fix compound check logic in page_remove_file_rmap
has been added to the -mm tree. Its filename is
rmap-fix-compound-check-logic-in-page_remove_file_rmap.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/rmap-fix-compound-check-logic-in-page_remove_file_rmap.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/rmap-fix-compound-check-logic-in-page_remove_file_rmap.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Steve Capper <steve.capper@xxxxxxx>
Subject: rmap: fix compound check logic in page_remove_file_rmap
In page_remove_file_rmap(.) we have the following check:
VM_BUG_ON_PAGE(compound && !PageTransHuge(page), page);
This is meant to check for either HugeTLB pages or THP when a compound
page is passed in.
Unfortunately, if one disables CONFIG_TRANSPARENT_HUGEPAGE, then
PageTransHuge(.) will always return false, provoking BUGs when one runs
the libhugetlbfs test suite.
This patch replaces PageTransHuge(), with PageHead() which will work for
both HugeTLB and THP.
Fixes: dd78fedde4b9 ("rmap: support file thp")
Link: http://lkml.kernel.org/r/1470838217-5889-1-git-send-email-steve.capper@xxxxxxx
Signed-off-by: Steve Capper <steve.capper@xxxxxxx>
Acked-by: Kirill A. Shutemov <kirill.shutemov@xxxxxxxxxxxxxxx>
Cc: Huang Shijie <shijie.huang@xxxxxxx>
Cc: Will Deacon <will.deacon@xxxxxxx>
Cc: Catalin Marinas <catalin.marinas@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/rmap.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN mm/rmap.c~rmap-fix-compound-check-logic-in-page_remove_file_rmap mm/rmap.c
--- a/mm/rmap.c~rmap-fix-compound-check-logic-in-page_remove_file_rmap
+++ a/mm/rmap.c
@@ -1304,7 +1304,7 @@ static void page_remove_file_rmap(struct
{
int i, nr = 1;
- VM_BUG_ON_PAGE(compound && !PageTransHuge(page), page);
+ VM_BUG_ON_PAGE(compound && !PageHead(page), page);
lock_page_memcg(page);
/* Hugepages are not counted in NR_FILE_MAPPED for now. */
_
Patches currently in -mm which might be from steve.capper@xxxxxxx are
rmap-fix-compound-check-logic-in-page_remove_file_rmap.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
