From: Konstantin Khlebnikov <khlebnikov@openvz.org> To: linux-mm@kvack.org, Andrew Morton <akpm@linux-foundation.org>, linux-kernel@vger.kernel.org Cc: Hugh Dickins <hughd@google.com>, KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Subject: [PATCH v6 6/7] mm/memcg: kill mem_cgroup_lru_del() Date: Fri, 23 Mar 2012 01:56:39 +0400 [thread overview] Message-ID: <20120322215639.27814.4996.stgit@zurg> (raw) In-Reply-To: <20120322214944.27814.42039.stgit@zurg> This patch kills mem_cgroup_lru_del(), we can use mem_cgroup_lru_del_list() instead. On 0-order isolation we already have right lru list id. Signed-off-by: Konstantin Khlebnikov <khlebnikov@openvz.org> Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Cc: Hugh Dickins <hughd@google.com> --- include/linux/memcontrol.h | 5 ----- mm/memcontrol.c | 5 ----- mm/vmscan.c | 7 +++++-- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 95dc32c..58d820c 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -66,7 +66,6 @@ struct lruvec *mem_cgroup_zone_lruvec(struct zone *, struct mem_cgroup *); struct lruvec *mem_cgroup_lru_add_list(struct zone *, struct page *, enum lru_list); void mem_cgroup_lru_del_list(struct page *, enum lru_list); -void mem_cgroup_lru_del(struct page *); struct lruvec *mem_cgroup_lru_move_lists(struct zone *, struct page *, enum lru_list, enum lru_list); @@ -260,10 +259,6 @@ static inline void mem_cgroup_lru_del_list(struct page *page, enum lru_list lru) { } -static inline void mem_cgroup_lru_del(struct page *page) -{ -} - static inline struct lruvec *mem_cgroup_lru_move_lists(struct zone *zone, struct page *page, enum lru_list from, diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 59697fb..16db6c1 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -1115,11 +1115,6 @@ void mem_cgroup_lru_del_list(struct page *page, enum lru_list lru) mz->lru_size[lru] -= 1 << compound_order(page); } -void mem_cgroup_lru_del(struct page *page) -{ - mem_cgroup_lru_del_list(page, page_lru(page)); -} - /** * mem_cgroup_lru_move_lists - account for moving a page between lrus * @zone: zone of the page diff --git a/mm/vmscan.c b/mm/vmscan.c index 5f6ed98..9de66be 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -1147,7 +1147,7 @@ static unsigned long isolate_lru_pages(unsigned long nr_to_scan, switch (__isolate_lru_page(page, mode)) { case 0: - mem_cgroup_lru_del(page); + mem_cgroup_lru_del_list(page, lru); list_move(&page->lru, dst); nr_taken += hpage_nr_pages(page); break; @@ -1205,8 +1205,11 @@ static unsigned long isolate_lru_pages(unsigned long nr_to_scan, if (__isolate_lru_page(cursor_page, mode) == 0) { unsigned int isolated_pages; + enum lru_list cursor_lru; - mem_cgroup_lru_del(cursor_page); + cursor_lru = page_lru(cursor_page); + mem_cgroup_lru_del_list(cursor_page, + cursor_lru); list_move(&cursor_page->lru, dst); isolated_pages = hpage_nr_pages(cursor_page); nr_taken += isolated_pages;
WARNING: multiple messages have this Message-ID (diff)
From: Konstantin Khlebnikov <khlebnikov@openvz.org> To: linux-mm@kvack.org, Andrew Morton <akpm@linux-foundation.org>, linux-kernel@vger.kernel.org Cc: Hugh Dickins <hughd@google.com>, KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Subject: [PATCH v6 6/7] mm/memcg: kill mem_cgroup_lru_del() Date: Fri, 23 Mar 2012 01:56:39 +0400 [thread overview] Message-ID: <20120322215639.27814.4996.stgit@zurg> (raw) In-Reply-To: <20120322214944.27814.42039.stgit@zurg> This patch kills mem_cgroup_lru_del(), we can use mem_cgroup_lru_del_list() instead. On 0-order isolation we already have right lru list id. Signed-off-by: Konstantin Khlebnikov <khlebnikov@openvz.org> Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Cc: Hugh Dickins <hughd@google.com> --- include/linux/memcontrol.h | 5 ----- mm/memcontrol.c | 5 ----- mm/vmscan.c | 7 +++++-- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 95dc32c..58d820c 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -66,7 +66,6 @@ struct lruvec *mem_cgroup_zone_lruvec(struct zone *, struct mem_cgroup *); struct lruvec *mem_cgroup_lru_add_list(struct zone *, struct page *, enum lru_list); void mem_cgroup_lru_del_list(struct page *, enum lru_list); -void mem_cgroup_lru_del(struct page *); struct lruvec *mem_cgroup_lru_move_lists(struct zone *, struct page *, enum lru_list, enum lru_list); @@ -260,10 +259,6 @@ static inline void mem_cgroup_lru_del_list(struct page *page, enum lru_list lru) { } -static inline void mem_cgroup_lru_del(struct page *page) -{ -} - static inline struct lruvec *mem_cgroup_lru_move_lists(struct zone *zone, struct page *page, enum lru_list from, diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 59697fb..16db6c1 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -1115,11 +1115,6 @@ void mem_cgroup_lru_del_list(struct page *page, enum lru_list lru) mz->lru_size[lru] -= 1 << compound_order(page); } -void mem_cgroup_lru_del(struct page *page) -{ - mem_cgroup_lru_del_list(page, page_lru(page)); -} - /** * mem_cgroup_lru_move_lists - account for moving a page between lrus * @zone: zone of the page diff --git a/mm/vmscan.c b/mm/vmscan.c index 5f6ed98..9de66be 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -1147,7 +1147,7 @@ static unsigned long isolate_lru_pages(unsigned long nr_to_scan, switch (__isolate_lru_page(page, mode)) { case 0: - mem_cgroup_lru_del(page); + mem_cgroup_lru_del_list(page, lru); list_move(&page->lru, dst); nr_taken += hpage_nr_pages(page); break; @@ -1205,8 +1205,11 @@ static unsigned long isolate_lru_pages(unsigned long nr_to_scan, if (__isolate_lru_page(cursor_page, mode) == 0) { unsigned int isolated_pages; + enum lru_list cursor_lru; - mem_cgroup_lru_del(cursor_page); + cursor_lru = page_lru(cursor_page); + mem_cgroup_lru_del_list(cursor_page, + cursor_lru); list_move(&cursor_page->lru, dst); isolated_pages = hpage_nr_pages(cursor_page); nr_taken += isolated_pages; -- 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/ . Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/ Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2012-03-22 21:57 UTC|newest] Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-03-22 21:56 [PATCH v6 0/7] mm: some simple cleanups Konstantin Khlebnikov 2012-03-22 21:56 ` Konstantin Khlebnikov 2012-03-22 21:56 ` [PATCH v6 1/7] mm/memcg: scanning_global_lru means mem_cgroup_disabled Konstantin Khlebnikov 2012-03-22 21:56 ` Konstantin Khlebnikov 2012-03-26 15:04 ` Michal Hocko 2012-03-26 15:04 ` Michal Hocko 2012-03-26 15:18 ` Johannes Weiner 2012-03-26 15:18 ` Johannes Weiner 2012-03-26 15:31 ` Michal Hocko 2012-03-26 15:31 ` Michal Hocko 2012-03-26 21:39 ` Hugh Dickins 2012-03-26 21:39 ` Hugh Dickins 2012-03-27 7:46 ` Michal Hocko 2012-03-27 7:46 ` Michal Hocko 2012-03-22 21:56 ` [PATCH v6 2/7] mm/memcg: move reclaim_stat into lruvec Konstantin Khlebnikov 2012-03-22 21:56 ` Konstantin Khlebnikov 2012-03-26 15:16 ` Michal Hocko 2012-03-26 15:16 ` Michal Hocko 2012-03-22 21:56 ` [PATCH v6 3/7] mm: push lru index into shrink_[in]active_list() Konstantin Khlebnikov 2012-03-22 21:56 ` Konstantin Khlebnikov 2012-03-23 4:48 ` Minchan Kim 2012-03-23 4:48 ` Minchan Kim 2012-03-26 15:39 ` Michal Hocko 2012-03-26 15:39 ` Michal Hocko 2012-03-22 21:56 ` [PATCH v6 4/7] mm: mark mm-inline functions as __always_inline Konstantin Khlebnikov 2012-03-22 21:56 ` Konstantin Khlebnikov 2012-03-22 21:56 ` [PATCH v6 5/7] mm: remove lru type checks from __isolate_lru_page() Konstantin Khlebnikov 2012-03-22 21:56 ` Konstantin Khlebnikov 2012-03-23 1:46 ` KAMEZAWA Hiroyuki 2012-03-23 1:46 ` KAMEZAWA Hiroyuki 2012-03-22 21:56 ` Konstantin Khlebnikov [this message] 2012-03-22 21:56 ` [PATCH v6 6/7] mm/memcg: kill mem_cgroup_lru_del() Konstantin Khlebnikov 2012-03-23 1:48 ` KAMEZAWA Hiroyuki 2012-03-23 1:48 ` KAMEZAWA Hiroyuki 2012-03-26 15:23 ` Michal Hocko 2012-03-26 15:23 ` Michal Hocko 2012-03-26 16:05 ` Konstantin Khlebnikov 2012-03-26 16:05 ` Konstantin Khlebnikov 2012-03-22 21:56 ` [PATCH v6 7/7] mm/memcg: use vm_swappiness from target memory cgroup Konstantin Khlebnikov 2012-03-22 21:56 ` Konstantin Khlebnikov 2012-03-26 15:59 ` Michal Hocko 2012-03-26 15:59 ` 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=20120322215639.27814.4996.stgit@zurg \ --to=khlebnikov@openvz.org \ --cc=akpm@linux-foundation.org \ --cc=hughd@google.com \ --cc=kamezawa.hiroyu@jp.fujitsu.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ /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.