Commit f6c7590b authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle) Committed by Andrew Morton

memcg: use a folio in get_mctgt_type_thp

Replace five calls to compound_head() with one.

Link: https://lkml.kernel.org/r/20240111181219.3462852-5-willy@infradead.orgSigned-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Acked-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
Reviewed-by: default avatarRoman Gushchin <roman.gushchin@linux.dev>
Reviewed-by: default avatarMuchun Song <muchun.song@linux.dev>
Acked-by: default avatarShakeel Butt <shakeelb@google.com>
Acked-by: default avatarMichal Hocko <mhocko@suse.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent b67fa6e4
...@@ -6194,6 +6194,7 @@ static enum mc_target_type get_mctgt_type_thp(struct vm_area_struct *vma, ...@@ -6194,6 +6194,7 @@ static enum mc_target_type get_mctgt_type_thp(struct vm_area_struct *vma,
unsigned long addr, pmd_t pmd, union mc_target *target) unsigned long addr, pmd_t pmd, union mc_target *target)
{ {
struct page *page = NULL; struct page *page = NULL;
struct folio *folio;
enum mc_target_type ret = MC_TARGET_NONE; enum mc_target_type ret = MC_TARGET_NONE;
if (unlikely(is_swap_pmd(pmd))) { if (unlikely(is_swap_pmd(pmd))) {
...@@ -6203,17 +6204,18 @@ static enum mc_target_type get_mctgt_type_thp(struct vm_area_struct *vma, ...@@ -6203,17 +6204,18 @@ static enum mc_target_type get_mctgt_type_thp(struct vm_area_struct *vma,
} }
page = pmd_page(pmd); page = pmd_page(pmd);
VM_BUG_ON_PAGE(!page || !PageHead(page), page); VM_BUG_ON_PAGE(!page || !PageHead(page), page);
folio = page_folio(page);
if (!(mc.flags & MOVE_ANON)) if (!(mc.flags & MOVE_ANON))
return ret; return ret;
if (page_memcg(page) == mc.from) { if (folio_memcg(folio) == mc.from) {
ret = MC_TARGET_PAGE; ret = MC_TARGET_PAGE;
if (target) { if (target) {
get_page(page); folio_get(folio);
if (!trylock_page(page)) { if (!folio_trylock(folio)) {
put_page(page); folio_put(folio);
return MC_TARGET_NONE; return MC_TARGET_NONE;
} }
target->folio = page_folio(page); target->folio = folio;
} }
} }
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment