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=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=no 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 01721C433E2 for ; Thu, 16 Jul 2020 21:46:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CF6AF207DD for ; Thu, 16 Jul 2020 21:46:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594935969; bh=8brAjMWSkWob2VE251V2BLcPwSwGG2wHutN+/gRV3xA=; h=Date:From:To:Subject:In-Reply-To:Reply-To:List-ID:From; b=jXlVuzX4WXE6vCZEupDWdiikySsQGfqV2QLHcDXrWc2Ijt0RV6uKPtpLxlU1TyI9X FU3pkMe1fYY1tMbDdQl17aYIgJEOSAipRW33kQrmr9ySEaq0EVnT4LtHBpvPXrTjkB HCYOd7i4BQuL73n+Y+KU1bADFC0UsNrFRq58/oK0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726337AbgGPVqJ (ORCPT ); Thu, 16 Jul 2020 17:46:09 -0400 Received: from mail.kernel.org ([198.145.29.99]:45848 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726002AbgGPVqJ (ORCPT ); Thu, 16 Jul 2020 17:46:09 -0400 Received: from localhost.localdomain (c-73-231-172-41.hsd1.ca.comcast.net [73.231.172.41]) (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 F145A2076D; Thu, 16 Jul 2020 21:46:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594935968; bh=8brAjMWSkWob2VE251V2BLcPwSwGG2wHutN+/gRV3xA=; h=Date:From:To:Subject:In-Reply-To:From; b=vMWnfT/tseJmiz3Mmgrqi/KLosml8NBNbPWMtwhsZ8RfN7XCzcg/smk6RXW+4ihpK KLoqQ5CVkZR/N9mP/q6Ovkivm1VgEQHnpjpq16ivc0EpamDOLNSFmqNxEF//UQzgMy 7pQcwHc721lvoyrBR01csqmLfTmtMZwMQqgn1/+U= Date: Thu, 16 Jul 2020 14:46:07 -0700 From: Andrew Morton To: aneesh.kumar@linux.vnet.ibm.com, dave.hansen@intel.com, david@redhat.com, mhocko@suse.com, mike.kravetz@oracle.com, mm-commits@vger.kernel.org, n-horiguchi@ah.jp.nec.com, naoya.horiguchi@nec.com, osalvador@suse.com, tony.luck@intel.com, zeil@yandex-team.ru Subject: + mmhwpoison-remove-mf_count_increased.patch added to -mm tree Message-ID: <20200716214607.Zgrn_cgyQ%akpm@linux-foundation.org> In-Reply-To: <20200703151445.b6a0cfee402c7c5c4651f1b1@linux-foundation.org> User-Agent: s-nail v14.8.16 Sender: mm-commits-owner@vger.kernel.org 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: remove MF_COUNT_INCREASED has been added to the -mm tree. Its filename is mmhwpoison-remove-mf_count_increased.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/mmhwpoison-remove-mf_count_increased.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/mmhwpoison-remove-mf_count_increased.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Naoya Horiguchi Subject: mm,hwpoison: remove MF_COUNT_INCREASED Now there's no user of MF_COUNT_INCREASED, so we can safely remove it from all calling points. Link: http://lkml.kernel.org/r/20200716123810.25292-9-osalvador@suse.de Signed-off-by: Naoya Horiguchi Signed-off-by: Oscar Salvador Cc: Aneesh Kumar K.V Cc: Dave Hansen Cc: David Hildenbrand Cc: Dmitry Yakunin Cc: Michal Hocko Cc: Mike Kravetz Cc: Naoya Horiguchi Cc: Tony Luck Signed-off-by: Andrew Morton --- include/linux/mm.h | 7 +++---- mm/memory-failure.c | 14 +++----------- 2 files changed, 6 insertions(+), 15 deletions(-) --- a/include/linux/mm.h~mmhwpoison-remove-mf_count_increased +++ a/include/linux/mm.h @@ -2983,10 +2983,9 @@ void register_page_bootmem_memmap(unsign unsigned long nr_pages); enum mf_flags { - MF_COUNT_INCREASED = 1 << 0, - MF_ACTION_REQUIRED = 1 << 1, - MF_MUST_KILL = 1 << 2, - MF_SOFT_OFFLINE = 1 << 3, + MF_ACTION_REQUIRED = 1 << 0, + MF_MUST_KILL = 1 << 1, + MF_SOFT_OFFLINE = 1 << 2, }; extern int memory_failure(unsigned long pfn, int flags); extern void memory_failure_queue(unsigned long pfn, int flags); --- a/mm/memory-failure.c~mmhwpoison-remove-mf_count_increased +++ a/mm/memory-failure.c @@ -1118,7 +1118,7 @@ static int memory_failure_hugetlb(unsign num_poisoned_pages_inc(); - if (!(flags & MF_COUNT_INCREASED) && !get_hwpoison_page(p)) { + if (!get_hwpoison_page(p)) { /* * Check "filter hit" and "race with other subpage." */ @@ -1314,7 +1314,7 @@ int memory_failure(unsigned long pfn, in * In fact it's dangerous to directly bump up page count from 0, * that may make page_ref_freeze()/page_ref_unfreeze() mismatch. */ - if (!(flags & MF_COUNT_INCREASED) && !get_hwpoison_page(p)) { + if (!get_hwpoison_page(p)) { if (is_free_buddy_page(p)) { action_result(pfn, MF_MSG_BUDDY, MF_DELAYED); return 0; @@ -1354,10 +1354,7 @@ int memory_failure(unsigned long pfn, in shake_page(p, 0); /* shake_page could have turned it free. */ if (!PageLRU(p) && is_free_buddy_page(p)) { - if (flags & MF_COUNT_INCREASED) - action_result(pfn, MF_MSG_BUDDY, MF_DELAYED); - else - action_result(pfn, MF_MSG_BUDDY_2ND, MF_DELAYED); + action_result(pfn, MF_MSG_BUDDY_2ND, MF_DELAYED); return 0; } @@ -1655,9 +1652,6 @@ static int __get_any_page(struct page *p { int ret; - if (flags & MF_COUNT_INCREASED) - return 1; - /* * When the target page is a free hugepage, just remove it * from free hugepage list. @@ -1933,8 +1927,6 @@ int soft_offline_page(unsigned long pfn, if (PageHWPoison(page)) { pr_info("soft offline: %#lx page already poisoned\n", pfn); - if (flags & MF_COUNT_INCREASED) - put_page(page); return -EBUSY; } _ Patches currently in -mm which might be from n-horiguchi@ah.jp.nec.com are mmhwpoison-cleanup-unused-pagehuge-check.patch mmmadvise-call-soft_offline_page-without-mf_count_increased.patch mmhwpoison-inject-dont-pin-for-hwpoison_filter.patch mmhwpoison-remove-mf_count_increased.patch mmhwpoison-remove-flag-argument-from-soft-offline-functions.patch