From: Konstantin Khlebnikov <khlebnikov@openvz.org>
To: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Hugh Dickins <hughd@google.com>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"linux-mm@kvack.org" <linux-mm@kvack.org>,
Johannes Weiner <hannes@cmpxchg.org>,
Andrew Morton <akpm@linux-foundation.org>,
Andi Kleen <andi@firstfloor.org>
Subject: Re: [PATCH v3 15/21] mm: handle lruvec relocks on lumpy reclaim
Date: Tue, 28 Feb 2012 10:25:44 +0400 [thread overview]
Message-ID: <4F4C7368.3090006@openvz.org> (raw)
In-Reply-To: <20120228100100.d59291d6.kamezawa.hiroyu@jp.fujitsu.com>
KAMEZAWA Hiroyuki wrote:
> On Thu, 23 Feb 2012 17:52:52 +0400
> Konstantin Khlebnikov<khlebnikov@openvz.org> wrote:
>
>> Prepare for lock splitting in lumly reclaim logic.
>> Now move_active_pages_to_lru() and putback_inactive_pages()
>> can put pages into different lruvecs.
>>
>> * relock book before SetPageLRU()
>
> lruvec ?
yeah, this came from v1
>
>> * update reclaim_stat pointer after relocks
>> * return currently locked lruvec
>>
>> Signed-off-by: Konstantin Khlebnikov<khlebnikov@openvz.org>
>> ---
>> mm/vmscan.c | 45 +++++++++++++++++++++++++++++++++------------
>> 1 files changed, 33 insertions(+), 12 deletions(-)
>>
>> diff --git a/mm/vmscan.c b/mm/vmscan.c
>> index a3941d1..6eeeb4b 100644
>> --- a/mm/vmscan.c
>> +++ b/mm/vmscan.c
>> @@ -1114,6 +1114,7 @@ static unsigned long isolate_lru_pages(unsigned long nr_to_scan,
>> unsigned long *nr_scanned, struct scan_control *sc,
>> isolate_mode_t mode, int active, int file)
>> {
>> + struct lruvec *cursor_lruvec = lruvec;
>> struct list_head *src;
>> unsigned long nr_taken = 0;
>> unsigned long nr_lumpy_taken = 0;
>> @@ -1197,14 +1198,17 @@ static unsigned long isolate_lru_pages(unsigned long nr_to_scan,
>> !PageSwapCache(cursor_page))
>> break;
>>
>> + /* Switch cursor_lruvec lock for lumpy isolate */
>> + if (!__lock_page_lruvec_irq(&cursor_lruvec,
>> + cursor_page))
>> + continue;
>> +
>> if (__isolate_lru_page(cursor_page, mode, file) == 0) {
>> unsigned int isolated_pages;
>> - struct lruvec *cursor_lruvec;
>> int cursor_lru = page_lru(cursor_page);
>>
>> list_move(&cursor_page->lru, dst);
>> isolated_pages = hpage_nr_pages(cursor_page);
>> - cursor_lruvec = page_lruvec(cursor_page);
>> cursor_lruvec->pages_count[cursor_lru] -=
>> isolated_pages;
>> VM_BUG_ON((long)cursor_lruvec->
>> @@ -1235,6 +1239,9 @@ static unsigned long isolate_lru_pages(unsigned long nr_to_scan,
>> }
>> }
>>
>> + /* Restore original lruvec lock */
>> + cursor_lruvec = __relock_page_lruvec(cursor_lruvec, page);
>> +
>> /* If we break out of the loop above, lumpy reclaim failed */
>> if (pfn< end_pfn)
>> nr_lumpy_failed++;
>> @@ -1325,7 +1332,10 @@ static int too_many_isolated(struct zone *zone, int file,
>> return isolated> inactive;
>> }
>>
>> -static noinline_for_stack void
>> +/*
>> + * Returns currently locked lruvec
>> + */
>> +static noinline_for_stack struct lruvec *
>> putback_inactive_pages(struct lruvec *lruvec,
>> struct list_head *page_list)
>> {
>> @@ -1347,10 +1357,13 @@ putback_inactive_pages(struct lruvec *lruvec,
>> lock_lruvec_irq(lruvec);
>> continue;
>> }
>> +
>> + lruvec = __relock_page_lruvec(lruvec, page);
>> + reclaim_stat =&lruvec->reclaim_stat;
>> +
>> SetPageLRU(page);
>> lru = page_lru(page);
>>
>> - lruvec = page_lruvec(page);
>> add_page_to_lru_list(lruvec, page, lru);
>> if (is_active_lru(lru)) {
>> int file = is_file_lru(lru);
>> @@ -1375,6 +1388,8 @@ putback_inactive_pages(struct lruvec *lruvec,
>> * To save our caller's stack, now use input list for pages to free.
>> */
>> list_splice(&pages_to_free, page_list);
>> +
>> + return lruvec;
>> }
>>
>> static noinline_for_stack void
>> @@ -1544,7 +1559,7 @@ shrink_inactive_list(unsigned long nr_to_scan, struct lruvec *lruvec,
>> __count_vm_events(KSWAPD_STEAL, nr_reclaimed);
>> __count_zone_vm_events(PGSTEAL, zone, nr_reclaimed);
>>
>> - putback_inactive_pages(lruvec,&page_list);
>> + lruvec = putback_inactive_pages(lruvec,&page_list);
>>
>> __mod_zone_page_state(zone, NR_ISOLATED_ANON, -nr_anon);
>> __mod_zone_page_state(zone, NR_ISOLATED_FILE, -nr_file);
>> @@ -1603,12 +1618,15 @@ shrink_inactive_list(unsigned long nr_to_scan, struct lruvec *lruvec,
>> *
>> * The downside is that we have to touch page->_count against each page.
>> * But we had to alter page->flags anyway.
>> + *
>> + * Returns currently locked lruvec
>> */
>>
>> -static void move_active_pages_to_lru(struct lruvec *lruvec,
>> - struct list_head *list,
>> - struct list_head *pages_to_free,
>> - enum lru_list lru)
>> +static struct lruvec *
>> +move_active_pages_to_lru(struct lruvec *lruvec,
>> + struct list_head *list,
>> + struct list_head *pages_to_free,
>> + enum lru_list lru)
>> {
>> unsigned long pgmoved = 0;
>> struct page *page;
>> @@ -1630,10 +1648,11 @@ static void move_active_pages_to_lru(struct lruvec *lruvec,
>>
>> page = lru_to_page(list);
>>
>> + lruvec = __relock_page_lruvec(lruvec, page);
>> +
>> VM_BUG_ON(PageLRU(page));
>> SetPageLRU(page);
>>
>> - lruvec = page_lruvec(page);
>> list_move(&page->lru,&lruvec->pages_lru[lru]);
>> numpages = hpage_nr_pages(page);
>> lruvec->pages_count[lru] += numpages;
>> @@ -1655,6 +1674,8 @@ static void move_active_pages_to_lru(struct lruvec *lruvec,
>> __mod_zone_page_state(lruvec_zone(lruvec), NR_LRU_BASE + lru, pgmoved);
>> if (!is_active_lru(lru))
>> __count_vm_events(PGDEACTIVATE, pgmoved);
>> +
>> + return lruvec;
>> }
>>
>> static void shrink_active_list(unsigned long nr_to_scan,
>> @@ -1744,9 +1765,9 @@ static void shrink_active_list(unsigned long nr_to_scan,
>> */
>> reclaim_stat->recent_rotated[file] += nr_rotated;
>>
>> - move_active_pages_to_lru(lruvec,&l_active,&l_hold,
>> + lruvec = move_active_pages_to_lru(lruvec,&l_active,&l_hold,
>> LRU_ACTIVE + file * LRU_FILE);
>> - move_active_pages_to_lru(lruvec,&l_inactive,&l_hold,
>> + lruvec = move_active_pages_to_lru(lruvec,&l_inactive,&l_hold,
>> LRU_BASE + file * LRU_FILE);
>> __mod_zone_page_state(zone, NR_ISOLATED_ANON + file, -nr_taken);
>> unlock_lruvec_irq(lruvec);
>>
>
> Hmm...could you add comments to each function as
> "The caller should _lock_ lruvec before calling this functions.
> This function returns a lruvec with _locked_. It may be different from passed one.
> And The callser should unlock lruvec"
Ok. Documenting is not my best side =)
>
>
> Thanks,
> -Kame
>
>
>
>
> --
> 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>
--
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-02-28 6:25 UTC|newest]
Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-23 13:51 [PATCH v3 00/21] mm: lru_lock splitting Konstantin Khlebnikov
2012-02-23 13:51 ` [PATCH v3 01/21] memcg: unify inactive_ratio calculation Konstantin Khlebnikov
2012-02-28 0:05 ` KAMEZAWA Hiroyuki
2012-02-23 13:51 ` [PATCH v3 02/21] memcg: make mm_match_cgroup() hirarchical Konstantin Khlebnikov
2012-02-23 18:03 ` Johannes Weiner
2012-02-23 19:46 ` Konstantin Khlebnikov
2012-02-23 22:06 ` Johannes Weiner
2012-02-28 0:11 ` KAMEZAWA Hiroyuki
2012-02-28 6:31 ` Konstantin Khlebnikov
2012-02-23 13:51 ` [PATCH v3 03/21] memcg: fix page_referencies cgroup filter on global reclaim Konstantin Khlebnikov
2012-02-28 0:13 ` KAMEZAWA Hiroyuki
2012-02-23 13:51 ` [PATCH v3 04/21] memcg: use vm_swappiness from target memory cgroup Konstantin Khlebnikov
2012-02-28 0:15 ` KAMEZAWA Hiroyuki
2012-02-23 13:52 ` [PATCH v3 05/21] mm: rename lruvec->lists into lruvec->pages_lru Konstantin Khlebnikov
2012-02-28 0:20 ` KAMEZAWA Hiroyuki
2012-02-28 6:04 ` Konstantin Khlebnikov
2012-02-23 13:52 ` [PATCH v3 06/21] mm: lruvec linking functions Konstantin Khlebnikov
2012-02-28 0:27 ` KAMEZAWA Hiroyuki
2012-02-28 6:09 ` Konstantin Khlebnikov
2012-02-23 13:52 ` [PATCH v3 07/21] mm: add lruvec->pages_count Konstantin Khlebnikov
2012-02-28 0:35 ` KAMEZAWA Hiroyuki
2012-02-28 6:16 ` Konstantin Khlebnikov
2012-02-23 13:52 ` [PATCH v3 08/21] mm: unify inactive_list_is_low() Konstantin Khlebnikov
2012-02-28 0:36 ` KAMEZAWA Hiroyuki
2012-02-23 13:52 ` [PATCH v3 09/21] mm: add lruvec->reclaim_stat Konstantin Khlebnikov
2012-02-28 0:38 ` KAMEZAWA Hiroyuki
2012-02-23 13:52 ` [PATCH v3 10/21] mm: kill struct mem_cgroup_zone Konstantin Khlebnikov
2012-02-28 0:41 ` KAMEZAWA Hiroyuki
2012-02-23 13:52 ` [PATCH v3 11/21] mm: move page-to-lruvec translation upper Konstantin Khlebnikov
2012-02-28 0:42 ` KAMEZAWA Hiroyuki
2012-02-23 13:52 ` [PATCH v3 12/21] mm: push lruvec into update_page_reclaim_stat() Konstantin Khlebnikov
2012-02-28 0:44 ` KAMEZAWA Hiroyuki
2012-02-23 13:52 ` [PATCH v3 13/21] mm: push lruvecs from pagevec_lru_move_fn() to iterator Konstantin Khlebnikov
2012-02-28 0:45 ` KAMEZAWA Hiroyuki
2012-02-23 13:52 ` [PATCH v3 14/21] mm: introduce lruvec locking primitives Konstantin Khlebnikov
2012-02-28 0:56 ` KAMEZAWA Hiroyuki
2012-02-28 6:23 ` Konstantin Khlebnikov
2012-02-23 13:52 ` [PATCH v3 15/21] mm: handle lruvec relocks on lumpy reclaim Konstantin Khlebnikov
2012-02-28 1:01 ` KAMEZAWA Hiroyuki
2012-02-28 6:25 ` Konstantin Khlebnikov [this message]
2012-02-23 13:52 ` [PATCH v3 16/21] mm: handle lruvec relocks in compaction Konstantin Khlebnikov
2012-02-28 1:13 ` KAMEZAWA Hiroyuki
2012-02-28 6:31 ` Konstantin Khlebnikov
2012-02-23 13:53 ` [PATCH v3 17/21] mm: handle lruvec relock in memory controller Konstantin Khlebnikov
2012-02-28 1:22 ` KAMEZAWA Hiroyuki
2012-02-23 13:53 ` [PATCH v3 18/21] mm: add to lruvec isolated pages counters Konstantin Khlebnikov
2012-02-24 5:32 ` Konstantin Khlebnikov
2012-02-28 1:38 ` KAMEZAWA Hiroyuki
2012-02-23 13:53 ` [PATCH v3 19/21] memcg: check lru vectors emptiness in pre-destroy Konstantin Khlebnikov
2012-02-28 1:43 ` KAMEZAWA Hiroyuki
2012-02-23 13:53 ` [PATCH v3 20/21] mm: split zone->lru_lock Konstantin Khlebnikov
2012-02-28 1:49 ` KAMEZAWA Hiroyuki
2012-02-28 6:39 ` Konstantin Khlebnikov
2012-02-23 13:53 ` [PATCH v3 21/21] mm: zone lru vectors interleaving Konstantin Khlebnikov
2012-02-23 14:44 ` Hillf Danton
2012-02-23 16:21 ` Andi Kleen
2012-02-23 18:48 ` [PATCH 1/2] mm: configure lruvec split by boot options Konstantin Khlebnikov
2012-02-23 18:48 ` [PATCH 2/2] mm: show zone lruvec state in /proc/zoneinfo Konstantin Khlebnikov
2012-02-25 0:05 ` [PATCH v3 00/21] mm: lru_lock splitting Tim Chen
2012-02-25 5:34 ` Konstantin Khlebnikov
2012-02-25 2:15 ` KAMEZAWA Hiroyuki
2012-02-25 5:31 ` Konstantin Khlebnikov
2012-02-26 23:54 ` KAMEZAWA Hiroyuki
2012-02-28 1:52 ` KAMEZAWA Hiroyuki
2012-02-28 6:49 ` Konstantin Khlebnikov
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=4F4C7368.3090006@openvz.org \
--to=khlebnikov@openvz.org \
--cc=akpm@linux-foundation.org \
--cc=andi@firstfloor.org \
--cc=hannes@cmpxchg.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: 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;
as well as URLs for NNTP newsgroup(s).