mm, hwpoison: enable memory error handling on 1GB hugepage

Now error handling code is prepared, so remove the blocking code and
enable memory error handling on 1GB hugepage.

Link: https://lkml.kernel.org/r/20220714042420.1847125-9-naoya.horiguchi@linux.dev
Signed-off-by: Naoya Horiguchi <naoya.horiguchi@nec.com>
Reviewed-by: Miaohe Lin <linmiaohe@huawei.com>
Cc: David Hildenbrand <david@redhat.com>
Cc: kernel test robot <lkp@intel.com>
Cc: Liu Shixin <liushixin2@huawei.com>
Cc: Mike Kravetz <mike.kravetz@oracle.com>
Cc: Muchun Song <songmuchun@bytedance.com>
Cc: Oscar Salvador <osalvador@suse.de>
Cc: Yang Shi <shy828301@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/include/linux/mm.h b/include/linux/mm.h
index 0345b8c303942e8ba0f8fdaa8af3e117df699997..3bedc449c14d8f80530dd7ce6ece6c7c57d6eaa7 100644 (file)
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -3229,7 +3229,6 @@ enum mf_action_page_type {
        MF_MSG_DIFFERENT_COMPOUND,
        MF_MSG_HUGE,
        MF_MSG_FREE_HUGE,
-       MF_MSG_NON_PMD_HUGE,
        MF_MSG_UNMAP_FAILED,
        MF_MSG_DIRTY_SWAPCACHE,
        MF_MSG_CLEAN_SWAPCACHE,

diff --git a/include/ras/ras_event.h b/include/ras/ras_event.h
index d0337a41141c84da69d043c255c1b17fc0acf8dd..cbd3ddd7c33d4d12326bafbc3c33c60c6317358e 100644 (file)
--- a/include/ras/ras_event.h
+++ b/include/ras/ras_event.h
@@ -360,7 +360,6 @@ TRACE_EVENT(aer_event,
        EM ( MF_MSG_DIFFERENT_COMPOUND, "different compound page after locking" ) \
        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" )           \
        EM ( MF_MSG_UNMAP_FAILED, "unmapping failed page" )             \
        EM ( MF_MSG_DIRTY_SWAPCACHE, "dirty swapcache page" )           \
        EM ( MF_MSG_CLEAN_SWAPCACHE, "clean swapcache page" )           \

diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index de4aff85e46668da602a5913492eab3a3ed1d265..14439806b5efc40327aefa05777422bcfca50611 100644 (file)
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -768,7 +768,6 @@ static const char * const action_page_types[] = {
        [MF_MSG_DIFFERENT_COMPOUND]     = "different compound page after locking",
        [MF_MSG_HUGE]                   = "huge 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",
        [MF_MSG_DIRTY_SWAPCACHE]        = "dirty swapcache page",
        [MF_MSG_CLEAN_SWAPCACHE]        = "clean swapcache page",
@@ -1885,21 +1884,6 @@ retry:
 
        page_flags = head->flags;
 
-       /*
-        * TODO: hwpoison for pud-sized hugetlb doesn't work right now, so
-        * simply disable it. In order to make it work properly, we need
-        * make sure that:
-        *  - conversion of a pud that maps an error hugetlb into hwpoison
-        *    entry properly works, and
-        *  - other mm code walking over page table is aware of pud-aligned
-        *    hwpoison entries.
-        */
-       if (huge_page_size(page_hstate(head)) > PMD_SIZE) {
-               action_result(pfn, MF_MSG_NON_PMD_HUGE, MF_IGNORED);
-               res = -EBUSY;
-               goto out;
-       }
-
        if (!hwpoison_user_mappings(p, pfn, flags, head)) {
                action_result(pfn, MF_MSG_UNMAP_FAILED, MF_IGNORED);
                res = -EBUSY;