niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

mm: huge_memory: convert madvise_free_huge_pmd to use a folio

Browse source 
Using folios instead of pages removes several calls to compound_head(),

Link: https://lkml.kernel.org/r/20221207023431.151008-1-wangkefeng.wang@huawei.com
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Reviewed-by: Vishal Moola (Oracle) <vishal.moola@gmail.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Kefeng Wang 2022-12-07 10:34:30 +08:00 • committed by Andrew Morton
parent cb6c33d4dc
commit fc986a38b6
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
mm/huge_memory.c
View file

@ -1603,7 +1603,7 @@ bool madvise_free_huge_pmd(struct mmu_gather *tlb, struct vm_area_struct *vma,
{ {
spinlock_t *ptl; spinlock_t *ptl;
pmd_t orig_pmd; pmd_t orig_pmd;
struct page *page; struct folio *folio;
struct mm_struct *mm = tlb->mm; struct mm_struct *mm = tlb->mm;
bool ret = false; bool ret = false;
@ -1623,15 +1623,15 @@ bool madvise_free_huge_pmd(struct mmu_gather *tlb, struct vm_area_struct *vma,
goto out; goto out;
} }
page = pmd_page(orig_pmd); folio = pfn_folio(pmd_pfn(orig_pmd));
/* /*
* If other processes are mapping this page, we couldn't discard * If other processes are mapping this folio, we couldn't discard
* the page unless they all do MADV_FREE so let's skip the page. * the folio unless they all do MADV_FREE so let's skip the folio.
*/ */
if (total_mapcount(page) != 1) if (folio_mapcount(folio) != 1)
goto out; goto out;
if (!trylock_page(page)) if (!folio_trylock(folio))
goto out; goto out;
/* /*
@ -1639,17 +1639,17 @@ bool madvise_free_huge_pmd(struct mmu_gather *tlb, struct vm_area_struct *vma,
* will deactivate only them. * will deactivate only them.
*/ */
if (next - addr != HPAGE_PMD_SIZE) { if (next - addr != HPAGE_PMD_SIZE) {
get_page(page); folio_get(folio);
spin_unlock(ptl); spin_unlock(ptl);
split_huge_page(page); split_folio(folio);
unlock_page(page); folio_unlock(folio);
put_page(page); folio_put(folio);
goto out_unlocked; goto out_unlocked;
} }
if (PageDirty(page)) if (folio_test_dirty(folio))
ClearPageDirty(page); folio_clear_dirty(folio);
unlock_page(page); folio_unlock(folio);
if (pmd_young(orig_pmd) || pmd_dirty(orig_pmd)) { if (pmd_young(orig_pmd) || pmd_dirty(orig_pmd)) {
pmdp_invalidate(vma, addr, pmd); pmdp_invalidate(vma, addr, pmd);
@ -1660,7 +1660,7 @@ bool madvise_free_huge_pmd(struct mmu_gather *tlb, struct vm_area_struct *vma,
tlb_remove_pmd_tlb_entry(tlb, pmd, addr); tlb_remove_pmd_tlb_entry(tlb, pmd, addr);
} }
mark_page_lazyfree(page); mark_page_lazyfree(&folio->page);
ret = true; ret = true;
out: out:
spin_unlock(ptl); spin_unlock(ptl);