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 66381C77B7C for ; Sun, 22 Jun 2025 21:38:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2A7B06B00AF; Sun, 22 Jun 2025 17:38:10 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2315D6B00B0; Sun, 22 Jun 2025 17:38:10 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 120FC6B00B1; Sun, 22 Jun 2025 17:38:10 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id ED5876B00AF for ; Sun, 22 Jun 2025 17:38:09 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id CBCD4104898 for ; Sun, 22 Jun 2025 21:38:09 +0000 (UTC) X-FDA: 83584349898.27.A5F2481 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf11.hostedemail.com (Postfix) with ESMTP id 36F8C40005 for ; Sun, 22 Jun 2025 21:38:08 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="Kek/JUaH"; spf=pass (imf11.hostedemail.com: domain of sj@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=sj@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1750628288; 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=1raDhX+SibbkAsHjl5Ngze1p+WNIa8oNLvQ7CqMfP3k=; b=Z4CK0GHkOGleZsoeLjqglzb/3cRppUPMTewjzJ6PFJ36RoodiRq6AJ4UitwmNmMlkQkWDh bN3qbjMpqURq22R/tXjcPLpKQ+q2OQm7WsoHaciQGuzHbj/FTddJtlfxnMN2Vr7PvZdpR0 X1AufJIlBicH26l9fZ6Bamed8oZOV8s= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="Kek/JUaH"; spf=pass (imf11.hostedemail.com: domain of sj@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=sj@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1750628288; a=rsa-sha256; cv=none; b=hN64QdZOxgTSS+ez5FWrYkguvPDx/ka8xAzwqz11xffx/9KDRkpXwiiH9aNoCWGRu0Bj1d quNRHHxi96rwtvbH+ftiDe3OrsKb9N6ryHyHrqZ8TRCMCiYZIy/oUARfwExXWVVVOwzV2b eV6uS4a7KyO21iVAXVzXvDdzXQ/KZOg= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id F24575C541D; Sun, 22 Jun 2025 21:35:50 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1D8AEC4CEF1; Sun, 22 Jun 2025 21:38:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750628287; bh=hoaJf6LTS/M19C68gmFwoJKbJwBssOw4AFc9E/nGoAI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Kek/JUaHvhnRV+TgYEcPUyum/L0sgKl2hAG2236Vda5DzmDVB57UTVZfFdJ7a9aYK u9nZkEzJMsEtEq2yJZP4IekQ+68tHVj1/cHjocA3MMmsZUaSMsaCttdvRXm7aQuehh Sn3nzQVPBhHysMdTQCGTvXvJFznPe4MZ7X3fYHtdYwYZYp/QCrYVWkhMFKVA3saDkD CKHcBwaPPusaE8yunMo91b6Gu6WKqW3AUBHV25HnNzWBuT/GUONTRaAxoXqHyFlZ66 QQGtNsw4+Fg2RwdUCdIe6ZC/FQ5MIDqmcBQhTPgvVCAYDftIv0o+VDVrbb0MvOwm1J j1N8hoQt4tzZg== 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 4/5] mm/damon/sysfs-schemes: decouple from damos_filter_type Date: Sun, 22 Jun 2025 14:37:58 -0700 Message-Id: <20250622213759.50930-5-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-Queue-Id: 36F8C40005 X-Rspam-User: X-Rspamd-Server: rspam07 X-Stat-Signature: yhhaekkwesjzcoeeuze7kjxxfrguofnb X-HE-Tag: 1750628288-423762 X-HE-Meta: U2FsdGVkX1/LNBaggZiRpohHkUAgXVVlolQbCN+SO9j8QWDj5UM+4asfFGyLCHc3N/TgE1lgE7d6X/TB4ni2WUysKlLUfUdPOlKKO7jSWMv/zUfYJUNGcoWXBPvbGa138cC/WxTjHAOUf2GCKxY91r9S4P7veRyMxNFtOFBiutvZuqUgzE4KkcVPqFfBEXWo1pLNSirasTh8amwan+euSWUzUcUPjEZKKLZOwWqA2ZFXtIikzAhMepFHTfu0e8Oq/OyRAN6VxoVdAtvoR8tXiCoCd5SRvQVOkW7oLUVBUYnjWXWlhR9M91hIrAfBvj+BGbQZBG1/lU/jr2xnwJ5JKSODrerQZ38dcwavGSkVzlc0mjqfd98eX8HQUabJRYDcDB+Pu6NxHWN04FL57lYcogKenPvhaMVQSGEqA/lXEhYmdHdcLYbdDFIL5cVK4N1ELZz2p1LprE1xKC89bmbKA/8BcE7W7ORb8k61Ql3UWECp0SaS86DoCP3rtigU+47s2ATkNb5NYAcuDu5JGA4D7jatD3euSgS20Ol/EiVJnoEh6yqelXtaahl61oJj1QfIkYxWWwqTLaq39GYl/ALx5JL0HZtdRYkOT6sA8Hzs7KgyfZdAcT7smBQeGdB0SSNyIbld29bKRQqEjKj/f6GlPXzRZpW3EX2TuTd7ij6r8cQdwCB68Xb1b+Xw40w5mRB22yA4h3boCIdySB3CObO/GnJCji1yz2CPpCFWBddV1tf7SmjduQduzITdRiylmWrE49uyP0+Hd18Z2VWtu64Gq2t0cqQpVAKzFb4HNmAITuN60KRHCbi2/ZkkJGu6qQzakTxnpyt6XUjomvi/V8rb2F5VdSisY4A3DwB2mAmOwE/SJNgYH+gELxjgGslQ6Us291RXZgZnDON24zaAftQkm4tRs4amPtVzTpw6dB5dAlQ5rRKjXazz3yaIE8SPECmRzRL14hSB17kVADVgy3u 4jTQTEUD kFeucNJgOnUPo/Ru+9Q0ZPd1djzmQOnO6ug2hUHLTxtLM/SGm/ECJMoAsqhRmBSF6Rv1iyMyAcMEZcTYJ4uA4jsnlI5EX3qsaOF8SEU+bXDPKGcVqhfHTyQR0WzLs/pHEDPVVJFDQRwHMP8tp4B7NRmhLZMkv0s4B9ZHOvPdEzepO9ossrVYbJaU/wVF7GJGGed5u2j5Hlee3xw96Ch/TLCuolAidpquRODoEMWBN2/orfb6DbmZaw8P7gZDi5X9pb1QM4bYF/bG7W5Bcqh1TJ9PXxw== 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_filter_type. For this, define and use new sysfs-schemes internal data structure that maps the user-space keywords and damos_filter_type, instead of having the implicit and unflexible array index rule. Signed-off-by: SeongJae Park --- mm/damon/sysfs-schemes.c | 75 ++++++++++++++++++++++++++++++---------- 1 file changed, 57 insertions(+), 18 deletions(-) diff --git a/mm/damon/sysfs-schemes.c b/mm/damon/sysfs-schemes.c index 3d42d24bb33a..5243b94cec24 100644 --- a/mm/damon/sysfs-schemes.c +++ b/mm/damon/sysfs-schemes.c @@ -341,16 +341,45 @@ static struct damon_sysfs_scheme_filter *damon_sysfs_scheme_filter_alloc( return filter; } -/* Should match with enum damos_filter_type */ -static const char * const damon_sysfs_scheme_filter_type_strs[] = { - "anon", - "active", - "memcg", - "young", - "hugepage_size", - "unmapped", - "addr", - "target", +struct damos_sysfs_filter_type_name { + enum damos_filter_type type; + char *name; +}; + +static const struct damos_sysfs_filter_type_name +damos_sysfs_filter_type_names[] = { + { + .type = DAMOS_FILTER_TYPE_ANON, + .name = "anon", + }, + { + .type = DAMOS_FILTER_TYPE_ACTIVE, + .name = "active", + }, + { + .type = DAMOS_FILTER_TYPE_MEMCG, + .name = "memcg", + }, + { + .type = DAMOS_FILTER_TYPE_YOUNG, + .name = "young", + }, + { + .type = DAMOS_FILTER_TYPE_HUGEPAGE_SIZE, + .name = "hugepage_size", + }, + { + .type = DAMOS_FILTER_TYPE_UNMAPPED, + .name = "unmapped", + }, + { + .type = DAMOS_FILTER_TYPE_ADDR, + .name = "addr", + }, + { + .type = DAMOS_FILTER_TYPE_TARGET, + .name = "target", + }, }; static ssize_t type_show(struct kobject *kobj, @@ -358,9 +387,16 @@ static ssize_t type_show(struct kobject *kobj, { struct damon_sysfs_scheme_filter *filter = container_of(kobj, struct damon_sysfs_scheme_filter, kobj); + int i; - return sysfs_emit(buf, "%s\n", - damon_sysfs_scheme_filter_type_strs[filter->type]); + for (i = 0; i < ARRAY_SIZE(damos_sysfs_filter_type_names); i++) { + const struct damos_sysfs_filter_type_name *type_name; + + type_name = &damos_sysfs_filter_type_names[i]; + if (type_name->type == filter->type) + return sysfs_emit(buf, "%s\n", type_name->name); + } + return -EINVAL; } static bool damos_sysfs_scheme_filter_valid_type( @@ -385,16 +421,19 @@ static ssize_t type_store(struct kobject *kobj, { struct damon_sysfs_scheme_filter *filter = container_of(kobj, struct damon_sysfs_scheme_filter, kobj); - enum damos_filter_type type; ssize_t ret = -EINVAL; + int i; + + for (i = 0; i < ARRAY_SIZE(damos_sysfs_filter_type_names); i++) { + const struct damos_sysfs_filter_type_name *type_name; - for (type = 0; type < NR_DAMOS_FILTER_TYPES; type++) { - if (sysfs_streq(buf, damon_sysfs_scheme_filter_type_strs[ - type])) { + type_name = &damos_sysfs_filter_type_names[i]; + if (sysfs_streq(buf, type_name->name)) { if (!damos_sysfs_scheme_filter_valid_type( - filter->handle_layer, type)) + filter->handle_layer, + type_name->type)) break; - filter->type = type; + filter->type = type_name->type; ret = count; break; } -- 2.39.5