Commit 3f4b815a authored Dec 14, 2020 by Oscar Salvador Committed by Linus Torvalds Dec 15, 2020

mm,hwpoison: return -EBUSY when migration fails

Currently, we return -EIO when we fail to migrate the page.

Migrations' failures are rather transient as they can happen due to
several reasons, e.g: high page refcount bump, mapping->migrate_page
failing etc.  All meaning that at that time the page could not be
migrated, but that has nothing to do with an EIO error.

Let us return -EBUSY instead, as we do in case we failed to isolate the
page.

While are it, let us remove the "ret" print as its value does not change.

Link: https://lkml.kernel.org/r/20201209092818.30417-1-osalvador@suse.de


Signed-off-by: Oscar Salvador <osalvador@suse.de>
Acked-by: Naoya Horiguchi <naoya.horiguchi@nec.com>
Acked-by: Vlastimil Babka <vbabka@suse.cz>
Cc: David Hildenbrand <david@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 1e8aaedb

mm/memory-failure.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -1855,11 +1855,11 @@ static int __soft_offline_page(struct page *page)
		pr_info("soft offline: %#lx: %s migration failed %d, type %lx (%pGp)\n",
		pfn, msg_page[huge], ret, page->flags, &page->flags);
		if (ret > 0)
		ret = -EIO;
		ret = -EBUSY;
		}
		} else {
		pr_info("soft offline: %#lx: %s isolation failed: %d, page count %d, type %lx (%pGp)\n",
		pfn, msg_page[huge], ret, page_count(page), page->flags, &page->flags);
		pr_info("soft offline: %#lx: %s isolation failed, page count %d, type %lx (%pGp)\n",
		pfn, msg_page[huge], page_count(page), page->flags, &page->flags);
		ret = -EBUSY;
		}
		return ret;

Admin message