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 3030DECAAD3 for ; Mon, 19 Sep 2022 16:56:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A52456B0073; Mon, 19 Sep 2022 12:56:10 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A019180007; Mon, 19 Sep 2022 12:56:10 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8CB46940007; Mon, 19 Sep 2022 12:56:10 -0400 (EDT) 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 7CDA86B0073 for ; Mon, 19 Sep 2022 12:56:10 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 6120F1C67BC for ; Mon, 19 Sep 2022 16:56:10 +0000 (UTC) X-FDA: 79929437700.03.FD73F4E Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by imf20.hostedemail.com (Postfix) with ESMTP id C7FDE1C0005 for ; Mon, 19 Sep 2022 16:56:09 +0000 (UTC) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 149BAB80AC9; Mon, 19 Sep 2022 16:56:08 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 50ECFC433D6; Mon, 19 Sep 2022 16:56:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1663606566; bh=32e/FZJDB4yuONft+PCsM5gw09vlrpQ66oMk3MTbToQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OukWh0UJozNYa++xmYgLggO6a95phKY30rdvo/buE5zoKiY9/6hp05EakF4YQugys Bjt30Og2aO71rbl/lNb1d4858DQeg8K86LLNx4ysh9fVIUswAqhGzdd4hP0i6mk3BA NbJ56z8ewoO3jTqBnrXyM9EMaISQg9uO02993/V/gSnr9EmXGD8sSDaJ18LCqPtNaA 6RRJ6GLLV4pwZ1bo/mxUYKolWhArZBPtKEY0d25USXgijLfmEuSk2bfgm4ORbcqIB2 Kc/8b9Je91WorUIBOr3V7C/88M4Yw0kEqPRmAo146JDXVM5cB9Gvie6BS6Ke7UqKtD dA5iV+NClFFsA== From: SeongJae Park To: xiakaixu1987@gmail.com Cc: sj@kernel.org, akpm@linux-foundation.org, damon@lists.linux.dev, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Kaixu Xia Subject: Re: [PATCH] mm/damon: deduplicate damon_{reclaim,lru_sort}_apply_parameters() Date: Mon, 19 Sep 2022 16:56:04 +0000 Message-Id: <20220919165604.61177-1-sj@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <1663568889-17634-1-git-send-email-kaixuxia@tencent.com> References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=OukWh0UJ; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf20.hostedemail.com: domain of sj@kernel.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=sj@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1663606570; a=rsa-sha256; cv=none; b=dW4UB2ZmYQmP9totMlALBuKqY0yRcC5YZ56w0AqMmrDCey/wzDCly6Hh9jg2+icVBI7ibR YOdd0uUvh+ocpfeH/tYbmNy7ZnqRKrsaZVyHJVaQcwUADHE3ROffS6PsjZAoQ7/GT8bVSD AeNaMA9jyKRHkI7Y0C8BiQJLMU/DplM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1663606570; 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=vfYIqTfsXJ0UN8dB/yn5+bVVqKkIt+HFzWXY+GFYFsg=; b=tpiiHd/BOO6fvRPoTsuc0MlWOkde0Owv73JOlCj6aFVDI+4yzb/tVBNnjYHnNQKo+R7Rjy j93Vznjt2uhHmSw12c73xkIPnSwYGZOrRz8INs67tzjMJudpYOMsnp+BgYFeZbU1IM78QE 5qyfk674nKSgStT7QRnZsYefuWtZ1gk= X-Stat-Signature: at8o38a98964rjp8tabmx3aexcs85ep6 X-Rspamd-Queue-Id: C7FDE1C0005 Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=OukWh0UJ; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf20.hostedemail.com: domain of sj@kernel.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=sj@kernel.org X-Rspam-User: X-Rspamd-Server: rspam09 X-HE-Tag: 1663606569-198940 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: Hi Kaixu, On Mon, 19 Sep 2022 14:28:09 +0800 xiakaixu1987@gmail.com wrote: > From: Kaixu Xia > > The bodies of damon_{reclaim,lru_sort}_apply_parameters() contain > duplicates. Good finding! > This commit add a common function > damon_set_regions_from_system_ram() to removes the duplicates. > > Signed-off-by: Kaixu Xia > --- > include/linux/damon.h | 3 ++- > mm/damon/core.c | 20 +++++++++++++++++++- > mm/damon/lru_sort.c | 13 +++---------- > mm/damon/reclaim.c | 13 +++---------- > 4 files changed, 27 insertions(+), 22 deletions(-) > > diff --git a/include/linux/damon.h b/include/linux/damon.h > index e7808a84675f..2fd05568ef45 100644 > --- a/include/linux/damon.h > +++ b/include/linux/damon.h > @@ -557,7 +557,8 @@ static inline bool damon_target_has_pid(const struct damon_ctx *ctx) > int damon_start(struct damon_ctx **ctxs, int nr_ctxs, bool exclusive); > int damon_stop(struct damon_ctx **ctxs, int nr_ctxs); > > -bool damon_find_biggest_system_ram(unsigned long *start, unsigned long *end); > +int damon_set_regions_from_system_ram(struct damon_target *t, > + unsigned long *start, unsigned long *end); > > #endif /* CONFIG_DAMON */ > > diff --git a/mm/damon/core.c b/mm/damon/core.c > index 9c80c6eb00c2..d967b2805a53 100644 > --- a/mm/damon/core.c > +++ b/mm/damon/core.c > @@ -1245,7 +1245,8 @@ static int walk_system_ram(struct resource *res, void *arg) > * Find biggest 'System RAM' resource and store its start and end address in > * @start and @end, respectively. If no System RAM is found, returns false. > */ > -bool damon_find_biggest_system_ram(unsigned long *start, unsigned long *end) > +static bool damon_find_biggest_system_ram(unsigned long *start, > + unsigned long *end) > > { > struct damon_system_ram_region arg = {}; > @@ -1259,6 +1260,23 @@ bool damon_find_biggest_system_ram(unsigned long *start, unsigned long *end) > return true; > } > > +int damon_set_regions_from_system_ram(struct damon_target *t, > + unsigned long *start, unsigned long *end) > +{ > + struct damon_addr_range addr_range; > + > + if (*start > *end) > + return -EINVAL; > + > + if (!*start && !*end && > + !damon_find_biggest_system_ram(start, end)) > + return -EINVAL; This function sets the region as biggest system ram only if both *start and *end are zero. The name should be changed, and it would better to have a kernel doc comment as the behavior is not very simple. How about below? /** * damon_set_region_biggest_system_ram_default() - Set the region of the given * monitoring target as requested, or biggest 'System RAM'. * @t: The monitoring target to set the region. * @start: The pointer to the start address of the region. * @end: The pointer to the end address of the region. * * This function sets the region of @t as requested by @start and @end. If the * values of the two pointers are pointing to are zero, however, this function * finds the biggest 'System RAM' resource and set the region to cover the * resource. In the latter case, this function saves the start and end address * of the resource in @start and @end, respectively. * * Return: 0 on success, negative error code otherwise. */ > + > + addr_range.start = *start; > + addr_range.end = *end; > + return damon_set_regions(t, &addr_range, 1); > +} > + > static int __init damon_init(void) > { > damon_region_cache = KMEM_CACHE(damon_region, 0); > diff --git a/mm/damon/lru_sort.c b/mm/damon/lru_sort.c > index d7eb72b41cb6..0276cbec632a 100644 > --- a/mm/damon/lru_sort.c > +++ b/mm/damon/lru_sort.c > @@ -188,7 +188,6 @@ static struct damos *damon_lru_sort_new_cold_scheme(unsigned int cold_thres) > static int damon_lru_sort_apply_parameters(void) > { > struct damos *scheme; > - struct damon_addr_range addr_range; > unsigned int hot_thres, cold_thres; > int err = 0; > > @@ -211,15 +210,9 @@ static int damon_lru_sort_apply_parameters(void) > return -ENOMEM; > damon_add_scheme(ctx, scheme); > > - if (monitor_region_start > monitor_region_end) > - return -EINVAL; > - if (!monitor_region_start && !monitor_region_end && > - !damon_find_biggest_system_ram(&monitor_region_start, > - &monitor_region_end)) > - return -EINVAL; > - addr_range.start = monitor_region_start; > - addr_range.end = monitor_region_end; > - return damon_set_regions(target, &addr_range, 1); > + return damon_set_regions_from_system_ram(target, > + &monitor_region_start, > + &monitor_region_end); > } > > static int damon_lru_sort_turn(bool on) > diff --git a/mm/damon/reclaim.c b/mm/damon/reclaim.c > index 3d59ab11b7b3..6297e1799190 100644 > --- a/mm/damon/reclaim.c > +++ b/mm/damon/reclaim.c > @@ -144,7 +144,6 @@ static struct damos *damon_reclaim_new_scheme(void) > static int damon_reclaim_apply_parameters(void) > { > struct damos *scheme; > - struct damon_addr_range addr_range; > int err = 0; > > err = damon_set_attrs(ctx, &damon_reclaim_mon_attrs); > @@ -157,15 +156,9 @@ static int damon_reclaim_apply_parameters(void) > return -ENOMEM; > damon_set_schemes(ctx, &scheme, 1); > > - if (monitor_region_start > monitor_region_end) > - return -EINVAL; > - if (!monitor_region_start && !monitor_region_end && > - !damon_find_biggest_system_ram(&monitor_region_start, > - &monitor_region_end)) > - return -EINVAL; > - addr_range.start = monitor_region_start; > - addr_range.end = monitor_region_end; > - return damon_set_regions(target, &addr_range, 1); > + return damon_set_regions_from_system_ram(target, > + &monitor_region_start, > + &monitor_region_end); > } > > static int damon_reclaim_turn(bool on) > -- > 2.27.0 > Thanks, SJ