From: Johannes Weiner <hannes@cmpxchg.org>
To: Michal Hocko <mhocko@suse.cz>
Cc: Jerome Marchand <jmarchan@redhat.com>,
linux-mm@kvack.org, linux-kernel@vger.kernel.org,
Andrew Morton <akpm@linux-foundation.org>,
Mel Gorman <mgorman@suse.de>, Rik van Riel <riel@redhat.com>
Subject: Re: [PATCH 2/2] memcg, vmscan: Fix forced scan of anonymous pages
Date: Fri, 1 Aug 2014 14:45:25 -0400 [thread overview]
Message-ID: <20140801184525.GK9952@cmpxchg.org> (raw)
In-Reply-To: <20140731123026.GE13561@dhcp22.suse.cz>
On Thu, Jul 31, 2014 at 02:30:26PM +0200, Michal Hocko wrote:
> On Thu 31-07-14 13:49:45, Jerome Marchand wrote:
> > @@ -1950,8 +1950,11 @@ static void get_scan_count(struct lruvec *lruvec, int swappiness,
> > */
> > if (global_reclaim(sc)) {
> > unsigned long free = zone_page_state(zone, NR_FREE_PAGES);
> > + unsigned long zonefile =
> > + zone_page_state(zone, NR_LRU_BASE + LRU_ACTIVE_FILE) +
> > + zone_page_state(zone, NR_LRU_BASE + LRU_INACTIVE_FILE);
> >
> > - if (unlikely(file + free <= high_wmark_pages(zone))) {
> > + if (unlikely(zonefile + free <= high_wmark_pages(zone))) {
> > scan_balance = SCAN_ANON;
> > goto out;
> > }
>
> You could move file and anon further down when we actually use them.
Agreed with that. Can we merge this into the original patch?
---
WARNING: multiple messages have this Message-ID (diff)
From: Johannes Weiner <hannes@cmpxchg.org>
To: Michal Hocko <mhocko@suse.cz>
Cc: Jerome Marchand <jmarchan@redhat.com>,
linux-mm@kvack.org, linux-kernel@vger.kernel.org,
Andrew Morton <akpm@linux-foundation.org>,
Mel Gorman <mgorman@suse.de>, Rik van Riel <riel@redhat.com>
Subject: Re: [PATCH 2/2] memcg, vmscan: Fix forced scan of anonymous pages
Date: Fri, 1 Aug 2014 14:45:25 -0400 [thread overview]
Message-ID: <20140801184525.GK9952@cmpxchg.org> (raw)
In-Reply-To: <20140731123026.GE13561@dhcp22.suse.cz>
On Thu, Jul 31, 2014 at 02:30:26PM +0200, Michal Hocko wrote:
> On Thu 31-07-14 13:49:45, Jerome Marchand wrote:
> > @@ -1950,8 +1950,11 @@ static void get_scan_count(struct lruvec *lruvec, int swappiness,
> > */
> > if (global_reclaim(sc)) {
> > unsigned long free = zone_page_state(zone, NR_FREE_PAGES);
> > + unsigned long zonefile =
> > + zone_page_state(zone, NR_LRU_BASE + LRU_ACTIVE_FILE) +
> > + zone_page_state(zone, NR_LRU_BASE + LRU_INACTIVE_FILE);
> >
> > - if (unlikely(file + free <= high_wmark_pages(zone))) {
> > + if (unlikely(zonefile + free <= high_wmark_pages(zone))) {
> > scan_balance = SCAN_ANON;
> > goto out;
> > }
>
> You could move file and anon further down when we actually use them.
Agreed with that. Can we merge this into the original patch?
---
>From e49bef8d2751d9b27f1733e3e0eced325ffce700 Mon Sep 17 00:00:00 2001
From: Johannes Weiner <hannes@cmpxchg.org>
Date: Fri, 1 Aug 2014 10:48:26 -0400
Subject: [patch] memcg, vmscan: Fix forced scan of anonymous pages fix -
cleanups
o Use enum zone_stat_item symbols directly to select zone stats,
rather than NR_LRU_BASE plus LRU index
o scanned/rotated scaling is the only user of the lruvec anon/file
counters, so move the reads of those values to right before that
Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
---
mm/vmscan.c | 23 +++++++++++++----------
1 file changed, 13 insertions(+), 10 deletions(-)
diff --git a/mm/vmscan.c b/mm/vmscan.c
index b3f629bdf4fe..2836b5373b2e 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -1934,11 +1934,6 @@ static void get_scan_count(struct lruvec *lruvec, int swappiness,
goto out;
}
- anon = get_lru_size(lruvec, LRU_ACTIVE_ANON) +
- get_lru_size(lruvec, LRU_INACTIVE_ANON);
- file = get_lru_size(lruvec, LRU_ACTIVE_FILE) +
- get_lru_size(lruvec, LRU_INACTIVE_FILE);
-
/*
* Prevent the reclaimer from falling into the cache trap: as
* cache pages start out inactive, every cache fault will tip
@@ -1949,12 +1944,14 @@ static void get_scan_count(struct lruvec *lruvec, int swappiness,
* anon pages. Try to detect this based on file LRU size.
*/
if (global_reclaim(sc)) {
- unsigned long free = zone_page_state(zone, NR_FREE_PAGES);
- unsigned long zonefile =
- zone_page_state(zone, NR_LRU_BASE + LRU_ACTIVE_FILE) +
- zone_page_state(zone, NR_LRU_BASE + LRU_INACTIVE_FILE);
+ unsigned long zonefile;
+ unsigned long zonefree;
+
+ zonefree = zone_page_state(zone, NR_FREE_PAGES);
+ zonefile = zone_page_state(zone, NR_ACTIVE_FILE) +
+ zone_page_state(zone, NR_INACTIVE_FILE);
- if (unlikely(zonefile + free <= high_wmark_pages(zone))) {
+ if (unlikely(zonefile + zonefree <= high_wmark_pages(zone))) {
scan_balance = SCAN_ANON;
goto out;
}
@@ -1989,6 +1986,12 @@ static void get_scan_count(struct lruvec *lruvec, int swappiness,
*
* anon in [0], file in [1]
*/
+
+ anon = get_lru_size(lruvec, LRU_ACTIVE_ANON) +
+ get_lru_size(lruvec, LRU_INACTIVE_ANON);
+ file = get_lru_size(lruvec, LRU_ACTIVE_FILE) +
+ get_lru_size(lruvec, LRU_INACTIVE_FILE);
+
spin_lock_irq(&zone->lru_lock);
if (unlikely(reclaim_stat->recent_scanned[0] > anon / 4)) {
reclaim_stat->recent_scanned[0] /= 2;
--
2.0.3
next prev parent reply other threads:[~2014-08-01 18:45 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-31 11:49 [PATCH 0/2] Fix excessive swapping when memcg are enabled Jerome Marchand
2014-07-31 11:49 ` Jerome Marchand
2014-07-31 11:49 ` [PATCH 1/2] mm, vmscan: fix an outdated comment still mentioning get_scan_ratio Jerome Marchand
2014-07-31 11:49 ` Jerome Marchand
2014-07-31 11:49 ` [PATCH 2/2] memcg, vmscan: Fix forced scan of anonymous pages Jerome Marchand
2014-07-31 11:49 ` Jerome Marchand
2014-07-31 12:30 ` Michal Hocko
2014-07-31 12:30 ` Michal Hocko
2014-08-01 18:45 ` Johannes Weiner [this message]
2014-08-01 18:45 ` Johannes Weiner
2014-08-01 18:52 ` Michal Hocko
2014-08-01 18:52 ` Michal Hocko
2014-08-04 9:56 ` Jerome Marchand
2014-07-31 15:06 ` Johannes Weiner
2014-07-31 15:06 ` Johannes Weiner
2014-07-31 15:38 ` Rik van Riel
2014-07-31 15:38 ` Rik van Riel
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=20140801184525.GK9952@cmpxchg.org \
--to=hannes@cmpxchg.org \
--cc=akpm@linux-foundation.org \
--cc=jmarchan@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mgorman@suse.de \
--cc=mhocko@suse.cz \
--cc=riel@redhat.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 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.