From: Johannes Weiner <hannes@cmpxchg.org> To: Josef Bacik <josef@toxicpanda.com> Cc: Michal Hocko <mhocko@suse.com>, Vladimir Davydov <vdavydov.dev@gmail.com>, Andrew Morton <akpm@linux-foundation.org>, Rik van Riel <riel@redhat.com>, linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-team@fb.com Subject: [PATCH 4/6] mm: memcontrol: use generic mod_memcg_page_state for kmem pages Date: Tue, 30 May 2017 14:17:22 -0400 [thread overview] Message-ID: <20170530181724.27197-5-hannes@cmpxchg.org> (raw) In-Reply-To: <20170530181724.27197-1-hannes@cmpxchg.org> The kmem-specific functions do the same thing. Switch and drop. Signed-off-by: Johannes Weiner <hannes@cmpxchg.org> --- include/linux/memcontrol.h | 17 ----------------- kernel/fork.c | 8 ++++---- mm/slab.h | 16 ++++++++-------- 3 files changed, 12 insertions(+), 29 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 7b8f0f239fd6..62139aff6033 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -884,19 +884,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; ) @@ -919,10 +906,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 aa1076c5e4a9..b5f45fe81a43 100644 --- 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 69f0579cb5aa..7b84e3839dfe 100644 --- 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); } -- 2.12.2
WARNING: multiple messages have this Message-ID (diff)
From: Johannes Weiner <hannes@cmpxchg.org> To: Josef Bacik <josef@toxicpanda.com> Cc: Michal Hocko <mhocko@suse.com>, Vladimir Davydov <vdavydov.dev@gmail.com>, Andrew Morton <akpm@linux-foundation.org>, Rik van Riel <riel@redhat.com>, linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-team@fb.com Subject: [PATCH 4/6] mm: memcontrol: use generic mod_memcg_page_state for kmem pages Date: Tue, 30 May 2017 14:17:22 -0400 [thread overview] Message-ID: <20170530181724.27197-5-hannes@cmpxchg.org> (raw) In-Reply-To: <20170530181724.27197-1-hannes@cmpxchg.org> The kmem-specific functions do the same thing. Switch and drop. Signed-off-by: Johannes Weiner <hannes@cmpxchg.org> --- include/linux/memcontrol.h | 17 ----------------- kernel/fork.c | 8 ++++---- mm/slab.h | 16 ++++++++-------- 3 files changed, 12 insertions(+), 29 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 7b8f0f239fd6..62139aff6033 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -884,19 +884,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; ) @@ -919,10 +906,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 aa1076c5e4a9..b5f45fe81a43 100644 --- 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 69f0579cb5aa..7b84e3839dfe 100644 --- 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); } -- 2.12.2 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2017-05-30 18:17 UTC|newest] Thread overview: 77+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-05-30 18:17 [PATCH 0/6] mm: per-lruvec slab stats Johannes Weiner 2017-05-30 18:17 ` Johannes Weiner 2017-05-30 18:17 ` [PATCH 1/6] mm: vmscan: delete unused pgdat_reclaimable_pages() Johannes Weiner 2017-05-30 18:17 ` Johannes Weiner 2017-05-30 21:50 ` Andrew Morton 2017-05-30 21:50 ` Andrew Morton 2017-05-30 22:02 ` Johannes Weiner 2017-05-30 22:02 ` Johannes Weiner 2017-05-30 18:17 ` [PATCH 2/6] mm: vmstat: move slab statistics from zone to node counters Johannes Weiner 2017-05-30 18:17 ` Johannes Weiner 2017-05-31 9:12 ` Heiko Carstens 2017-05-31 9:12 ` Heiko Carstens 2017-05-31 9:12 ` Heiko Carstens 2017-05-31 11:39 ` Heiko Carstens 2017-05-31 11:39 ` Heiko Carstens 2017-05-31 17:11 ` Yury Norov 2017-05-31 17:11 ` Yury Norov 2017-06-01 10:07 ` Michael Ellerman 2017-06-01 10:07 ` Michael Ellerman 2017-06-01 10:07 ` Michael Ellerman 2017-06-05 18:35 ` Johannes Weiner 2017-06-05 18:35 ` Johannes Weiner 2017-06-05 18:35 ` Johannes Weiner 2017-06-05 21:38 ` Andrew Morton 2017-06-05 21:38 ` Andrew Morton 2017-06-05 21:38 ` Andrew Morton 2017-06-07 16:20 ` Johannes Weiner 2017-06-07 16:20 ` Johannes Weiner 2017-06-06 4:31 ` Michael Ellerman 2017-06-06 4:31 ` Michael Ellerman 2017-06-06 4:31 ` Michael Ellerman 2017-06-06 11:15 ` Michael Ellerman 2017-06-06 11:15 ` Michael Ellerman 2017-06-06 11:15 ` Michael Ellerman 2017-06-06 14:33 ` Johannes Weiner 2017-06-06 14:33 ` Johannes Weiner 2017-06-06 14:33 ` Johannes Weiner 2017-05-30 18:17 ` [PATCH 3/6] mm: memcontrol: use the node-native slab memory counters Johannes Weiner 2017-05-30 18:17 ` Johannes Weiner 2017-06-03 17:39 ` Vladimir Davydov 2017-06-03 17:39 ` Vladimir Davydov 2017-06-03 17:39 ` Vladimir Davydov 2017-05-30 18:17 ` Johannes Weiner [this message] 2017-05-30 18:17 ` [PATCH 4/6] mm: memcontrol: use generic mod_memcg_page_state for kmem pages Johannes Weiner 2017-06-03 17:40 ` Vladimir Davydov 2017-06-03 17:40 ` Vladimir Davydov 2017-05-30 18:17 ` [PATCH 5/6] mm: memcontrol: per-lruvec stats infrastructure Johannes Weiner 2017-05-30 18:17 ` Johannes Weiner 2017-05-31 17:14 ` Johannes Weiner 2017-05-31 17:14 ` Johannes Weiner 2017-05-31 17:14 ` Johannes Weiner 2017-05-31 18:18 ` Andrew Morton 2017-05-31 18:18 ` Andrew Morton 2017-05-31 18:18 ` Andrew Morton 2017-05-31 19:02 ` Tony Lindgren 2017-05-31 19:02 ` Tony Lindgren 2017-05-31 19:02 ` Tony Lindgren 2017-05-31 22:03 ` Stephen Rothwell 2017-05-31 22:03 ` Stephen Rothwell 2017-06-01 1:44 ` Johannes Weiner 2017-06-01 1:44 ` Johannes Weiner 2017-06-01 1:44 ` Johannes Weiner 2017-06-03 17:50 ` Vladimir Davydov 2017-06-03 17:50 ` Vladimir Davydov 2017-06-03 17:50 ` Vladimir Davydov 2017-06-05 17:53 ` Johannes Weiner 2017-06-05 17:53 ` Johannes Weiner 2017-06-05 17:53 ` Johannes Weiner 2017-05-30 18:17 ` [PATCH 6/6] mm: memcontrol: account slab stats per lruvec Johannes Weiner 2017-05-30 18:17 ` Johannes Weiner 2017-06-03 17:54 ` Vladimir Davydov 2017-06-03 17:54 ` Vladimir Davydov 2017-06-05 16:52 ` [6/6] " Guenter Roeck 2017-06-05 16:52 ` Guenter Roeck 2017-06-05 17:52 ` Johannes Weiner 2017-06-05 17:52 ` Johannes Weiner 2017-06-05 17:52 ` Johannes Weiner
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20170530181724.27197-5-hannes@cmpxchg.org \ --to=hannes@cmpxchg.org \ --cc=akpm@linux-foundation.org \ --cc=cgroups@vger.kernel.org \ --cc=josef@toxicpanda.com \ --cc=kernel-team@fb.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=mhocko@suse.com \ --cc=riel@redhat.com \ --cc=vdavydov.dev@gmail.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.