From: Mel Gorman <mgorman@techsingularity.net>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Minchan Kim <minchan@kernel.org>,
Johannes Weiner <hannes@cmpxchg.org>,
Michal Hocko <mhocko@suse.cz>, Vlastimil Babka <vbabka@suse.cz>,
Linux-MM <linux-mm@kvack.org>,
LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH] mm, vmscan: remove highmem_file_pages -fix
Date: Mon, 25 Jul 2016 10:23:24 +0100 [thread overview]
Message-ID: <20160725092324.GM10438@techsingularity.net> (raw)
In-Reply-To: <20160725080911.GC1660@bbox>
The wrong stat is being accumulatedin highmem_dirtyable_memory, fix it.
This is a fix to the mmotm patch mm-vmscan-remove-highmem_file_pages.patch
Signed-off-by: Mel Gorman <mgorman@techsingularity.net>
---
mm/page-writeback.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/mm/page-writeback.c b/mm/page-writeback.c
index 7e9061ec040b..f4cd7d8005c9 100644
--- a/mm/page-writeback.c
+++ b/mm/page-writeback.c
@@ -322,8 +322,8 @@ static unsigned long highmem_dirtyable_memory(unsigned long total)
nr_pages = zone_page_state(z, NR_FREE_PAGES);
/* watch for underflows */
nr_pages -= min(nr_pages, high_wmark_pages(z));
- nr_pages += zone_page_state(z, NR_INACTIVE_FILE);
- nr_pages += zone_page_state(z, NR_ACTIVE_FILE);
+ nr_pages += zone_page_state(z, NR_ZONE_INACTIVE_FILE);
+ nr_pages += zone_page_state(z, NR_ZONE_ACTIVE_FILE);
x += nr_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/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
WARNING: multiple messages have this Message-ID (diff)
From: Mel Gorman <mgorman@techsingularity.net>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Minchan Kim <minchan@kernel.org>,
Johannes Weiner <hannes@cmpxchg.org>,
Michal Hocko <mhocko@suse.cz>, Vlastimil Babka <vbabka@suse.cz>,
Linux-MM <linux-mm@kvack.org>,
LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH] mm, vmscan: remove highmem_file_pages -fix
Date: Mon, 25 Jul 2016 10:23:24 +0100 [thread overview]
Message-ID: <20160725092324.GM10438@techsingularity.net> (raw)
In-Reply-To: <20160725080911.GC1660@bbox>
The wrong stat is being accumulatedin highmem_dirtyable_memory, fix it.
This is a fix to the mmotm patch mm-vmscan-remove-highmem_file_pages.patch
Signed-off-by: Mel Gorman <mgorman@techsingularity.net>
---
mm/page-writeback.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/mm/page-writeback.c b/mm/page-writeback.c
index 7e9061ec040b..f4cd7d8005c9 100644
--- a/mm/page-writeback.c
+++ b/mm/page-writeback.c
@@ -322,8 +322,8 @@ static unsigned long highmem_dirtyable_memory(unsigned long total)
nr_pages = zone_page_state(z, NR_FREE_PAGES);
/* watch for underflows */
nr_pages -= min(nr_pages, high_wmark_pages(z));
- nr_pages += zone_page_state(z, NR_INACTIVE_FILE);
- nr_pages += zone_page_state(z, NR_ACTIVE_FILE);
+ nr_pages += zone_page_state(z, NR_ZONE_INACTIVE_FILE);
+ nr_pages += zone_page_state(z, NR_ZONE_ACTIVE_FILE);
x += nr_pages;
}
}
next prev parent reply other threads:[~2016-07-25 9:23 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-21 14:10 [PATCH 0/5] Candidate fixes for premature OOM kills with node-lru v2 Mel Gorman
2016-07-21 14:10 ` Mel Gorman
2016-07-21 14:10 ` [PATCH 1/5] mm: add per-zone lru list stat Mel Gorman
2016-07-21 14:10 ` Mel Gorman
2016-07-22 15:51 ` Johannes Weiner
2016-07-22 15:51 ` Johannes Weiner
2016-07-21 14:10 ` [PATCH 2/5] mm, vmscan: Remove highmem_file_pages Mel Gorman
2016-07-21 14:10 ` Mel Gorman
2016-07-22 15:53 ` Johannes Weiner
2016-07-22 15:53 ` Johannes Weiner
2016-07-25 8:09 ` Minchan Kim
2016-07-25 8:09 ` Minchan Kim
2016-07-25 9:23 ` Mel Gorman [this message]
2016-07-25 9:23 ` [PATCH] mm, vmscan: remove highmem_file_pages -fix Mel Gorman
2016-07-21 14:10 ` [PATCH 3/5] mm: Remove reclaim and compaction retry approximations Mel Gorman
2016-07-21 14:10 ` Mel Gorman
2016-07-22 15:57 ` Johannes Weiner
2016-07-22 15:57 ` Johannes Weiner
2016-07-25 8:18 ` Minchan Kim
2016-07-25 8:18 ` Minchan Kim
2016-07-21 14:11 ` [PATCH 4/5] mm: consider per-zone inactive ratio to deactivate Mel Gorman
2016-07-21 14:11 ` Mel Gorman
2016-07-21 15:52 ` Johannes Weiner
2016-07-21 15:52 ` Johannes Weiner
2016-07-21 14:11 ` [PATCH 5/5] mm, vmscan: Account for skipped pages as a partial scan Mel Gorman
2016-07-21 14:11 ` Mel Gorman
2016-07-22 16:02 ` Johannes Weiner
2016-07-22 16:02 ` Johannes Weiner
2016-07-25 8:39 ` Minchan Kim
2016-07-25 8:39 ` Minchan Kim
2016-07-25 9:52 ` Mel Gorman
2016-07-25 9:52 ` Mel Gorman
2016-07-26 8:16 ` Joonsoo Kim
2016-07-26 8:16 ` Joonsoo Kim
2016-07-26 8:26 ` Joonsoo Kim
2016-07-26 8:26 ` Joonsoo Kim
2016-07-26 8:11 ` [PATCH 0/5] Candidate fixes for premature OOM kills with node-lru v2 Joonsoo Kim
2016-07-26 8:11 ` Joonsoo Kim
2016-07-26 12:50 ` Mel Gorman
2016-07-26 12:50 ` Mel Gorman
2016-07-28 6:44 ` Joonsoo Kim
2016-07-28 6:44 ` Joonsoo Kim
2016-07-28 10:27 ` Mel Gorman
2016-07-28 10:27 ` Mel Gorman
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=20160725092324.GM10438@techsingularity.net \
--to=mgorman@techsingularity.net \
--cc=akpm@linux-foundation.org \
--cc=hannes@cmpxchg.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mhocko@suse.cz \
--cc=minchan@kernel.org \
--cc=vbabka@suse.cz \
/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.