Hi Naoya, On 4/26/22 05:30, HORIGUCHI NAOYA(堀口 直也) wrote: > Hi, > > Thank you for working on this. This patch depends on commit d173d5417fb6 > ("mm/memory-failure.c: skip huge_zero_page in memory_failure()") which was a > bit prematurely merged into mainline. The proposer would like to submit > another version of fix in the agreed approach, and d173d5417fb6 will be > likely to be reverted. So could you drop this patch from linux-mm for now > to avoid the confusion due to the conflict. I am happy to resend this patch after all the stated above. > > Thanks, > Naoya Horiguchi > > On Mon, Apr 25, 2022 at 03:15:15PM -0700, Andrew Morton wrote: >> >> The patch titled >> Subject: mm/memory-failure: add new memory failure message MF_MSG_HUGE_ZERO >> has been added to the -mm tree. Its filename is >> mm-memory-failure-add-new-memory-failure-message-mf_msg_huge_zero.patch >> >> This patch should soon appear at >> https://ozlabs.org/~akpm/mmots/broken-out/mm-memory-failure-add-new-memory-failure-message-mf_msg_huge_zero.patch >> and later at >> https://ozlabs.org/~akpm/mmotm/broken-out/mm-memory-failure-add-new-memory-failure-message-mf_msg_huge_zero.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: Anshuman Khandual <anshuman.khandual@xxxxxxx> >> Subject: mm/memory-failure: add new memory failure message MF_MSG_HUGE_ZERO >> >> Memory failure just gets ignored for global huge_zero_page even without a >> split attempt. But corresponding memory failure message >> MF_MSG_UNSPLIT_THP is misleading as if the THP page could not be split >> during memory failure handling. This adds a new message MF_MSG_HUGE_ZERO >> indicating that memory got ignored for being a huge zero page. >> >> Link: https://lkml.kernel.org/r/20220425080306.1771480-1-anshuman.khandual@xxxxxxx >> Signed-off-by: Anshuman Khandual <anshuman.khandual@xxxxxxx> >> Cc: Tony Luck <tony.luck@xxxxxxxxx> >> Cc: Borislav Petkov <bp@xxxxxxxxx> >> Cc: Naoya Horiguchi <naoya.horiguchi@xxxxxxx> >> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> >> --- >> >> include/linux/mm.h | 1 + >> include/ras/ras_event.h | 1 + >> mm/memory-failure.c | 3 ++- >> 3 files changed, 4 insertions(+), 1 deletion(-) >> >> --- a/include/linux/mm.h~mm-memory-failure-add-new-memory-failure-message-mf_msg_huge_zero >> +++ a/include/linux/mm.h >> @@ -3275,6 +3275,7 @@ enum mf_action_page_type { >> MF_MSG_SLAB, >> MF_MSG_DIFFERENT_COMPOUND, >> MF_MSG_HUGE, >> + MF_MSG_HUGE_ZERO, >> MF_MSG_FREE_HUGE, >> MF_MSG_NON_PMD_HUGE, >> MF_MSG_UNMAP_FAILED, >> --- a/include/ras/ras_event.h~mm-memory-failure-add-new-memory-failure-message-mf_msg_huge_zero >> +++ a/include/ras/ras_event.h >> @@ -359,6 +359,7 @@ TRACE_EVENT(aer_event, >> EM ( MF_MSG_SLAB, "kernel slab page" ) \ >> EM ( MF_MSG_DIFFERENT_COMPOUND, "different compound page after locking" ) \ >> EM ( MF_MSG_HUGE, "huge page" ) \ >> + EM ( MF_MSG_HUGE_ZERO, "huge zero page" ) \ >> EM ( MF_MSG_FREE_HUGE, "free huge page" ) \ >> EM ( MF_MSG_NON_PMD_HUGE, "non-pmd-sized huge page" ) \ >> EM ( MF_MSG_UNMAP_FAILED, "unmapping failed page" ) \ >> --- a/mm/memory-failure.c~mm-memory-failure-add-new-memory-failure-message-mf_msg_huge_zero >> +++ a/mm/memory-failure.c >> @@ -719,6 +719,7 @@ static const char * const action_page_ty >> [MF_MSG_SLAB] = "kernel slab page", >> [MF_MSG_DIFFERENT_COMPOUND] = "different compound page after locking", >> [MF_MSG_HUGE] = "huge page", >> + [MF_MSG_HUGE_ZERO] = "huge zero page", >> [MF_MSG_FREE_HUGE] = "free huge page", >> [MF_MSG_NON_PMD_HUGE] = "non-pmd-sized huge page", >> [MF_MSG_UNMAP_FAILED] = "unmapping failed page", >> @@ -1859,7 +1860,7 @@ try_again: >> * TODO: Handle memory failure of huge_zero_page thoroughly. >> */ >> if (is_huge_zero_page(hpage)) { >> - action_result(pfn, MF_MSG_UNSPLIT_THP, MF_IGNORED); >> + action_result(pfn, MF_MSG_HUGE_ZERO, MF_IGNORED); >> res = -EBUSY; >> goto unlock_mutex; >> } >> _ >> >> Patches currently in -mm which might be from anshuman.khandual@xxxxxxx are >> >> mm-debug_vm_pgtable-drop-protection_map-usage.patch >> mm-mmap-clarify-protection_map-indices.patch >> mm-mmap-add-new-config-arch_has_vm_get_page_prot.patch >> powerpc-mm-enable-arch_has_vm_get_page_prot.patch >> arm64-mm-enable-arch_has_vm_get_page_prot.patch >> sparc-mm-enable-arch_has_vm_get_page_prot.patch >> mm-mmap-drop-arch_filter_pgprot.patch >> mm-mmap-drop-arch_vm_get_page_pgprot.patch >> mm-memory-failure-add-new-memory-failure-message-mf_msg_huge_zero.patch