From patchwork Mon Jun 14 02:12:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naoya Horiguchi X-Patchwork-Id: 12318035 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=-13.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT 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 2275FC48BDF for ; Mon, 14 Jun 2021 02:12:39 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id D3DC9613AB for ; Mon, 14 Jun 2021 02:12:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D3DC9613AB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 74CCE6B0078; Sun, 13 Jun 2021 22:12:38 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6FCDC6B007B; Sun, 13 Jun 2021 22:12:38 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 528646B007D; Sun, 13 Jun 2021 22:12:38 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0181.hostedemail.com [216.40.44.181]) by kanga.kvack.org (Postfix) with ESMTP id 20C466B0078 for ; Sun, 13 Jun 2021 22:12:38 -0400 (EDT) Received: from smtpin19.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id B8D1E5DD6 for ; Mon, 14 Jun 2021 02:12:37 +0000 (UTC) X-FDA: 78250705554.19.F0F49B3 Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) by imf17.hostedemail.com (Postfix) with ESMTP id B6B3B40002C1 for ; Mon, 14 Jun 2021 02:12:31 +0000 (UTC) Received: by mail-pf1-f170.google.com with SMTP id y15so9423428pfl.4 for ; Sun, 13 Jun 2021 19:12:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hc5tE0rYCbS37ZgBxKFPNr3nuu+6cVzWda11nQdq3iM=; b=Vh+7NPD40igcWMA8ZxCKb882Omc6aDgbk/irfaju7R6OY9JHsN4hyxBDkVJB/XXQeb vtzEuQVTi62SnxT6OobcfTLjOhUpuods3mnG6KdDw+Z59+x3hjUfsydiYzV2Br0XLibk HmBowFSmZoqqKF/uRr4SBf7/xG3uxM+6OYL4WSZ7iCDcvycMF8DCOo1wHBC4eIZvAfjm NQnCbAh1eLGVojwwuV7yl/Yzmj5Zt93GlIJ5JGMNA/QomFnvWoPayMRUSANzoMO/nX38 nMmm0LEQ0/F02e2wKpIbuhG+KZp+R0MDP6rNv6KNnifZP7HcdMmBfBsdO1sUQIQrMs4c Ol4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hc5tE0rYCbS37ZgBxKFPNr3nuu+6cVzWda11nQdq3iM=; b=fRDfs6NtE63aGGAYDHSaQqNX2OtLglZ7ivJqPyLhyqvuTybDn3NFukjQ6bkUem2yXo r+vIixSthKraqGo9n0edSlHuneEWiqFtsMAn9DXD/OL+DZLVmYckfqxhQbU+79iGjU++ X34sSRJo6hD4+P17eqfMW9STpQzr6bmxtbg0XPJIqs2EKHdzDdhJzN/3FAZwyQ5JtjbR 6jqoUoSB3rCi4pP7BR53TFpbWY2268phx8KA6VTbNJ8juQxKWgPwcmY7Hf2D9OGaxDRu iAzGE+nykBW6ANg3q+bV8BsJjGUrUl5sVoSeNiKynNgJbvXDzZa2jPibi7jTWOe3DhUP Y2+g== X-Gm-Message-State: AOAM530oPHGdmbq0gFECOddAvWV5oHSN1xeacUdIrdu+k/UJ/cu/SrEr EBN1yC1FyI+sYdFfGBOkHAKZc9Zo6oZ3 X-Google-Smtp-Source: ABdhPJw9PDSjTntjgblnpRRtXcC12ps1LpPVexLCN0hoszoS8nN9Si7jFc9Ikr9TWPNAO/xM0yrnhw== X-Received: by 2002:a63:ae01:: with SMTP id q1mr14567258pgf.216.1623636756646; Sun, 13 Jun 2021 19:12:36 -0700 (PDT) Received: from localhost.localdomain (h175-177-040-153.catv02.itscom.jp. [175.177.40.153]) by smtp.gmail.com with ESMTPSA id z14sm10952986pfn.11.2021.06.13.19.12.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Jun 2021 19:12:36 -0700 (PDT) From: Naoya Horiguchi To: linux-mm@kvack.org Cc: Andrew Morton , David Hildenbrand , Oscar Salvador , Michal Hocko , Ding Hui , Tony Luck , "Aneesh Kumar K.V" , Naoya Horiguchi , linux-kernel@vger.kernel.org Subject: [PATCH v1 4/6] mm/hwpoison: remove MF_MSG_BUDDY_2ND and MF_MSG_POISONED_HUGE Date: Mon, 14 Jun 2021 11:12:10 +0900 Message-Id: <20210614021212.223326-5-nao.horiguchi@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210614021212.223326-1-nao.horiguchi@gmail.com> References: <20210614021212.223326-1-nao.horiguchi@gmail.com> MIME-Version: 1.0 X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: B6B3B40002C1 Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=gmail.com header.s=20161025 header.b=Vh+7NPD4; spf=pass (imf17.hostedemail.com: domain of naohoriguchi@gmail.com designates 209.85.210.170 as permitted sender) smtp.mailfrom=naohoriguchi@gmail.com; dmarc=pass (policy=none) header.from=gmail.com X-Stat-Signature: 9qg8sbjmqbzusbx65ebpr63c5boahjkf X-HE-Tag: 1623636751-668677 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 These action_page_types are no longer used, so remove them. Signed-off-by: Naoya Horiguchi --- include/linux/mm.h | 2 -- include/ras/ras_event.h | 2 -- mm/memory-failure.c | 2 -- 3 files changed, 6 deletions(-) diff --git v5.13-rc5/include/linux/mm.h v5.13-rc5_patched/include/linux/mm.h index 45008654f695..f1e3b82e1a93 100644 --- v5.13-rc5/include/linux/mm.h +++ v5.13-rc5_patched/include/linux/mm.h @@ -3105,7 +3105,6 @@ enum mf_action_page_type { MF_MSG_SLAB, MF_MSG_PAGETABLE, MF_MSG_DIFFERENT_COMPOUND, - MF_MSG_POISONED_HUGE, MF_MSG_HUGE, MF_MSG_FREE_HUGE, MF_MSG_NON_PMD_HUGE, @@ -3120,7 +3119,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 v5.13-rc5/include/ras/ras_event.h v5.13-rc5_patched/include/ras/ras_event.h index 2f459f6f87fb..23306428f5e6 100644 --- v5.13-rc5/include/ras/ras_event.h +++ v5.13-rc5_patched/include/ras/ras_event.h @@ -359,7 +359,6 @@ TRACE_EVENT(aer_event, EM ( MF_MSG_SLAB, "kernel slab page" ) \ EM ( MF_MSG_PAGETABLE, "page table page 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" ) \ @@ -374,7 +373,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 v5.13-rc5/mm/memory-failure.c v5.13-rc5_patched/mm/memory-failure.c index 30d6519ce203..b986936e50eb 100644 --- v5.13-rc5/mm/memory-failure.c +++ v5.13-rc5_patched/mm/memory-failure.c @@ -710,7 +710,6 @@ static const char * const action_page_types[] = { [MF_MSG_SLAB] = "kernel slab page", [MF_MSG_PAGETABLE] = "page table 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", @@ -725,7 +724,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",