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 152B2C19F32 for ; Wed, 5 Mar 2025 22:27:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AC2EF28000B; Wed, 5 Mar 2025 17:27:46 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 9F9CB280001; Wed, 5 Mar 2025 17:27:46 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 89EE928000B; Wed, 5 Mar 2025 17:27:46 -0500 (EST) 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 59EEA280001 for ; Wed, 5 Mar 2025 17:27:46 -0500 (EST) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id F1FEAC0B7E for ; Wed, 5 Mar 2025 22:27:46 +0000 (UTC) X-FDA: 83188935732.23.0C9CED3 Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf18.hostedemail.com (Postfix) with ESMTP id 4BB0B1C000C for ; Wed, 5 Mar 2025 22:27:45 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=nPCf65V6; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf18.hostedemail.com: domain of sj@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=sj@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741213665; a=rsa-sha256; cv=none; b=Ax7n4ovfGUdWSesKSYBOdYXCcbu8NmPQMuNki8T4rTeWzFg2WmEYteskdY5SPB+HolOFmY e5Gani7CVAZ9eTeP5JCabJqRjuqvxuy4Yd3f8/SPWWnmBGR62k7GyyF0qOUPoSD+mFoerD HXEizQBBJKIAzYjra2LfOwx2SWMfUmM= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=nPCf65V6; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf18.hostedemail.com: domain of sj@kernel.org designates 147.75.193.91 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=1741213665; 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=ZyUifpdZ3AB1OnDMPC8HBHJTPaBkonQr4n/qRblCwZs=; b=zRkDsH7/zAPPRI+3LrPd4rQQLifJkm6oJsBiWE7rwrdFXh9NHsoeYJuWtOAQF9RApxiBBU K2GdTqgaJSqeSjLLfeRagiqm1bTTaXAM41QGXtONBL7HF5bd3/nc7GHsE7s1nEdx2yiTQ5 JYUkoAXg00LxLdrvr64QoLkFsCg5hTY= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id E3253A4655A; Wed, 5 Mar 2025 22:22:13 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1A9FEC4CEE9; Wed, 5 Mar 2025 22:27:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741213664; bh=omzDcLQxOt4b1eAtHmmakixx0La83wEbeQMY0qApQrU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nPCf65V6a35HkE8QBy7nmsiyOHOU4SuTigF0B8sRNGJ4wLWSSKyjjfhQ/STTBPP0A gXEwAFSr+JuwMNcFuEzucZLQipdOf4Lcuhw5EtFtOAjwHCDJYMQv1iN/38o484Kvrr U9e+rdqtUJ02+Qq1s4OSqNENlq++fM6niYZrcCNij7yecPp0P3ZLAmAzkBODE1zhLy 5+QQNfYKWLEmji0XggkpOLCnF2aGMu4jjDknAeenNHsfXpqD+0uukb7d3CIwEZ2s3M AV8WGF0r2XHOvDfw5U9NSQZI7EAR5ojT6hwLpqi6fNdQlf8oykeH+VPXxCa7uD6ev9 zOZ0T9WB7DCgw== 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 5/8] mm/damon/sysfs-schemes: record filters of which layer should be added to the given filters directory Date: Wed, 5 Mar 2025 14:27:30 -0800 Message-Id: <20250305222733.59089-6-sj@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250305222733.59089-1-sj@kernel.org> References: <20250305222733.59089-1-sj@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4BB0B1C000C X-Stat-Signature: 8qjp7r7tcunx9ne7iirqx8ht55b8tqf4 X-Rspam-User: X-Rspamd-Server: rspam05 X-HE-Tag: 1741213665-425400 X-HE-Meta: U2FsdGVkX1+OVHQpjv2gSN97puDzL6uOqAKHQFZrAuW2OBN18KZnuKCh2dzqIG1Tn3KFNo1lqo+4J3JcCPTRS2zPeInpMHogTjbIskkKv4BzZuFM/aumkgd8IBmp3hK/RKmw3GTnVrUvc54+rglwG2CaUhqTpLl4R51lj/A9eUCMBFdLvcCTTdwJo4TejK/Jpkf12QidfInAcKaJ+NZhS/c/HKgcHRLQ4rwWnd7MHkD4KFfuU+EO+5fWaMHRpKRjlg+m1EZYe1uueUjDUdujpr+3XTougYdXTUezXopldJD0/8av4d6AVVBX58IhvBxesknBQPLGIuwb2ntbhHMTvndZz7Uje5kIpO5isCXaMXIZR0vivT7R+D+aLpFM+Xq4S+Byn5KQJ1nXbYVLI+09FESnGJgKkRppK6y1csJU8XmFlKj7t61buaHzgf6tf0bS8rn3+rOKTOirzza/IxaZ/aSeWz/TJCoCOzMXusfsd7RBiHgX5h1LVkMlPnYcCsZXs/RRlaiaayKkqvmsUC+FJvDco/vSq5Lfm9P4nv8mW60UFV1RFfZ6I2lderQefEutXldCB1PM9MvsDYBe1z2+2WovrtmiZWiK7EX5UZcI+kPhyGUQOLD7KrXjZyiHhSUzTDW2L/rdrfuf4d6BlFbM2nLopMRui9iVbsB5I534GcnkpPkdAD7o9t9mFQNY0+4WTA9pHu/zsj2lGWJMpgm4QEPVAG3fYHHB/atCFJdow7pJkRRLulx6dbRtjhXTZloDeOgIdN91l+n0Thwuse3j8j6Lsa/WKMIgjUZbMZUf4aJvE80RUpT456Hl1p9J9ibEdMT6C01Ccm9PtT8vNNO3es1Rmo5ZoNmVlihYCi2PLsrwls5MAKxZuLs4usXF/Hf53vZlNjpkP6RmU2B78jpQBRo9UXqT7SzJrvZBWOEpAlHp7+BIierG9KsnhfazyYD9JuGh9u0FVYYctcrVlAu 1jd8NUhC UopRT4HCqhT/UT4LvJJsOdK9GhgN7sv5sv4lQDIcTHdHS1ohQWMoP98Id1pyAAfr1ihrFxmx/XNo+XGXGKh9I2Mxw/gpilXuXmTjDKktMSblOPyqZ4nj6PuC9TyASoEJ68VFCZPJfaLxBGzPgSt2igyRwkbqZfsQnPuG8U5JOSswqna2DwT3p58zs+QeisGyqbmYrqt/08YwK6gZIT2mCRxqZMmOv55LGUhX/NxLtEV7DrI/BrvPhiJEXFSIDdi5ccOzc8x5fA4oCT55kam4WQL2wZ6E/L4Rcb6y0 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: Unlike their name and assumed purposes, {core,ops}_filters DAMOS sysfs directories are allowing installing any type of filters. As a first step for preventing such wrong installments, add information about filters that handled by what layer should the installed to the given filters directory in the DAMOS sysfs internal data structures. Signed-off-by: SeongJae Park --- mm/damon/sysfs-schemes.c | 46 +++++++++++++++++++++++++++++++--------- 1 file changed, 36 insertions(+), 10 deletions(-) diff --git a/mm/damon/sysfs-schemes.c b/mm/damon/sysfs-schemes.c index e85feb329bd6..b9f035f4b00f 100644 --- a/mm/damon/sysfs-schemes.c +++ b/mm/damon/sysfs-schemes.c @@ -309,8 +309,18 @@ static const struct kobj_type damon_sysfs_stats_ktype = { * filter directory */ +/* + * enum damos_sysfs_filter_handle_layer - Layers handling filters of a dir. + */ +enum damos_sysfs_filter_handle_layer { + DAMOS_SYSFS_FILTER_HANDLE_LAYER_CORE, + DAMOS_SYSFS_FILTER_HANDLE_LAYER_OPS, + DAMOS_SYSFS_FILTER_HANDLE_LAYER_BOTH, +}; + struct damon_sysfs_scheme_filter { struct kobject kobj; + enum damos_sysfs_filter_handle_layer handle_layer; enum damos_filter_type type; bool matching; bool allow; @@ -320,9 +330,15 @@ struct damon_sysfs_scheme_filter { int target_idx; }; -static struct damon_sysfs_scheme_filter *damon_sysfs_scheme_filter_alloc(void) +static struct damon_sysfs_scheme_filter *damon_sysfs_scheme_filter_alloc( + enum damos_sysfs_filter_handle_layer layer) { - return kzalloc(sizeof(struct damon_sysfs_scheme_filter), GFP_KERNEL); + struct damon_sysfs_scheme_filter *filter; + + filter = kzalloc(sizeof(struct damon_sysfs_scheme_filter), GFP_KERNEL); + if (filter) + filter->handle_layer = layer; + return filter; } /* Should match with enum damos_filter_type */ @@ -595,14 +611,20 @@ static const struct kobj_type damon_sysfs_scheme_filter_ktype = { struct damon_sysfs_scheme_filters { struct kobject kobj; + enum damos_sysfs_filter_handle_layer handle_layer; struct damon_sysfs_scheme_filter **filters_arr; int nr; }; static struct damon_sysfs_scheme_filters * -damon_sysfs_scheme_filters_alloc(void) +damon_sysfs_scheme_filters_alloc(enum damos_sysfs_filter_handle_layer layer) { - return kzalloc(sizeof(struct damon_sysfs_scheme_filters), GFP_KERNEL); + struct damon_sysfs_scheme_filters *filters; + + filters = kzalloc(sizeof(struct damon_sysfs_scheme_filters), GFP_KERNEL); + if (filters) + filters->handle_layer = layer; + return filters; } static void damon_sysfs_scheme_filters_rm_dirs( @@ -635,7 +657,8 @@ static int damon_sysfs_scheme_filters_add_dirs( filters->filters_arr = filters_arr; for (i = 0; i < nr_filters; i++) { - filter = damon_sysfs_scheme_filter_alloc(); + filter = damon_sysfs_scheme_filter_alloc( + filters->handle_layer); if (!filter) { damon_sysfs_scheme_filters_rm_dirs(filters); return -ENOMEM; @@ -1607,11 +1630,11 @@ static int damon_sysfs_scheme_set_watermarks(struct damon_sysfs_scheme *scheme) } static int damon_sysfs_scheme_set_filters(struct damon_sysfs_scheme *scheme, - const char *name, + enum damos_sysfs_filter_handle_layer layer, const char *name, struct damon_sysfs_scheme_filters **filters_ptr) { struct damon_sysfs_scheme_filters *filters = - damon_sysfs_scheme_filters_alloc(); + damon_sysfs_scheme_filters_alloc(layer); int err; if (!filters) @@ -1630,15 +1653,18 @@ static int damos_sysfs_set_filter_dirs(struct damon_sysfs_scheme *scheme) { int err; - err = damon_sysfs_scheme_set_filters(scheme, "filters", + err = damon_sysfs_scheme_set_filters(scheme, + DAMOS_SYSFS_FILTER_HANDLE_LAYER_BOTH, "filters", &scheme->filters); if (err) return err; - err = damon_sysfs_scheme_set_filters(scheme, "core_filters", + err = damon_sysfs_scheme_set_filters(scheme, + DAMOS_SYSFS_FILTER_HANDLE_LAYER_CORE, "core_filters", &scheme->core_filters); if (err) goto put_filters_out; - err = damon_sysfs_scheme_set_filters(scheme, "ops_filters", + err = damon_sysfs_scheme_set_filters(scheme, + DAMOS_SYSFS_FILTER_HANDLE_LAYER_OPS, "ops_filters", &scheme->ops_filters); if (err) goto put_core_filters_out; -- 2.39.5