diff options
| author | Naoya Horiguchi <naoya.horiguchi@nec.com> | 2022-04-28 23:16:02 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-07-12 16:35:17 +0200 |
| commit | 2fa22e7906c1caf4731dc150a464547468b4b03a (patch) | |
| tree | d93c58c4c82564880965f1fd3ccc24a62befc508 /mm | |
| parent | c1c98764c3c31e01800b7b0a1b15be7a04ebe3d8 (diff) | |
| download | linux-2fa22e7906c1caf4731dc150a464547468b4b03a.tar.gz linux-2fa22e7906c1caf4731dc150a464547468b4b03a.tar.bz2 linux-2fa22e7906c1caf4731dc150a464547468b4b03a.zip | |
Revert "mm/memory-failure.c: fix race with changing page compound again"
commit 2ba2b008a8bf5fd268a43d03ba79e0ad464d6836 upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/memory-failure.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/mm/memory-failure.c b/mm/memory-failure.c index ecd64b203272..c71135edd0a1 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -741,7 +741,6 @@ static const char * const action_page_types[] = { [MF_MSG_BUDDY_2ND] = "free buddy page (2nd try)", [MF_MSG_DAX] = "dax page", [MF_MSG_UNSPLIT_THP] = "unsplit thp", - [MF_MSG_DIFFERENT_PAGE_SIZE] = "different page size", [MF_MSG_UNKNOWN] = "unknown page", }; @@ -1526,16 +1525,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; /* |