Commit b1baabd9 authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle)
Browse files

mm/memcg: Add folio_lruvec() 



This replaces mem_cgroup_page_lruvec().  All callers converted.

Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarMike Rapoport <rppt@linux.ibm.com>
Reviewed-by: default avatarDavid Howells <dhowells@redhat.com>
Acked-by: default avatarVlastimil Babka <vbabka@suse.cz>
parent fcce4672

include/linux/memcontrol.h

+9 −11
Original line number Diff line number Diff line
@@ -784,18 +784,17 @@ static inline struct lruvec *mem_cgroup_lruvec(struct mem_cgroup *memcg, 
}



/**

 * mem_cgroup_page_lruvec - return lruvec for isolating/putting an LRU page

 * @page: the page

 * folio_lruvec - return lruvec for isolating/putting an LRU folio

 * @folio: Pointer to the folio.

 *

 * This function relies on page->mem_cgroup being stable.

 * This function relies on folio->mem_cgroup being stable.

 */

static inline struct lruvec *mem_cgroup_page_lruvec(struct page *page)

static inline struct lruvec *folio_lruvec(struct folio *folio)

{

	pg_data_t *pgdat = page_pgdat(page);

	struct mem_cgroup *memcg = page_memcg(page);

	struct mem_cgroup *memcg = folio_memcg(folio);



	VM_WARN_ON_ONCE_PAGE(!memcg && !mem_cgroup_disabled(), page);

	return mem_cgroup_lruvec(memcg, pgdat);

	VM_WARN_ON_ONCE_FOLIO(!memcg && !mem_cgroup_disabled(), folio);

	return mem_cgroup_lruvec(memcg, folio_pgdat(folio));

}



struct mem_cgroup *mem_cgroup_from_task(struct task_struct *p);
@@ -1256,10 +1255,9 @@ static inline struct lruvec *mem_cgroup_lruvec(struct mem_cgroup *memcg, 
	return &pgdat->__lruvec;

}



static inline struct lruvec *mem_cgroup_page_lruvec(struct page *page)

static inline struct lruvec *folio_lruvec(struct folio *folio)

{

	pg_data_t *pgdat = page_pgdat(page);



	struct pglist_data *pgdat = folio_pgdat(folio);

	return &pgdat->__lruvec;

}

mm/compaction.c

+1 −1
Original line number Diff line number Diff line
@@ -1022,7 +1022,7 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn, 
		if (!TestClearPageLRU(page))

			goto isolate_fail_put;



		lruvec = mem_cgroup_page_lruvec(page);

		lruvec = folio_lruvec(page_folio(page));



		/* If we already hold the lock, we can skip some rechecking */

		if (lruvec != locked) {

mm/memcontrol.c

+6 −3
Original line number Diff line number Diff line
@@ -1154,9 +1154,10 @@ void lruvec_memcg_debug(struct lruvec *lruvec, struct page *page) 
 */

struct lruvec *lock_page_lruvec(struct page *page)

{

	struct folio *folio = page_folio(page);

	struct lruvec *lruvec;



	lruvec = mem_cgroup_page_lruvec(page);

	lruvec = folio_lruvec(folio);

	spin_lock(&lruvec->lru_lock);



	lruvec_memcg_debug(lruvec, page);
@@ -1166,9 +1167,10 @@ struct lruvec *lock_page_lruvec(struct page *page) 


struct lruvec *lock_page_lruvec_irq(struct page *page)

{

	struct folio *folio = page_folio(page);

	struct lruvec *lruvec;



	lruvec = mem_cgroup_page_lruvec(page);

	lruvec = folio_lruvec(folio);

	spin_lock_irq(&lruvec->lru_lock);



	lruvec_memcg_debug(lruvec, page);
@@ -1178,9 +1180,10 @@ struct lruvec *lock_page_lruvec_irq(struct page *page) 


struct lruvec *lock_page_lruvec_irqsave(struct page *page, unsigned long *flags)

{

	struct folio *folio = page_folio(page);

	struct lruvec *lruvec;



	lruvec = mem_cgroup_page_lruvec(page);

	lruvec = folio_lruvec(folio);

	spin_lock_irqsave(&lruvec->lru_lock, *flags);



	lruvec_memcg_debug(lruvec, page);

mm/swap.c

+2 −1
Original line number Diff line number Diff line
@@ -293,7 +293,8 @@ void lru_note_cost(struct lruvec *lruvec, bool file, unsigned int nr_pages) 


void lru_note_cost_page(struct page *page)

{

	lru_note_cost(mem_cgroup_page_lruvec(page),

	struct folio *folio = page_folio(page);

	lru_note_cost(folio_lruvec(folio),

		      page_is_file_lru(page), thp_nr_pages(page));

}

mm/workingset.c

+2 −1
Original line number Diff line number Diff line
@@ -397,6 +397,7 @@ void workingset_refault(struct page *page, void *shadow) 
 */

void workingset_activation(struct page *page)

{

	struct folio *folio = page_folio(page);

	struct mem_cgroup *memcg;

	struct lruvec *lruvec;
@@ -411,7 +412,7 @@ void workingset_activation(struct page *page) 
	memcg = page_memcg_rcu(page);

	if (!mem_cgroup_disabled() && !memcg)

		goto out;

	lruvec = mem_cgroup_page_lruvec(page);

	lruvec = folio_lruvec(folio);

	workingset_age_nonresident(lruvec, thp_nr_pages(page));

out:

	rcu_read_unlock();