Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d715ae08 authored by Michal Hocko's avatar Michal Hocko Committed by Linus Torvalds
Browse files

memcg: rename high level charging functions 



mem_cgroup_newpage_charge is used only for charging anonymous memory so
it is better to rename it to mem_cgroup_charge_anon.

mem_cgroup_cache_charge is used for file backed memory so rename it to
mem_cgroup_charge_file.

Signed-off-by: default avatarMichal Hocko <mhocko@suse.cz>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6d1fdc48

Documentation/cgroups/memcg_test.txt

+2 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ Please note that implementation details can be changed. 


   a page/swp_entry may be charged (usage += PAGE_SIZE) at



	mem_cgroup_newpage_charge()

	mem_cgroup_charge_anon()

	  Called at new page fault and Copy-On-Write.



	mem_cgroup_try_charge_swapin()
@@ -32,7 +32,7 @@ Please note that implementation details can be changed. 
	  Followed by charge-commit-cancel protocol. (With swap accounting)

	  At commit, a charge recorded in swap_cgroup is removed.



	mem_cgroup_cache_charge()

	mem_cgroup_charge_file()

	  Called at add_to_page_cache()



	mem_cgroup_cache_charge_swapin()

include/linux/memcontrol.h

+4 −4
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ struct mem_cgroup_reclaim_cookie { 
 * (Of course, if memcg does memory allocation in future, GFP_KERNEL is sane.)

 */



extern int mem_cgroup_newpage_charge(struct page *page, struct mm_struct *mm,

extern int mem_cgroup_charge_anon(struct page *page, struct mm_struct *mm,

				gfp_t gfp_mask);

/* for swap handling */

extern int mem_cgroup_try_charge_swapin(struct mm_struct *mm,
@@ -74,7 +74,7 @@ extern void mem_cgroup_commit_charge_swapin(struct page *page, 
					struct mem_cgroup *memcg);

extern void mem_cgroup_cancel_charge_swapin(struct mem_cgroup *memcg);



extern int mem_cgroup_cache_charge(struct page *page, struct mm_struct *mm,

extern int mem_cgroup_charge_file(struct page *page, struct mm_struct *mm,

					gfp_t gfp_mask);



struct lruvec *mem_cgroup_zone_lruvec(struct zone *, struct mem_cgroup *);
@@ -233,13 +233,13 @@ void mem_cgroup_print_bad_page(struct page *page); 
#else /* CONFIG_MEMCG */

struct mem_cgroup;



static inline int mem_cgroup_newpage_charge(struct page *page,

static inline int mem_cgroup_charge_anon(struct page *page,

					struct mm_struct *mm, gfp_t gfp_mask)

{

	return 0;

}



static inline int mem_cgroup_cache_charge(struct page *page,

static inline int mem_cgroup_charge_file(struct page *page,

					struct mm_struct *mm, gfp_t gfp_mask)

{

	return 0;

mm/filemap.c

+1 −1
Original line number Diff line number Diff line
@@ -563,7 +563,7 @@ static int __add_to_page_cache_locked(struct page *page, 
	VM_BUG_ON_PAGE(!PageLocked(page), page);

	VM_BUG_ON_PAGE(PageSwapBacked(page), page);



	error = mem_cgroup_cache_charge(page, current->mm,

	error = mem_cgroup_charge_file(page, current->mm,

					gfp_mask & GFP_RECLAIM_MASK);

	if (error)

		return error;

mm/huge_memory.c

+4 −4
Original line number Diff line number Diff line
@@ -827,7 +827,7 @@ int do_huge_pmd_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma, 
		count_vm_event(THP_FAULT_FALLBACK);

		return VM_FAULT_FALLBACK;

	}

	if (unlikely(mem_cgroup_newpage_charge(page, mm, GFP_KERNEL))) {

	if (unlikely(mem_cgroup_charge_anon(page, mm, GFP_KERNEL))) {

		put_page(page);

		count_vm_event(THP_FAULT_FALLBACK);

		return VM_FAULT_FALLBACK;
@@ -968,7 +968,7 @@ static int do_huge_pmd_wp_page_fallback(struct mm_struct *mm, 
					       __GFP_OTHER_NODE,

					       vma, address, page_to_nid(page));

		if (unlikely(!pages[i] ||

			     mem_cgroup_newpage_charge(pages[i], mm,

			     mem_cgroup_charge_anon(pages[i], mm,

						       GFP_KERNEL))) {

			if (pages[i])

				put_page(pages[i]);
@@ -1101,7 +1101,7 @@ int do_huge_pmd_wp_page(struct mm_struct *mm, struct vm_area_struct *vma, 
		goto out;

	}



	if (unlikely(mem_cgroup_newpage_charge(new_page, mm, GFP_KERNEL))) {

	if (unlikely(mem_cgroup_charge_anon(new_page, mm, GFP_KERNEL))) {

		put_page(new_page);

		if (page) {

			split_huge_page(page);
@@ -2359,7 +2359,7 @@ static void collapse_huge_page(struct mm_struct *mm, 
	if (!new_page)

		return;



	if (unlikely(mem_cgroup_newpage_charge(new_page, mm, GFP_KERNEL)))

	if (unlikely(mem_cgroup_charge_anon(new_page, mm, GFP_KERNEL)))

		return;



	/*

mm/memcontrol.c

+2 −2
Original line number Diff line number Diff line
@@ -3818,7 +3818,7 @@ static int mem_cgroup_move_parent(struct page *page, 
	return ret;

}



int mem_cgroup_newpage_charge(struct page *page,

int mem_cgroup_charge_anon(struct page *page,

			      struct mm_struct *mm, gfp_t gfp_mask)

{

	unsigned int nr_pages = 1;
@@ -3954,7 +3954,7 @@ void mem_cgroup_commit_charge_swapin(struct page *page, 
					  MEM_CGROUP_CHARGE_TYPE_ANON);

}



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

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

				gfp_t gfp_mask)

{

	enum charge_type type = MEM_CGROUP_CHARGE_TYPE_CACHE;