From patchwork Tue Jul 12 03:28:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naoya Horiguchi X-Patchwork-Id: 12914502 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 502F8C43334 for ; Tue, 12 Jul 2022 03:29:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DE20494003E; Mon, 11 Jul 2022 23:29:28 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D9329940033; Mon, 11 Jul 2022 23:29:28 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C59EC94003E; Mon, 11 Jul 2022 23:29:28 -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 B4876940033 for ; Mon, 11 Jul 2022 23:29:28 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 870E42076D for ; Tue, 12 Jul 2022 03:29:28 +0000 (UTC) X-FDA: 79677017616.04.12E9E42 Received: from out1.migadu.com (out1.migadu.com [91.121.223.63]) by imf26.hostedemail.com (Postfix) with ESMTP id CEFF314005A for ; Tue, 12 Jul 2022 03:29:27 +0000 (UTC) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1657596566; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fetpvhLLFbX033QEZ0y/ojPyygR2BZFVpqQBMwNEgGo=; b=AEjM1vDMNL98lSukj6e3L2un/X0Hu9UbY95wD4fO7CevAFs5qrYMVEHkYTAWD5zN07Lz21 KI0qO92xIuC6N35lhA+8jQ5C0foS/CGsTkWWzEr/rbFy42kobOHQORu5Z7hnlY1n0U8ppk emjKpcixzB5QdXBl5fSZr6ALyBct24w= From: Naoya Horiguchi To: linux-mm@kvack.org Cc: Andrew Morton , David Hildenbrand , Mike Kravetz , Miaohe Lin , Liu Shixin , Yang Shi , Oscar Salvador , Muchun Song , Naoya Horiguchi , linux-kernel@vger.kernel.org Subject: [mm-unstable PATCH v6 4/8] mm, hwpoison: make unpoison aware of raw error info in hwpoisoned hugepage Date: Tue, 12 Jul 2022 12:28:54 +0900 Message-Id: <20220712032858.170414-5-naoya.horiguchi@linux.dev> In-Reply-To: <20220712032858.170414-1-naoya.horiguchi@linux.dev> References: <20220712032858.170414-1-naoya.horiguchi@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1657596568; a=rsa-sha256; cv=none; b=1olO78zKMQWgA1Ply2MS1njB0DNv6idb4/gUn6IoVrZ61Z0LB7BVJCw4E2t8vPBG5ODSN6 p48V3Gjt/5ZbyOfwvtzvhgp0iHcDJWzuVHgl4rtM618uvOkn+nmTg9ZYvcND6bvA23Y7HE 03QeQT2vTJI/PDUP5tOruXBnS+11S8U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1657596568; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=fetpvhLLFbX033QEZ0y/ojPyygR2BZFVpqQBMwNEgGo=; b=lMJIdwMAIYICOhgC7+ouKmaPfS9b9nqOJUPEbP/SYGYteDUophDy6M67GjISBhFkeUwbOL e5veEZRjPMDdVWWm2M3GhQhqsabbmdkzdg/OardmtZoJ7sWv+xynoDQ+CfEAETGr5rry2d +Uq/tjXNEts3lzYnD0GTS2DVei+9bcY= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=AEjM1vDM; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf26.hostedemail.com: domain of naoya.horiguchi@linux.dev designates 91.121.223.63 as permitted sender) smtp.mailfrom=naoya.horiguchi@linux.dev Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=AEjM1vDM; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf26.hostedemail.com: domain of naoya.horiguchi@linux.dev designates 91.121.223.63 as permitted sender) smtp.mailfrom=naoya.horiguchi@linux.dev X-Rspamd-Server: rspam03 X-Stat-Signature: qhk1xyrdcexz3qei8qre6oaafbc8k4y4 X-Rspamd-Queue-Id: CEFF314005A X-Rspam-User: X-HE-Tag: 1657596567-171716 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: 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. HPageVmemmapOptimized(hpage) and HPageRawHwpUnreliable(hpage)) can't be unpoisoned, so let's skip them. Signed-off-by: Naoya Horiguchi Reported-by: kernel test robot Reviewed-by: Miaohe Lin --- v5 -> v6: - set type of return value of hugetlb_clear_page_hwpoison() to void - change type of return value of hugetlb_clear_page_hwpoison() to unsigned long v4 -> v5: - fix type of return value of free_raw_hwp_pages() (found by kernel test robot), - prevent unpoison for HPageVmemmapOptimized and HPageRawHwpUnreliable. --- include/linux/swapops.h | 9 ++++++++ mm/memory-failure.c | 46 ++++++++++++++++++++++++++++++++++++----- 2 files changed, 50 insertions(+), 5 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 74195c181d69..56fd9d809013 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -1720,21 +1720,38 @@ static int hugetlb_set_page_hwpoison(struct page *hpage, struct page *page) return ret; } -void hugetlb_clear_page_hwpoison(struct page *hpage) +static unsigned long free_raw_hwp_pages(struct page *hpage, bool move_flag) { struct llist_head *head; struct llist_node *t, *tnode; + unsigned long count = 0; - if (!HPageRawHwpUnreliable(hpage)) - ClearPageHWPoison(hpage); + /* + * HPageVmemmapOptimized hugepages can't be unpoisoned because + * struct pages for tail pages are required to free hwpoisoned + * hugepages. HPageRawHwpUnreliable hugepages shouldn't be + * unpoisoned by definition. + */ + if (HPageVmemmapOptimized(hpage) || HPageRawHwpUnreliable(hpage)) + return 0; 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 count; +} + +void hugetlb_clear_page_hwpoison(struct page *hpage) +{ + if (!HPageRawHwpUnreliable(hpage)) + ClearPageHWPoison(hpage); + free_raw_hwp_pages(hpage, true); } /* @@ -1878,6 +1895,10 @@ static inline int try_memory_failure_hugetlb(unsigned long pfn, int flags, int * return 0; } +static inline unsigned long free_raw_hwp_pages(struct page *hpage, bool flag) +{ + return 0; +} #endif /* CONFIG_HUGETLB_PAGE */ static int memory_failure_dev_pagemap(unsigned long pfn, int flags, @@ -2283,6 +2304,7 @@ int unpoison_memory(unsigned long pfn) struct page *p; int ret = -EBUSY; int freeit = 0; + unsigned long count = 1; static DEFINE_RATELIMIT_STATE(unpoison_rs, DEFAULT_RATELIMIT_INTERVAL, DEFAULT_RATELIMIT_BURST); @@ -2330,6 +2352,13 @@ 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); + if (count == 0) { + ret = -EBUSY; + goto unlock_mutex; + } + } ret = TestClearPageHWPoison(page) ? 0 : -EBUSY; } else if (ret < 0) { if (ret == -EHWPOISON) { @@ -2338,6 +2367,13 @@ 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); + if (count == 0) { + ret = -EBUSY; + goto unlock_mutex; + } + } freeit = !!TestClearPageHWPoison(p); put_page(page); @@ -2350,7 +2386,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); }