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 C213DC77B7F for ; Sun, 22 Jun 2025 21:38:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7B1346B00AD; Sun, 22 Jun 2025 17:38:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 73FC46B00AE; Sun, 22 Jun 2025 17:38:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 64FC06B00AF; Sun, 22 Jun 2025 17:38:08 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 4F3E06B00AD for ; Sun, 22 Jun 2025 17:38:08 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id E9AE980F17 for ; Sun, 22 Jun 2025 21:38:07 +0000 (UTC) X-FDA: 83584349814.22.E079F05 Received: from sea.source.kernel.org (sea.source.kernel.org [172.234.252.31]) by imf01.hostedemail.com (Postfix) with ESMTP id 359FE4000B for ; Sun, 22 Jun 2025 21:38:06 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=ZYqdLGVl; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf01.hostedemail.com: domain of sj@kernel.org designates 172.234.252.31 as permitted sender) smtp.mailfrom=sj@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1750628286; a=rsa-sha256; cv=none; b=F+LD3XqTIOiMBiDxzo0owUhMxXLeYjAsUYRNNjRRlyCaR7rXgBVuiueHn4Lm22QfG4unZ0 sST1SE8NtRvA3F+CwDcrojdWC2b2KWCvGloBU0kwWS3ZWWVsiQeKoAakuqSPaUfMpIlvju NwECNDbtx+m//CX9Qcbu9pYf2clE3Do= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=ZYqdLGVl; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf01.hostedemail.com: domain of sj@kernel.org designates 172.234.252.31 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=1750628286; 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=YueEmAseeM+QqDSEVoGCqAUL+Jfepn847YviP/Ibk90=; b=tA/wn1qCDqTg92XpS/28rCwzt7VSZg9HBgi12bUHC22DirF6hONvdXS90OASG9k0qO4BVA itu5jUEC/mOq7zFmWjgpfKu/fTY4yMqBbmAER0jCfW3x5IGBBRJq9WpU5kqQS/NwmBhl0G lF+POyRV5aa6JHDY3T3PvVvP+Cq+FFE= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id 2D8FE4A882; Sun, 22 Jun 2025 21:38:05 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DA9CFC4CEF4; Sun, 22 Jun 2025 21:38:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750628285; bh=ZYMeQoFGvpOlMGZ1tBRgXborsAE0j4pUGN4+GxrhYyM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZYqdLGVlfMzv+B71dgzFSSPHYLxj43eQH9utuqOr+oyeAtto9M/NfXY2lI/CklOfV sxxSi9tnnneoddVbjNyHjLEufRKdbH6q/1UwkZZL8EiKElymgAo58Luw8pIaL4V9mb Y7b8TpjcR+W2idnz7djRLZT+c7uWaSS4X0LEF7NlTwgw0/FGL2+6kE6cVgUydjqCCs CJiTSwH8ZEF/l0aDOju2dfYubOx5MHlJkvFWBDikAQPi5CcGphD0vBnvNkw29wkM6F ikn0e3RwvIe/J2B0Izy6qJoGmaPi/sQXLxqby0NnMY7oq8qiT5xvY2gd7x9xxD1kwn +cWY1Wsqc4rkQ== From: SeongJae Park To: Andrew Morton Cc: SeongJae Park , damon@lists.linux.dev, kernel-team@meta.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 2/5] mm/damon/sysfs-schemes: decouple from damos_action Date: Sun, 22 Jun 2025 14:37:56 -0700 Message-Id: <20250622213759.50930-3-sj@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250622213759.50930-1-sj@kernel.org> References: <20250622213759.50930-1-sj@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 359FE4000B X-Stat-Signature: 5tn75yy56r1jp3xyjex8isgizufkgtmh X-Rspam-User: X-HE-Tag: 1750628286-989769 X-HE-Meta: U2FsdGVkX18TOJhQnLji9KWiDTsDrCnQP+zP27cAXg0zf384Xva+91WhMj/J2395jJAp5dUGEL0DtWXB1P+GEwMSdyZ8zIy12ixsyTSsYWqsiCWoX1Xp/EcvrhdqtO/i2YfXaCaHOssmmxxDJ/vqpwylZeyNox3VP/2SsMthLPdYn11OO2yJOgSH4TpPthsKDW1FQv63z58StAIJczeZlabOhqG8lNgsWnkwQcIL0D41oEZOA7rezNldK4CV2Pc2wJ7kc7AJ9lahY/6btNPpVPPCgzwODnDELAR4izie8VazxH33PFrQAXqqtqoc5W0phmf4tK0UdXCTXE66l1U6IzPA7PIDDDxliEYFJGGSiWdmN73lo+teDY8iLcW3xNPAU61Y4ejW4n+7vA2n4Kew6DNMSVK9X1T+PiU56+NOJB/+Sk8FzXgrQzHarsVkhKRD0i1TsKl3pvQzNXNDUV5IcFa4gOVoeDMDQAsxxMo0UhEvLGcSv/zCATpCgT1hCpy6nvhXUFiXJhhvFa2htdzyMT8WP4BEQDkxnYLxOxQ7j7hbJrfMxb1TN72zfbqk0ubme9+weBoye2bUZPcpUZVueHQD/TP1wjUcCy/La2ngr0yPvQSu5ni9R3Bw8w+ffeMlTbz30EaTLCg4Ny4ji+uBs4KZ4aYq0+TpJ6YVJZvqljpU2E3m6Z6wl2aJGwxoSF7sTjfAnVDacxZ9ehOarTLxFkEwNgUkhyYLmQw3FcQ4189A28O20Cql10jLsExFyf3+BP+yeTqoH+WHsZyiuEql+ZE9uU0GZq2AZk4KqQhnj3ITlUYSXrKmoTtgMuEaVFWS4CFp0gr23iedwAtnT0cjtKJpAc7DYAoTpYIZrnVM+ILR3cOvmZqr7AfSW2BSBYDIJkLxFuG3+w0eZva5XK3DcgnpgkOz9+AVZqnu9WVze/Js4wK4LLKovN54iaS3Sl1FhsLoVRTbxogR58oGE0B 797DkLlY ywsRAqDorzizPy7MJzbk4Hm9IT+BRgLBpjlIHJjPfcPwSBx+ey4rtKa4FKEN2Kr3MFcF19TdbXZsIEOqkwlnpeIS010Hcb/m5k2t302J9BgtBkdYGzAVthZkUvqGbXArAMZ8QpE5HS2AbnalBtGKoGjcnVLCBWCcoXx4AQi47lYQW6YSMs4h416/+oIK4Qt00qbkqDXrc5hazZFlepfp0oapcarG5z5N602oQcWfvwA1gM2Ky1DgjYH92reb4QWLGzjG8py3mXMH95BzY2J0ciJmHWg== 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: Decouple DAMOS sysfs interface from damos_action. For this, define and use new sysfs-schemes internal data structure that maps the user-space keywords and damos_action, instead of having the implicit and unflexible array index rule. Signed-off-by: SeongJae Park --- mm/damon/sysfs-schemes.c | 80 +++++++++++++++++++++++++++++++--------- 1 file changed, 62 insertions(+), 18 deletions(-) diff --git a/mm/damon/sysfs-schemes.c b/mm/damon/sysfs-schemes.c index 3747dc6678f2..117d27544173 100644 --- a/mm/damon/sysfs-schemes.c +++ b/mm/damon/sysfs-schemes.c @@ -1614,18 +1614,52 @@ struct damon_sysfs_scheme { int target_nid; }; -/* This should match with enum damos_action */ -static const char * const damon_sysfs_damos_action_strs[] = { - "willneed", - "cold", - "pageout", - "hugepage", - "nohugepage", - "lru_prio", - "lru_deprio", - "migrate_hot", - "migrate_cold", - "stat", +struct damos_sysfs_action_name { + enum damos_action action; + char *name; +}; + +struct damos_sysfs_action_name damos_sysfs_action_names[] = { + { + .action = DAMOS_WILLNEED, + .name = "willneed", + }, + { + .action = DAMOS_COLD, + .name = "cold", + }, + { + .action = DAMOS_PAGEOUT, + .name = "pageout", + }, + { + .action = DAMOS_HUGEPAGE, + .name = "hugepage", + }, + { + .action = DAMOS_NOHUGEPAGE, + .name = "nohugepage", + }, + { + .action = DAMOS_LRU_PRIO, + .name = "lru_prio", + }, + { + .action = DAMOS_LRU_DEPRIO, + .name = "lru_deprio", + }, + { + .action = DAMOS_MIGRATE_HOT, + .name = "migrate_hot", + }, + { + .action = DAMOS_MIGRATE_COLD, + .name = "migrate_cold", + }, + { + .action = DAMOS_STAT, + .name = "stat", + }, }; static struct damon_sysfs_scheme *damon_sysfs_scheme_alloc( @@ -1862,9 +1896,16 @@ static ssize_t action_show(struct kobject *kobj, struct kobj_attribute *attr, { struct damon_sysfs_scheme *scheme = container_of(kobj, struct damon_sysfs_scheme, kobj); + int i; - return sysfs_emit(buf, "%s\n", - damon_sysfs_damos_action_strs[scheme->action]); + for (i = 0; i < ARRAY_SIZE(damos_sysfs_action_names); i++) { + struct damos_sysfs_action_name *action_name; + + action_name = &damos_sysfs_action_names[i]; + if (action_name->action == scheme->action) + return sysfs_emit(buf, "%s\n", action_name->name); + } + return -EINVAL; } static ssize_t action_store(struct kobject *kobj, struct kobj_attribute *attr, @@ -1872,11 +1913,14 @@ static ssize_t action_store(struct kobject *kobj, struct kobj_attribute *attr, { struct damon_sysfs_scheme *scheme = container_of(kobj, struct damon_sysfs_scheme, kobj); - enum damos_action action; + int i; + + for (i = 0; i < ARRAY_SIZE(damos_sysfs_action_names); i++) { + struct damos_sysfs_action_name *action_name; - for (action = 0; action < NR_DAMOS_ACTIONS; action++) { - if (sysfs_streq(buf, damon_sysfs_damos_action_strs[action])) { - scheme->action = action; + action_name = &damos_sysfs_action_names[i]; + if (sysfs_streq(buf, action_name->name)) { + scheme->action = action_name->action; return count; } } -- 2.39.5