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 D83A442B728; Tue, 30 Jun 2026 14:17:48 +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=1782829069; cv=none; b=iEya4/0ajck9rF2UyBy64T/QkZt/rAs1tzrSKfaYU/mVYL2Nqhp4sUc1h1J+jR4X9bfvU0zY8pLOIGRxxSPdg6Ml9i+con1m/eJ5PrYa3DNvktTwbRbqsAWzyjfHcry6tOM6bQqi4SZuRJCoFRnHvKAQ3duU9vX1tMDJQZVadYY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782829069; c=relaxed/simple; bh=c5zgWqhxkixW5vLNhzBl9whKK5TN4XGT5kLvyfQ7NGQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ArPNkp5k1Tcnu6d2vsyGZZC+GOjtoOdAJNLHG+XLZdIj0cbX+ygAJ4K/q8XrgA6f/iXRWYFU726vadBSMHM4EMknJugDBgodPgLAGoZroE3HesWOdG7FdcYYeoLjN40x2pVe2wLJkP0HJyxEfq1bdpYYQDXa7daAwb8cK4kRE0c= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Le/IDJFZ; 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="Le/IDJFZ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D9B5A1F00A3D; Tue, 30 Jun 2026 14:17:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1782829068; bh=EMClHuJCnm03p59Q5WZmdREjq3/bnb9cFWhoj4p+Z3o=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Le/IDJFZnOKcym8aD6P6r/kdamO4tWO0+9OiqKJkauF9zYuUeZCpK27TfbEyCxWwT w+dT7iH3GYCt+JgqWWBGjO+bwL14MLTCASj2OsJ+KscSvbRqFpLNCgdYBQH0mlsmY8 FW9Y8IY6UQ0MIDknDQjI30pPmkMGpA0WcCUcrof1Bzm7G3eOz2ap8tJUPuWICVcJe2 9mc2LaNLyOyBD2BkmD8r4TUM/FhKmd+5ryrkNhDe26QQi/9Ioun2FXBfgN8r1DPp9K 5q+c455/Rbsg0mC2sUoLqu/nD5m3y8i5prIRqSoc6JRI+wwGeCIjtfV1I0dTvx+CwX M5PHrBnXjyY8w== From: SJ Park To: Andrew Morton Cc: SJ Park , damon@lists.linux.dev, linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 09/11] mm/damon/sysfs: split probe setup function out Date: Tue, 30 Jun 2026 07:17:23 -0700 Message-ID: <20260630141726.92246-10-sj@kernel.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260630141726.92246-1-sj@kernel.org> References: <20260630141726.92246-1-sj@kernel.org> Precedence: bulk X-Mailing-List: damon@lists.linux.dev 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: SJ 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 e3526a263e205..02afd37b04df4 100644 --- a/mm/damon/sysfs.c +++ b/mm/damon/sysfs.c @@ -1909,47 +1909,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