Message ID | 20210614021212.223326-4-nao.horiguchi@gmail.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | mm/hwpoison: fix unpoison_memory() | expand |
On Mon, Jun 14, 2021 at 11:12:09AM +0900, Naoya Horiguchi wrote: > +++ v5.13-rc5_patched/include/ras/ras_event.h > @@ -357,6 +357,7 @@ TRACE_EVENT(aer_event, > EM ( MF_MSG_KERNEL, "reserved kernel page" ) \ > EM ( MF_MSG_KERNEL_HIGH_ORDER, "high-order kernel page" ) \ > EM ( MF_MSG_SLAB, "kernel slab page" ) \ > + EM ( MF_MSG_PAGETABLE, "page table page page" ) \ Did you intend to double the word "page"? > +++ v5.13-rc5_patched/mm/memory-failure.c > @@ -708,6 +708,7 @@ static const char * const action_page_types[] = { > [MF_MSG_KERNEL] = "reserved kernel page", > [MF_MSG_KERNEL_HIGH_ORDER] = "high-order kernel page", > [MF_MSG_SLAB] = "kernel slab page", > + [MF_MSG_PAGETABLE] = "page table page", ... you didn't here.
On Mon, Jun 14, 2021 at 04:06:32AM +0100, Matthew Wilcox wrote: > On Mon, Jun 14, 2021 at 11:12:09AM +0900, Naoya Horiguchi wrote: > > +++ v5.13-rc5_patched/include/ras/ras_event.h > > @@ -357,6 +357,7 @@ TRACE_EVENT(aer_event, > > EM ( MF_MSG_KERNEL, "reserved kernel page" ) \ > > EM ( MF_MSG_KERNEL_HIGH_ORDER, "high-order kernel page" ) \ > > EM ( MF_MSG_SLAB, "kernel slab page" ) \ > > + EM ( MF_MSG_PAGETABLE, "page table page page" ) \ > > Did you intend to double the word "page"? Oh, this is a typo, I'll fix this. > > > +++ v5.13-rc5_patched/mm/memory-failure.c > > @@ -708,6 +708,7 @@ static const char * const action_page_types[] = { > > [MF_MSG_KERNEL] = "reserved kernel page", > > [MF_MSG_KERNEL_HIGH_ORDER] = "high-order kernel page", > > [MF_MSG_SLAB] = "kernel slab page", > > + [MF_MSG_PAGETABLE] = "page table page", > > ... you didn't here. Thank you! - Naoya Horiguchi
diff --git v5.13-rc5/include/linux/mm.h v5.13-rc5_patched/include/linux/mm.h index c274f75efcf9..45008654f695 100644 --- v5.13-rc5/include/linux/mm.h +++ v5.13-rc5_patched/include/linux/mm.h @@ -3103,6 +3103,7 @@ enum mf_action_page_type { MF_MSG_KERNEL, MF_MSG_KERNEL_HIGH_ORDER, MF_MSG_SLAB, + MF_MSG_PAGETABLE, MF_MSG_DIFFERENT_COMPOUND, MF_MSG_POISONED_HUGE, MF_MSG_HUGE, diff --git v5.13-rc5/include/ras/ras_event.h v5.13-rc5_patched/include/ras/ras_event.h index 0bdbc0d17d2f..2f459f6f87fb 100644 --- v5.13-rc5/include/ras/ras_event.h +++ v5.13-rc5_patched/include/ras/ras_event.h @@ -357,6 +357,7 @@ TRACE_EVENT(aer_event, EM ( MF_MSG_KERNEL, "reserved kernel page" ) \ EM ( MF_MSG_KERNEL_HIGH_ORDER, "high-order kernel page" ) \ 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" ) \ diff --git v5.13-rc5/mm/memory-failure.c v5.13-rc5_patched/mm/memory-failure.c index e7910386fc9c..30d6519ce203 100644 --- v5.13-rc5/mm/memory-failure.c +++ v5.13-rc5_patched/mm/memory-failure.c @@ -708,6 +708,7 @@ static const char * const action_page_types[] = { [MF_MSG_KERNEL] = "reserved kernel page", [MF_MSG_KERNEL_HIGH_ORDER] = "high-order kernel page", [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",