From patchwork Thu Feb 20 19:46:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SeongJae Park X-Patchwork-Id: 13984466 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 28F59C021B2 for ; Thu, 20 Feb 2025 19:47:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 22E40280333; Thu, 20 Feb 2025 14:46:59 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 18C9928032E; Thu, 20 Feb 2025 14:46:59 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EF870280333; Thu, 20 Feb 2025 14:46:58 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id C44CB28032E for ; Thu, 20 Feb 2025 14:46:58 -0500 (EST) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 77E08C2B56 for ; Thu, 20 Feb 2025 19:46:58 +0000 (UTC) X-FDA: 83141356116.27.35E36A2 Received: from tor.source.kernel.org (tor.source.kernel.org [172.105.4.254]) by imf20.hostedemail.com (Postfix) with ESMTP id E70661C000F for ; Thu, 20 Feb 2025 19:46:56 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=maUxGS9R; spf=pass (imf20.hostedemail.com: domain of sj@kernel.org designates 172.105.4.254 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=1740080816; 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=ikZ/tnHD9e3cljXpiW7EOHMvDbLul49SDSCLRjGTb2c=; b=JrdOvWoZfOzjAx3Gdj9mkVE+PYSI80bwbltz3f9M1UEU7hk7foRf6H4oycGJyLCF0GVKu+ gTCruXFbZg3quMSKPcKCj3Hg8piySESPLn2rBKdZ8rYtyP1RN9j/aq/Eve7jTor82lJTyQ zJtfybH4Fu9pzrX2Jmg3Nnloptg1BPw= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=maUxGS9R; spf=pass (imf20.hostedemail.com: domain of sj@kernel.org designates 172.105.4.254 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=1740080816; a=rsa-sha256; cv=none; b=oEy2HXvKgVyasn5J4Jw5US9p1ChzLRgTJrsMSnrXRmcwdGu+z43DcQYMCCi0SBQhLyuGR0 TCAJlNTrMlLGOTPQxxCoVnsJcVqLlEBX9jIKVwSwTNnI7xdvUoQJap8fPChisRmD71LdyF XdfJeBIc8xm/jivC7WECXEJwYEdnr0M= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id 1AE136832A; Thu, 20 Feb 2025 19:46:55 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 583C9C4CEE4; Thu, 20 Feb 2025 19:46:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1740080816; bh=Oq7zbJY/d75refySY9fqfwByqDNucfBFfKnaietebjw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=maUxGS9RJdK/mzBVdHSuSfIk7VmThiSz7N59euVqeFHpmaCGfRUL/9WfYVhzkNwFc /bv/0r0YnnNsDvxgNMcPkITwNP2+d+Y8uizGuWm1hLHD5CHLiGT8+5bHhyMDKrFD02 CwKNdOI9XLKrBmZCCMMyK3KpxdmxEZ5E67aUvcfUPE8HzzggqWLPfsbH50GnAEG9Vs D58in8g9O2J0YICICksTAR+qBmUF6zVfTOrk/06L2BE2e4turV5njT2kMPTyPeEzN3 akk6KIthCZdvwKXuZxNlDlziSTSGeT1DBuh+m31Vw3+AqpEvizFzWqO/DsRM9zwpwq F1XWNTZfmRUvw== From: SeongJae Park To: Cc: SeongJae Park , Andrew Morton , 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: set filters handling layer of directories Date: Thu, 20 Feb 2025 11:46:43 -0800 Message-Id: <20250220194646.37726-6-sj@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250220194646.37726-1-sj@kernel.org> References: <20250220194646.37726-1-sj@kernel.org> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: E70661C000F X-Stat-Signature: ogc6z59fdutmprxcymxf8n8ra8rww7fb X-HE-Tag: 1740080816-37728 X-HE-Meta: U2FsdGVkX1/Lm05HhPqaRCyuI9fUCsekxm8KIEU9u0REq8hzKFW3SXXXtuxFKY2qTv0wdhY8eh0iG27lX4zrDXN7KQlXIeDLOk/9Xkr3zhcep/6IfbpPUggwwdox72N03B6QlXfT6L/iLeEr79mhXr3Xjn1T4RhxTLbxyZmD6GDxeu8i5UuEtCJVrJm4AGt0n3J8RsXwwqmHyzs+6Z+yWHKduajxkAEL1PxzKQaTZGVHagaouXlPnsViAmeMthkb4kGxBioCGVszbBPaz+B1BcJg1CIIDb+76OMjqUPJPhLnFTDix2SGKMT1MkH1oXHCoH+9u6sAOIkRNesCHnLr7XeYiIe94jXKIsZG74i/aoyZeMX0mMB88Tj04rFE7tTZLQbFqovaY+NXlb+oSBeyDc1Xo98XtufyzWDK8WJiTPprIEZJjyf2ge3JC5SzTXNBQWsg+8ifovh/1CPPOvb0Jlgr/pWabZIp3mjQrzExDw5tt30M61rZWkO1BdQmFySxjc/qL3ZzRF3AKyzN/mFVnLPck52F7fiQ1/F26Ja56wCSz68s0TFNq3JqPvJHkDNuMkTA1pqaRxK6/FXqXJgNYz0oMw1MnFk3YxN1R79+LWIA7tV/abAge7FoEav4r53ZJV/b8sF8ctXy+hKdC1Weutv2WA2XmAaK10Jmc/i6YxIn1RdhYNIszw9Ws06/M4kflQ8pxr1IRVDMWtnh/1guj8hgLpBZrFkOx6MIO+moXfTp+V2V7D9Z78PBh3DUWq8E3+46VHj3aMKyKKG6Xpt6YIcJMRbfY6Y4ukGPC6gwPYY7Y0x7P6h1KGI9IjV6MMcf64pM64ukEfBRtzC2mfMYnX/C2+THoHgDeJvBtWVXvC4dFX0I8m05A+mtMCT/fwhHIOqHeTMOlMWfgJvPhUTL9P3qRMIeZupuBueIqUoYpH/FUV29ZeZ79QZPS7Imndbop3Mg2abWpjsuruyeIIU GJ/fZnPj 1Hjs16/x3H9Nv1WNGFJqhvs0GpMGw2es2awqPpzIFys0p/j1298rkHfZ7bpqhyU4LhgcLFHyArwPzcBaf2ptRYUfai3LDb9TmplVbKpUNG/FZkrhgeGql5mkD+RB4WyChE9tmBwe9XMh9/2AmOkwUsGtdMTIcf3a29YHZQYPLd5/4lAcByBdd9rYjgnGPXGahsqQ8wOoIj163sggcFBhp43BuYAZgojXwwg8baZJuUa9SpfyuqZuvQqV6C2hid7Vjwk/haaEYVb+7dTk= 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. To restrict wrong type of filters to the directories, first add information about filters that handled by what layer should the filters allow installing to 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;