diff mbox series

[3/4] mm/hwpoison: remove MF_MSG_BUDDY_2ND and MF_MSG_POISONED_HUGE

Message ID 20211025231120.GA2651146@u2004 (mailing list archive)
State New
Headers show
Series mm/hwpoison: fix unpoison_memory() | expand

Commit Message

Naoya Horiguchi Oct. 25, 2021, 11:14 p.m. UTC 
(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 <naoya.horiguchi@nec.com>

These action_page_types are no longer used, so remove them.

Signed-off-by: Naoya Horiguchi <naoya.horiguchi@nec.com>
---
 include/linux/mm.h      | 2 --
 include/ras/ras_event.h | 2 --
 mm/memory-failure.c     | 2 --
 3 files changed, 6 deletions(-)

Comments

Yang Shi Oct. 27, 2021, 1:05 a.m. UTC | #1 
On Mon, Oct 25, 2021 at 4:14 PM Naoya Horiguchi <nao.horiguchi@gmail.com> wrote:
>
> (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 <naoya.horiguchi@nec.com>
>
> These action_page_types are no longer used, so remove them.
>
> Signed-off-by: Naoya Horiguchi <naoya.horiguchi@nec.com>

Acked-by: Yang Shi <shy828301@gmail.com>

> ---
>  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",
> --
> 2.25.1
>
>
>
>
>
>
>
>
>
>
>
>
> From: Naoya Horiguchi <nao.horiguchi@gmail.com>
> To:
> Cc:
> Bcc: nao.horiguchi@gmail.com
> Subject:
> Reply-To:
>
diff mbox series

Patch

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",