mm/workingset: Convert workingset_activation to take a folio

This function already assumed it was being passed a head page.  No real
change here, except that thp_nr_pages() compiles away on kernels with
THP compiled out while folio_nr_pages() is always present.  Also convert
page_memcg_rcu() to folio_memcg_rcu().

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: David Howells <dhowells@redhat.com>
Acked-by: Vlastimil Babka <vbabka@suse.cz>
This commit is contained in:
Matthew Wilcox (Oracle)
2021-05-04 17:19:13 -04:00
parent 0de340cbed
commit c5ce619a77
4 changed files with 18 additions and 19 deletions

View File

@@ -393,13 +393,11 @@ out:
/**
* workingset_activation - note a page activation
* @page: page that is being activated
* @folio: Folio that is being activated.
*/
void workingset_activation(struct page *page)
void workingset_activation(struct folio *folio)
{
struct folio *folio = page_folio(page);
struct mem_cgroup *memcg;
struct lruvec *lruvec;
rcu_read_lock();
/*
@@ -409,11 +407,10 @@ void workingset_activation(struct page *page)
* XXX: See workingset_refault() - this should return
* root_mem_cgroup even for !CONFIG_MEMCG.
*/
memcg = page_memcg_rcu(page);
memcg = folio_memcg_rcu(folio);
if (!mem_cgroup_disabled() && !memcg)
goto out;
lruvec = folio_lruvec(folio);
workingset_age_nonresident(lruvec, thp_nr_pages(page));
workingset_age_nonresident(folio_lruvec(folio), folio_nr_pages(folio));
out:
rcu_read_unlock();
}