mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

memcg: return the folio in union mc_target 

All users of target.page convert it to the folio, so we can just return
the folio directly and save a few calls to compound_head().

Link: https://lkml.kernel.org/r/20240111181219.3462852-3-willy@infradead.org
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Acked-by: Johannes Weiner <hannes@cmpxchg.org>
Reviewed-by: Roman Gushchin <roman.gushchin@linux.dev>
Reviewed-by: Muchun Song <muchun.song@linux.dev>
Acked-by: Shakeel Butt <shakeelb@google.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Matthew Wilcox (Oracle) 2024-01-11 18:12:17 +00:00 committed by Andrew Morton
parent b267e1a3e4
commit b46777da7d
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mm/memcontrol.c
View File

@ -5873,7 +5873,7 @@ static int mem_cgroup_do_precharge(unsigned long count)
}
union mc_target {
struct page *page;
struct folio *folio;
swp_entry_t ent;
};
@ -6095,7 +6095,7 @@ out:
* Return:
* * MC_TARGET_NONE - If the pte is not a target for move charge.
* * MC_TARGET_PAGE - If the page corresponding to this pte is a target for
* move charge. If @target is not NULL, the page is stored in target->page
* move charge. If @target is not NULL, the folio is stored in target->folio
* with extra refcnt taken (Caller should release it).
* * MC_TARGET_SWAP - If the swap entry corresponding to this pte is a
* target for charge migration. If @target is not NULL, the entry is
@ -6160,7 +6160,7 @@ static enum mc_target_type get_mctgt_type(struct vm_area_struct *vma,
is_device_coherent_page(page))
ret = MC_TARGET_DEVICE;
if (target)
target->page = page;
target->folio = page_folio(page);
}
if (!ret || !target) {
if (target)
@ -6210,7 +6210,7 @@ static enum mc_target_type get_mctgt_type_thp(struct vm_area_struct *vma,
put_page(page);
return MC_TARGET_NONE;
}
target->page = page;
target->folio = page_folio(page);
}
}
return ret;
@ -6440,7 +6440,7 @@ static int mem_cgroup_move_charge_pte_range(pmd_t *pmd,
}
target_type = get_mctgt_type_thp(vma, addr, *pmd, &target);
if (target_type == MC_TARGET_PAGE) {
folio = page_folio(target.page);
folio = target.folio;
if (folio_isolate_lru(folio)) {
if (!mem_cgroup_move_account(folio, true,
mc.from, mc.to)) {
@ -6452,7 +6452,7 @@ static int mem_cgroup_move_charge_pte_range(pmd_t *pmd,
folio_unlock(folio);
folio_put(folio);
} else if (target_type == MC_TARGET_DEVICE) {
folio = page_folio(target.page);
folio = target.folio;
if (!mem_cgroup_move_account(folio, true,
mc.from, mc.to)) {
mc.precharge -= HPAGE_PMD_NR;
@ -6482,7 +6482,7 @@ retry:
device = true;
fallthrough;
case MC_TARGET_PAGE:
folio = page_folio(target.page);
folio = target.folio;
/*
* We can have a part of the split pmd here. Moving it
* can be done but it would be too convoluted so simply