Messages in this thread Patch in this message | | | From | Naoya Horiguchi <> | Subject | [PATCH 4/4] mm/memory-failure: me_huge_page() does nothing for thp | Date | Tue, 12 May 2015 09:46:47 +0000 |
| |
memory_failure() is supposed not to handle thp itself, but to split it. But if something were wrong and page_action() were called on thp, me_huge_page() (action routine for hugepages) should be better to take no action, rather than to take wrong action prepared for hugetlb (which triggers BUG_ON().)
This change is for potential problems, but makes sense to me because thp is an actively developing feature and this code path can be open in the future.
Signed-off-by: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com> --- mm/memory-failure.c | 4 ++++ 1 file changed, 4 insertions(+)
diff --git v4.1-rc3.orig/mm/memory-failure.c v4.1-rc3/mm/memory-failure.c index 918256de15bf..6b5bdc575496 100644 --- v4.1-rc3.orig/mm/memory-failure.c +++ v4.1-rc3/mm/memory-failure.c @@ -743,6 +743,10 @@ static int me_huge_page(struct page *p, unsigned long pfn) { int res = 0; struct page *hpage = compound_head(p); + + if (!PageHuge(hpage)) + return MF_DELAYED; + /* * We can safely recover from error on free or reserved (i.e. * not in-use) hugepage by dequeuing it from freelist. -- 2.1.0
| |