mm-memory-failurec-rework-the-try_to_unmap-logic-in-hwpoison_user_mappings.patch removed from -mm tree
The patch titled
Subject: mm/memory-failure.c: rework the try_to_unmap logic in hwpoison_user_mappings()
has been removed from the -mm tree. Its filename was
mm-memory-failurec-rework-the-try_to_unmap-logic-in-hwpoison_user_mappings.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Miaohe Lin <[email protected]>
Subject: mm/memory-failure.c: rework the try_to_unmap logic in hwpoison_user_mappings()
Only for hugetlb pages in shared mappings, try_to_unmap should take semaphore in write mode here. Rework the code to make it clear.
---
mm/memory-failure.c | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-)
mm/memory-failure.c renamed from mm/memory-failure.c~mm-memory-failurec-rework-the-try_to_unmap-logic-in-hwpoison_user_mappings +15 -19
@@ -1404,26 +1404,22 @@ static bool hwpoison_user_mappings(strucif (kill)collect_procs (hpage, &tokill, flags &MF_ACTION_REQUIRED ); -if (!PageHuge (hpage)) { -try_to_unmap (hpage, ttu); +if (PageHuge (hpage) && !PageAnon (hpage)) { +/* +* For hugetlb pages in shared mappings, try_to_unmap +* could potentially call huge_pmd_unshare. Because of +* this, take semaphore in write mode here and set +* TTU_RMAP_LOCKED to indicate we have taken the lock +* at this higher level. +*/ + mapping =hugetlb_page_mapping_lock_write (hpage); +if (mapping) { +try_to_unmap (hpage, ttu|TTU_RMAP_LOCKED ); +i_mmap_unlock_write (mapping); + }else +pr_info ("Memory failure: %#lx: could not lock mapping for mapped huge page\n" , pfn); }else { -if (!PageAnon (hpage)) { -/* -* For hugetlb pages in shared mappings, try_to_unmap -* could potentially call huge_pmd_unshare. Because of -* this, take semaphore in write mode here and set -* TTU_RMAP_LOCKED to indicate we have taken the lock -* at this higher level. -*/ - mapping =hugetlb_page_mapping_lock_write (hpage); -if (mapping) { -try_to_unmap (hpage, ttu|TTU_RMAP_LOCKED ); -i_mmap_unlock_write (mapping); - }else -pr_info ("Memory failure: %#lx: could not lock mapping for mapped huge page\n" , pfn); - }else { -try_to_unmap (hpage, ttu); - } +try_to_unmap (hpage, ttu); } unmap_success = !page_mapped (hpage);
_
Patches currently in -mm which might be from [email protected] are
mm-huge_memory-make-is_transparent_hugepage-static.patch