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 960EAECAAD3 for ; Mon, 19 Sep 2022 06:28:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A9F716B0072; Mon, 19 Sep 2022 02:28:30 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A4EAB940007; Mon, 19 Sep 2022 02:28:30 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 917186B0074; Mon, 19 Sep 2022 02:28:30 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 8287E6B0072 for ; Mon, 19 Sep 2022 02:28:30 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 4D4D2804D7 for ; Mon, 19 Sep 2022 06:28:30 +0000 (UTC) X-FDA: 79927855980.17.27CB5DF Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by imf31.hostedemail.com (Postfix) with ESMTP id 06E4720004 for ; Mon, 19 Sep 2022 06:28:29 +0000 (UTC) Received: by mail-pj1-f48.google.com with SMTP id go6so22602239pjb.2 for ; Sun, 18 Sep 2022 23:28:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=4WuZzVRxwcTGHQZujoUVeEOCj8W31DhiTMyONvZ57AA=; b=C7poXa9A9sBin/vPnHXBndUU4/Qwekk3fXFmg8Lw0NKK3r6WnHu8j5SR/tG/lvZpXr SoINxtIChpZ6dbFt8Kd0HOWBxN5+4YwLKjwBddEaxJIPJ4I0V5zRpBgpD9oIXHpueuMz o/IA40WwOkljkuhdZZeAZvBkIF8X5yRPVorThzihTLUx6QOrI3MRl9tGRQMC+KxAxede 6vjKXWkdMm/tdozpAwbeaZexCTIZ1W05InKxljdzNi/GAcibfOaGH4LIzxLYs20ME01I F59g2p3kMxsHJKCGbztDy3Y/5WwYazNS8VitGmr/MIEKsEr+ok27KanMLhS9yyDkJt8s XJag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=4WuZzVRxwcTGHQZujoUVeEOCj8W31DhiTMyONvZ57AA=; b=Kk9jinoVfhVndWqmi0K0nItLnLsvPhyApMNnefX/ALO8vhhMbt/hV206eScpMHf3GA Tj0xeAa/l/W2E+NWT2Pifq0DLmVh/ry3xxeoNUWjBWMfARcZrIKAt8xWynMav4sAFOm6 cITukN12lB2ETrntmc3w+x47pY7NxoXpccIZxwYs8+Bs39yi9wxcXI0XiASF9rz+AY8e 8gE84GfEyspQtABQASlr2LP1IpTJWBWOG7sPnniEMG2VP2CPu2wycui6w8eQ2YfA9DHD NrZOtllzv9igfxH3J4hjhtcjkOEK1yW32bl81OYKHHWM7PzHW5H/i80DZVww/Lc9fHaa KhZw== X-Gm-Message-State: ACrzQf3kE0CnV6xgCNdEKZQjXbDDHLRcM7LJIDw3bCbMqdUS5FY75bWx aT0QdKKp1ULTgEyVUUuHQQ== X-Google-Smtp-Source: AMsMyM6KfjLlQbOOM0eEafho5Jey3U0WUAIhvROAuqw6rNfno/hBboac9DDKd1AgWsrH/xRDYl+xYA== X-Received: by 2002:a17:90b:1b0e:b0:202:c913:221f with SMTP id nu14-20020a17090b1b0e00b00202c913221fmr29411347pjb.211.1663568908981; Sun, 18 Sep 2022 23:28:28 -0700 (PDT) Received: from localhost.localdomain ([43.132.141.9]) by smtp.gmail.com with ESMTPSA id co16-20020a17090afe9000b001fba4716f11sm5840259pjb.22.2022.09.18.23.28.26 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 18 Sep 2022 23:28:28 -0700 (PDT) From: xiakaixu1987@gmail.com X-Google-Original-From: kaixuxia@tencent.com To: sj@kernel.org, akpm@linux-foundation.org Cc: damon@lists.linux.dev, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Kaixu Xia Subject: [PATCH] mm/damon: deduplicate damon_{reclaim,lru_sort}_apply_parameters() Date: Mon, 19 Sep 2022 14:28:09 +0800 Message-Id: <1663568889-17634-1-git-send-email-kaixuxia@tencent.com> X-Mailer: git-send-email 1.8.3.1 ARC-Authentication-Results: i=1; imf31.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=C7poXa9A; spf=pass (imf31.hostedemail.com: domain of xiakaixu1987@gmail.com designates 209.85.216.48 as permitted sender) smtp.mailfrom=xiakaixu1987@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1663568910; a=rsa-sha256; cv=none; b=2TRR5u+ECStOGQxVEAvT1tVxwFnC9zCr+LavBDfcc6d2X/EQwgEx1KrcrELmgYY9IkUp45 lAJCK98ZO3r8UIkFeMLFNKq/ZnJQC3oJV1aP5cynAEyyhHSFczxPlj+6MY0Iz2k2Kka1b7 3WpR7hAJAEPzfcBQQG7jXGahjfMPaPk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1663568910; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references:dkim-signature; bh=4WuZzVRxwcTGHQZujoUVeEOCj8W31DhiTMyONvZ57AA=; b=huuMUydUPTqXJRcWYfGTdxpPBuaeXP7MdiYNiBZRI+imuqJYH5YH6jw6Rhpjv4J8gGmBp9 rLCzPf0VN5gbeJ2ddpCrXnrqBYHQkHydKH3C0Uzh7FuBoCdqIz4hUoRsJKGcp27jFKeyup 5h22tdwgMT2hu1T6quiUvYD8n9HXIAI= X-Rspam-User: X-Rspamd-Queue-Id: 06E4720004 Authentication-Results: imf31.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=C7poXa9A; spf=pass (imf31.hostedemail.com: domain of xiakaixu1987@gmail.com designates 209.85.216.48 as permitted sender) smtp.mailfrom=xiakaixu1987@gmail.com; dmarc=pass (policy=none) header.from=gmail.com X-Stat-Signature: ao3ywi98qqpjqe8px17qxzuttejckeqz X-Rspamd-Server: rspam04 X-HE-Tag: 1663568909-663178 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: From: Kaixu Xia The bodies of damon_{reclaim,lru_sort}_apply_parameters() contain duplicates. 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; + + 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