diff options
| author | Naoya Horiguchi <n-horiguchi@ah.jp.nec.com> | 2015-06-25 01:56:53 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-25 02:49:42 +0200 |
| commit | 2491ffee9e66edc2a6ff5ddb49118377257c0014 (patch) | |
| tree | db0a667f222c51a797a9d47f0d09166622bca036 /mm/memory-failure.c | |
| parent | mm: soft-offline: don't free target page in successful page migration (diff) | |
| download | linux-2491ffee9e66edc2a6ff5ddb49118377257c0014.tar.xz linux-2491ffee9e66edc2a6ff5ddb49118377257c0014.zip | |
mm/memory-failure: me_huge_page() does nothing for thp
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>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: Tony Luck <tony.luck@intel.com>
Cc: "Kirill A. Shutemov" <kirill@shutemov.name>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/memory-failure.c')
| -rw-r--r-- | mm/memory-failure.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mm/memory-failure.c b/mm/memory-failure.c index 62ebb1b7f4bf..c72f41bfbaaf 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -777,6 +777,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. |