Commit 5dab29113ca56335c78be3f98bf5ddf2ef8eb6a6

Authored by Mel Gorman
Committed by Linus Torvalds
1 parent a6e21b14f2

mm: page_alloc: take the ALLOC_NO_WATERMARK check out of the fast path

ALLOC_NO_WATERMARK is set in a few cases.  Always by kswapd, always for
__GFP_MEMALLOC, sometimes for swap-over-nfs, tasks etc.  Each of these
cases are relatively rare events but the ALLOC_NO_WATERMARK check is an
unlikely branch in the fast path.  This patch moves the check out of the
fast path and after it has been determined that the watermarks have not
been met.  This helps the common fast path at the cost of making the slow
path slower and hitting kswapd with a performance cost.  It's a reasonable
tradeoff.

Signed-off-by: Mel Gorman <mgorman@suse.de>
Acked-by: Johannes Weiner <hannes@cmpxchg.org>
Reviewed-by: Rik van Riel <riel@redhat.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Jan Kara <jack@suse.cz>
Cc: Michal Hocko <mhocko@suse.cz>
Cc: Hugh Dickins <hughd@google.com>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Theodore Ts'o <tytso@mit.edu>
Cc: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 5 additions and 3 deletions Side-by-side Diff

... ... @@ -1937,9 +1937,6 @@
1937 1937 (alloc_flags & ALLOC_CPUSET) &&
1938 1938 !cpuset_zone_allowed_softwall(zone, gfp_mask))
1939 1939 continue;
1940   - BUILD_BUG_ON(ALLOC_NO_WATERMARKS < NR_WMARK);
1941   - if (unlikely(alloc_flags & ALLOC_NO_WATERMARKS))
1942   - goto try_this_zone;
1943 1940 /*
1944 1941 * Distribute pages in proportion to the individual
1945 1942 * zone size to ensure fair page aging. The zone a
... ... @@ -1985,6 +1982,11 @@
1985 1982 if (!zone_watermark_ok(zone, order, mark,
1986 1983 classzone_idx, alloc_flags)) {
1987 1984 int ret;
  1985 +
  1986 + /* Checked here to keep the fast path fast */
  1987 + BUILD_BUG_ON(ALLOC_NO_WATERMARKS < NR_WMARK);
  1988 + if (alloc_flags & ALLOC_NO_WATERMARKS)
  1989 + goto try_this_zone;
1988 1990  
1989 1991 if (IS_ENABLED(CONFIG_NUMA) &&
1990 1992 !did_zlc_setup && nr_online_nodes > 1) {