This is a note to let you know that I've just added the patch titled mm,hwpoison: return -EBUSY when migration fails to the 5.10-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: mm-hwpoison-return-ebusy-when-migration-fails.patch and it can be found in the queue-5.10 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From foo@baz Thu Jul 15 01:10:15 PM CEST 2021 From: Hanjun Guo <guohanjun@xxxxxxxxxx> Date: Tue, 13 Jul 2021 17:18:32 +0800 Subject: mm,hwpoison: return -EBUSY when migration fails To: <stable@xxxxxxxxxxxxxxx> Cc: <linux-kernel@xxxxxxxxxxxxxxx>, Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>, Sasha Levin <sashal@xxxxxxxxxx>, Oscar Salvador <osalvador@xxxxxxx>, David Hildenbrand <david@xxxxxxxxxx>, Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>, Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>, Hanjun Guo <guohanjun@xxxxxxxxxx> Message-ID: <1626167917-11972-3-git-send-email-guohanjun@xxxxxxxxxx> From: Oscar Salvador <osalvador@xxxxxxx> commit 3f4b815a439adfb8f238335612c4b28bc10084d8 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@xxxxxxx Signed-off-by: Oscar Salvador <osalvador@xxxxxxx> Acked-by: Naoya Horiguchi <naoya.horiguchi@xxxxxxx> Acked-by: Vlastimil Babka <vbabka@xxxxxxx> Cc: David Hildenbrand <david@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> Signed-off-by: Hanjun Guo <guohanjun@xxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- mm/memory-failure.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -1856,11 +1856,11 @@ static int __soft_offline_page(struct pa 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; Patches currently in stable-queue which might be from guohanjun@xxxxxxxxxx are queue-5.10/io_uring-simplify-io_remove_personalities.patch queue-5.10/io_uring-convert-personality_idr-to-xarray.patch queue-5.10/loop-fix-i-o-error-on-fsync-in-detached-loop-devices.patch queue-5.10/io_uring-convert-io_buffer_idr-to-xarray.patch queue-5.10/mm-hwpoison-return-ebusy-when-migration-fails.patch queue-5.10/scsi-iscsi-fix-iscsi-cls-conn-state.patch queue-5.10/scsi-iscsi-fix-race-condition-between-login-and-sync-thread.patch