lkml.org 
[lkml]   [2020]   [Jun]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 01/15] mm,hwpoison: cleanup unused PageHuge() check
    Date
    From: Naoya Horiguchi <naoya.horiguchi@nec.com>

    Drop the PageHuge check, which is dead code since memory_failure() forks
    into memory_failure_hugetlb() for hugetlb pages.

    memory_failure() and memory_failure_hugetlb() shares some functions like
    hwpoison_user_mappings() and identify_page_state(), so they should properly
    handle 4kB page, thp, and hugetlb.

    Signed-off-by: Naoya Horiguchi <naoya.horiguchi@nec.com>
    Signed-off-by: Oscar Salvador <osalvador@suse.de>
    ---
    changelog v2 -> v3:
    - add description about shared logic b/w hugetlb and non-hugetlb path.
    ---
    mm/memory-failure.c | 5 +----
    1 file changed, 1 insertion(+), 4 deletions(-)

    diff --git v5.8-rc1-mmots-2020-06-20-21-44/mm/memory-failure.c v5.8-rc1-mmots-2020-06-20-21-44_patched/mm/memory-failure.c
    index 47b8ccb1fb9b..e5d0c14c2332 100644
    --- v5.8-rc1-mmots-2020-06-20-21-44/mm/memory-failure.c
    +++ v5.8-rc1-mmots-2020-06-20-21-44_patched/mm/memory-failure.c
    @@ -1382,10 +1382,7 @@ int memory_failure(unsigned long pfn, int flags)
    * page_remove_rmap() in try_to_unmap_one(). So to determine page status
    * correctly, we save a copy of the page flags at this time.
    */
    - if (PageHuge(p))
    - page_flags = hpage->flags;
    - else
    - page_flags = p->flags;
    + page_flags = p->flags;

    /*
    * unpoison always clear PG_hwpoison inside page lock
    --
    2.17.1
    \
     
     \ /
      Last update: 2020-06-24 17:02    [W:4.186 / U:0.108 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site