From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4FB893002D1; Thu, 25 Jun 2026 05:08:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782364108; cv=none; b=WQ42e6q4tbhJBEBHUlg2OfRMxcS3b3oGqTQAZvq2+QuESZwGqi7c+Eg99RLWjBm86Uaew5FWOFaZOR3CJ+o1XDRC+h7DlbD6H9VBVLKiriiK+TQvUmI70yHV8n6GLxH1d1oJ/mqiqv5mxiug9bPXpTF9jnnLivnnM4GZSRp/ODE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782364108; c=relaxed/simple; bh=okIK07moQLx3ER5ErmrgTfwRe5dUBIZuWmrnRf1ysJ4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PIptau0MoN4H2jiI3wSbqPXs72b1s9py5gSyw4LsyCaKTecPE9mBg1inflkmjCb8FP6y+MW6f8vhuAmi9wfG6TmWr9bNYUyDqIxGGX5SvhB8TKVuwVSI/UTMa3NbMbiCnKUwoDvNmQ+sbCVBVhPagMHHGgFRGX3LvfvVF+znj6s= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=MTOpIr0H; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="MTOpIr0H" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 60A601F00A3A; Thu, 25 Jun 2026 05:08:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1782364106; bh=rt+skPoflDd8ZOfYhc/MuTewnEe5bpXk/xs4uU5zeT8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=MTOpIr0Hgy75CfGgKJmaPpM/6Mr1aU5CrRL+9S2WaFWZD1UQGeAk+lmJNrA3JyeKT fZIPQ4ikxTdqq7ffEXL9bCfS8jOaXz88siHyyTdwbJN2bhXzHO8H7zrUVKKSG3P3dm gqUo8kss/6kId45tmu6R1MhRQsTyEfjIfMwhF18qDFuM1e8XzMbUF9es3Kn5iO5nRU goEfoayO0bADTHe52YUt7cuj4GafYOk+jr5U7LsMrDONXPA7KK9z6qWluzwbZQrv8n LyIqAggYOANMSsksMYclLc3hEyC15lQyz4hGLCo2cS7mVRIiJuPulVlnI/ivUMzMit yEccVjxv1DFTw== From: SeongJae Park To: Cc: SeongJae Park , Andrew Morton , damon@lists.linux.dev, linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [RFC PATCH v1.1 09/11] mm/damon/sysfs: split probe setup function out Date: Wed, 24 Jun 2026 22:07:52 -0700 Message-ID: <20260625050756.91115-10-sj@kernel.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260625050756.91115-1-sj@kernel.org> References: <20260625050756.91115-1-sj@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit damon_sysfs_set_probes() function is relatively long. It has two nested loop for setting two nested entities, namely probe and filter. Split out the probe level setup for readability. Signed-off-by: SeongJae Park --- mm/damon/sysfs.c | 80 ++++++++++++++++++++++++++++-------------------- 1 file changed, 46 insertions(+), 34 deletions(-) diff --git a/mm/damon/sysfs.c b/mm/damon/sysfs.c index 2e95e3bac774d..982d824f63c21 100644 --- a/mm/damon/sysfs.c +++ b/mm/damon/sysfs.c @@ -1899,47 +1899,59 @@ static int damon_sysfs_set_attrs(struct damon_ctx *ctx, return damon_set_attrs(ctx, &attrs); } -static int damon_sysfs_set_probes(struct damon_ctx *ctx, - struct damon_sysfs_probes *sys_probes) +static int damon_sysfs_set_probe(struct damon_probe *probe, + struct damon_sysfs_probe *sys_probe) { + struct damon_sysfs_filters *sys_filters; int i; - for (i = 0; i < sys_probes->nr; i++) { - struct damon_sysfs_filters *sys_filters = - sys_probes->probes_arr[i]->filters; - struct damon_probe *c; - int j; + sys_filters = sys_probe->filters; + if (!sys_filters) + return 0; - if (!sys_filters) - continue; - c = damon_new_probe(); - if (!c) + for (i = 0; i < sys_filters->nr; i++) { + struct damon_sysfs_filter *sys_filter = + sys_filters->filters_arr[i]; + struct damon_filter *filter; + + filter = damon_new_filter(sys_filter->type, + sys_filter->matching, + sys_filter->allow); + if (!filter) return -ENOMEM; - damon_add_probe(ctx, c); - - for (j = 0; j < sys_filters->nr; j++) { - struct damon_sysfs_filter *sys_filter = - sys_filters->filters_arr[j]; - struct damon_filter *filter; - - filter = damon_new_filter(sys_filter->type, - sys_filter->matching, - sys_filter->allow); - if (!filter) - return -ENOMEM; - if (filter->type == DAMON_FILTER_TYPE_MEMCG) { - int err; - - err = damon_sysfs_memcg_path_to_id( - sys_filter->path, - &filter->memcg_id); - if (err) { - damon_destroy_filter(filter); - return err; - } + if (filter->type == DAMON_FILTER_TYPE_MEMCG) { + int err; + + err = damon_sysfs_memcg_path_to_id( + sys_filter->path, + &filter->memcg_id); + if (err) { + damon_destroy_filter(filter); + return err; } - damon_add_filter(c, filter); } + damon_add_filter(probe, filter); + } + return 0; +} + +static int damon_sysfs_set_probes(struct damon_ctx *ctx, + struct damon_sysfs_probes *sys_probes) +{ + int i, err; + + for (i = 0; i < sys_probes->nr; i++) { + struct damon_sysfs_probe *sys_probe; + struct damon_probe *p; + + p = damon_new_probe(); + if (!p) + return -ENOMEM; + damon_add_probe(ctx, p); + sys_probe = sys_probes->probes_arr[i]; + err = damon_sysfs_set_probe(p, sys_probe); + if (err) + return err; } return 0; } -- 2.47.3