The patch titled
Subject: mm: create promo_wmark_pages and clean up open-coded sites
has been added to the -mm mm-unstable branch. Its filename is
mm-create-promo_wmark_pages-and-clean-up-open-coded-sites.patch
This patch will shortly appear at
https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/mm-create-promo_wmark_pages-and-clean-up-open-coded-sites.patch
This patch will later appear in the mm-unstable branch at
git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next via the mm-everything
branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
and is updated there every 2-3 working days
------------------------------------------------------
From: Kaiyang Zhao <kaiyang2@xxxxxxxxxx>
Subject: mm: create promo_wmark_pages and clean up open-coded sites
Date: Thu, 1 Aug 2024 23:25:47 +0000
Patch series "mm: print the promo watermark in zoneinfo", v2.
This patch (of 2):
Define promo_wmark_pages and convert current call sites of wmark_pages
with fixed WMARK_PROMO to using it instead.
Link: https://lkml.kernel.org/r/20240801232548.36604-1-kaiyang2@xxxxxxxxxx
Link: https://lkml.kernel.org/r/20240801232548.36604-2-kaiyang2@xxxxxxxxxx
Signed-off-by: Kaiyang Zhao <kaiyang2@xxxxxxxxxx>
Cc: Johannes Weiner <hannes@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/mmzone.h | 1 +
kernel/sched/fair.c | 2 +-
mm/vmscan.c | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
--- a/include/linux/mmzone.h~mm-create-promo_wmark_pages-and-clean-up-open-coded-sites
+++ a/include/linux/mmzone.h
@@ -671,6 +671,7 @@ enum zone_watermarks {
#define min_wmark_pages(z) (z->_watermark[WMARK_MIN] + z->watermark_boost)
#define low_wmark_pages(z) (z->_watermark[WMARK_LOW] + z->watermark_boost)
#define high_wmark_pages(z) (z->_watermark[WMARK_HIGH] + z->watermark_boost)
+#define promo_wmark_pages(z) (z->_watermark[WMARK_PROMO] + z->watermark_boost)
#define wmark_pages(z, i) (z->_watermark[i] + z->watermark_boost)
/*
--- a/kernel/sched/fair.c~mm-create-promo_wmark_pages-and-clean-up-open-coded-sites
+++ a/kernel/sched/fair.c
@@ -1742,7 +1742,7 @@ static bool pgdat_free_space_enough(stru
continue;
if (zone_watermark_ok(zone, 0,
- wmark_pages(zone, WMARK_PROMO) + enough_wmark,
+ promo_wmark_pages(zone) + enough_wmark,
ZONE_MOVABLE, 0))
return true;
}
--- a/mm/vmscan.c~mm-create-promo_wmark_pages-and-clean-up-open-coded-sites
+++ a/mm/vmscan.c
@@ -6669,7 +6669,7 @@ static bool pgdat_balanced(pg_data_t *pg
continue;
if (sysctl_numa_balancing_mode & NUMA_BALANCING_MEMORY_TIERING)
- mark = wmark_pages(zone, WMARK_PROMO);
+ mark = promo_wmark_pages(zone);
else
mark = high_wmark_pages(zone);
if (zone_watermark_ok_safe(zone, order, mark, highest_zoneidx))
_
Patches currently in -mm which might be from kaiyang2@xxxxxxxxxx are
mm-consider-cma-pages-in-watermark-check-for-numa-balancing-target-node.patch
mm-create-promo_wmark_pages-and-clean-up-open-coded-sites.patch
mm-print-the-promo-watermark-in-zoneinfo.patch
