mm: memcontrol: use generic mod_memcg_page_state for kmem pages

The kmem-specific functions do the same thing.  Switch and drop.

Link: http://lkml.kernel.org/r/20170530181724.27197-5-hannes@cmpxchg.org
Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
Acked-by: Vladimir Davydov <vdavydov.dev@gmail.com>
Cc: Josef Bacik <josef@toxicpanda.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Rik van Riel <riel@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h
index fa506ae61d66f678047bcaab7ba40ae8de40e636..5a72d837794243349d46f3a11ee717f941ccf93c 100644 (file)
--- a/include/linux/memcontrol.h
+++ b/include/linux/memcontrol.h
@@ -929,19 +929,6 @@ static inline int memcg_cache_id(struct mem_cgroup *memcg)
        return memcg ? memcg->kmemcg_id : -1;
 }
 
-/**
- * memcg_kmem_update_page_stat - update kmem page state statistics
- * @page: the page
- * @idx: page state item to account
- * @val: number of pages (positive or negative)
- */
-static inline void memcg_kmem_update_page_stat(struct page *page,
-                               enum memcg_stat_item idx, int val)
-{
-       if (memcg_kmem_enabled() && page->mem_cgroup)
-               this_cpu_add(page->mem_cgroup->stat->count[idx], val);
-}
-
 #else
 #define for_each_memcg_cache_index(_idx)       \
        for (; NULL; )
@@ -964,10 +951,6 @@ static inline void memcg_put_cache_ids(void)
 {
 }
 
-static inline void memcg_kmem_update_page_stat(struct page *page,
-                               enum memcg_stat_item idx, int val)
-{
-}
 #endif /* CONFIG_MEMCG && !CONFIG_SLOB */
 
 #endif /* _LINUX_MEMCONTROL_H */

diff --git a/kernel/fork.c b/kernel/fork.c
index e53770d2bf956bf5bf6ec1a42c75121552713da6..aa01b810c0bdc872c275df43424c045a6eb56d2a 100644 (file)
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -326,8 +326,8 @@ static void account_kernel_stack(struct task_struct *tsk, int account)
                }
 
                /* All stack pages belong to the same memcg. */
-               memcg_kmem_update_page_stat(vm->pages[0], MEMCG_KERNEL_STACK_KB,
-                                           account * (THREAD_SIZE / 1024));
+               mod_memcg_page_state(vm->pages[0], MEMCG_KERNEL_STACK_KB,
+                                    account * (THREAD_SIZE / 1024));
        } else {
                /*
                 * All stack pages are in the same zone and belong to the
@@ -338,8 +338,8 @@ static void account_kernel_stack(struct task_struct *tsk, int account)
                mod_zone_page_state(page_zone(first_page), NR_KERNEL_STACK_KB,
                                    THREAD_SIZE / 1024 * account);
 
-               memcg_kmem_update_page_stat(first_page, MEMCG_KERNEL_STACK_KB,
-                                           account * (THREAD_SIZE / 1024));
+               mod_memcg_page_state(first_page, MEMCG_KERNEL_STACK_KB,
+                                    account * (THREAD_SIZE / 1024));
        }
 }
 

diff --git a/mm/slab.h b/mm/slab.h
index 69f0579cb5aa8e512fedc3f2b6abf73df1a8f09d..7b84e3839dfef16b3338900c2ddbc6dcc5b95a03 100644 (file)
--- a/mm/slab.h
+++ b/mm/slab.h
@@ -285,10 +285,10 @@ static __always_inline int memcg_charge_slab(struct page *page,
        if (ret)
                return ret;
 
-       memcg_kmem_update_page_stat(page,
-                       (s->flags & SLAB_RECLAIM_ACCOUNT) ?
-                       NR_SLAB_RECLAIMABLE : NR_SLAB_UNRECLAIMABLE,
-                       1 << order);
+       mod_memcg_page_state(page,
+                            (s->flags & SLAB_RECLAIM_ACCOUNT) ?
+                            NR_SLAB_RECLAIMABLE : NR_SLAB_UNRECLAIMABLE,
+                            1 << order);
        return 0;
 }
 
@@ -298,10 +298,10 @@ static __always_inline void memcg_uncharge_slab(struct page *page, int order,
        if (!memcg_kmem_enabled())
                return;
 
-       memcg_kmem_update_page_stat(page,
-                       (s->flags & SLAB_RECLAIM_ACCOUNT) ?
-                       NR_SLAB_RECLAIMABLE : NR_SLAB_UNRECLAIMABLE,
-                       -(1 << order));
+       mod_memcg_page_state(page,
+                            (s->flags & SLAB_RECLAIM_ACCOUNT) ?
+                            NR_SLAB_RECLAIMABLE : NR_SLAB_UNRECLAIMABLE,
+                            -(1 << order));
        memcg_kmem_uncharge(page, order);
 }