From: Johannes Weiner <hannes@cmpxchg.org>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>,
Michal Hocko <mhocko@suse.cz>, Hugh Dickins <hughd@google.com>,
David Rientjes <rientjes@google.com>,
linux-mm@kvack.org, cgroups@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [patch 07/11] mm: memcg: remove unneeded shmem charge type
Date: Thu, 5 Jul 2012 02:44:59 +0200 [thread overview]
Message-ID: <1341449103-1986-8-git-send-email-hannes@cmpxchg.org> (raw)
In-Reply-To: <1341449103-1986-1-git-send-email-hannes@cmpxchg.org>
shmem page charges have not needed a separate charge type to tell them
from regular file pages since 08e552c 'memcg: synchronized LRU'.
Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
---
mm/memcontrol.c | 11 +----------
1 files changed, 1 insertions(+), 10 deletions(-)
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 4a41b55..418b47d 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -379,7 +379,6 @@ static bool move_file(void)
enum charge_type {
MEM_CGROUP_CHARGE_TYPE_CACHE = 0,
MEM_CGROUP_CHARGE_TYPE_ANON,
- MEM_CGROUP_CHARGE_TYPE_SHMEM, /* used by page migration of shmem */
MEM_CGROUP_CHARGE_TYPE_SWAPOUT, /* for accounting swapcache */
MEM_CGROUP_CHARGE_TYPE_DROP, /* a page was unused swap cache */
NR_CHARGE_TYPE,
@@ -2835,8 +2834,6 @@ int mem_cgroup_cache_charge(struct page *page, struct mm_struct *mm,
if (unlikely(!mm))
mm = &init_mm;
- if (!page_is_file_cache(page))
- type = MEM_CGROUP_CHARGE_TYPE_SHMEM;
if (!PageSwapCache(page))
ret = mem_cgroup_charge_common(page, mm, gfp_mask, type);
@@ -3243,10 +3240,8 @@ void mem_cgroup_prepare_migration(struct page *page, struct page *newpage,
*/
if (PageAnon(page))
ctype = MEM_CGROUP_CHARGE_TYPE_ANON;
- else if (page_is_file_cache(page))
- ctype = MEM_CGROUP_CHARGE_TYPE_CACHE;
else
- ctype = MEM_CGROUP_CHARGE_TYPE_SHMEM;
+ ctype = MEM_CGROUP_CHARGE_TYPE_CACHE;
/*
* The page is committed to the memcg, but it's not actually
* charged to the res_counter since we plan on replacing the
@@ -3340,10 +3335,6 @@ void mem_cgroup_replace_page_cache(struct page *oldpage,
*/
if (!memcg)
return;
-
- if (PageSwapBacked(oldpage))
- type = MEM_CGROUP_CHARGE_TYPE_SHMEM;
-
/*
* Even if newpage->mapping was NULL before starting replacement,
* the newpage may be on LRU(or pagevec for LRU) already. We lock
--
1.7.7.6
--
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:[~2012-07-05 0:45 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-05 0:44 [patch 00/11] mm: memcg: charge/uncharge improvements Johannes Weiner
2012-07-05 0:44 ` [patch 01/11] mm: memcg: fix compaction/migration failing due to memcg limits Johannes Weiner
2012-07-09 2:27 ` Kamezawa Hiroyuki
2012-07-09 14:15 ` Michal Hocko
2012-07-05 0:44 ` [patch 02/11] mm: swapfile: clean up unuse_pte race handling Johannes Weiner
2012-07-09 2:29 ` Kamezawa Hiroyuki
2012-07-09 14:22 ` Michal Hocko
2012-07-05 0:44 ` [patch 03/11] mm: shmem: do not try to uncharge known swapcache pages Johannes Weiner
2012-07-09 2:33 ` Kamezawa Hiroyuki
2012-07-09 14:46 ` Michal Hocko
2012-07-09 20:37 ` Hugh Dickins
2012-07-10 17:16 ` Michal Hocko
2012-07-11 18:48 ` Hugh Dickins
2012-07-12 13:51 ` Michal Hocko
2012-07-09 20:11 ` Hugh Dickins
2012-07-05 0:44 ` [patch 04/11] mm: memcg: push down PageSwapCache check into uncharge entry functions Johannes Weiner
2012-07-09 2:42 ` Kamezawa Hiroyuki
2012-07-09 7:36 ` Johannes Weiner
2012-07-09 15:02 ` Michal Hocko
2012-07-05 0:44 ` [patch 05/11] mm: memcg: only check for PageSwapCache when uncharging anon Johannes Weiner
2012-07-09 2:49 ` Kamezawa Hiroyuki
2012-07-09 15:05 ` Michal Hocko
2012-07-05 0:44 ` [patch 06/11] mm: memcg: move swapin charge functions above callsites Johannes Weiner
2012-07-09 2:50 ` Kamezawa Hiroyuki
2012-07-09 15:10 ` Michal Hocko
2012-07-05 0:44 ` Johannes Weiner [this message]
2012-07-09 2:51 ` [patch 07/11] mm: memcg: remove unneeded shmem charge type Kamezawa Hiroyuki
2012-07-09 15:17 ` Michal Hocko
2012-07-05 0:45 ` [patch 08/11] mm: memcg: remove needless !mm fixup to init_mm when charging Johannes Weiner
2012-07-09 2:53 ` Kamezawa Hiroyuki
2012-07-09 15:20 ` Michal Hocko
2012-07-10 6:10 ` Wanpeng Li
2012-07-10 6:21 ` Michal Hocko
2012-07-10 6:54 ` Wanpeng Li
2012-07-10 16:22 ` Michal Hocko
2012-07-05 0:45 ` [patch 09/11] mm: memcg: split swapin charge function into private and public part Johannes Weiner
2012-07-09 2:55 ` Kamezawa Hiroyuki
2012-07-09 15:28 ` Michal Hocko
2012-07-05 0:45 ` [patch 10/11] mm: memcg: only check swap cache pages for repeated charging Johannes Weiner
2012-07-09 3:26 ` Kamezawa Hiroyuki
2012-07-09 15:32 ` Michal Hocko
2012-07-05 0:45 ` [patch 11/11] mm: memcg: only check anon swapin page charges for swap cache Johannes Weiner
2012-07-09 3:44 ` Kamezawa Hiroyuki
2012-07-09 15:34 ` Michal Hocko
2012-07-09 15:35 ` [patch 00/11] mm: memcg: charge/uncharge improvements Michal Hocko
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=1341449103-1986-8-git-send-email-hannes@cmpxchg.org \
--to=hannes@cmpxchg.org \
--cc=akpm@linux-foundation.org \
--cc=cgroups@vger.kernel.org \
--cc=hughd@google.com \
--cc=kamezawa.hiroyu@jp.fujitsu.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mhocko@suse.cz \
--cc=rientjes@google.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox