The patch titled
     Subject: mm/hwpoison: fix fail isolate hugetlbfs page w/ refcount held
has been added to the -mm tree.  Its filename is
     mm-hwpoison-fix-fail-isolate-hugetlbfs-page-w-refcount-held.patch

This patch should soon appear at
    
http://ozlabs.org/~akpm/mmots/broken-out/mm-hwpoison-fix-fail-isolate-hugetlbfs-page-w-refcount-held.patch
and later at
    
http://ozlabs.org/~akpm/mmotm/broken-out/mm-hwpoison-fix-fail-isolate-hugetlbfs-page-w-refcount-held.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: Wanpeng Li <[email protected]>
Subject: mm/hwpoison: fix fail isolate hugetlbfs page w/ refcount held

Hugetlbfs pages will get a refcount in get_any_page() or
madvise_hwpoison() if soft offlining through madvise.  The refcount which
is held by the soft offline path should be released if we fail to isolate
hugetlbfs pages.

Fix it by reducing the refcount for both isolation success and failure.

Signed-off-by: Wanpeng Li <[email protected]>
Cc: Naoya Horiguchi <[email protected]>
Cc: <[email protected]>    [3.9+]
Signed-off-by: Andrew Morton <[email protected]>
---

 mm/memory-failure.c |   13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff -puN 
mm/memory-failure.c~mm-hwpoison-fix-fail-isolate-hugetlbfs-page-w-refcount-held 
mm/memory-failure.c
--- 
a/mm/memory-failure.c~mm-hwpoison-fix-fail-isolate-hugetlbfs-page-w-refcount-held
+++ a/mm/memory-failure.c
@@ -1569,13 +1569,12 @@ static int soft_offline_huge_page(struct
        unlock_page(hpage);
 
        ret = isolate_huge_page(hpage, &pagelist);
-       if (ret) {
-               /*
-                * get_any_page() and isolate_huge_page() takes a refcount each,
-                * so need to drop one here.
-                */
-               put_page(hpage);
-       } else {
+       /*
+        * get_any_page() and isolate_huge_page() takes a refcount each,
+        * so need to drop one here.
+        */
+       put_page(hpage);
+       if (!ret) {
                pr_info("soft offline: %#lx hugepage failed to isolate\n", pfn);
                return -EBUSY;
        }
_

Patches currently in -mm which might be from [email protected] are

mm-hwpoison-fix-page-refcount-of-unkown-non-lru-page.patch
mm-hwpoison-fix-fail-isolate-hugetlbfs-page-w-refcount-held.patch

--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to