Skip to content

Commit

Permalink
memcg: rename high level charging functions
Browse files Browse the repository at this point in the history 
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: Michal Hocko <mhocko@suse.cz>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Michal Hocko authored and Linus Torvalds committed Apr 7, 2014
1 parent 6d1fdc4 commit d715ae0
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 19 deletions.
4 changes: 2 additions & 2 deletions Documentation/cgroups/memcg_test.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ 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()
Called at do_swap_page() (page fault on swap entry) and swapoff.
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()
Expand Down
8 changes: 4 additions & 4 deletions include/linux/memcontrol.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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 *);
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion mm/filemap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions mm/huge_memory.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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]);
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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;

/*
Expand Down
4 changes: 2 additions & 2 deletions mm/memcontrol.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions mm/memory.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2828,7 +2828,7 @@ static int do_wp_page(struct mm_struct *mm, struct vm_area_struct *vma,
}
__SetPageUptodate(new_page);

if (mem_cgroup_newpage_charge(new_page, mm, GFP_KERNEL))
if (mem_cgroup_charge_anon(new_page, mm, GFP_KERNEL))
goto oom_free_new;

mmun_start = address & PAGE_MASK;
Expand Down Expand Up @@ -3281,7 +3281,7 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
*/
__SetPageUptodate(page);

if (mem_cgroup_newpage_charge(page, mm, GFP_KERNEL))
if (mem_cgroup_charge_anon(page, mm, GFP_KERNEL))
goto oom_free_page;

entry = mk_pte(page, vma->vm_page_prot);
Expand Down Expand Up @@ -3537,7 +3537,7 @@ static int do_cow_fault(struct mm_struct *mm, struct vm_area_struct *vma,
if (!new_page)
return VM_FAULT_OOM;

if (mem_cgroup_newpage_charge(new_page, mm, GFP_KERNEL)) {
if (mem_cgroup_charge_anon(new_page, mm, GFP_KERNEL)) {
page_cache_release(new_page);
return VM_FAULT_OOM;
}
Expand Down
6 changes: 3 additions & 3 deletions mm/shmem.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -683,7 +683,7 @@ int shmem_unuse(swp_entry_t swap, struct page *page)
* the shmem_swaplist_mutex which might hold up shmem_writepage().
* Charged back to the user (not to caller) when swap account is used.
*/
error = mem_cgroup_cache_charge(page, current->mm, GFP_KERNEL);
error = mem_cgroup_charge_file(page, current->mm, GFP_KERNEL);
if (error)
goto out;
/* No radix_tree_preload: swap entry keeps a place for page in tree */
Expand Down Expand Up @@ -1080,7 +1080,7 @@ static int shmem_getpage_gfp(struct inode *inode, pgoff_t index,
goto failed;
}

error = mem_cgroup_cache_charge(page, current->mm,
error = mem_cgroup_charge_file(page, current->mm,
gfp & GFP_RECLAIM_MASK);
if (!error) {
error = shmem_add_to_page_cache(page, mapping, index,
Expand Down Expand Up @@ -1134,7 +1134,7 @@ static int shmem_getpage_gfp(struct inode *inode, pgoff_t index,

SetPageSwapBacked(page);
__set_page_locked(page);
error = mem_cgroup_cache_charge(page, current->mm,
error = mem_cgroup_charge_file(page, current->mm,
gfp & GFP_RECLAIM_MASK);
if (error)
goto decused;
Expand Down

0 comments on commit d715ae0

Please sign in to comment.