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 86D83C021B8 for ; Tue, 4 Mar 2025 21:19:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 463BF6B0093; Tue, 4 Mar 2025 16:19:23 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 39C806B0095; Tue, 4 Mar 2025 16:19:23 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1F03E6B0096; Tue, 4 Mar 2025 16:19:23 -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 EFCBA6B0093 for ; Tue, 4 Mar 2025 16:19:22 -0500 (EST) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 9BF04C0634 for ; Tue, 4 Mar 2025 21:19:22 +0000 (UTC) X-FDA: 83185134564.16.0D4461C Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf10.hostedemail.com (Postfix) with ESMTP id 0D2B9C0006 for ; Tue, 4 Mar 2025 21:19:20 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=kqIpFa+R; spf=pass (imf10.hostedemail.com: domain of sj@kernel.org designates 147.75.193.91 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=1741123161; 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=Roxbi+mH/NdwfOmAlTyUajM1Qj63tlolVmRshCUfFVw=; b=aqe/2HQ1I1J+zKq/iaIYBIZ/e5+cuQZE1v2u7bP3XN3T4uUEELo5Ij22H9AFNz+H7Kn47c nJsdFMgXsFMiVf/1C3hoWg9tJmZRy8X4BRbz9XnjYyL87m1ZZSIJ1pwar28gBnQXJURcO3 OuAkOnc6ZF93N2LOgDI/6l9QGoGWyqE= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=kqIpFa+R; spf=pass (imf10.hostedemail.com: domain of sj@kernel.org designates 147.75.193.91 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=1741123161; a=rsa-sha256; cv=none; b=AdCJBVZ8qJ6c9R8vCngSQuVqhemx/7h2CeFnlNnBYzfuAkn+SNQ3t2t19qEEIYYW98svB3 FZF2YBlw0VsfyPurkMDmPGyn48lhjG3DLmA2fbCpODWna6kGo1F2vudbwaN/CEJvogm01E GrHvLw9GmUEVAQ0ZVRAudn9pPVfLCfg= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id A50A9A45F92; Tue, 4 Mar 2025 21:13:49 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 20FFDC4CEE9; Tue, 4 Mar 2025 21:19:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741123160; bh=6FhMRhtfgS5z0o99EQbkeXHgbive43ppIa5gFAsIPKQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kqIpFa+RIbg45l+WZVNN2pvsN+N5xKLHk5pBg7HNxx8Wvqj9os5jidvQxjr4C3W6Q ElW6wzf8gv1cRgPliHbzAOgnLGmcH22Vti65265Vg7KAv9gHbwljGws8BvO/VXgkZn H74aAIRPmZ7kB2KeuYKh/VnuA+a5bhiOVB4csn2fLiQy3U1RHvK3HAV2LTKZ0NJCAp sbd4TGUdFyvyRqtuzqIhLTamE5avcohCCPPHljPBBvs0G3gxuDtnfBgDzS1uGOOdcx hNpMjlC84+/rIkSjrxxDZFokHNm/r1dhCbW/h5aDQ9rtkKxMzQ+6XV4APWaA/qOA2N dRmILrEr8vJRg== 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 3/9] mm/damon/core: support committing ops_filters Date: Tue, 4 Mar 2025 13:19:07 -0800 Message-Id: <20250304211913.53574-4-sj@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250304211913.53574-1-sj@kernel.org> References: <20250304211913.53574-1-sj@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Stat-Signature: xaupdryzstspotncx73w7uatkh3jhq35 X-Rspamd-Queue-Id: 0D2B9C0006 X-Rspamd-Server: rspam07 X-HE-Tag: 1741123160-127684 X-HE-Meta: U2FsdGVkX19ITp/Hxx1skFYoIgrLWsPd0fksS/xDr0QxXlIHNPegI8ZwSh9vlLhdFdzRjhXvCDzK/lc85MOha/Yk8LVR8ZWcKoBkc+kaTqz/4UQwOKaDsa9lQEhgEqp1rd/9y7fPzJ4jxjW59k7F1db2Uamkp2L/6yXvGQehmRGlsgJkPnUAdNfSai+VZC1C7RklhRo474r6mpPkG/GVgvGceLkxMEiim+fK+fOiscg8ke7wtEbEK2FnCeaAE/m3hDDdeRoNmDltXh24c5ay0ezCZVtSfzq537rLmxJBB/6j37aekd8BAiwl9u/rcreKQOaK9/ODR20Ji1x76WhXIj/DOuuSnwSx2P/nb2sO+yS7FkdOP2DVm/BC4STofdsr2xczZvHuQKSfxcemqNwqJQZOGJVwXUfX4RDuqjE5ZCx0AFNYQqjwLkLv9/cXsds0D3oSYuunuiGfkyE9xsKOIuMGwUskKp4mwPFnJ7wfj32x6aujS66ATnaKHYeBZJXtHIgfaRQzhFK3WNH3fKUwhmCih/HWw9la8CgeWMPOh0+jwCPxu+w4XndyTuuvRG+RucSr+0wxwTEmtKVup0+ikO+GQNfTXw0cVZEBB2INXlD2S8RcsgjxJkCPWm4MbB/PLAM9cEuDXdaeiYbNdIaLTjF0+UBVGDLlFxqR8KuWu4hXEn0HRL4NOXRmIVRxMn3lnkMlQ6gvnOo/kfego7xpZ5rKyD7N7bzXYmb0bNo2Qqko6Bjz0LWt43w7vTyG2VEQqR85zRuGIP1mNxBDPblMj9V8/aeORXNsID4ZuspPnZ798HW+RFTSJ68CwVq/mAeOhLMoBm6CQfnz2Af1K2g38tng2lFMeWVxFVrR2WuTBShmGejRxcleL/XwqxVyootKtzUOTeZMU6z79SzVn8P4NAB3ocBVXcrBrn7BPK0iaEBJXin4u3HDZAkEeXOvtS6v/R7SNCsVyMUxTIG5iBR fqKorgGm szR1fy1IqzTuhDtHycfk51HlwHpid1hbrgxel30vpqGCwD1gkCnFMxL5KMgJxRvsxrM+EOQP9SgExVniMTt1+Aqu+HSrKAtABwz9a/gANDmTb5PjmnzBegYsmpxA8CUf0hcwxb+ckjinz3dvmXv/6a+vbho2BCgsvCtWp1NFXKMbRujzkRyuF+BNj9z58aCjopfjXnpPratyNUN53uYDLeRHF8szAQRJbU3mR3ufLRmXNhCrkHZT1h67HAOjXmP5wr9vOUvBZxOJClaAVOrHF86VYHg== 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: DAMON kernel API callers should use damon_commit_ctx() to install DAMON parameters including DAMOS filters. But damos_commit_ops_filters(), which is called by damon_commit_ctx() for filters installing, is not handling damos->ops_filters. Hence, no DAMON kernel API caller can use damos->ops_filters. Do the committing of the ops_filters to make it usable. Signed-off-by: SeongJae Park --- mm/damon/core.c | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/mm/damon/core.c b/mm/damon/core.c index 5415b7603d01..1daccccb5d67 100644 --- a/mm/damon/core.c +++ b/mm/damon/core.c @@ -820,7 +820,7 @@ static void damos_commit_filter( damos_commit_filter_arg(dst, src); } -static int damos_commit_filters(struct damos *dst, struct damos *src) +static int damos_commit_core_filters(struct damos *dst, struct damos *src) { struct damos_filter *dst_filter, *next, *src_filter, *new_filter; int i = 0, j = 0; @@ -848,6 +848,44 @@ static int damos_commit_filters(struct damos *dst, struct damos *src) return 0; } +static int damos_commit_ops_filters(struct damos *dst, struct damos *src) +{ + struct damos_filter *dst_filter, *next, *src_filter, *new_filter; + int i = 0, j = 0; + + damos_for_each_ops_filter_safe(dst_filter, next, dst) { + src_filter = damos_nth_filter(i++, src); + if (src_filter) + damos_commit_filter(dst_filter, src_filter); + else + damos_destroy_filter(dst_filter); + } + + damos_for_each_ops_filter_safe(src_filter, next, src) { + if (j++ < i) + continue; + + new_filter = damos_new_filter( + src_filter->type, src_filter->matching, + src_filter->allow); + if (!new_filter) + return -ENOMEM; + damos_commit_filter_arg(new_filter, src_filter); + damos_add_filter(dst, new_filter); + } + return 0; +} + +static int damos_commit_filters(struct damos *dst, struct damos *src) +{ + int err; + + err = damos_commit_core_filters(dst, src); + if (err) + return err; + return damos_commit_ops_filters(dst, src); +} + static struct damos *damon_nth_scheme(int n, struct damon_ctx *ctx) { struct damos *s; -- 2.39.5