Received: by 2002:ab2:7a55:0:b0:1f4:4a7d:290d with SMTP id u21csp501296lqp; Thu, 4 Apr 2024 23:12:48 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCWZwcBk2Qiso7+dKmE4fcy2vAzefPJxpMIardBAc1LawKibH/gTOhuWgai2TucCs2NDupZbttXyGwvyaWJvMZ51AIlLJdkdJQuRFS7vkQ== X-Google-Smtp-Source: AGHT+IFyOz67Uo8s3hAYTX8eZAwbG5YRapomrr3Yvi8SDF0Q32dBJCL5NSY67zPE4RoEHTi6xrdR X-Received: by 2002:a05:620a:2a03:b0:78a:45ad:b0b8 with SMTP id o3-20020a05620a2a0300b0078a45adb0b8mr1061523qkp.39.1712297567795; Thu, 04 Apr 2024 23:12:47 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1712297567; cv=pass; d=google.com; s=arc-20160816; b=wcHmxltFNFRmD3JvYryx9DOLmBKxdMRMrp4zuCngWbl/3SxmV33G6mJLPcuu79ytx9 WTI5/CWXNob6ek4WUtwsHvqjUXhurLoM0g9V/idnwhSATLvIMx17zX46PXal9jcp+MjK H0Ne1zrhohv20oBfabugAz4Kdm36oivRk+RGKTl/ZTI25yA6RSpxfMKdwwF9WrvipevT 2HL+DuBwREii5OsXTg5cMHrXbh+54yS+A9Sxz4E2Tyvt3LCydNpjFBHx6toqxKfqpWUF 14f9fLC27dd4k/51mwtH2l7Byf3PuDdVCKdttLOK5WnaPsNHz9VPu29D0LIm97LdRmY5 jeTQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from; bh=mNgAPJ+qIlwiGuqJ6g7Mm+OsST2uRHDmb//xZNucxeU=; fh=5w1ouSnQepJltuotioeWrfka6spZYxCV2UackS2InTw=; b=PY6B9NzN34x/iEUwup+EldQoX2uq2Gfzfuj8yobVzExtK8woaDTYT1J7UhX6nqzujG M4cgYC98PclXBvRLZwIFss4mQCjsXtP7rHnumjEnrRfPE29HOgUYonLqo+6MV3P2yvnm XpE0zZ33U4/M3udSCU2rB7RI+uL27dwYXlDAfwD7bRjlzEWmff38e06kRAa+fz0/vPig 0qlF8WDb1iE717Ls08eoY2sUln0JZcLHPYDjDC1ejWNBoVQfxYSJCM4OD4G808tDrQzU KlqFuznjWPTV5Y6HrbwzIKL41Y0xvrvwZOCgK5s0oLBDj+v+J4B5sZvk9cP0xQdwNAr0 fHxw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1 spf=pass spfdomain=sk.com); spf=pass (google.com: domain of linux-kernel+bounces-132457-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-132457-linux.lists.archive=gmail.com@vger.kernel.org" Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id g24-20020a05620a109800b00789c6c92980si1033787qkk.504.2024.04.04.23.12.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Apr 2024 23:12:47 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-132457-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=sk.com); spf=pass (google.com: domain of linux-kernel+bounces-132457-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-132457-linux.lists.archive=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 667C11C2150E for ; Fri, 5 Apr 2024 06:12:47 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 5984D59B64; Fri, 5 Apr 2024 06:09:19 +0000 (UTC) Received: from invmail4.hynix.com (exvmail4.skhynix.com [166.125.252.92]) by smtp.subspace.kernel.org (Postfix) with ESMTP id E3AE1482EE; Fri, 5 Apr 2024 06:09:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=166.125.252.92 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712297358; cv=none; b=c6shNAsGO5gJClD+1nNzUGknp/erDR6WqDZkTFN2koAkV6l+JC6Oo9N/fUiUMAT37ue6NfVxYTCOEPNIFaLtfZ7z0nPW623zlybvHYq4vA6np1jkZVlqgTIcuFFJBRTTZuR2cebBE18FSLaSQOWAU5CcVcqrbJ+aABnFbfSRLFE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712297358; c=relaxed/simple; bh=9Ay746iN0JsKpTWWBdgvutQICelqTPORpOnMQc1VkGo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qLIqhX2zZ94xAAA6m2heeYdnVGVuMPRYCupJpIVnaLewKoKVgi/SbvG05/aDyeNnNXJme2YA39V0X+OgVthMi3xd535c+7Xj8r+THdmNlVIzKgywR/Y31sKzexcb12KkBuju+nlctmBnj+4ar6o7JBsoCoKoT6OyjQgSkl0F0K4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sk.com; spf=pass smtp.mailfrom=sk.com; arc=none smtp.client-ip=166.125.252.92 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sk.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sk.com X-AuditID: a67dfc5b-d6dff70000001748-9f-660f958295ec 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, 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, art.jeongseob@gmail.com Subject: [RFC PATCH v3 3/7] mm/damon/sysfs-schemes: add target_nid on sysfs-schemes Date: Fri, 5 Apr 2024 15:08:52 +0900 Message-ID: <20240405060858.2818-4-honggyu.kim@sk.com> X-Mailer: git-send-email 2.43.0.windows.1 In-Reply-To: <20240405060858.2818-1-honggyu.kim@sk.com> References: <20240405060858.2818-1-honggyu.kim@sk.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrIIsWRmVeSWpSXmKPExsXC9ZZnkW7TVP40gx0nhCwm9hhYzFm/hs1i 140Qi/sPXrNb/N97jNHiyf/frBYnbjayWXR+X8picXnXHDaLe2v+s1ocWX+WxWLz2TPMFouX q1ns63jAZHH46xsmi8mXFrBZvJhyhtHi5KzJLBazj95jdxD2WHr6DZvHhiYgsXPWXXaPln23 2D0WbCr1aDnyltVj8Z6XTB6bVnWyeWz6NInd48SM3yweOx9aerzYPJPRo7f5HZvH501yAXxR XDYpqTmZZalF+nYJXBmbHy5jLbhjVXFg5hLmBsZ9Bl2MHBwSAiYSsw+FdjFygpmb3y1lBbHZ BNQkrrycxARSIiLgILHqq0IXIxcHs8B/ZonLvb9YQeLCAsES8655g5SzCKhKNPRtBQvzCphJ bJoaBzFRU+Lx9p/sIDangLnEvMcbwGwhoJJPB4+B2bwCghInZz5hAbGZBeQlmrfOZgZZJSFw il1i2tNtrBCDJCUOrrjBMoGRfxaSnllIehYwMq1iFMrMK8tNzMwx0cuozMus0EvOz93ECIy4 ZbV/oncwfroQfIhRgINRiYfXYy5fmhBrYllxZe4hRgkOZiUR3m4H3jQh3pTEyqrUovz4otKc 1OJDjNIcLErivEbfylOEBNITS1KzU1MLUotgskwcnFINjIH+PVPYlZRNStfYajLPX5ez+Vl5 y04jjwWvZlpHie35adks+d2wcdm26atc887yvBISNp248c5zDfeYv63rnFV95Zm4tv29zcon G2WyuOJXw6LVLEXz54mGHfw8leXBtjC93bIyunOnyWqEzRCtucxbeqrMvP7ChFdzn8dqaemZ Bej2tDRdVmIpzkg01GIuKk4EAASFmLK0AgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprDIsWRmVeSWpSXmKPExsXCNUNLT7dpKn+aQV8Ts8XEHgOLOevXsFns uhFicf/Ba3aL/3uPMVo8+f+b1eLEzUY2i8/PXjNbdD75zmhxeO5JVovO70tZLC7vmsNmcW/N f1aLI+vPslhsPnuG2WLxcjWLQ9ees1rs63jAZHH46xsmi8mXFrBZvJhyhtHi5KzJLBazj95j dxD3WHr6DZvHhiYgsXPWXXaPln232D0WbCr1aDnyltVj8Z6XTB6bVnWyeWz6NInd48SM3ywe Ox9aerzYPJPRo7f5HZvHt9seHotffGDy+LxJLkAgissmJTUnsyy1SN8ugStj88NlrAV3rCoO zFzC3MC4z6CLkZNDQsBEYvO7pawgNpuAmsSVl5OYuhg5OEQEHCRWfVXoYuTiYBb4zyxxufcX K0hcWCBYYt41b5ByFgFViYa+rWBhXgEziU1T4yAmako83v6THcTmFDCXmPd4A5gtBFTy6eAx MJtXQFDi5MwnLCA2s4C8RPPW2cwTGHlmIUnNQpJawMi0ilEkM68sNzEzx1SvODujMi+zQi85 P3cTIzDOltX+mbiD8ctl90OMAhyMSjy8HnP50oRYE8uKK3MPMUpwMCuJ8HY78KYJ8aYkVlal FuXHF5XmpBYfYpTmYFES5/UKT00QEkhPLEnNTk0tSC2CyTJxcEo1MD6Uu/581YT/bsqSy4IC ReRdy5YveLJV58GjZdvu3P5vfeDwy4eNLy6sbd8bYsf4TIxv2dT+5Sbb7K8lmcuf/+8kmTuN c0ZwiBSrVO6JQw+373+8fbIDQ82jrRt2X24KatvRbii07+iqW4+/6yTmfX7Zu/HSsSTtq+yT W6yPR3eWHc78fm9bUu9nJZbijERDLeai4kQA5lJONa8CAAA= X-CFilter-Loop: Reflected 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 --- 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 5881e4ac30be..24ea33a03d5d 100644 --- a/include/linux/damon.h +++ b/include/linux/damon.h @@ -337,6 +337,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. @@ -352,6 +353,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 @@ -373,6 +378,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; @@ -677,7 +685,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 5b325749fc12..7ff0259d9fa6 100644 --- a/mm/damon/core.c +++ b/mm/damon/core.c @@ -316,7 +316,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; @@ -341,6 +342,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 7dac24e69e3b..d04fdccfa65b 100644 --- a/mm/damon/dbgfs.c +++ b/mm/damon/dbgfs.c @@ -279,7 +279,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 66e190f0374a..84e6e96b5dcc 100644 --- a/mm/damon/reclaim.c +++ b/mm/damon/reclaim.c @@ -147,7 +147,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 ae0f0b314f3a..1a30ea82c890 100644 --- a/mm/damon/sysfs-schemes.c +++ b/mm/damon/sysfs-schemes.c @@ -6,6 +6,7 @@ */ #include +#include #include "sysfs-common.h" @@ -1393,6 +1394,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 */ @@ -1418,6 +1420,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; } @@ -1640,6 +1643,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)); @@ -1651,9 +1676,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); @@ -1956,7 +1985,8 @@ static struct damos *damon_sysfs_mk_scheme( damos_sysfs_set_quota_score(sysfs_quotas->goals, "a); 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; @@ -1987,6 +2017,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.34.1