mm: Convert [un]account_slab_page() to struct slab

Convert the parameter of these functions to struct slab instead of
struct page and drop _page from the names. For now their callers just
convert page to slab.

[ vbabka@suse.cz: replace existing functions instead of calling them ]

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Vlastimil Babka <vbabka@suse.cz>
Acked-by: Johannes Weiner <hannes@cmpxchg.org>
Reviewed-by: Roman Gushchin <guro@fb.com>

diff --git a/mm/slab.c b/mm/slab.c
index 381875e23277174ac05ffa339690fe66af1014dd..7f147805d0abdbd5133976086cff318ca67ca9b1 100644 (file)
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -1380,7 +1380,7 @@ static struct page *kmem_getpages(struct kmem_cache *cachep, gfp_t flags,
                return NULL;
        }
 
-       account_slab_page(page, cachep->gfporder, cachep, flags);
+       account_slab(page_slab(page), cachep->gfporder, cachep, flags);
        __SetPageSlab(page);
        /* Record if ALLOC_NO_WATERMARKS was set when allocating the slab */
        if (sk_memalloc_socks() && page_is_pfmemalloc(page))
@@ -1405,7 +1405,7 @@ static void kmem_freepages(struct kmem_cache *cachep, struct page *page)
 
        if (current->reclaim_state)
                current->reclaim_state->reclaimed_slab += 1 << order;
-       unaccount_slab_page(page, order, cachep);
+       unaccount_slab(page_slab(page), order, cachep);
        __free_pages(page, order);
 }
 

diff --git a/mm/slab.h b/mm/slab.h
index 0e67a8cb7f8098db8ab2bfee2559ffbbbac48b3e..dd3f72fddff6d85c4784771d267b6174cade0345 100644 (file)
--- a/mm/slab.h
+++ b/mm/slab.h
@@ -583,24 +583,23 @@ static inline struct kmem_cache *virt_to_cache(const void *obj)
        return page->slab_cache;
 }
 
-static __always_inline void account_slab_page(struct page *page, int order,
-                                             struct kmem_cache *s,
-                                             gfp_t gfp)
+static __always_inline void account_slab(struct slab *slab, int order,
+                                        struct kmem_cache *s, gfp_t gfp)
 {
        if (memcg_kmem_enabled() && (s->flags & SLAB_ACCOUNT))
-               memcg_alloc_page_obj_cgroups(page, s, gfp, true);
+               memcg_alloc_page_obj_cgroups(slab_page(slab), s, gfp, true);
 
-       mod_node_page_state(page_pgdat(page), cache_vmstat_idx(s),
+       mod_node_page_state(slab_pgdat(slab), cache_vmstat_idx(s),
                            PAGE_SIZE << order);
 }
 
-static __always_inline void unaccount_slab_page(struct page *page, int order,
-                                               struct kmem_cache *s)
+static __always_inline void unaccount_slab(struct slab *slab, int order,
+                                          struct kmem_cache *s)
 {
        if (memcg_kmem_enabled())
-               memcg_free_page_obj_cgroups(page);
+               memcg_free_page_obj_cgroups(slab_page(slab));
 
-       mod_node_page_state(page_pgdat(page), cache_vmstat_idx(s),
+       mod_node_page_state(slab_pgdat(slab), cache_vmstat_idx(s),
                            -(PAGE_SIZE << order));
 }
 

diff --git a/mm/slub.c b/mm/slub.c
index a211d96011bab26a7b78ed65359388375bf4c9a1..c94fb4b4d6551b47ea09921074b2d08e569bb0aa 100644 (file)
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -1943,7 +1943,7 @@ static struct page *allocate_slab(struct kmem_cache *s, gfp_t flags, int node)
 
        page->objects = oo_objects(oo);
 
-       account_slab_page(page, oo_order(oo), s, flags);
+       account_slab(page_slab(page), oo_order(oo), s, flags);
 
        page->slab_cache = s;
        __SetPageSlab(page);
@@ -2014,7 +2014,7 @@ static void __free_slab(struct kmem_cache *s, struct page *page)
        page->slab_cache = NULL;
        if (current->reclaim_state)
                current->reclaim_state->reclaimed_slab += pages;
-       unaccount_slab_page(page, order, s);
+       unaccount_slab(page_slab(page), order, s);
        __free_pages(page, order);
 }