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 E1A73C25B4F for ; Sun, 12 May 2024 17:55:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5CDDE6B00DF; Sun, 12 May 2024 13:54:59 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 57D2F6B00E3; Sun, 12 May 2024 13:54:59 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4451D6B00F5; Sun, 12 May 2024 13:54:59 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 237936B00E3 for ; Sun, 12 May 2024 13:54:59 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id A1DB540B01 for ; Sun, 12 May 2024 17:54:58 +0000 (UTC) X-FDA: 82110494676.18.AF54155 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf25.hostedemail.com (Postfix) with ESMTP id DD756A0011 for ; Sun, 12 May 2024 17:54:56 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=lyBAV9AV; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf25.hostedemail.com: domain of sj@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=sj@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1715536497; 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:dkim-signature; bh=oNVmLJ6k9ivk6XXOchJrvdB1kICq33ICLN6C7+vYZgo=; b=uZ1WP7YfMu9XNHNx90kzx803DHK/wOjLZ/g4cWfzUmyIN/ySTFhKuLMYxI3ncKYqnxAzlg D4X1cJREiC/djN4p6i1NQZcwtNRtgSurp36o0kxxQgpEFPel4nnz3uoczwa+B6NaIWZW4p 4irYwQ/X5T2UikOrK+Ue7wKQB1KtZbw= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1715536497; a=rsa-sha256; cv=none; b=kj5xxnAOiO6KGGlf0CuIcDuHdDIpecj+rDAtZQRp4C7Ekbu6ypMIRR+N/Tq9dojqlB2sZA WNmB+x5ZBFEQkF5frDlDW5F7UPuWvdwAbvfdV3GCsNwTYw2Y3eZd1WAb1LgWRp3vcYilX2 8OqZ5ciZUg6sO7HKRkAiJjjvzW6F+0w= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=lyBAV9AV; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf25.hostedemail.com: domain of sj@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=sj@kernel.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 11AA360B6E; Sun, 12 May 2024 17:54:56 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2FABCC116B1; Sun, 12 May 2024 17:54:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1715536495; bh=vBax8IQjCZahbUBgsA8N3gO+pf43TzfEVXtgesAQ6bE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lyBAV9AVGCq6yXdy/aW3PmZ8JWsV8XngJMaFr7osxhdC0ekeLwPTvVw6Wiyg+PCPu eRdHFPEp6poLsUEDvio7nw1h6oX84fhBy8yyV3VTGioQRBvofhvpNZ/cr+QUwZt4Rm pUvI4R9YYYfVpasOVMitrr2pQ84mVKGNXWtcqGNsBlyTzKdaXWqP9V/AytmDCZhrSY XlD98FWNAgZwMEllxKOh3k50efUoMsnKpn/bHWSM/1hMMb78X7ec/04u6ZTypiJYrd J3r0o3mEJc4aPWXNhaE0GUdgdX6YF5L7DmnS1X8HpAe3KmPcqsp01gq1vNl4lYLwCA EOT9JC90/lCDw== From: SeongJae Park To: Cc: Hyeongtak Ji , SeongJae Park , Andrew Morton , damon@lists.linux.dev, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Honggyu Kim Subject: [RFC PATCH v4 2/5] mm/damon/sysfs-schemes: add target_nid on sysfs-schemes Date: Sun, 12 May 2024 10:54:44 -0700 Message-Id: <20240512175447.75943-3-sj@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240512175447.75943-1-sj@kernel.org> References: <20240512175447.75943-1-sj@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: 7zz9z7wqb4qjq9sse86mtn7zkrioz4th X-Rspamd-Queue-Id: DD756A0011 X-Rspam-User: X-Rspamd-Server: rspam01 X-HE-Tag: 1715536496-619978 X-HE-Meta: U2FsdGVkX1+YH4wrg5iszakXtxbjDsD7You8CgoDC6CAMxXaC916RQ8CB4f8YuOb7sK3fJrMQ93DC6KektXtkzzEAQj8YPjXUbIRoEn25JSj12V79W3Jh8H+hSvT0EIikxgL9t3+OHyjOoJOLz1I8Ya2DkBCmHeBXU+nsivNfJj/U+bB1AEJMrfHRgYaZvCzfbo3jFi3wwnM6Tbinc+aFqIs0NW1n5346JCp89O9RgJ0C2aKkiOf8XPDJ1mYtU+9MijthDaMc+ueVN8bw5wGYrsX0AKedaZoUYNXUR18mhddvXzRp5QblyiKQ715oaUClheEWEpHypT9Zh8d+A9V+IEUxwlSI8kHlbP+irmJiJKuenRXDU+2jcdjrODC+o90qJBxooJpVQMxhSv8KKLaGSazB7hb7HHbXuDRmtOLm0oEt14Yaz9k4wVdeu7W7YhczET7OtpQMqwI2/cr23HuePcseqgY2+Ia5YfkHYf6/u/EWGjH34UMQ7pP5GRo9stHqK5sJr2dlcGXV2e414XZUalv5M5l9qJfkdribug1HDoP6D6rRgvs139wq7zurZiVQn8GUHUKR8hCRw1DynxBvwdEZKoLOUvKqijxwqv1kR0FwE6TmlQIaBBwIB7zDTofT0o1toe4WLlKGToIWPmVkqqPslooms3Xcvrv7KHxboq1KK+6J3ONhqeKXDdrQ0GWIxv4PlbILSYtxC4bU0YrNVrJBiy8IUOzEVDLgvqX2dNPXh5OKLnuB0/V0lRyBNALZmaRi2XCflm/8qocKhHuMqY3XUZY3LhfG4Bg/GzeIMxN6E0Y/l2x0bTeFiYpkgMkXJUz3Li/QnQmZfFvSBFetzw22W8M7t/ruN1QRjtpYVmCw4f1MnMfM22MaM9pxwFwByUmUHocOkugnJkEQvRu/UIDcGPYGvBXjGOfyorWJUxaGXDW1cFAjkKePWGCT8l59rOn3hvsUMvYsioZnhu IE4/M9qD IKYrXd1wc3Te5sI7N8hgEaFWf4Peb4qOXkBjatLDuid4Yg8+upHE97YW5ITr2x1zfwOCmsV6TZLylR+LNYhaTJHpju3N2SrxOfbr+e3fWOM1C2el4CQx4TaxEw2IOrzi3+1NNgdClX8qeqadyBxoD3bsgONBM0UjazhRPiZSWdwSHjFxGbDtFtVFzHkwVhqfbb+dmW3+brUfUF7Km5scG2o38zjhriA+dRpKeoMUQNdGFYFAaVFFU4My8bvK+3lXyODy5oJAuP4STNjDnK2LQd2BqC6vGGL6LBaMsiqdjrxEqXKvGEwyYx/wSF/O8x8hG1+COKXawUZbrZ0vtFibQ1z+ALRl6f4z63jb0 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 adds target_nid under /sys/kernel/mm/damon/admin/kdamonds//contexts//schemes// The 'target_nid' can be used as the destination node for DAMOS actions such as DAMOS_MIGRATE_{HOT,COLD} in the follow up patches. Signed-off-by: Hyeongtak Ji Signed-off-by: Honggyu Kim Signed-off-by: SeongJae Park --- include/linux/damon.h | 11 ++++++++++- mm/damon/core.c | 5 ++++- mm/damon/dbgfs.c | 2 +- mm/damon/lru_sort.c | 3 ++- mm/damon/reclaim.c | 3 ++- mm/damon/sysfs-schemes.c | 33 ++++++++++++++++++++++++++++++++- 6 files changed, 51 insertions(+), 6 deletions(-) diff --git a/include/linux/damon.h b/include/linux/damon.h index f7da65e1ac04..21d6b69a015c 100644 --- a/include/linux/damon.h +++ b/include/linux/damon.h @@ -374,6 +374,7 @@ struct damos_access_pattern { * @apply_interval_us: The time between applying the @action. * @quota: Control the aggressiveness of this scheme. * @wmarks: Watermarks for automated (in)activation of this scheme. + * @target_nid: Destination node if @action is "migrate_{hot,cold}". * @filters: Additional set of &struct damos_filter for &action. * @stat: Statistics of this scheme. * @list: List head for siblings. @@ -389,6 +390,10 @@ struct damos_access_pattern { * monitoring context are inactive, DAMON stops monitoring either, and just * repeatedly checks the watermarks. * + * @target_nid is used to set the migration target node for migrate_hot or + * migrate_cold actions, which means it's only meaningful when @action is either + * "migrate_hot" or "migrate_cold". + * * Before applying the &action to a memory region, &struct damon_operations * implementation could check pages of the region and skip &action to respect * &filters @@ -410,6 +415,9 @@ struct damos { /* public: */ struct damos_quota quota; struct damos_watermarks wmarks; + union { + int target_nid; + }; struct list_head filters; struct damos_stat stat; struct list_head list; @@ -726,7 +734,8 @@ struct damos *damon_new_scheme(struct damos_access_pattern *pattern, enum damos_action action, unsigned long apply_interval_us, struct damos_quota *quota, - struct damos_watermarks *wmarks); + struct damos_watermarks *wmarks, + int target_nid); void damon_add_scheme(struct damon_ctx *ctx, struct damos *s); void damon_destroy_scheme(struct damos *s); diff --git a/mm/damon/core.c b/mm/damon/core.c index e1a0c2a11007..32c261aeff88 100644 --- a/mm/damon/core.c +++ b/mm/damon/core.c @@ -364,7 +364,8 @@ struct damos *damon_new_scheme(struct damos_access_pattern *pattern, enum damos_action action, unsigned long apply_interval_us, struct damos_quota *quota, - struct damos_watermarks *wmarks) + struct damos_watermarks *wmarks, + int target_nid) { struct damos *scheme; @@ -391,6 +392,8 @@ struct damos *damon_new_scheme(struct damos_access_pattern *pattern, scheme->wmarks = *wmarks; scheme->wmarks.activated = true; + scheme->target_nid = target_nid; + return scheme; } diff --git a/mm/damon/dbgfs.c b/mm/damon/dbgfs.c index 2461cfe2e968..51a6f1cac385 100644 --- a/mm/damon/dbgfs.c +++ b/mm/damon/dbgfs.c @@ -281,7 +281,7 @@ static struct damos **str_to_schemes(const char *str, ssize_t len, pos += parsed; scheme = damon_new_scheme(&pattern, action, 0, "a, - &wmarks); + &wmarks, NUMA_NO_NODE); if (!scheme) goto fail; diff --git a/mm/damon/lru_sort.c b/mm/damon/lru_sort.c index 3de2916a65c3..3775f0f2743d 100644 --- a/mm/damon/lru_sort.c +++ b/mm/damon/lru_sort.c @@ -163,7 +163,8 @@ static struct damos *damon_lru_sort_new_scheme( /* under the quota. */ "a, /* (De)activate this according to the watermarks. */ - &damon_lru_sort_wmarks); + &damon_lru_sort_wmarks, + NUMA_NO_NODE); } /* Create a DAMON-based operation scheme for hot memory regions */ diff --git a/mm/damon/reclaim.c b/mm/damon/reclaim.c index 9bd341d62b4c..a05ccb41749b 100644 --- a/mm/damon/reclaim.c +++ b/mm/damon/reclaim.c @@ -177,7 +177,8 @@ static struct damos *damon_reclaim_new_scheme(void) /* under the quota. */ &damon_reclaim_quota, /* (De)activate this according to the watermarks. */ - &damon_reclaim_wmarks); + &damon_reclaim_wmarks, + NUMA_NO_NODE); } static void damon_reclaim_copy_quota_status(struct damos_quota *dst, diff --git a/mm/damon/sysfs-schemes.c b/mm/damon/sysfs-schemes.c index bea5bc52846a..0632d28b67f8 100644 --- a/mm/damon/sysfs-schemes.c +++ b/mm/damon/sysfs-schemes.c @@ -6,6 +6,7 @@ */ #include +#include #include "sysfs-common.h" @@ -1445,6 +1446,7 @@ struct damon_sysfs_scheme { struct damon_sysfs_scheme_filters *filters; struct damon_sysfs_stats *stats; struct damon_sysfs_scheme_regions *tried_regions; + int target_nid; }; /* This should match with enum damos_action */ @@ -1470,6 +1472,7 @@ static struct damon_sysfs_scheme *damon_sysfs_scheme_alloc( scheme->kobj = (struct kobject){}; scheme->action = action; scheme->apply_interval_us = apply_interval_us; + scheme->target_nid = NUMA_NO_NODE; return scheme; } @@ -1692,6 +1695,28 @@ static ssize_t apply_interval_us_store(struct kobject *kobj, return err ? err : count; } +static ssize_t target_nid_show(struct kobject *kobj, + struct kobj_attribute *attr, char *buf) +{ + struct damon_sysfs_scheme *scheme = container_of(kobj, + struct damon_sysfs_scheme, kobj); + + return sysfs_emit(buf, "%d\n", scheme->target_nid); +} + +static ssize_t target_nid_store(struct kobject *kobj, + struct kobj_attribute *attr, const char *buf, size_t count) +{ + struct damon_sysfs_scheme *scheme = container_of(kobj, + struct damon_sysfs_scheme, kobj); + int err = 0; + + /* TODO: error handling for target_nid range. */ + err = kstrtoint(buf, 0, &scheme->target_nid); + + return err ? err : count; +} + static void damon_sysfs_scheme_release(struct kobject *kobj) { kfree(container_of(kobj, struct damon_sysfs_scheme, kobj)); @@ -1703,9 +1728,13 @@ static struct kobj_attribute damon_sysfs_scheme_action_attr = static struct kobj_attribute damon_sysfs_scheme_apply_interval_us_attr = __ATTR_RW_MODE(apply_interval_us, 0600); +static struct kobj_attribute damon_sysfs_scheme_target_nid_attr = + __ATTR_RW_MODE(target_nid, 0600); + static struct attribute *damon_sysfs_scheme_attrs[] = { &damon_sysfs_scheme_action_attr.attr, &damon_sysfs_scheme_apply_interval_us_attr.attr, + &damon_sysfs_scheme_target_nid_attr.attr, NULL, }; ATTRIBUTE_GROUPS(damon_sysfs_scheme); @@ -2031,7 +2060,8 @@ static struct damos *damon_sysfs_mk_scheme( }; scheme = damon_new_scheme(&pattern, sysfs_scheme->action, - sysfs_scheme->apply_interval_us, "a, &wmarks); + sysfs_scheme->apply_interval_us, "a, &wmarks, + sysfs_scheme->target_nid); if (!scheme) return NULL; @@ -2068,6 +2098,7 @@ static void damon_sysfs_update_scheme(struct damos *scheme, scheme->action = sysfs_scheme->action; scheme->apply_interval_us = sysfs_scheme->apply_interval_us; + scheme->target_nid = sysfs_scheme->target_nid; scheme->quota.ms = sysfs_quotas->ms; scheme->quota.sz = sysfs_quotas->sz; -- 2.39.2