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=-9.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,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 3B9FCC43464 for ; Sat, 19 Sep 2020 00:24:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F2AC1221EC for ; Sat, 19 Sep 2020 00:24:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600475068; bh=UCzyqbSJaUYE6Ns6QIXquLZEUbkFaiMeT+Z18136FVM=; h=Date:From:To:Subject:Reply-To:List-ID:From; b=HOdZjMtqsp6N77xYut5N53G01AwGJoaKVbCIVzHKeEKE6eV7biY0hYLWkJ61I6p05 9R0klBUsre+3+7FLw1fEbsVRUEygFJ1FLux7JLBIZKzGxmj0wG098sv6G+fUOx7xIg 1e+9iYZyT+Q+JtBTV/l6PXgJ5Zruq6b/1AnQK/b8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726276AbgISAY1 (ORCPT ); Fri, 18 Sep 2020 20:24:27 -0400 Received: from mail.kernel.org ([198.145.29.99]:55748 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726009AbgISAY1 (ORCPT ); Fri, 18 Sep 2020 20:24:27 -0400 Received: from X1 (unknown [67.22.170.76]) (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 134BF21D43; Sat, 19 Sep 2020 00:24:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600475066; bh=UCzyqbSJaUYE6Ns6QIXquLZEUbkFaiMeT+Z18136FVM=; h=Date:From:To:Subject:From; b=XvlaxF3hQbLBW6dQ4vrX4nwzlURbjGraZ1cxHDDq8dL/UOlyCEwrk9emQ5iylTm3L TLPBq20cWLzjG0WTYN+E5lIn8lEdXbdT7Z1cztE2OQl6jgNDiSYJrTQ1Y5Zp4txrCY oB1gg8fL41E6DD9YAJtBfVV4fj/zypbxfFXrptUA= Date: Fri, 18 Sep 2020 17:24:25 -0700 From: akpm@linux-foundation.org To: mm-commits@vger.kernel.org, zeil@yandex-team.ru, tony.luck@intel.com, osalvador@suse.com, naoya.horiguchi@nec.com, mike.kravetz@oracle.com, mhocko@kernel.org, david@redhat.com, dave.hansen@intel.com, cai@lca.pw, aneesh.kumar@linux.vnet.ibm.com, aneesh.kumar@linux.ibm.com, osalvador@suse.de Subject: [to-be-updated] mmhwpoison-rework-soft-offline-for-free-pages.patch removed from -mm tree Message-ID: <20200919002425.WxcM5%akpm@linux-foundation.org> User-Agent: s-nail v14.9.10 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: rework soft offline for free pages has been removed from the -mm tree. Its filename was mmhwpoison-rework-soft-offline-for-free-pages.patch This patch was dropped because an updated version will be merged ------------------------------------------------------ From: Oscar Salvador Subject: mm,hwpoison: rework soft offline for free pages When trying to soft-offline a free page, we need to first take it off the buddy allocator. Once we know is out of reach, we can safely flag it as poisoned. take_page_off_buddy will be used to take a page meant to be poisoned off the buddy allocator. take_page_off_buddy calls break_down_buddy_pages, which splits a higher-order page in case our page belongs to one. Once the page is under our control, we call page_handle_poison to set it as poisoned and grab a refcount on it. Link: http://lkml.kernel.org/r/20200806184923.7007-8-nao.horiguchi@gmail.com Signed-off-by: Oscar Salvador Signed-off-by: Naoya Horiguchi Cc: "Aneesh Kumar K.V" Cc: Aneesh Kumar K.V Cc: Dave Hansen Cc: David Hildenbrand Cc: Dmitry Yakunin Cc: Michal Hocko Cc: Mike Kravetz Cc: Qian Cai Cc: Tony Luck Signed-off-by: Andrew Morton --- include/linux/page-flags.h | 1 mm/memory-failure.c | 18 ++++++--- mm/page_alloc.c | 68 +++++++++++++++++++++++++++++++++++ 3 files changed, 81 insertions(+), 6 deletions(-) --- a/include/linux/page-flags.h~mmhwpoison-rework-soft-offline-for-free-pages +++ a/include/linux/page-flags.h @@ -429,6 +429,7 @@ PAGEFLAG(HWPoison, hwpoison, PF_ANY) TESTSCFLAG(HWPoison, hwpoison, PF_ANY) #define __PG_HWPOISON (1UL << PG_hwpoison) extern bool set_hwpoison_free_buddy_page(struct page *page); +extern bool take_page_off_buddy(struct page *page); #else PAGEFLAG_FALSE(HWPoison) static inline bool set_hwpoison_free_buddy_page(struct page *page) --- a/mm/memory-failure.c~mmhwpoison-rework-soft-offline-for-free-pages +++ a/mm/memory-failure.c @@ -65,6 +65,13 @@ int sysctl_memory_failure_recovery __rea atomic_long_t num_poisoned_pages __read_mostly = ATOMIC_LONG_INIT(0); +static void page_handle_poison(struct page *page) +{ + SetPageHWPoison(page); + page_ref_inc(page); + num_poisoned_pages_inc(); +} + #if defined(CONFIG_HWPOISON_INJECT) || defined(CONFIG_HWPOISON_INJECT_MODULE) u32 hwpoison_filter_enable = 0; @@ -1884,14 +1891,13 @@ static int soft_offline_in_use_page(stru static int soft_offline_free_page(struct page *page) { - int rc = dissolve_free_huge_page(page); + int rc = -EBUSY; - if (!rc) { - if (set_hwpoison_free_buddy_page(page)) - num_poisoned_pages_inc(); - else - rc = -EBUSY; + if (!dissolve_free_huge_page(page) && take_page_off_buddy(page)) { + page_handle_poison(page); + rc = 0; } + return rc; } --- a/mm/page_alloc.c~mmhwpoison-rework-soft-offline-for-free-pages +++ a/mm/page_alloc.c @@ -8759,6 +8759,74 @@ bool is_free_buddy_page(struct page *pag #ifdef CONFIG_MEMORY_FAILURE /* + * Break down a higher-order page in sub-pages, and keep our target out of + * buddy allocator. + */ +static void break_down_buddy_pages(struct zone *zone, struct page *page, + struct page *target, int low, int high, + int migratetype) +{ + unsigned long size = 1 << high; + struct page *current_buddy, *next_page; + + while (high > low) { + high--; + size >>= 1; + + if (target >= &page[size]) { + next_page = page + size; + current_buddy = page; + } else { + next_page = page; + current_buddy = page + size; + } + + if (set_page_guard(zone, current_buddy, high, migratetype)) + continue; + + if (current_buddy != target) { + add_to_free_list(current_buddy, zone, high, migratetype); + set_page_order(current_buddy, high); + page = next_page; + } + } +} + +/* + * Take a page that will be marked as poisoned off the buddy allocator. + */ +bool take_page_off_buddy(struct page *page) +{ + struct zone *zone = page_zone(page); + unsigned long pfn = page_to_pfn(page); + unsigned long flags; + unsigned int order; + bool ret = false; + + spin_lock_irqsave(&zone->lock, flags); + for (order = 0; order < MAX_ORDER; order++) { + struct page *page_head = page - (pfn & ((1 << order) - 1)); + int buddy_order = page_order(page_head); + + if (PageBuddy(page_head) && buddy_order >= order) { + unsigned long pfn_head = page_to_pfn(page_head); + int migratetype = get_pfnblock_migratetype(page_head, + pfn_head); + + del_page_from_free_list(page_head, zone, buddy_order); + break_down_buddy_pages(zone, page_head, page, 0, + buddy_order, migratetype); + ret = true; + break; + } + if (page_count(page_head) > 0) + break; + } + spin_unlock_irqrestore(&zone->lock, flags); + return ret; +} + +/* * Set PG_hwpoison flag if a given page is confirmed to be a free page. This * test is performed under the zone lock to prevent a race against page * allocation. _ Patches currently in -mm which might be from osalvador@suse.de are mmhwpoison-rework-soft-offline-for-in-use-pages.patch mmhwpoison-refactor-soft_offline_huge_page-and-__soft_offline_page.patch mmhwpoison-return-0-if-the-page-is-already-poisoned-in-soft-offline.patch mmhwpoison-take-free-pages-off-the-buddy-freelists.patch mmhwpoison-refactor-madvise_inject_error.patch mmhwpoison-drain-pcplists-before-bailing-out-for-non-buddy-zero-refcount-page.patch mmhwpoison-drop-unneeded-pcplist-draining.patch mmhwpoison-remove-stale-code.patch