From: Johannes Weiner <hannes@cmpxchg.org> To: Andrew Morton <akpm@linux-foundation.org> Cc: Mel Gorman <mgorman@suse.de>, Rik van Riel <riel@surriel.com>, Andrea Arcangeli <aarcange@redhat.com>, Zlatko Calusic <zcalusic@bitsync.net>, Minchan Kim <minchan@kernel.org>, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [patch v2 2/3] mm: page_alloc: rearrange watermark checking in get_page_from_freelist Date: Fri, 2 Aug 2013 11:37:25 -0400 [thread overview] Message-ID: <1375457846-21521-3-git-send-email-hannes@cmpxchg.org> (raw) In-Reply-To: <1375457846-21521-1-git-send-email-hannes@cmpxchg.org> Allocations that do not have to respect the watermarks are rare high-priority events. Reorder the code such that per-zone dirty limits and future checks important only to regular page allocations are ignored in these extraordinary situations. Signed-off-by: Johannes Weiner <hannes@cmpxchg.org> Reviewed-by: Rik van Riel <riel@redhat.com> --- mm/page_alloc.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index bf9d7c1..3b27d3e 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -1889,12 +1889,17 @@ zonelist_scan: */ for_each_zone_zonelist_nodemask(zone, z, zonelist, high_zoneidx, nodemask) { + unsigned long mark; + if (IS_ENABLED(CONFIG_NUMA) && zlc_active && !zlc_zone_worth_trying(zonelist, z, allowednodes)) continue; if ((alloc_flags & ALLOC_CPUSET) && !cpuset_zone_allowed_softwall(zone, gfp_mask)) continue; + BUILD_BUG_ON(ALLOC_NO_WATERMARKS < NR_WMARK); + if (alloc_flags & ALLOC_NO_WATERMARKS) + goto try_this_zone; /* * When allocating a page cache page for writing, we * want to get it from a zone that is within its dirty @@ -1925,16 +1930,11 @@ zonelist_scan: (gfp_mask & __GFP_WRITE) && !zone_dirty_ok(zone)) goto this_zone_full; - BUILD_BUG_ON(ALLOC_NO_WATERMARKS < NR_WMARK); - if (!(alloc_flags & ALLOC_NO_WATERMARKS)) { - unsigned long mark; + mark = zone->watermark[alloc_flags & ALLOC_WMARK_MASK]; + if (!zone_watermark_ok(zone, order, mark, + classzone_idx, alloc_flags)) { int ret; - mark = zone->watermark[alloc_flags & ALLOC_WMARK_MASK]; - if (zone_watermark_ok(zone, order, mark, - classzone_idx, alloc_flags)) - goto try_this_zone; - if (IS_ENABLED(CONFIG_NUMA) && !did_zlc_setup && nr_online_nodes > 1) { /* -- 1.8.3.2
WARNING: multiple messages have this Message-ID (diff)
From: Johannes Weiner <hannes@cmpxchg.org> To: Andrew Morton <akpm@linux-foundation.org> Cc: Mel Gorman <mgorman@suse.de>, Rik van Riel <riel@surriel.com>, Andrea Arcangeli <aarcange@redhat.com>, Zlatko Calusic <zcalusic@bitsync.net>, Minchan Kim <minchan@kernel.org>, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [patch v2 2/3] mm: page_alloc: rearrange watermark checking in get_page_from_freelist Date: Fri, 2 Aug 2013 11:37:25 -0400 [thread overview] Message-ID: <1375457846-21521-3-git-send-email-hannes@cmpxchg.org> (raw) In-Reply-To: <1375457846-21521-1-git-send-email-hannes@cmpxchg.org> Allocations that do not have to respect the watermarks are rare high-priority events. Reorder the code such that per-zone dirty limits and future checks important only to regular page allocations are ignored in these extraordinary situations. Signed-off-by: Johannes Weiner <hannes@cmpxchg.org> Reviewed-by: Rik van Riel <riel@redhat.com> --- mm/page_alloc.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index bf9d7c1..3b27d3e 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -1889,12 +1889,17 @@ zonelist_scan: */ for_each_zone_zonelist_nodemask(zone, z, zonelist, high_zoneidx, nodemask) { + unsigned long mark; + if (IS_ENABLED(CONFIG_NUMA) && zlc_active && !zlc_zone_worth_trying(zonelist, z, allowednodes)) continue; if ((alloc_flags & ALLOC_CPUSET) && !cpuset_zone_allowed_softwall(zone, gfp_mask)) continue; + BUILD_BUG_ON(ALLOC_NO_WATERMARKS < NR_WMARK); + if (alloc_flags & ALLOC_NO_WATERMARKS) + goto try_this_zone; /* * When allocating a page cache page for writing, we * want to get it from a zone that is within its dirty @@ -1925,16 +1930,11 @@ zonelist_scan: (gfp_mask & __GFP_WRITE) && !zone_dirty_ok(zone)) goto this_zone_full; - BUILD_BUG_ON(ALLOC_NO_WATERMARKS < NR_WMARK); - if (!(alloc_flags & ALLOC_NO_WATERMARKS)) { - unsigned long mark; + mark = zone->watermark[alloc_flags & ALLOC_WMARK_MASK]; + if (!zone_watermark_ok(zone, order, mark, + classzone_idx, alloc_flags)) { int ret; - mark = zone->watermark[alloc_flags & ALLOC_WMARK_MASK]; - if (zone_watermark_ok(zone, order, mark, - classzone_idx, alloc_flags)) - goto try_this_zone; - if (IS_ENABLED(CONFIG_NUMA) && !did_zlc_setup && nr_online_nodes > 1) { /* -- 1.8.3.2 -- 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:[~2013-08-02 15:37 UTC|newest] Thread overview: 82+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-08-02 15:37 [patch v2 0/3] mm: improve page aging fairness between zones/nodes Johannes Weiner 2013-08-02 15:37 ` Johannes Weiner 2013-08-02 15:37 ` [patch v2 1/3] mm: vmscan: fix numa reclaim balance problem in kswapd Johannes Weiner 2013-08-02 15:37 ` Johannes Weiner 2013-08-07 14:15 ` Mel Gorman 2013-08-07 14:15 ` Mel Gorman 2013-08-02 15:37 ` Johannes Weiner [this message] 2013-08-02 15:37 ` [patch v2 2/3] mm: page_alloc: rearrange watermark checking in get_page_from_freelist Johannes Weiner 2013-08-07 14:20 ` Mel Gorman 2013-08-07 14:20 ` Mel Gorman 2013-08-02 15:37 ` [patch v2 3/3] mm: page_alloc: fair zone allocator policy Johannes Weiner 2013-08-02 15:37 ` Johannes Weiner 2013-08-02 17:51 ` Rik van Riel 2013-08-02 17:51 ` Rik van Riel 2013-08-05 1:15 ` Minchan Kim 2013-08-05 1:15 ` Minchan Kim 2013-08-05 3:43 ` Johannes Weiner 2013-08-05 3:43 ` Johannes Weiner 2013-08-05 4:48 ` Minchan Kim 2013-08-05 4:48 ` Minchan Kim 2013-08-05 5:01 ` Johannes Weiner 2013-08-05 5:01 ` Johannes Weiner 2013-08-05 10:34 ` Wanpeng Li 2013-08-05 10:34 ` Wanpeng Li 2013-08-05 11:34 ` Andrea Arcangeli 2013-08-05 11:34 ` Andrea Arcangeli 2013-08-05 13:11 ` Wanpeng Li 2013-08-05 13:11 ` Wanpeng Li 2013-08-07 14:58 ` Mel Gorman 2013-08-07 14:58 ` Mel Gorman 2013-08-07 15:37 ` Johannes Weiner 2013-08-07 15:37 ` Johannes Weiner 2013-08-08 4:16 ` Johannes Weiner 2013-08-08 4:16 ` Johannes Weiner 2013-08-08 9:21 ` Mel Gorman 2013-08-08 9:21 ` Mel Gorman 2013-08-09 18:45 ` Rik van Riel 2013-08-09 18:45 ` Rik van Riel 2013-08-16 17:07 ` Kevin Hilman 2013-08-16 17:17 ` Kevin Hilman 2013-08-16 20:18 ` Johannes Weiner 2013-08-16 20:18 ` Johannes Weiner 2013-08-16 20:18 ` Johannes Weiner 2013-08-16 21:24 ` Stephen Warren 2013-08-16 21:24 ` Stephen Warren 2013-08-16 21:24 ` Stephen Warren 2013-08-16 21:52 ` Kevin Hilman 2013-08-16 21:52 ` Kevin Hilman 2013-08-16 21:52 ` Kevin Hilman 2013-08-19 0:48 ` Stephen Rothwell 2013-08-19 0:48 ` Stephen Rothwell 2014-04-02 14:26 ` Thomas Schwinge 2014-04-02 14:26 ` Thomas Schwinge 2014-04-24 13:37 ` radeon: screen garbled after page allocator change, was: " Johannes Weiner 2014-04-24 13:37 ` Johannes Weiner 2014-04-24 13:37 ` Johannes Weiner 2014-04-25 21:47 ` Jerome Glisse 2014-04-25 21:47 ` Jerome Glisse 2014-04-25 21:47 ` Jerome Glisse 2014-04-25 21:50 ` Jerome Glisse 2014-04-25 21:50 ` Jerome Glisse 2014-04-25 23:03 ` Jerome Glisse 2014-04-25 23:03 ` Jerome Glisse 2014-04-25 23:03 ` Jerome Glisse 2014-04-28 8:03 ` Thomas Schwinge 2014-04-28 9:09 ` Thomas Schwinge 2014-04-27 3:31 ` Jerome Glisse 2014-04-27 3:31 ` Jerome Glisse 2014-04-27 3:31 ` Jerome Glisse 2014-04-27 19:55 ` Jerome Glisse 2014-04-27 19:55 ` Jerome Glisse 2014-04-27 19:55 ` Jerome Glisse 2014-04-28 7:30 ` Christian König 2014-04-28 7:30 ` Christian König 2014-04-28 12:51 ` Deucher, Alexander 2014-04-28 12:51 ` Deucher, Alexander 2014-04-28 12:52 ` Deucher, Alexander 2014-04-28 12:52 ` Deucher, Alexander 2014-04-28 8:09 ` Thomas Schwinge 2014-06-16 7:11 ` Thomas Schwinge 2013-08-02 19:59 ` [patch v2 0/3] mm: improve page aging fairness between zones/nodes Andrea Arcangeli 2013-08-02 19:59 ` Andrea Arcangeli
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=1375457846-21521-3-git-send-email-hannes@cmpxchg.org \ --to=hannes@cmpxchg.org \ --cc=aarcange@redhat.com \ --cc=akpm@linux-foundation.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=mgorman@suse.de \ --cc=minchan@kernel.org \ --cc=riel@surriel.com \ --cc=zcalusic@bitsync.net \ /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.