From: Mel Gorman <mgorman@techsingularity.net> To: Andrew Morton <akpm@linux-foundation.org> Cc: Johannes Weiner <hannes@cmpxchg.org>, Rik van Riel <riel@redhat.com>, Vlastimil Babka <vbabka@suse.cz>, David Rientjes <rientjes@google.com>, Joonsoo Kim <iamjoonsoo.kim@lge.com>, Michal Hocko <mhocko@kernel.org>, Linux-MM <linux-mm@kvack.org>, LKML <linux-kernel@vger.kernel.org>, Mel Gorman <mgorman@techsingularity.net> Subject: [PATCH 01/10] mm, page_alloc: Remove unnecessary parameter from zone_watermark_ok_safe Date: Mon, 21 Sep 2015 11:52:33 +0100 [thread overview] Message-ID: <1442832762-7247-2-git-send-email-mgorman@techsingularity.net> (raw) In-Reply-To: <1442832762-7247-1-git-send-email-mgorman@techsingularity.net> No user of zone_watermark_ok_safe() specifies alloc_flags. This patch removes the unnecessary parameter. Signed-off-by: Mel Gorman <mgorman@techsingularity.net> Acked-by: David Rientjes <rientjes@google.com> Acked-by: Vlastimil Babka <vbabka@suse.cz> Acked-by: Michal Hocko <mhocko@suse.com> Reviewed-by: Christoph Lameter <cl@linux.com> --- include/linux/mmzone.h | 2 +- mm/page_alloc.c | 5 +++-- mm/vmscan.c | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index d94347737292..8687467a6e84 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -817,7 +817,7 @@ void wakeup_kswapd(struct zone *zone, int order, enum zone_type classzone_idx); bool zone_watermark_ok(struct zone *z, unsigned int order, unsigned long mark, int classzone_idx, int alloc_flags); bool zone_watermark_ok_safe(struct zone *z, unsigned int order, - unsigned long mark, int classzone_idx, int alloc_flags); + unsigned long mark, int classzone_idx); enum memmap_context { MEMMAP_EARLY, MEMMAP_HOTPLUG, diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 48aaf7b9f253..7a3199313622 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -2249,6 +2249,7 @@ static bool __zone_watermark_ok(struct zone *z, unsigned int order, min -= min / 2; if (alloc_flags & ALLOC_HARDER) min -= min / 4; + #ifdef CONFIG_CMA /* If allocation can't use CMA areas don't use free CMA pages */ if (!(alloc_flags & ALLOC_CMA)) @@ -2278,14 +2279,14 @@ bool zone_watermark_ok(struct zone *z, unsigned int order, unsigned long mark, } bool zone_watermark_ok_safe(struct zone *z, unsigned int order, - unsigned long mark, int classzone_idx, int alloc_flags) + unsigned long mark, int classzone_idx) { long free_pages = zone_page_state(z, NR_FREE_PAGES); if (z->percpu_drift_mark && free_pages < z->percpu_drift_mark) free_pages = zone_page_state_snapshot(z, NR_FREE_PAGES); - return __zone_watermark_ok(z, order, mark, classzone_idx, alloc_flags, + return __zone_watermark_ok(z, order, mark, classzone_idx, 0, free_pages); } diff --git a/mm/vmscan.c b/mm/vmscan.c index 2d978b28a410..8b2786fd42b5 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -2480,7 +2480,7 @@ static inline bool compaction_ready(struct zone *zone, int order) balance_gap = min(low_wmark_pages(zone), DIV_ROUND_UP( zone->managed_pages, KSWAPD_ZONE_BALANCE_GAP_RATIO)); watermark = high_wmark_pages(zone) + balance_gap + (2UL << order); - watermark_ok = zone_watermark_ok_safe(zone, 0, watermark, 0, 0); + watermark_ok = zone_watermark_ok_safe(zone, 0, watermark, 0); /* * If compaction is deferred, reclaim up to a point where @@ -2963,7 +2963,7 @@ static bool zone_balanced(struct zone *zone, int order, unsigned long balance_gap, int classzone_idx) { if (!zone_watermark_ok_safe(zone, order, high_wmark_pages(zone) + - balance_gap, classzone_idx, 0)) + balance_gap, classzone_idx)) return false; if (IS_ENABLED(CONFIG_COMPACTION) && order && compaction_suitable(zone, -- 2.4.6
WARNING: multiple messages have this Message-ID (diff)
From: Mel Gorman <mgorman@techsingularity.net> To: Andrew Morton <akpm@linux-foundation.org> Cc: Johannes Weiner <hannes@cmpxchg.org>, Rik van Riel <riel@redhat.com>, Vlastimil Babka <vbabka@suse.cz>, David Rientjes <rientjes@google.com>, Joonsoo Kim <iamjoonsoo.kim@lge.com>, Michal Hocko <mhocko@kernel.org>, Linux-MM <linux-mm@kvack.org>, LKML <linux-kernel@vger.kernel.org>, Mel Gorman <mgorman@techsingularity.net> Subject: [PATCH 01/10] mm, page_alloc: Remove unnecessary parameter from zone_watermark_ok_safe Date: Mon, 21 Sep 2015 11:52:33 +0100 [thread overview] Message-ID: <1442832762-7247-2-git-send-email-mgorman@techsingularity.net> (raw) In-Reply-To: <1442832762-7247-1-git-send-email-mgorman@techsingularity.net> No user of zone_watermark_ok_safe() specifies alloc_flags. This patch removes the unnecessary parameter. Signed-off-by: Mel Gorman <mgorman@techsingularity.net> Acked-by: David Rientjes <rientjes@google.com> Acked-by: Vlastimil Babka <vbabka@suse.cz> Acked-by: Michal Hocko <mhocko@suse.com> Reviewed-by: Christoph Lameter <cl@linux.com> --- include/linux/mmzone.h | 2 +- mm/page_alloc.c | 5 +++-- mm/vmscan.c | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index d94347737292..8687467a6e84 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -817,7 +817,7 @@ void wakeup_kswapd(struct zone *zone, int order, enum zone_type classzone_idx); bool zone_watermark_ok(struct zone *z, unsigned int order, unsigned long mark, int classzone_idx, int alloc_flags); bool zone_watermark_ok_safe(struct zone *z, unsigned int order, - unsigned long mark, int classzone_idx, int alloc_flags); + unsigned long mark, int classzone_idx); enum memmap_context { MEMMAP_EARLY, MEMMAP_HOTPLUG, diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 48aaf7b9f253..7a3199313622 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -2249,6 +2249,7 @@ static bool __zone_watermark_ok(struct zone *z, unsigned int order, min -= min / 2; if (alloc_flags & ALLOC_HARDER) min -= min / 4; + #ifdef CONFIG_CMA /* If allocation can't use CMA areas don't use free CMA pages */ if (!(alloc_flags & ALLOC_CMA)) @@ -2278,14 +2279,14 @@ bool zone_watermark_ok(struct zone *z, unsigned int order, unsigned long mark, } bool zone_watermark_ok_safe(struct zone *z, unsigned int order, - unsigned long mark, int classzone_idx, int alloc_flags) + unsigned long mark, int classzone_idx) { long free_pages = zone_page_state(z, NR_FREE_PAGES); if (z->percpu_drift_mark && free_pages < z->percpu_drift_mark) free_pages = zone_page_state_snapshot(z, NR_FREE_PAGES); - return __zone_watermark_ok(z, order, mark, classzone_idx, alloc_flags, + return __zone_watermark_ok(z, order, mark, classzone_idx, 0, free_pages); } diff --git a/mm/vmscan.c b/mm/vmscan.c index 2d978b28a410..8b2786fd42b5 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -2480,7 +2480,7 @@ static inline bool compaction_ready(struct zone *zone, int order) balance_gap = min(low_wmark_pages(zone), DIV_ROUND_UP( zone->managed_pages, KSWAPD_ZONE_BALANCE_GAP_RATIO)); watermark = high_wmark_pages(zone) + balance_gap + (2UL << order); - watermark_ok = zone_watermark_ok_safe(zone, 0, watermark, 0, 0); + watermark_ok = zone_watermark_ok_safe(zone, 0, watermark, 0); /* * If compaction is deferred, reclaim up to a point where @@ -2963,7 +2963,7 @@ static bool zone_balanced(struct zone *zone, int order, unsigned long balance_gap, int classzone_idx) { if (!zone_watermark_ok_safe(zone, order, high_wmark_pages(zone) + - balance_gap, classzone_idx, 0)) + balance_gap, classzone_idx)) return false; if (IS_ENABLED(CONFIG_COMPACTION) && order && compaction_suitable(zone, -- 2.4.6 -- 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:[~2015-09-21 10:52 UTC|newest] Thread overview: 96+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-09-21 10:52 [PATCH 00/10] Remove zonelist cache and high-order watermark checking v4 Mel Gorman 2015-09-21 10:52 ` Mel Gorman 2015-09-21 10:52 ` Mel Gorman [this message] 2015-09-21 10:52 ` [PATCH 01/10] mm, page_alloc: Remove unnecessary parameter from zone_watermark_ok_safe Mel Gorman 2015-09-24 20:01 ` Johannes Weiner 2015-09-24 20:01 ` Johannes Weiner 2015-09-21 10:52 ` [PATCH 02/10] mm, page_alloc: Remove unnecessary recalculations for dirty zone balancing Mel Gorman 2015-09-21 10:52 ` Mel Gorman 2015-09-24 20:05 ` Johannes Weiner 2015-09-24 20:05 ` Johannes Weiner 2015-09-21 10:52 ` [PATCH 03/10] mm, page_alloc: Remove unnecessary taking of a seqlock when cpusets are disabled Mel Gorman 2015-09-21 10:52 ` Mel Gorman 2015-09-24 20:06 ` Johannes Weiner 2015-09-24 20:06 ` Johannes Weiner 2015-09-30 22:22 ` David Rientjes 2015-09-30 22:22 ` David Rientjes 2015-10-01 7:35 ` Vlastimil Babka 2015-10-01 7:35 ` Vlastimil Babka 2015-09-21 10:52 ` [PATCH 04/10] mm, page_alloc: Use masks and shifts when converting GFP flags to migrate types Mel Gorman 2015-09-21 10:52 ` Mel Gorman 2015-09-24 20:34 ` Johannes Weiner 2015-09-24 20:34 ` Johannes Weiner 2015-09-25 12:50 ` Mel Gorman 2015-09-25 12:50 ` Mel Gorman 2015-09-25 13:56 ` Johannes Weiner 2015-09-25 13:56 ` Johannes Weiner 2015-09-21 10:52 ` [PATCH 05/10] mm, page_alloc: Distinguish between being unable to sleep, unwilling to sleep and avoiding waking kswapd Mel Gorman 2015-09-21 10:52 ` Mel Gorman 2015-09-24 13:51 ` Michal Hocko 2015-09-24 13:51 ` Michal Hocko 2015-09-24 20:55 ` Johannes Weiner 2015-09-24 20:55 ` Johannes Weiner 2015-09-25 12:51 ` Mel Gorman 2015-09-25 12:51 ` Mel Gorman 2015-09-25 19:01 ` Johannes Weiner 2015-09-25 19:01 ` Johannes Weiner 2015-09-29 13:35 ` Mel Gorman 2015-09-29 13:35 ` Mel Gorman 2015-09-30 12:26 ` Vlastimil Babka 2015-09-30 12:26 ` Vlastimil Babka 2015-09-30 13:17 ` Mel Gorman 2015-09-30 13:17 ` Mel Gorman 2015-10-01 3:04 ` Drokin, Oleg 2015-10-01 3:04 ` Drokin, Oleg 2015-10-02 12:30 ` Mel Gorman 2015-10-02 12:30 ` Mel Gorman 2015-09-21 10:52 ` [PATCH 06/10] mm, page_alloc: Rename __GFP_WAIT to __GFP_RECLAIM Mel Gorman 2015-09-21 10:52 ` Mel Gorman 2015-09-25 19:03 ` Johannes Weiner 2015-09-25 19:03 ` Johannes Weiner 2015-09-28 23:55 ` Andrew Morton 2015-09-28 23:55 ` Andrew Morton 2015-09-29 13:37 ` Mel Gorman 2015-09-29 13:37 ` Mel Gorman 2015-10-01 8:39 ` Vlastimil Babka 2015-10-01 8:39 ` Vlastimil Babka 2015-10-02 13:03 ` [PATCH] mm: page_alloc: Hide some GFP internals and document the bits and flag combinations -fix Mel Gorman 2015-10-02 13:03 ` Mel Gorman 2015-10-01 14:06 ` [PATCH 06/10] mm, page_alloc: Rename __GFP_WAIT to __GFP_RECLAIM Michal Hocko 2015-10-01 14:06 ` Michal Hocko 2015-09-30 22:25 ` David Rientjes 2015-09-30 22:25 ` David Rientjes 2015-09-21 10:52 ` [PATCH 07/10] mm, page_alloc: Delete the zonelist_cache Mel Gorman 2015-09-21 10:52 ` Mel Gorman 2015-09-25 19:09 ` Johannes Weiner 2015-09-25 19:09 ` Johannes Weiner 2015-09-21 10:52 ` [PATCH 08/10] mm, page_alloc: Remove MIGRATE_RESERVE Mel Gorman 2015-09-21 10:52 ` Mel Gorman 2015-09-21 10:52 ` [PATCH 09/10] mm, page_alloc: Reserve pageblocks for high-order atomic allocations on demand Mel Gorman 2015-09-21 10:52 ` Mel Gorman 2015-09-24 13:50 ` Michal Hocko 2015-09-24 13:50 ` Michal Hocko 2015-09-25 19:22 ` Johannes Weiner 2015-09-25 19:22 ` Johannes Weiner 2015-09-29 21:01 ` Andrew Morton 2015-09-29 21:01 ` Andrew Morton 2015-09-30 8:27 ` Mel Gorman 2015-09-30 8:27 ` Mel Gorman 2015-09-30 14:02 ` Vlastimil Babka 2015-09-30 14:02 ` Vlastimil Babka 2015-09-21 12:03 ` [PATCH 10/10] mm, page_alloc: Only enforce watermarks for order-0 allocations Mel Gorman 2015-09-21 12:03 ` Mel Gorman 2015-09-25 19:32 ` Johannes Weiner 2015-09-25 19:32 ` Johannes Weiner 2015-09-29 21:05 ` Andrew Morton 2015-09-29 21:05 ` Andrew Morton 2015-09-30 8:46 ` Mel Gorman 2015-09-30 8:46 ` Mel Gorman 2015-09-30 14:17 ` Vlastimil Babka 2015-09-30 14:17 ` Vlastimil Babka 2015-09-30 15:12 ` Mel Gorman 2015-09-30 15:12 ` Mel Gorman 2015-09-30 20:37 ` Andrew Morton 2015-09-30 20:37 ` Andrew Morton 2015-09-30 14:11 ` Vlastimil Babka 2015-09-30 14:11 ` Vlastimil Babka
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=1442832762-7247-2-git-send-email-mgorman@techsingularity.net \ --to=mgorman@techsingularity.net \ --cc=akpm@linux-foundation.org \ --cc=hannes@cmpxchg.org \ --cc=iamjoonsoo.kim@lge.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=mhocko@kernel.org \ --cc=riel@redhat.com \ --cc=rientjes@google.com \ --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: 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.