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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 21F80C54E41 for ; Mon, 26 Feb 2024 14:06:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3DA936B00E0; Mon, 26 Feb 2024 09:06:28 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 363156B00E3; Mon, 26 Feb 2024 09:06:28 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1DBDB6B00E5; Mon, 26 Feb 2024 09:06:28 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id F1DC16B00E0 for ; Mon, 26 Feb 2024 09:06:27 -0500 (EST) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id AC4361408D9 for ; Mon, 26 Feb 2024 14:06:27 +0000 (UTC) X-FDA: 81834130014.23.D4A49BC Received: from invmail4.hynix.com (exvmail4.skhynix.com [166.125.252.92]) by imf09.hostedemail.com (Postfix) with ESMTP id 9386B14000A for ; Mon, 26 Feb 2024 14:06:25 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf09.hostedemail.com: domain of honggyu.kim@sk.com designates 166.125.252.92 as permitted sender) smtp.mailfrom=honggyu.kim@sk.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1708956386; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WCJbCXrjn/PAdTWQ0hYIswG7MSzXLA6XzCdTSZGM83g=; b=CN1mQGlsawgGVul+1esOV5rvDEUggZ+nZ5lDITTY6vVIasj2fhAX/IeegnWWmhdzmT4FZ1 JSFCiwWatWhpZNUcvEzRmlpTnZrR3772j2ETSP92Yh9n5uSToRBNmRjwkn9WIr7UMEStI0 Re7ozCYtnLykbR5SsdzJLbzju4v3mwk= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf09.hostedemail.com: domain of honggyu.kim@sk.com designates 166.125.252.92 as permitted sender) smtp.mailfrom=honggyu.kim@sk.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1708956386; a=rsa-sha256; cv=none; b=LvhuZveWIKMznXVcecusfPczscYb24nylTv44Tf8gkmPEqduh2A8vGyStaFCBWgmAeRcQy XgrbVRyXkaBcQFqOJXHxZpsCMVmkUef6Zq9KCSlS7AZdTavS7TNu7TLbakb4P7MkMV4k0i gWPIiWMx9aF7Esl2MbPB3r/cm0Z+aZ4= X-AuditID: a67dfc5b-d6dff70000001748-83-65dc9adb88dd From: Honggyu Kim To: sj@kernel.org, damon@lists.linux.dev, linux-mm@kvack.org Cc: akpm@linux-foundation.org, apopple@nvidia.com, baolin.wang@linux.alibaba.com, dave.jiang@intel.com, honggyu.kim@sk.com, hyeongtak.ji@sk.com, kernel_team@skhynix.com, linmiaohe@huawei.com, linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, lizhijian@cn.fujitsu.com, mathieu.desnoyers@efficios.com, mhiramat@kernel.org, rakie.kim@sk.com, rostedt@goodmis.org, surenb@google.com, yangx.jy@fujitsu.com, ying.huang@intel.com, ziy@nvidia.com, 42.hyeyoo@gmail.com Subject: [PATCH v2 5/7] mm/damon: introduce DAMOS_PROMOTE action for promotion Date: Mon, 26 Feb 2024 23:05:51 +0900 Message-ID: <20240226140555.1615-6-honggyu.kim@sk.com> X-Mailer: git-send-email 2.43.0.windows.1 In-Reply-To: <20240226140555.1615-1-honggyu.kim@sk.com> References: <20240226140555.1615-1-honggyu.kim@sk.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrKIsWRmVeSWpSXmKPExsXC9ZZnoe7tWXdSDbYckLeY2GNgMWf9GjaL XTdCLP7vPcZo8eT/b1aLEzcb2Sw6vy9lsbi8aw6bxb01/1ktjqw/y2Kx7haQtfnsGWaLxcvV LPZ1PGCyOPz1DZPF5EsL2CxeTDnDaHFy1mQWi9lH77E7CHv8PziJ2WPp6TdsHhuagMTOWXfZ PVr23WL3WLCp1KPlyFtWj8V7XjJ5bFrVyeax6dMkdo8TM36zeOx8aOnxYvNMRo/e5ndsHp83 yQXwR3HZpKTmZJalFunbJXBlTDz7hq1goUXFnL5tjA2Mv3S7GDk4JARMJL4uK+5i5AQzp545 yQxiswmoSVx5OYkJpEREwEFi1VeFLkYuDmaBBhaJH58vsYDEhQX8JDa/LAMxWQRUJW4tEQDp 5BUwk3h5aR4rxERNicfbf7KD2JwC5hL/D7ezgZQLAdUcvc0MUS4ocXLmExYQm1lAXqJ562xm kE0SAqfYJXYu2skEMUdS4uCKGywTGPlnIemZhaRnASPTKkahzLyy3MTMHBO9jMq8zAq95Pzc TYzAyFtW+yd6B+OnC8GHGAU4GJV4eB1q76QKsSaWFVfmHmKU4GBWEuENl7mZKsSbklhZlVqU H19UmpNafIhRmoNFSZzX6Ft5ipBAemJJanZqakFqEUyWiYNTqoExc5uYpGYdU+jLbvYbJc+c C/IN5vrMsZj+vszyRE2yOqvE4RuVi+afWLlBj+PY/aMJf68HfEtMi2UrnTJXfb9HyYybhU27 7QU1a/49rzsus76lnKnRUOTc1QvPN8yKdFG/qOXZelPnfnVxsv7t9TvvPMuTPH1iy2Mu/2vX lxxvjHe9cuvBhjc2SizFGYmGWsxFxYkA+pGG7LgCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprDIsWRmVeSWpSXmKPExsXCNUNLT/f2rDupBu9n8FlM7DGwmLN+DZvF rhshFv/3HmO0ePL/N6vFiZuNbBafn71mtuh88p3R4vDck6wWnd+Xslhc3jWHzeLemv+sFkfW n2WxWHcLyNp89gyzxeLlahaHrj1ntdjX8YDJ4vDXN0wWky8tYLN4MeUMo8XJWZNZLGYfvcfu IO7x/+AkZo+lp9+weWxoAhI7Z91l92jZd4vdY8GmUo+WI29ZPRbvecnksWlVJ5vHpk+T2D1O zPjN4rHzoaXHi80zGT16m9+xeXy77eGx+MUHpgDBKC6blNSczLLUIn27BK6MiWffsBUstKiY 07eNsYHxl24XIyeHhICJxNQzJ5lBbDYBNYkrLycxdTFycIgIOEis+qrQxcjFwSzQwCLx4/Ml FpC4sICfxOaXZSAmi4CqxK0lAiCdvAJmEi8vzWOFmKgp8Xj7T3YQm1PAXOL/4XY2kHIhoJqj t5khygUlTs58wgJiMwvISzRvnc08gZFnFpLULCSpBYxMqxhFMvPKchMzc0z1irMzKvMyK/SS 83M3MQLjbFntn4k7GL9cdj/EKMDBqMTD61B7J1WINbGsuDL3EKMEB7OSCG+4zM1UId6UxMqq 1KL8+KLSnNTiQ4zSHCxK4rxe4akJQgLpiSWp2ampBalFMFkmDk6pBsaZS5iZNt2Tdbt0unvm iovFUdcX3Wq791p78tTIUrU5c/hXW3OkcVzoSwmaaeu8+/eSDEVN0VZDyT3cux47NJxh37gi KrjL31clSkhh00MFPZb1r0QDVCdOMU741V437+TRA0+1+982M1+fkPPlt3nRZPu23BldO/rM ntjqx0yaLdCxjD/R9ZESS3FGoqEWc1FxIgBxEqWRrwIAAA== X-CFilter-Loop: Reflected X-Rspamd-Queue-Id: 9386B14000A X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: 5qkhm8uk7ney9dpyuqk1pmige5jm4rfg X-HE-Tag: 1708956385-798702 X-HE-Meta: U2FsdGVkX18Or+ZjbClohpwwECUSXHrXG9VCIsNA84xjvVM8cgygu3naDCPujwaFqHD+7+PJqyy9nzhF8DiJ+lbYZ6FenMR0B+MshUepVzWeaQp2wzzAw5+i/bVOP8iBBYIiuzgTJXGMr0zheYE5wtpl3sX1AvILEgPdmu/XbnBmYFNt20EWY6WstzGlGIutPtetaFTbs/anBTCSzLQVD1iAafr+y3aXIQm9rWxwCsnEZMsICqNFcemtjO9tDRUmqK1gB1VL6Luww8k8fosLYu3vtCuBd8aFkeL3QH6vW+Dyd3th6Rmd6f5jVcCJdTrPLSlpkF0Jy1qcMEsBgpNbBKFxpiktzSoytTo6iHut3S9HioS57OM4tVWPV1Nym2eopXUpNTCPikacCgXkGSF17NBmqy0dvb+A0lzndBv9WzkNlViw9Rc1ighod9d+d7wZLRMe/Bzu6gCwvO/Y+lrLjEagO7MyXu5ljlO3QZWtr8xg+xziKZ4AaiNzKjRtqAR2dnoEh5wQmWN8DqM85Ruc1j+pGlBdzsKX5IW3VmMMnO1NtQL7M1EJIm0jHD2TOymYV8fm9fue/6AncPEzxBuBX58zmhvykGNqjUMCPSzB+hHbkXuN0GHpifPpEnH3RojHEEIWwoss+AAEn9YnmOjDm1LPl6QTx7f8+f2XzeaDwfH7O6V3936eKj460OpShtR4FQ2u2TlO9KNro0+luiRt8D/vY8d2QRbsWFxYSRyYKz8L0kwtInCPewHYdT0/QL4t79jBt6CC4xotDSty+9pM6nlCaUD/Ax3sIet1+x87QrCCAN3xYXXYOxg+NAD0zw0vvdA4IDWTzNoKCNslsh5l+d23GxJg4cTdd/vwyqqBQfYdXsig5H0BIA== 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: List-Subscribe: List-Unsubscribe: From: Hyeongtak Ji This patch introduces DAMOS_PROMOTE action for paddr mode. It includes renaming alloc_demote_folio to alloc_migrate_folio to use it for promotion as well. Signed-off-by: Hyeongtak Ji Signed-off-by: Honggyu Kim --- include/linux/damon.h | 2 ++ include/linux/migrate_mode.h | 1 + include/linux/vm_event_item.h | 1 + include/trace/events/migrate.h | 3 ++- mm/damon/paddr.c | 45 ++++++++++++++++++++++++++++------ mm/damon/sysfs-schemes.c | 1 + mm/vmstat.c | 1 + 7 files changed, 46 insertions(+), 8 deletions(-) diff --git a/include/linux/damon.h b/include/linux/damon.h index 86e66772766b..d7e52d0228b4 100644 --- a/include/linux/damon.h +++ b/include/linux/damon.h @@ -105,6 +105,7 @@ struct damon_target { * @DAMOS_NOHUGEPAGE: Call ``madvise()`` for the region with MADV_NOHUGEPAGE. * @DAMOS_LRU_PRIO: Prioritize the region on its LRU lists. * @DAMOS_LRU_DEPRIO: Deprioritize the region on its LRU lists. + * @DAMOS_PROMOTE: Do promotion for the given region. * @DAMOS_DEMOTE: Do demotion for the given region. * @DAMOS_STAT: Do nothing but count the stat. * @NR_DAMOS_ACTIONS: Total number of DAMOS actions @@ -123,6 +124,7 @@ enum damos_action { DAMOS_NOHUGEPAGE, DAMOS_LRU_PRIO, DAMOS_LRU_DEPRIO, + DAMOS_PROMOTE, DAMOS_DEMOTE, DAMOS_STAT, /* Do nothing but only record the stat */ NR_DAMOS_ACTIONS, diff --git a/include/linux/migrate_mode.h b/include/linux/migrate_mode.h index f37cc03f9369..63f75eb9abf3 100644 --- a/include/linux/migrate_mode.h +++ b/include/linux/migrate_mode.h @@ -29,6 +29,7 @@ enum migrate_reason { MR_CONTIG_RANGE, MR_LONGTERM_PIN, MR_DEMOTION, + MR_PROMOTION, MR_TYPES }; diff --git a/include/linux/vm_event_item.h b/include/linux/vm_event_item.h index 8abfa1240040..63cf920afeaa 100644 --- a/include/linux/vm_event_item.h +++ b/include/linux/vm_event_item.h @@ -44,6 +44,7 @@ enum vm_event_item { PGPGIN, PGPGOUT, PSWPIN, PSWPOUT, PGDEMOTE_KSWAPD, PGDEMOTE_DIRECT, PGDEMOTE_KHUGEPAGED, + PGPROMOTE, PGSCAN_KSWAPD, PGSCAN_DIRECT, PGSCAN_KHUGEPAGED, diff --git a/include/trace/events/migrate.h b/include/trace/events/migrate.h index 0190ef725b43..f0dd569c1e62 100644 --- a/include/trace/events/migrate.h +++ b/include/trace/events/migrate.h @@ -22,7 +22,8 @@ EM( MR_NUMA_MISPLACED, "numa_misplaced") \ EM( MR_CONTIG_RANGE, "contig_range") \ EM( MR_LONGTERM_PIN, "longterm_pin") \ - EMe(MR_DEMOTION, "demotion") + EM( MR_DEMOTION, "demotion") \ + EMe(MR_PROMOTION, "promotion") /* * First define the enums in the above macros to be exported to userspace diff --git a/mm/damon/paddr.c b/mm/damon/paddr.c index 23e37ce57202..37a7b34a36dd 100644 --- a/mm/damon/paddr.c +++ b/mm/damon/paddr.c @@ -229,6 +229,7 @@ static bool damos_pa_filter_out(struct damos *scheme, struct folio *folio) enum migration_mode { MIG_PAGEOUT, + MIG_PROMOTE, MIG_DEMOTE, }; @@ -241,9 +242,26 @@ static unsigned int migrate_folio_list(struct list_head *migrate_folios, struct pglist_data *pgdat, enum migration_mode mm) { - int target_nid = next_demotion_node(pgdat->node_id); + int target_nid; unsigned int nr_succeeded; nodemask_t allowed_mask; + int reason; + enum vm_event_item vm_event; + + switch (mm) { + case MIG_PROMOTE: + target_nid = next_promotion_node(pgdat->node_id); + reason = MR_PROMOTION; + vm_event = PGPROMOTE; + break; + case MIG_DEMOTE: + target_nid = next_demotion_node(pgdat->node_id); + reason = MR_DEMOTION; + vm_event = PGDEMOTE_DIRECT; + break; + default: + return 0; + } struct migration_target_control mtc = { /* @@ -263,14 +281,19 @@ static unsigned int migrate_folio_list(struct list_head *migrate_folios, if (list_empty(migrate_folios)) return 0; - node_get_allowed_targets(pgdat, &allowed_mask); + if (mm == MIG_DEMOTE) { + node_get_allowed_targets(pgdat, &allowed_mask); + } else if (mm == MIG_PROMOTE) { + /* TODO: Need to add upper_tier_mask at struct memory_tier. */ + allowed_mask = NODE_MASK_NONE; + } /* Migration ignores all cpuset and mempolicy settings */ migrate_pages(migrate_folios, alloc_migrate_folio, NULL, - (unsigned long)&mtc, MIGRATE_ASYNC, MR_DEMOTION, + (unsigned long)&mtc, MIGRATE_ASYNC, reason, &nr_succeeded); - __count_vm_events(PGDEMOTE_DIRECT, nr_succeeded); + __count_vm_events(vm_event, nr_succeeded); return nr_succeeded; } @@ -359,7 +382,8 @@ static unsigned int damon_pa_migrate_folio_list(struct list_head *folio_list, VM_BUG_ON_FOLIO(folio_test_active(folio), folio); references = folio_check_references(folio); - if (references == FOLIOREF_KEEP) + if (references == FOLIOREF_KEEP || + (references == FOLIOREF_RECLAIM && mm == MIG_PROMOTE)) goto keep_locked; /* Relocate its contents to another node. */ @@ -452,8 +476,10 @@ static unsigned long damon_pa_migrate(struct damon_region *r, struct damos *s, if (damos_pa_filter_out(s, folio)) goto put_folio; - folio_clear_referenced(folio); - folio_test_clear_young(folio); + if (mm != MIG_PROMOTE) { + folio_clear_referenced(folio); + folio_test_clear_young(folio); + } if (!folio_isolate_lru(folio)) goto put_folio; /* @@ -471,6 +497,7 @@ static unsigned long damon_pa_migrate(struct damon_region *r, struct damos *s, case MIG_PAGEOUT: applied = reclaim_pages(&folio_list); break; + case MIG_PROMOTE: case MIG_DEMOTE: applied = damon_pa_migrate_pages(&folio_list, mm); break; @@ -530,6 +557,8 @@ static unsigned long damon_pa_apply_scheme(struct damon_ctx *ctx, return damon_pa_mark_accessed(r, scheme); case DAMOS_LRU_DEPRIO: return damon_pa_deactivate_pages(r, scheme); + case DAMOS_PROMOTE: + return damon_pa_migrate(r, scheme, MIG_PROMOTE); case DAMOS_DEMOTE: return damon_pa_migrate(r, scheme, MIG_DEMOTE); case DAMOS_STAT: @@ -552,6 +581,8 @@ static int damon_pa_scheme_score(struct damon_ctx *context, return damon_hot_score(context, r, scheme); case DAMOS_LRU_DEPRIO: return damon_cold_score(context, r, scheme); + case DAMOS_PROMOTE: + return damon_hot_score(context, r, scheme); case DAMOS_DEMOTE: return damon_cold_score(context, r, scheme); default: diff --git a/mm/damon/sysfs-schemes.c b/mm/damon/sysfs-schemes.c index 53e47fad5021..9bc48932eb6c 100644 --- a/mm/damon/sysfs-schemes.c +++ b/mm/damon/sysfs-schemes.c @@ -1186,6 +1186,7 @@ static const char * const damon_sysfs_damos_action_strs[] = { "nohugepage", "lru_prio", "lru_deprio", + "promote", "demote", "stat", }; diff --git a/mm/vmstat.c b/mm/vmstat.c index 359460deb377..c703abdb8137 100644 --- a/mm/vmstat.c +++ b/mm/vmstat.c @@ -1282,6 +1282,7 @@ const char * const vmstat_text[] = { "pgdemote_kswapd", "pgdemote_direct", "pgdemote_khugepaged", + "pgpromote", "pgscan_kswapd", "pgscan_direct", "pgscan_khugepaged", -- 2.34.1