leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mm/mlock: Add mlock_vma_folio()

Browse Source 
Convert mlock_page() into mlock_folio() and convert the callers.  Keep
mlock_vma_page() as a wrapper.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
This commit is contained in:
Matthew Wilcox (Oracle) 2022-02-15 13:33:59 -05:00
parent e83c09a24e
commit dcc5d337c5
2 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mm/internal.h
View File

@ -416,8 +416,8 @@ extern int mlock_future_check(struct mm_struct *mm, unsigned long flags,
* pte mappings of THPs, which cannot be consistently counted: a pte * pte mappings of THPs, which cannot be consistently counted: a pte
* mapping of the THP head cannot be distinguished by the page alone. * mapping of the THP head cannot be distinguished by the page alone.
*/ */
void mlock_page(struct page *page); void mlock_folio(struct folio *folio);
static inline void mlock_vma_page(struct page *page, static inline void mlock_vma_folio(struct folio *folio,
struct vm_area_struct *vma, bool compound) struct vm_area_struct *vma, bool compound)
{ {
/* /*
@ -429,9 +429,16 @@ static inline void mlock_vma_page(struct page *page,
* still be set while VM_SPECIAL bits are added: so ignore it then. * still be set while VM_SPECIAL bits are added: so ignore it then.
*/ */
if (unlikely((vma->vm_flags & (VM_LOCKED|VM_SPECIAL)) == VM_LOCKED) && if (unlikely((vma->vm_flags & (VM_LOCKED|VM_SPECIAL)) == VM_LOCKED) &&
(compound || !PageTransCompound(page))) (compound || !folio_test_large(folio)))
mlock_page(page); mlock_folio(folio);
} }
static inline void mlock_vma_page(struct page *page,
struct vm_area_struct *vma, bool compound)
{
mlock_vma_folio(page_folio(page), vma, compound);
}
void munlock_page(struct page *page); void munlock_page(struct page *page);
static inline void munlock_vma_page(struct page *page, static inline void munlock_vma_page(struct page *page,
struct vm_area_struct *vma, bool compound) struct vm_area_struct *vma, bool compound)

22
mm/mlock.c
View File

@ -218,23 +218,23 @@ bool need_mlock_page_drain(int cpu)
} }
/** /**
* mlock_page - mlock a page already on (or temporarily off) LRU * mlock_folio - mlock a folio already on (or temporarily off) LRU
* @page: page to be mlocked, either a normal page or a THP head. * @folio: folio to be mlocked.
*/ */
void mlock_page(struct page *page) void mlock_folio(struct folio *folio)
{ {
struct pagevec *pvec = &get_cpu_var(mlock_pvec); struct pagevec *pvec = &get_cpu_var(mlock_pvec);
if (!TestSetPageMlocked(page)) { if (!folio_test_set_mlocked(folio)) {
int nr_pages = thp_nr_pages(page); int nr_pages = folio_nr_pages(folio);
mod_zone_page_state(page_zone(page), NR_MLOCK, nr_pages); zone_stat_mod_folio(folio, NR_MLOCK, nr_pages);
__count_vm_events(UNEVICTABLE_PGMLOCKED, nr_pages); __count_vm_events(UNEVICTABLE_PGMLOCKED, nr_pages);
} }
get_page(page); folio_get(folio);
if (!pagevec_add(pvec, mlock_lru(page)) || if (!pagevec_add(pvec, mlock_lru(&folio->page)) ||
PageHead(page) || lru_cache_disabled()) folio_test_large(folio) || lru_cache_disabled())
mlock_pagevec(pvec); mlock_pagevec(pvec);
put_cpu_var(mlock_pvec); put_cpu_var(mlock_pvec);
} }
@ -296,7 +296,7 @@ static int mlock_pte_range(pmd_t *pmd, unsigned long addr,
goto out; goto out;
page = pmd_page(*pmd); page = pmd_page(*pmd);
if (vma->vm_flags & VM_LOCKED) if (vma->vm_flags & VM_LOCKED)
mlock_page(page); mlock_folio(page_folio(page));
else else
munlock_page(page); munlock_page(page);
goto out; goto out;
@ -312,7 +312,7 @@ static int mlock_pte_range(pmd_t *pmd, unsigned long addr,
if (PageTransCompound(page)) if (PageTransCompound(page))
continue; continue;
if (vma->vm_flags & VM_LOCKED) if (vma->vm_flags & VM_LOCKED)
mlock_page(page); mlock_folio(page_folio(page));
else else
munlock_page(page); munlock_page(page);
} }