Commit 74d555be authored by Roman Gushchin's avatar Roman Gushchin Committed by Linus Torvalds
Browse files

mm: slab: rename (un)charge_slab_page() to (un)account_slab_page() 



charge_slab_page() and uncharge_slab_page() are not related anymore to
memcg charging and uncharging.  In order to make their names less
confusing, let's rename them to account_slab_page() and
unaccount_slab_page() respectively.

Signed-off-by: default avatarRoman Gushchin <guro@fb.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Reviewed-by: default avatarShakeel Butt <shakeelb@google.com>
Acked-by: default avatarVlastimil Babka <vbabka@suse.cz>
Cc: Christoph Lameter <cl@linux.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Pekka Enberg <penberg@kernel.org>
Link: http://lkml.kernel.org/r/20200707173612.124425-2-guro@fb.com


Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 84950480

mm/slab.c

+2 −2
Original line number Diff line number Diff line
@@ -1379,7 +1379,7 @@ static struct page *kmem_getpages(struct kmem_cache *cachep, gfp_t flags, 
		return NULL;

	}



	charge_slab_page(page, cachep->gfporder, cachep);

	account_slab_page(page, cachep->gfporder, cachep);

	__SetPageSlab(page);

	/* Record if ALLOC_NO_WATERMARKS was set when allocating the slab */

	if (sk_memalloc_socks() && page_is_pfmemalloc(page))
@@ -1403,7 +1403,7 @@ static void kmem_freepages(struct kmem_cache *cachep, struct page *page) 


	if (current->reclaim_state)

		current->reclaim_state->reclaimed_slab += 1 << order;

	uncharge_slab_page(page, order, cachep);

	unaccount_slab_page(page, order, cachep);

	__free_pages(page, order);

}

mm/slab.h

+4 −4
Original line number Diff line number Diff line
@@ -423,14 +423,14 @@ static inline struct kmem_cache *virt_to_cache(const void *obj) 
	return page->slab_cache;

}



static __always_inline void charge_slab_page(struct page *page, int order,

static __always_inline void account_slab_page(struct page *page, int order,

					      struct kmem_cache *s)

{

	mod_node_page_state(page_pgdat(page), cache_vmstat_idx(s),

			    PAGE_SIZE << order);

}



static __always_inline void uncharge_slab_page(struct page *page, int order,

static __always_inline void unaccount_slab_page(struct page *page, int order,

						struct kmem_cache *s)

{

	if (memcg_kmem_enabled())

mm/slub.c

+2 −2
Original line number Diff line number Diff line
@@ -1621,7 +1621,7 @@ static inline struct page *alloc_slab_page(struct kmem_cache *s, 
		page = __alloc_pages_node(node, flags, order);



	if (page)

		charge_slab_page(page, order, s);

		account_slab_page(page, order, s);



	return page;

}
@@ -1844,7 +1844,7 @@ static void __free_slab(struct kmem_cache *s, struct page *page) 
	page->mapping = NULL;

	if (current->reclaim_state)

		current->reclaim_state->reclaimed_slab += pages;

	uncharge_slab_page(page, order, s);

	unaccount_slab_page(page, order, s);

	__free_pages(page, order);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE