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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id CC9C4C433EF for ; Wed, 6 Jul 2022 02:59:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 688018E0002; Tue, 5 Jul 2022 22:59:05 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 636618E0001; Tue, 5 Jul 2022 22:59:05 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 529FE8E0002; Tue, 5 Jul 2022 22:59:05 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 431CE8E0001 for ; Tue, 5 Jul 2022 22:59:05 -0400 (EDT) Received: from smtpin31.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 01B062089C for ; Wed, 6 Jul 2022 02:59:04 +0000 (UTC) X-FDA: 79655168250.31.55AEEB0 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by imf27.hostedemail.com (Postfix) with ESMTP id E907C40015 for ; Wed, 6 Jul 2022 02:59:02 +0000 (UTC) Received: from canpemm500002.china.huawei.com (unknown [172.30.72.54]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4Ld42v4mQ2zkX2x; Wed, 6 Jul 2022 10:57:27 +0800 (CST) Received: from [10.174.177.76] (10.174.177.76) by canpemm500002.china.huawei.com (7.192.104.244) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Wed, 6 Jul 2022 10:58:54 +0800 Subject: Re: [mm-unstable PATCH v4 5/9] mm, hwpoison: make unpoison aware of raw error info in hwpoisoned hugepage To: Naoya Horiguchi , CC: Andrew Morton , David Hildenbrand , Mike Kravetz , Liu Shixin , Yang Shi , Oscar Salvador , Muchun Song , Naoya Horiguchi , References: <20220704013312.2415700-1-naoya.horiguchi@linux.dev> <20220704013312.2415700-6-naoya.horiguchi@linux.dev> From: Miaohe Lin Message-ID: <9aba706c-b38f-f887-486e-b60c0025d9d8@huawei.com> Date: Wed, 6 Jul 2022 10:58:53 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 MIME-Version: 1.0 In-Reply-To: <20220704013312.2415700-6-naoya.horiguchi@linux.dev> Content-Type: text/plain; charset="utf-8" Content-Language: en-US Content-Transfer-Encoding: 7bit X-Originating-IP: [10.174.177.76] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To canpemm500002.china.huawei.com (7.192.104.244) X-CFilter-Loop: Reflected ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1657076343; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cJW0cLqngbmgTSrEWRc7Bopv6Bh31Neb9qRIERHbngI=; b=2CZami0GFGg022ZbRHh/QyUtE39z2bNQSaXJOXEyRA5Lf5yKsUP32bgaopaXF3Wsb6jJvx +I3XgOAoPfcm4c0tl2fcbnTV0TlHbCkILv+mnXN2+rMBGypM/J7RvFBX4UmRfo9VspywmV 55ine/e/AO7cRC6eRERWj5I5M/hZLj4= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf27.hostedemail.com: domain of linmiaohe@huawei.com designates 45.249.212.187 as permitted sender) smtp.mailfrom=linmiaohe@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1657076343; a=rsa-sha256; cv=none; b=k0mKOUT3P4dn5Rmv/PL8Lrg0+YULG9yRSPAQXLhN7pSEpVUOCOeH19lYlhrCnWUxClCdvZ 7prj/mGOlcRdIYJqFezSTeg03/5uEM/ofvhK+QvR+6U18A/l/fC9A0Ho0VL8MgZYiO7eul HB90F9qLXA4XRq+bSgrBAY33QmhfDyA= X-Rspamd-Server: rspam11 X-Rspam-User: X-Stat-Signature: 3sexxhh3onxs7aafj68a3ag6xb97ydaz X-Rspamd-Queue-Id: E907C40015 Authentication-Results: imf27.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf27.hostedemail.com: domain of linmiaohe@huawei.com designates 45.249.212.187 as permitted sender) smtp.mailfrom=linmiaohe@huawei.com X-HE-Tag: 1657076342-58351 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 2022/7/4 9:33, Naoya Horiguchi wrote: > From: Naoya Horiguchi > > Raw error info list needs to be removed when hwpoisoned hugetlb is > unpoisoned. And unpoison handler needs to know how many errors there > are in the target hugepage. So add them. > > Signed-off-by: Naoya Horiguchi > --- > include/linux/swapops.h | 9 +++++++++ > mm/memory-failure.c | 31 +++++++++++++++++++++++++------ > 2 files changed, 34 insertions(+), 6 deletions(-) > > diff --git a/include/linux/swapops.h b/include/linux/swapops.h > index a01aeb3fcc0b..ddc98f96ad2c 100644 > --- a/include/linux/swapops.h > +++ b/include/linux/swapops.h > @@ -498,6 +498,11 @@ static inline void num_poisoned_pages_dec(void) > atomic_long_dec(&num_poisoned_pages); > } > > +static inline void num_poisoned_pages_sub(long i) > +{ > + atomic_long_sub(i, &num_poisoned_pages); > +} > + > #else > > static inline swp_entry_t make_hwpoison_entry(struct page *page) > @@ -518,6 +523,10 @@ static inline struct page *hwpoison_entry_to_page(swp_entry_t entry) > static inline void num_poisoned_pages_inc(void) > { > } > + > +static inline void num_poisoned_pages_sub(long i) > +{ > +} > #endif > > static inline int non_swap_entry(swp_entry_t entry) > diff --git a/mm/memory-failure.c b/mm/memory-failure.c > index 53bf7486a245..6af2096d8ea0 100644 > --- a/mm/memory-failure.c > +++ b/mm/memory-failure.c > @@ -1722,22 +1722,33 @@ static inline int hugetlb_set_page_hwpoison(struct page *hpage, > return ret; > } > > -inline int hugetlb_clear_page_hwpoison(struct page *hpage) > +static inline long free_raw_hwp_pages(struct page *hpage, bool move_flag) > { > struct llist_head *head; > struct llist_node *t, *tnode; > + long count = 0; > > - if (!HPageRawHwpUnreliable(hpage)) > - ClearPageHWPoison(hpage); > head = raw_hwp_list_head(hpage); > llist_for_each_safe(tnode, t, head->first) { > struct raw_hwp_page *p = container_of(tnode, struct raw_hwp_page, node); > > - SetPageHWPoison(p->page); > + if (move_flag) > + SetPageHWPoison(p->page); > kfree(p); > + count++; > } > llist_del_all(head); > - return 0; > + return count; > +} > + > +inline int hugetlb_clear_page_hwpoison(struct page *hpage) > +{ > + int ret = -EBUSY; > + > + if (!HPageRawHwpUnreliable(hpage)) > + ret = !TestClearPageHWPoison(hpage); > + free_raw_hwp_pages(hpage, true); > + return ret; > } > > /* > @@ -1882,6 +1893,9 @@ static inline int try_memory_failure_hugetlb(unsigned long pfn, int flags, int * > return 0; > } > > +static inline void free_raw_hwp_pages(struct page *hpage, bool move_flag) > +{ > +} > #endif /* CONFIG_HUGETLB_PAGE */ > > static int memory_failure_dev_pagemap(unsigned long pfn, int flags, > @@ -2287,6 +2301,7 @@ int unpoison_memory(unsigned long pfn) Is it safe to unpoison hugepage when HPageRawHwpUnreliable? I'm afraid because some raw error info is missing.. Thanks. > struct page *p; > int ret = -EBUSY; > int freeit = 0; > + long count = 1; > static DEFINE_RATELIMIT_STATE(unpoison_rs, DEFAULT_RATELIMIT_INTERVAL, > DEFAULT_RATELIMIT_BURST); > > @@ -2334,6 +2349,8 @@ int unpoison_memory(unsigned long pfn) > > ret = get_hwpoison_page(p, MF_UNPOISON); > if (!ret) { > + if (PageHuge(p)) > + count = free_raw_hwp_pages(page, false); > ret = TestClearPageHWPoison(page) ? 0 : -EBUSY; > } else if (ret < 0) { > if (ret == -EHWPOISON) { > @@ -2342,6 +2359,8 @@ int unpoison_memory(unsigned long pfn) > unpoison_pr_info("Unpoison: failed to grab page %#lx\n", > pfn, &unpoison_rs); > } else { > + if (PageHuge(p)) > + count = free_raw_hwp_pages(page, false); > freeit = !!TestClearPageHWPoison(p); > > put_page(page); > @@ -2354,7 +2373,7 @@ int unpoison_memory(unsigned long pfn) > unlock_mutex: > mutex_unlock(&mf_mutex); > if (!ret || freeit) { > - num_poisoned_pages_dec(); > + num_poisoned_pages_sub(count); > unpoison_pr_info("Unpoison: Software-unpoisoned page %#lx\n", > page_to_pfn(p), &unpoison_rs); > } >