Revert "mm/memory-failure.c: fix race with changing page compound again"

Reverts commit 888af2701db7 ("mm/memory-failure.c: fix race with changing
page compound again") because now we fetch the page refcount under
hugetlb_lock in try_memory_failure_hugetlb() so that the race check is no
longer necessary.

Link: https://lkml.kernel.org/r/20220408135323.1559401-4-naoya.horiguchi@linux.dev
Signed-off-by: Naoya Horiguchi <naoya.horiguchi@nec.com>
Suggested-by: Miaohe Lin <linmiaohe@huawei.com>
Reviewed-by: Miaohe Lin <linmiaohe@huawei.com>
Reviewed-by: Mike Kravetz <mike.kravetz@oracle.com>
Cc: Miaohe Lin <linmiaohe@huawei.com>
Cc: Yang Shi <shy828301@gmail.com>
Cc: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/include/linux/mm.h b/include/linux/mm.h
index 9f44254af8ce9e6d229adfe027e3ba5955ce50e8..d446e834a3e5c3712b40d4a31cca12e29e31d695 100644 (file)
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -3251,7 +3251,6 @@ enum mf_action_page_type {
        MF_MSG_BUDDY,
        MF_MSG_DAX,
        MF_MSG_UNSPLIT_THP,
-       MF_MSG_DIFFERENT_PAGE_SIZE,
        MF_MSG_UNKNOWN,
 };
 

diff --git a/include/ras/ras_event.h b/include/ras/ras_event.h
index 1e694fd239b9ad1e8735f46db3aa88dbf1e1fa90..d0337a41141c84da69d043c255c1b17fc0acf8dd 100644 (file)
--- a/include/ras/ras_event.h
+++ b/include/ras/ras_event.h
@@ -374,7 +374,6 @@ TRACE_EVENT(aer_event,
        EM ( MF_MSG_BUDDY, "free buddy page" )                          \
        EM ( MF_MSG_DAX, "dax page" )                                   \
        EM ( MF_MSG_UNSPLIT_THP, "unsplit thp" )                        \
-       EM ( MF_MSG_DIFFERENT_PAGE_SIZE, "different page size" )        \
        EMe ( MF_MSG_UNKNOWN, "unknown page" )
 
 /*

diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index 44510efd0829166decd383313ffadf558a2084b1..8af37f76e7bacfeacb9fe1ebda3c203fa20f0bf8 100644 (file)
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -733,7 +733,6 @@ static const char * const action_page_types[] = {
        [MF_MSG_BUDDY]                  = "free buddy page",
        [MF_MSG_DAX]                    = "dax page",
        [MF_MSG_UNSPLIT_THP]            = "unsplit thp",
-       [MF_MSG_DIFFERENT_PAGE_SIZE]    = "different page size",
        [MF_MSG_UNKNOWN]                = "unknown page",
 };
 
@@ -1605,16 +1604,6 @@ retry:
                return res == MF_RECOVERED ? 0 : -EBUSY;
        }
 
-       /*
-        * The page could have changed compound pages due to race window.
-        * If this happens just bail out.
-        */
-       if (!PageHuge(p) || compound_head(p) != head) {
-               action_result(pfn, MF_MSG_DIFFERENT_PAGE_SIZE, MF_IGNORED);
-               res = -EBUSY;
-               goto out;
-       }
-
        page_flags = head->flags;
 
        /*