From patchwork Mon Oct 25 23:14:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naoya Horiguchi X-Patchwork-Id: 12583477 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2EAECC433F5 for ; Mon, 25 Oct 2021 23:14:21 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id BA45A61076 for ; Mon, 25 Oct 2021 23:14:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org BA45A61076 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id 453D4940008; Mon, 25 Oct 2021 19:14:20 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3E83C940007; Mon, 25 Oct 2021 19:14:20 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2A3B9940008; Mon, 25 Oct 2021 19:14:20 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0199.hostedemail.com [216.40.44.199]) by kanga.kvack.org (Postfix) with ESMTP id 16A30940007 for ; Mon, 25 Oct 2021 19:14:20 -0400 (EDT) Received: from smtpin22.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id B6BED8249980 for ; Mon, 25 Oct 2021 23:14:19 +0000 (UTC) X-FDA: 78736515438.22.6248E07 Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) by imf19.hostedemail.com (Postfix) with ESMTP id 11507B0000A3 for ; Mon, 25 Oct 2021 23:14:14 +0000 (UTC) Received: by mail-pj1-f47.google.com with SMTP id lx5-20020a17090b4b0500b001a262880e99so150133pjb.5 for ; Mon, 25 Oct 2021 16:14:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:date:to:cc:subject:message-id:mime-version:content-disposition :in-reply-to; bh=Lh3py47gA8jg6Gb0rOjwQD82lb53Sm8VrPET+7wqweU=; b=oC7s9lfcXvHb8GRvOWEgcGhIyRfEicCKCTCuu+2KC7c3BABC0NHhIBow7E6xLZIUyC 0xsSBuSoyShsveED9PlDgizbLrEAyiULB3490fdPvkS3iDgv1aEHxsl25nxTCwvBbpPA jMjqJo93kja70FwMf6zXL663O2Lh3CdcM70xFd4xNpBxDLVt41lVBxdRU0BEB6LkwD6/ Ll5Bjm1ZtwoD3lpGAcur5UaX9jaAKjAwuJgrE3rcEBd8dAIlY6q28kBLFagPNN6UTO5w w4ruzR2/Afvvyva2nkbLvm3B6gTOojkma9/APlNGsmvOlgZa86E6fzq6Uyg/Ipb9kXx5 i7tQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:date:to:cc:subject:message-id:mime-version :content-disposition:in-reply-to; bh=Lh3py47gA8jg6Gb0rOjwQD82lb53Sm8VrPET+7wqweU=; b=QlUGi2vwAoFctuEJ3Xus3BrJUpJOVEFSR2UXoVmFl3vcH69ZKRgNFI2QrUIZY2vtmj CuZ2E1VhfjyNYIzSuGNxVLRpYinV3WamM5YnUAMVOp6PtWv7Gwi7lkvx7E6nsGljzpZn oM2WZITJBZNv2hFBAs5MMSck47g5C84BVXBd6wH4kiA/xRvi+PuoByx1flcmsDI1HC39 H06/GiJ8bQqMNhY/k8mZXOD99OI4Z4GeuBoFv8RR+UU5BUC6i6wRIjulZmTBunUoumHN FadyD9X1vMkxQqBQ/wgWUXARw9pIBxWplt9hNwRdC2W0nrqHxLlCJLi6m7Kq3ZenR4t0 a6ew== X-Gm-Message-State: AOAM532+4rlblGTxC6aWnrrVoX9B+d+wacixA6ZILI4HRaScxMgBWG8f Xpp4CwXdiwTYMNMC+tMwYLQGToDRsBFC X-Google-Smtp-Source: ABdhPJwQNFIGfOE2VPjqLATShIXQYysjolvs2G1MnC0uCysSRth3EfS/RS0y3Jzr9s2LlVT31xGGyw== X-Received: by 2002:a17:90b:4a07:: with SMTP id kk7mr24128073pjb.37.1635203657849; Mon, 25 Oct 2021 16:14:17 -0700 (PDT) Received: from u2004 ([2407:c800:3f11:740:8ea1:3c5:6c2d:e5c9]) by smtp.gmail.com with ESMTPSA id g5sm12041028pfc.65.2021.10.25.16.14.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Oct 2021 16:14:17 -0700 (PDT) From: Naoya Horiguchi X-Google-Original-From: Naoya Horiguchi Date: Tue, 26 Oct 2021 08:14:13 +0900 To: linux-mm@kvack.org Cc: Andrew Morton , David Hildenbrand , Oscar Salvador , Michal Hocko , Ding Hui , Tony Luck , "Aneesh Kumar K.V" , Miaohe Lin , Yang Shi , Peter Xu , Naoya Horiguchi , linux-kernel@vger.kernel.org Subject: [PATCH 3/4] mm/hwpoison: remove MF_MSG_BUDDY_2ND and MF_MSG_POISONED_HUGE Message-ID: <20211025231120.GA2651146@u2004> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20211025230503.2650970-1-naoya.horiguchi@linux.dev> X-Mutt-References: <20211025230503.2650970-1-naoya.horiguchi@linux.dev> X-Mutt-Fcc: =Sent X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 11507B0000A3 X-Stat-Signature: erdtqcbqrzm4s9wgsjm5opuy35f67onp Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=oC7s9lfc; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf19.hostedemail.com: domain of nao.horiguchi@gmail.com designates 209.85.216.47 as permitted sender) smtp.mailfrom=nao.horiguchi@gmail.com X-HE-Tag: 1635203654-339032 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: (I failed to send patch 3/4 and 4/4 due to the ratelimit of linux.dev, so I switched mail server...) From: Naoya Horiguchi These action_page_types are no longer used, so remove them. Signed-off-by: Naoya Horiguchi Acked-by: Yang Shi --- include/linux/mm.h | 2 -- include/ras/ras_event.h | 2 -- mm/memory-failure.c | 2 -- 3 files changed, 6 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index a3229f609856..71d886470d71 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -3246,7 +3246,6 @@ enum mf_action_page_type { MF_MSG_KERNEL_HIGH_ORDER, MF_MSG_SLAB, MF_MSG_DIFFERENT_COMPOUND, - MF_MSG_POISONED_HUGE, MF_MSG_HUGE, MF_MSG_FREE_HUGE, MF_MSG_NON_PMD_HUGE, @@ -3261,7 +3260,6 @@ enum mf_action_page_type { MF_MSG_CLEAN_LRU, MF_MSG_TRUNCATED_LRU, MF_MSG_BUDDY, - MF_MSG_BUDDY_2ND, MF_MSG_DAX, MF_MSG_UNSPLIT_THP, MF_MSG_UNKNOWN, diff --git a/include/ras/ras_event.h b/include/ras/ras_event.h index 0bdbc0d17d2f..d0337a41141c 100644 --- a/include/ras/ras_event.h +++ b/include/ras/ras_event.h @@ -358,7 +358,6 @@ TRACE_EVENT(aer_event, EM ( MF_MSG_KERNEL_HIGH_ORDER, "high-order kernel page" ) \ EM ( MF_MSG_SLAB, "kernel slab page" ) \ EM ( MF_MSG_DIFFERENT_COMPOUND, "different compound page after locking" ) \ - EM ( MF_MSG_POISONED_HUGE, "huge page already hardware poisoned" ) \ EM ( MF_MSG_HUGE, "huge page" ) \ EM ( MF_MSG_FREE_HUGE, "free huge page" ) \ EM ( MF_MSG_NON_PMD_HUGE, "non-pmd-sized huge page" ) \ @@ -373,7 +372,6 @@ TRACE_EVENT(aer_event, EM ( MF_MSG_CLEAN_LRU, "clean LRU page" ) \ EM ( MF_MSG_TRUNCATED_LRU, "already truncated LRU page" ) \ EM ( MF_MSG_BUDDY, "free buddy page" ) \ - EM ( MF_MSG_BUDDY_2ND, "free buddy page (2nd try)" ) \ EM ( MF_MSG_DAX, "dax page" ) \ EM ( MF_MSG_UNSPLIT_THP, "unsplit thp" ) \ EMe ( MF_MSG_UNKNOWN, "unknown page" ) diff --git a/mm/memory-failure.c b/mm/memory-failure.c index a47b741ca04b..09f079987928 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -723,7 +723,6 @@ static const char * const action_page_types[] = { [MF_MSG_KERNEL_HIGH_ORDER] = "high-order kernel page", [MF_MSG_SLAB] = "kernel slab page", [MF_MSG_DIFFERENT_COMPOUND] = "different compound page after locking", - [MF_MSG_POISONED_HUGE] = "huge page already hardware poisoned", [MF_MSG_HUGE] = "huge page", [MF_MSG_FREE_HUGE] = "free huge page", [MF_MSG_NON_PMD_HUGE] = "non-pmd-sized huge page", @@ -738,7 +737,6 @@ static const char * const action_page_types[] = { [MF_MSG_CLEAN_LRU] = "clean LRU page", [MF_MSG_TRUNCATED_LRU] = "already truncated LRU page", [MF_MSG_BUDDY] = "free buddy page", - [MF_MSG_BUDDY_2ND] = "free buddy page (2nd try)", [MF_MSG_DAX] = "dax page", [MF_MSG_UNSPLIT_THP] = "unsplit thp", [MF_MSG_UNKNOWN] = "unknown page",