arm64: use asm-generic/mmu_context.h for no-op implementations

[linux-2.6-microblaze.git] / mm / memory-failure.c

diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index f9fa998..c0bb186 100644 (file)
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -1673,16 +1673,6 @@ int unpoison_memory(unsigned long pfn)
 }
 EXPORT_SYMBOL(unpoison_memory);
 
-static struct page *new_page(struct page *p, unsigned long private)
-{
-       struct migration_target_control mtc = {
-               .nid = page_to_nid(p),
-               .gfp_mask = GFP_USER | __GFP_MOVABLE | __GFP_RETRY_MAYFAIL,
-       };
-
-       return alloc_migration_target(p, (unsigned long)&mtc);
-}
-
 /*
  * Safely get reference count of an arbitrary page.
  * Returns 0 for a free page, -EIO for a zero refcount page
@@ -1707,6 +1697,9 @@ static int __get_any_page(struct page *p, unsigned long pfn, int flags)
                } else if (is_free_buddy_page(p)) {
                        pr_info("%s: %#lx free buddy page\n", __func__, pfn);
                        ret = 0;
+               } else if (page_count(p)) {
+                       /* raced with allocation */
+                       ret = -EBUSY;
                } else {
                        pr_info("%s: %#lx: unknown zero refcount page type %lx\n",
                                __func__, pfn, p->flags);
@@ -1723,6 +1716,9 @@ static int get_any_page(struct page *page, unsigned long pfn, int flags)
 {
        int ret = __get_any_page(page, pfn, flags);
 
+       if (ret == -EBUSY)
+               ret = __get_any_page(page, pfn, flags);
+
        if (ret == 1 && !PageHuge(page) &&
            !PageLRU(page) && !__PageMovable(page)) {
                /*
@@ -1791,6 +1787,10 @@ static int __soft_offline_page(struct page *page)
        char const *msg_page[] = {"page", "hugepage"};
        bool huge = PageHuge(page);
        LIST_HEAD(pagelist);
+       struct migration_target_control mtc = {
+               .nid = NUMA_NO_NODE,
+               .gfp_mask = GFP_USER | __GFP_MOVABLE | __GFP_RETRY_MAYFAIL,
+       };
 
        /*
         * Check PageHWPoison again inside page lock because PageHWPoison
@@ -1827,8 +1827,8 @@ static int __soft_offline_page(struct page *page)
        }
 
        if (isolate_page(hpage, &pagelist)) {
-               ret = migrate_pages(&pagelist, new_page, NULL, MPOL_MF_MOVE_ALL,
-                                       MIGRATE_SYNC, MR_MEMORY_FAILURE);
+               ret = migrate_pages(&pagelist, alloc_migration_target, NULL,
+                       (unsigned long)&mtc, MIGRATE_SYNC, MR_MEMORY_FAILURE);
                if (!ret) {
                        bool release = !huge;
 
@@ -1897,6 +1897,7 @@ int soft_offline_page(unsigned long pfn, int flags)
 {
        int ret;
        struct page *page;
+       bool try_again = true;
 
        if (!pfn_valid(pfn))
                return -ENXIO;
@@ -1912,6 +1913,7 @@ int soft_offline_page(unsigned long pfn, int flags)
                return 0;
        }
 
+retry:
        get_online_mems();
        ret = get_any_page(page, pfn, flags);
        put_online_mems();
@@ -1919,7 +1921,10 @@ int soft_offline_page(unsigned long pfn, int flags)
        if (ret > 0)
                ret = soft_offline_in_use_page(page);
        else if (ret == 0)
-               ret = soft_offline_free_page(page);
+               if (soft_offline_free_page(page) && try_again) {
+                       try_again = false;
+                       goto retry;
+               }
 
        return ret;
 }