Skip to content

Commit

Permalink
mm: hugetlb: cleanup duplicated code in unmapping vm range
Browse files Browse the repository at this point in the history
Fix code duplication in __unmap_hugepage_range(), such as pte_page() and
huge_pte_none().

Signed-off-by: Hillf Danton <dhillf@gmail.com>
Cc: Michal Hocko <mhocko@suse.cz>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Hugh Dickins <hughd@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Hillf Danton authored and Linus Torvalds committed Mar 23, 2012
1 parent 934e18b commit 6629326
Showing 1 changed file with 11 additions and 14 deletions.
25 changes: 11 additions & 14 deletions mm/hugetlb.c
Original file line number Diff line number Diff line change
Expand Up @@ -2331,16 +2331,23 @@ void __unmap_hugepage_range(struct vm_area_struct *vma, unsigned long start,
if (huge_pmd_unshare(mm, &address, ptep))
continue;

pte = huge_ptep_get(ptep);
if (huge_pte_none(pte))
continue;

/*
* HWPoisoned hugepage is already unmapped and dropped reference
*/
if (unlikely(is_hugetlb_entry_hwpoisoned(pte)))
continue;

page = pte_page(pte);
/*
* If a reference page is supplied, it is because a specific
* page is being unmapped, not a range. Ensure the page we
* are about to unmap is the actual page of interest.
*/
if (ref_page) {
pte = huge_ptep_get(ptep);
if (huge_pte_none(pte))
continue;
page = pte_page(pte);
if (page != ref_page)
continue;

Expand All @@ -2353,16 +2360,6 @@ void __unmap_hugepage_range(struct vm_area_struct *vma, unsigned long start,
}

pte = huge_ptep_get_and_clear(mm, address, ptep);
if (huge_pte_none(pte))
continue;

/*
* HWPoisoned hugepage is already unmapped and dropped reference
*/
if (unlikely(is_hugetlb_entry_hwpoisoned(pte)))
continue;

page = pte_page(pte);
if (pte_dirty(pte))
set_page_dirty(page);
list_add(&page->lru, &page_list);
Expand Down

0 comments on commit 6629326

Please sign in to comment.