From mboxrd@z Thu Jan 1 00:00:00 1970 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=-7.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 0413CC06510 for ; Tue, 2 Jul 2019 08:17:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C4589205ED for ; Tue, 2 Jul 2019 08:17:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562055438; bh=l38vMRgwQYIAowAjhEHFO5/jEsKo8inoBgrQgGayZSU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=f07SfAN+br/VtlciySD1I+smn+9vvy8lirNyM+PGblduR/DtFphjASg1VfAOrscYW BcVzmJExwfNOj2KcoVHTXRq5t+hCf8gQclRh//QaOYP3Jvbbs/grAQEoCIf6ftI3XV mySOlYzJMXYghJhCj1SxR78LgEkrjPUQTV0j5sY4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726046AbfGBICq (ORCPT ); Tue, 2 Jul 2019 04:02:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:47422 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727088AbfGBICq (ORCPT ); Tue, 2 Jul 2019 04:02:46 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id BA4D3216C8; Tue, 2 Jul 2019 08:02:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562054565; bh=l38vMRgwQYIAowAjhEHFO5/jEsKo8inoBgrQgGayZSU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dIDgWmeZ50eXlgPbMSBheKChSI4rUCkOwRu6UThSXnw8Icmy1DCgYG4afIEnIC6Ll rLEZYgECQtvMnkvtlE83nbAPkFWQbJerhP64nJIyRoccgQ7RMZ1mKiJLg4W6bL6yzj oAcRZatYE+jLw7wSMI/4VqwUvXO6FYdOcs5u8seQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Naoya Horiguchi , Mike Kravetz , Oscar Salvador , Michal Hocko , Xishi Qiu , "Chen, Jerry T" , "Zhuo, Qiuxu" , Andrew Morton , Linus Torvalds Subject: [PATCH 5.1 13/55] mm: soft-offline: return -EBUSY if set_hwpoison_free_buddy_page() fails Date: Tue, 2 Jul 2019 10:01:21 +0200 Message-Id: <20190702080124.727361433@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190702080124.103022729@linuxfoundation.org> References: <20190702080124.103022729@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Naoya Horiguchi commit b38e5962f8ed0d2a2b28a887fc2221f7f41db119 upstream. The pass/fail of soft offline should be judged by checking whether the raw error page was finally contained or not (i.e. the result of set_hwpoison_free_buddy_page()), but current code do not work like that. It might lead us to misjudge the test result when set_hwpoison_free_buddy_page() fails. Without this fix, there are cases where madvise(MADV_SOFT_OFFLINE) may not offline the original page and will not return an error. Link: http://lkml.kernel.org/r/1560154686-18497-2-git-send-email-n-horiguchi@ah.jp.nec.com Signed-off-by: Naoya Horiguchi Fixes: 6bc9b56433b76 ("mm: fix race on soft-offlining") Reviewed-by: Mike Kravetz Reviewed-by: Oscar Salvador Cc: Michal Hocko Cc: Xishi Qiu Cc: "Chen, Jerry T" Cc: "Zhuo, Qiuxu" Cc: [4.19+] Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- mm/memory-failure.c | 2 ++ 1 file changed, 2 insertions(+) --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -1733,6 +1733,8 @@ static int soft_offline_huge_page(struct if (!ret) { if (set_hwpoison_free_buddy_page(page)) num_poisoned_pages_inc(); + else + ret = -EBUSY; } } return ret;