Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 260BAC4743A for ; Tue, 15 Dec 2020 23:59:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F014522D57 for ; Tue, 15 Dec 2020 23:59:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726662AbgLOX7d (ORCPT ); Tue, 15 Dec 2020 18:59:33 -0500 Received: from mail.kernel.org ([198.145.29.99]:59710 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729040AbgLOXZG (ORCPT ); Tue, 15 Dec 2020 18:25:06 -0500 Date: Tue, 15 Dec 2020 15:22:25 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1608074545; bh=klfzFUDHOm/dXsyzM8mmGreAaf7VcD9Xa+6t4qMPkVE=; h=From:To:Subject:From; b=NAxbFyh6+dUysZr3PRkJYbt4BFnX5920Iq8heHZpuJCfURdTY8MLmLAfGBiCI83vs VGLV1v2Szpn2fJV4AWEzgToxI7n/0MBNSnLIv5VujMiSIRKcBygwJSr3JUPrV8Y1C1 dEv69tE+e1extpe9YEEt11vj5UNpFGPbeSZKzbV0= From: akpm@linux-foundation.org To: david@redhat.com, mm-commits@vger.kernel.org, naoya.horiguchi@nec.com, osalvador@suse.de, vbabka@suse.cz Subject: [merged] mmhwpoison-return-ebusy-when-migration-fails.patch removed from -mm tree Message-ID: <20201215232225.yFas9iZPY%akpm@linux-foundation.org> User-Agent: s-nail v14.8.16 Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The patch titled Subject: mm,hwpoison: return -EBUSY when migration fails has been removed from the -mm tree. Its filename was mmhwpoison-return-ebusy-when-migration-fails.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Oscar Salvador Subject: 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 Acked-by: Naoya Horiguchi Acked-by: Vlastimil Babka Cc: David Hildenbrand Signed-off-by: Andrew Morton --- mm/memory-failure.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/mm/memory-failure.c~mmhwpoison-return-ebusy-when-migration-fails +++ a/mm/memory-failure.c @@ -1855,11 +1855,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 -mm which might be from osalvador@suse.de are