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=-15.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 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 79A45C6379D for ; Wed, 25 Nov 2020 16:36:29 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id D76152083E for ; Wed, 25 Nov 2020 16:36:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D76152083E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.cz Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 53CD56B0071; Wed, 25 Nov 2020 11:36:28 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 4EB086B0072; Wed, 25 Nov 2020 11:36:28 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 402C56B0073; Wed, 25 Nov 2020 11:36:28 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0240.hostedemail.com [216.40.44.240]) by kanga.kvack.org (Postfix) with ESMTP id 24F5C6B0071 for ; Wed, 25 Nov 2020 11:36:28 -0500 (EST) Received: from smtpin30.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id D76FC33CD for ; Wed, 25 Nov 2020 16:36:27 +0000 (UTC) X-FDA: 77523493614.30.rod19_330120c27378 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin30.hostedemail.com (Postfix) with ESMTP id A05BD180B3C83 for ; Wed, 25 Nov 2020 16:36:27 +0000 (UTC) X-HE-Tag: rod19_330120c27378 X-Filterd-Recvd-Size: 3224 Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by imf20.hostedemail.com (Postfix) with ESMTP for ; Wed, 25 Nov 2020 16:36:27 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 151EBACC6; Wed, 25 Nov 2020 16:36:26 +0000 (UTC) Subject: Re: [PATCH v5 3/4] mm,hwpoison: take free pages off the buddy freelists for hugetlb To: Oscar Salvador , n-horiguchi@ah.jp.nec.com Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org References: <20201013144447.6706-1-osalvador@suse.de> <20201013144447.6706-4-osalvador@suse.de> From: Vlastimil Babka Message-ID: <440ab1e0-1b69-f2e5-a07a-31861aa2b633@suse.cz> Date: Wed, 25 Nov 2020 17:36:25 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.5.0 MIME-Version: 1.0 In-Reply-To: <20201013144447.6706-4-osalvador@suse.de> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On 10/13/20 4:44 PM, Oscar Salvador wrote: > Currently, free hugetlb get dissolved, but we also need to make sure > to take the poisoned subpage off the buddy frelists, so no one stumbles > upon it (see previous patch for more information). > > Signed-off-by: Oscar Salvador Acked-by: Vlastimil Babka > --- > mm/memory-failure.c | 19 +++++++++++++------ > 1 file changed, 13 insertions(+), 6 deletions(-) > > diff --git a/mm/memory-failure.c b/mm/memory-failure.c > index 181bed890c16..30aadeca97d2 100644 > --- a/mm/memory-failure.c > +++ b/mm/memory-failure.c > @@ -809,7 +809,7 @@ static int me_swapcache_clean(struct page *p, unsigned long pfn) > */ > static int me_huge_page(struct page *p, unsigned long pfn) > { > - int res = 0; > + int res; > struct page *hpage = compound_head(p); > struct address_space *mapping; > > @@ -820,6 +820,7 @@ static int me_huge_page(struct page *p, unsigned long pfn) > if (mapping) { > res = truncate_error_page(hpage, pfn, mapping); > } else { > + res = MF_FAILED; > unlock_page(hpage); > /* > * migration entry prevents later access on error anonymous > @@ -828,8 +829,10 @@ static int me_huge_page(struct page *p, unsigned long pfn) > */ > if (PageAnon(hpage)) > put_page(hpage); > - dissolve_free_huge_page(p); > - res = MF_RECOVERED; > + if (!dissolve_free_huge_page(p) && take_page_off_buddy(p)) { > + page_ref_inc(p); > + res = MF_RECOVERED; > + } > lock_page(hpage); > } > > @@ -1198,9 +1201,13 @@ static int memory_failure_hugetlb(unsigned long pfn, int flags) > } > } > unlock_page(head); > - dissolve_free_huge_page(p); > - action_result(pfn, MF_MSG_FREE_HUGE, MF_DELAYED); > - return 0; > + res = MF_FAILED; > + if (!dissolve_free_huge_page(p) && take_page_off_buddy(p)) { > + page_ref_inc(p); > + res = MF_RECOVERED; > + } > + action_result(pfn, MF_MSG_FREE_HUGE, res); > + return res == MF_RECOVERED ? 0 : -EBUSY; > } > > lock_page(head); >