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

mm/memcg: Convert mem_cgroup_charge() to take a folio 



Convert all callers of mem_cgroup_charge() to call page_folio() on the
page they're currently passing in.  Many of them will be converted to
use folios themselves soon.

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

include/linux/memcontrol.h

+21 −7
Original line number Diff line number Diff line
@@ -694,14 +694,28 @@ static inline bool mem_cgroup_below_min(struct mem_cgroup *memcg) 
		page_counter_read(&memcg->memory);

}



int __mem_cgroup_charge(struct page *page, struct mm_struct *mm,

			gfp_t gfp_mask);

static inline int mem_cgroup_charge(struct page *page, struct mm_struct *mm,

				    gfp_t gfp_mask)

int __mem_cgroup_charge(struct folio *folio, struct mm_struct *mm, gfp_t gfp);



/**

 * mem_cgroup_charge - Charge a newly allocated folio to a cgroup.

 * @folio: Folio to charge.

 * @mm: mm context of the allocating task.

 * @gfp: Reclaim mode.

 *

 * Try to charge @folio to the memcg that @mm belongs to, reclaiming

 * pages according to @gfp if necessary.  If @mm is NULL, try to

 * charge to the active memcg.

 *

 * Do not use this for folios allocated for swapin.

 *

 * Return: 0 on success. Otherwise, an error code is returned.

 */

static inline int mem_cgroup_charge(struct folio *folio, struct mm_struct *mm,

				    gfp_t gfp)

{

	if (mem_cgroup_disabled())

		return 0;

	return __mem_cgroup_charge(page, mm, gfp_mask);

	return __mem_cgroup_charge(folio, mm, gfp);

}



int mem_cgroup_swapin_charge_page(struct page *page, struct mm_struct *mm,
@@ -1199,8 +1213,8 @@ static inline bool mem_cgroup_below_min(struct mem_cgroup *memcg) 
	return false;

}



static inline int mem_cgroup_charge(struct page *page, struct mm_struct *mm,

				    gfp_t gfp_mask)

static inline int mem_cgroup_charge(struct folio *folio,

		struct mm_struct *mm, gfp_t gfp)

{

	return 0;

}

kernel/events/uprobes.c

+2 −1
Original line number Diff line number Diff line
@@ -167,7 +167,8 @@ static int __replace_page(struct vm_area_struct *vma, unsigned long addr, 
				addr + PAGE_SIZE);



	if (new_page) {

		err = mem_cgroup_charge(new_page, vma->vm_mm, GFP_KERNEL);

		err = mem_cgroup_charge(page_folio(new_page), vma->vm_mm,

					GFP_KERNEL);

		if (err)

			return err;

	}

mm/filemap.c

+1 −1
Original line number Diff line number Diff line
@@ -889,7 +889,7 @@ noinline int __add_to_page_cache_locked(struct page *page, 
	page->index = offset;



	if (!huge) {

		error = mem_cgroup_charge(page, NULL, gfp);

		error = mem_cgroup_charge(page_folio(page), NULL, gfp);

		if (error)

			goto error;

		charged = true;

mm/huge_memory.c

+1 −1
Original line number Diff line number Diff line
@@ -603,7 +603,7 @@ static vm_fault_t __do_huge_pmd_anonymous_page(struct vm_fault *vmf, 


	VM_BUG_ON_PAGE(!PageCompound(page), page);



	if (mem_cgroup_charge(page, vma->vm_mm, gfp)) {

	if (mem_cgroup_charge(page_folio(page), vma->vm_mm, gfp)) {

		put_page(page);

		count_vm_event(THP_FAULT_FALLBACK);

		count_vm_event(THP_FAULT_FALLBACK_CHARGE);

mm/khugepaged.c

+2 −2
Original line number Diff line number Diff line
@@ -1087,7 +1087,7 @@ static void collapse_huge_page(struct mm_struct *mm, 
		goto out_nolock;

	}



	if (unlikely(mem_cgroup_charge(new_page, mm, gfp))) {

	if (unlikely(mem_cgroup_charge(page_folio(new_page), mm, gfp))) {

		result = SCAN_CGROUP_CHARGE_FAIL;

		goto out_nolock;

	}
@@ -1658,7 +1658,7 @@ static void collapse_file(struct mm_struct *mm, 
		goto out;

	}



	if (unlikely(mem_cgroup_charge(new_page, mm, gfp))) {

	if (unlikely(mem_cgroup_charge(page_folio(new_page), mm, gfp))) {

		result = SCAN_CGROUP_CHARGE_FAIL;

		goto out;

	}