From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 65916C433ED for ; Mon, 5 Apr 2021 18:09:17 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id DFE12613B2 for ; Mon, 5 Apr 2021 18:09:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DFE12613B2 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 6B5416B0083; Mon, 5 Apr 2021 14:09:14 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 663CA6B0085; Mon, 5 Apr 2021 14:09:14 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4BC2A6B0087; Mon, 5 Apr 2021 14:09:14 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0005.hostedemail.com [216.40.44.5]) by kanga.kvack.org (Postfix) with ESMTP id 257646B0083 for ; Mon, 5 Apr 2021 14:09:14 -0400 (EDT) Received: from smtpin33.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id DB9F9F04E for ; Mon, 5 Apr 2021 18:09:13 +0000 (UTC) X-FDA: 77999100186.33.17CB22E Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by imf06.hostedemail.com (Postfix) with ESMTP id E5790C0007C0 for ; Mon, 5 Apr 2021 18:09:13 +0000 (UTC) IronPort-SDR: 0b/dVAmsmREyUHM9PkzqoaFBl3GyFunYobiUHedbgm5TNlpMH60A/8xaOLBNwtd5LWZAriObua +9FmR6oQMyxw== X-IronPort-AV: E=McAfee;i="6000,8403,9945"; a="172968236" X-IronPort-AV: E=Sophos;i="5.81,307,1610438400"; d="scan'208";a="172968236" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Apr 2021 11:09:12 -0700 IronPort-SDR: uRJWNIEvIVenX3zhCfRavpX69HZihlo15E+HdqNsuhc8s2r9sEnAo//jTyEmVjEzmIsM3NyzhF 6er8odyQGP3w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,307,1610438400"; d="scan'208";a="448153952" Received: from skl-02.jf.intel.com ([10.54.74.28]) by fmsmga002.fm.intel.com with ESMTP; 05 Apr 2021 11:09:12 -0700 From: Tim Chen To: Michal Hocko Cc: Tim Chen , Johannes Weiner , Andrew Morton , Dave Hansen , Ying Huang , Dan Williams , David Rientjes , Shakeel Butt , linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [RFC PATCH v1 09/11] mm: Use kswapd to demote pages when toptier memory is tight Date: Mon, 5 Apr 2021 10:08:33 -0700 Message-Id: <83c06bf70e38360358c84daab399f18f57e7eba4.1617642417.git.tim.c.chen@linux.intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: References: MIME-Version: 1.0 X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: E5790C0007C0 X-Stat-Signature: qzonb9apro7h6gdwjtt3khxhxabjkrq3 Received-SPF: none (linux.intel.com>: No applicable sender policy available) receiver=imf06; identity=mailfrom; envelope-from=""; helo=mga17.intel.com; client-ip=192.55.52.151 X-HE-DKIM-Result: none/none X-HE-Tag: 1617646153-340470 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Demote pages from memory cgroup that has excess toptier memory usage when top tier memory is tight. When free top tier memory falls below this fraction "toptier_scale_factor/10000" of overall toptier memory in a node, kswapd reclaims top tier memory from those mem cgroups that exceeded their toptier memory soft limit by deomoting the top tier pages to lower memory tier. Signed-off-by: Tim Chen --- Documentation/admin-guide/sysctl/vm.rst | 12 +++++ include/linux/mmzone.h | 2 + mm/page_alloc.c | 14 +++++ mm/vmscan.c | 69 ++++++++++++++++++++++++- 4 files changed, 96 insertions(+), 1 deletion(-) diff --git a/Documentation/admin-guide/sysctl/vm.rst b/Documentation/admi= n-guide/sysctl/vm.rst index 9de3847c3469..6b49e2e90953 100644 --- a/Documentation/admin-guide/sysctl/vm.rst +++ b/Documentation/admin-guide/sysctl/vm.rst @@ -74,6 +74,7 @@ Currently, these files are in /proc/sys/vm: - vfs_cache_pressure - watermark_boost_factor - watermark_scale_factor +- toptier_scale_factor - zone_reclaim_mode =20 =20 @@ -962,6 +963,17 @@ too small for the allocation bursts occurring in the= system. This knob can then be used to tune kswapd aggressiveness accordingly. =20 =20 +toptier_scale_factor +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + +This factor controls when kswapd wakes up to demote pages of those +cgroups that have exceeded their memory soft limit. + +The unit is in fractions of 10,000. The default value of 2000 means the +if there are less than 20% of free top tier memory in the +node/system, we will start to demote pages of those memory cgroups +that have exceeded their soft memory limit. + zone_reclaim_mode =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index bbe649c4fdee..4ee0073d255f 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -332,12 +332,14 @@ enum zone_watermarks { WMARK_MIN, WMARK_LOW, WMARK_HIGH, + WMARK_TOPTIER, NR_WMARK }; =20 #define min_wmark_pages(z) (z->_watermark[WMARK_MIN] + z->watermark_boos= t) #define low_wmark_pages(z) (z->_watermark[WMARK_LOW] + z->watermark_boos= t) #define high_wmark_pages(z) (z->_watermark[WMARK_HIGH] + z->watermark_bo= ost) +#define toptier_wmark_pages(z) (z->_watermark[WMARK_TOPTIER] + z->waterm= ark_boost) #define wmark_pages(z, i) (z->_watermark[i] + z->watermark_boost) =20 struct per_cpu_pages { diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 471a2c342c4f..20f3caee60f3 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -7964,6 +7964,20 @@ static void __setup_per_zone_wmarks(void) zone->_watermark[WMARK_LOW] =3D min_wmark_pages(zone) + tmp; zone->_watermark[WMARK_HIGH] =3D min_wmark_pages(zone) + tmp * 2; =20 + tmp =3D mult_frac(zone_managed_pages(zone), + toptier_scale_factor, 10000); + /* + * Clamp toptier watermark between twice high watermark + * and max managed pages. + */ + if (tmp < 2 * zone->_watermark[WMARK_HIGH]) + tmp =3D 2 * zone->_watermark[WMARK_HIGH]; + if (tmp > zone_managed_pages(zone)) + tmp =3D zone_managed_pages(zone); + zone->_watermark[WMARK_TOPTIER] =3D tmp; + + zone->watermark_boost =3D 0; + spin_unlock_irqrestore(&zone->lock, flags); } =20 diff --git a/mm/vmscan.c b/mm/vmscan.c index 11bb0c6fa524..270880c8baef 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -185,6 +185,7 @@ static void set_task_reclaim_state(struct task_struct= *task, =20 static LIST_HEAD(shrinker_list); static DECLARE_RWSEM(shrinker_rwsem); +int toptier_scale_factor =3D 2000; =20 #ifdef CONFIG_MEMCG /* @@ -3624,6 +3625,34 @@ static bool pgdat_balanced(pg_data_t *pgdat, int o= rder, int highest_zoneidx) return false; } =20 +static bool pgdat_toptier_balanced(pg_data_t *pgdat, int order, int clas= szone_idx) +{ + int i; + unsigned long mark; + struct zone *zone; + + zone =3D pgdat->node_zones + ZONE_NORMAL; + + if (!node_state(pgdat->node_id, N_TOPTIER) || + next_demotion_node(pgdat->node_id) =3D=3D -1 || + order > 0 || classzone_idx < ZONE_NORMAL) { + return true; + } + + zone =3D pgdat->node_zones + ZONE_NORMAL; + + if (!managed_zone(zone)) + return true; + + mark =3D min(toptier_wmark_pages(zone), + zone_managed_pages(zone)); + + if (zone_page_state(zone, NR_FREE_PAGES) < mark) + return false; + + return true; +} + /* Clear pgdat state for congested, dirty or under writeback. */ static void clear_pgdat_congested(pg_data_t *pgdat) { @@ -4049,6 +4078,39 @@ static void kswapd_try_to_sleep(pg_data_t *pgdat, = int alloc_order, int reclaim_o finish_wait(&pgdat->kswapd_wait, &wait); } =20 +static bool toptier_soft_reclaim(pg_data_t *pgdat, + unsigned int reclaim_order, + unsigned int classzone_idx) +{ + unsigned long nr_soft_scanned, nr_soft_reclaimed; + int ret; + struct scan_control sc =3D { + .gfp_mask =3D GFP_KERNEL, + .order =3D reclaim_order, + .may_unmap =3D 1, + }; + + if (!node_state(pgdat->node_id, N_TOPTIER) || kthread_should_stop()) + return false; + + set_task_reclaim_state(current, &sc.reclaim_state); + + if (!pgdat_toptier_balanced(pgdat, 0, classzone_idx)) { + nr_soft_scanned =3D 0; + nr_soft_reclaimed =3D mem_cgroup_soft_limit_reclaim(pgdat, + 0, GFP_KERNEL, + &nr_soft_scanned, N_TOPTIER); + } + + set_task_reclaim_state(current, NULL); + + if (prepare_kswapd_sleep(pgdat, reclaim_order, classzone_idx) && + !kthread_should_stop()) + return true; + else + return false; +} + /* * The background pageout daemon, started as a kernel thread * from the init process. @@ -4108,6 +4170,10 @@ static int kswapd(void *p) WRITE_ONCE(pgdat->kswapd_order, 0); WRITE_ONCE(pgdat->kswapd_highest_zoneidx, MAX_NR_ZONES); =20 + if (toptier_soft_reclaim(pgdat, 0, + highest_zoneidx)) + goto kswapd_try_sleep; + ret =3D try_to_freeze(); if (kthread_should_stop()) break; @@ -4173,7 +4239,8 @@ void wakeup_kswapd(struct zone *zone, gfp_t gfp_fla= gs, int order, =20 /* Hopeless node, leave it to direct reclaim if possible */ if (pgdat->kswapd_failures >=3D MAX_RECLAIM_RETRIES || - (pgdat_balanced(pgdat, order, highest_zoneidx) && + (pgdat_toptier_balanced(pgdat, 0, highest_zoneidx) && + pgdat_balanced(pgdat, order, highest_zoneidx) && !pgdat_watermark_boosted(pgdat, highest_zoneidx))) { /* * There may be plenty of free memory available, but it's too --=20 2.20.1