From patchwork Sun Sep 11 00:59:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: haoxin X-Patchwork-Id: 12972731 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 23303ECAAD5 for ; Sun, 11 Sep 2022 00:59:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 244D46B0071; Sat, 10 Sep 2022 20:59:26 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1A6198D0001; Sat, 10 Sep 2022 20:59:26 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 047556B0073; Sat, 10 Sep 2022 20:59:25 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id E6CFC6B0071 for ; Sat, 10 Sep 2022 20:59:25 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id BAB6640460 for ; Sun, 11 Sep 2022 00:59:25 +0000 (UTC) X-FDA: 79897996290.14.5E9DF13 Received: from out30-42.freemail.mail.aliyun.com (out30-42.freemail.mail.aliyun.com [115.124.30.42]) by imf04.hostedemail.com (Postfix) with ESMTP id D737A40088 for ; Sun, 11 Sep 2022 00:59:23 +0000 (UTC) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R111e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018045168;MF=xhao@linux.alibaba.com;NM=1;PH=DS;RN=6;SR=0;TI=SMTPD_---0VPHfOLp_1662857958; Received: from localhost.localdomain(mailfrom:xhao@linux.alibaba.com fp:SMTPD_---0VPHfOLp_1662857958) by smtp.aliyun-inc.com; Sun, 11 Sep 2022 08:59:19 +0800 From: Xin Hao To: sj@kernel.org Cc: akpm@linux-foundation.org, damon@lists.linux.dev, linux-mm@kvack.org, linux-kernel@vger.kernel.org, xhao@linux.alibaba.com Subject: [PATCH V2] mm/damon: simplify scheme create in damon_lru_sort_apply_parameters Date: Sun, 11 Sep 2022 08:59:17 +0800 Message-Id: <20220911005917.835-1-xhao@linux.alibaba.com> X-Mailer: git-send-email 2.31.0 MIME-Version: 1.0 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1662857965; 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:references; bh=HV9z69Kter6oGt/WaV1x2D/HlFN4PS6SHSp3ldMFXso=; b=63yI1BCDxbz2b7+Km250N3mCuPMh76COm/iz06orEW6nF7zJzA1rXQOHFQwed72VTlSEhJ vfrIcFHBgveq+Aqk2FsAWfoFZRH8SEfwvKN1aatLELhpZ2pkbAULn5D7ymvXgQ5LK3NYWU 59t33iJeRuRG788QLotm6YcLqL1DyhE= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=none; spf=pass (imf04.hostedemail.com: domain of xhao@linux.alibaba.com designates 115.124.30.42 as permitted sender) smtp.mailfrom=xhao@linux.alibaba.com; dmarc=pass (policy=none) header.from=alibaba.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1662857965; a=rsa-sha256; cv=none; b=TasQr/gHdJRw6IRjMnUxtRvsTHK8PdfZVcLpzxcJa233GN8E0AdY1DlK4ALSTa1tqyc/v1 xy8j8lvmfYFpjyB2LollC8sYzRvN6LxRYhg6O7MTRqOUZeBbz47sXNz5NyzbuN8ef9utfT 0eyvUv7IHJ6IXEivK6Tbe+H+csKKqe0= X-Rspam-User: X-Stat-Signature: w81ejcdjbram61to7kpwko3ceimqyust X-Rspamd-Queue-Id: D737A40088 Authentication-Results: imf04.hostedemail.com; dkim=none; spf=pass (imf04.hostedemail.com: domain of xhao@linux.alibaba.com designates 115.124.30.42 as permitted sender) smtp.mailfrom=xhao@linux.alibaba.com; dmarc=pass (policy=none) header.from=alibaba.com X-Rspamd-Server: rspam12 X-HE-Tag: 1662857963-129941 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000006, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: In damon_lru_sort_apply_parameters(), we can use damon_set_schemes() to replace the way of creating the first 'scheme' in original code, this makes the code look cleaner. Signed-off-by: Xin Hao Reviewed-by: SeongJae Park --- Changes from v1 (https://lore.kernel.org/linux-mm/20220910165536.99023-1-xhao@linux.alibaba.com/T/) - Fix complile warning about unused 'next_schemes' variable --- mm/damon/lru_sort.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) -- 2.31.0 diff --git a/mm/damon/lru_sort.c b/mm/damon/lru_sort.c index b8ec52739e0f..1eb824ab8a98 100644 --- a/mm/damon/lru_sort.c +++ b/mm/damon/lru_sort.c @@ -340,7 +340,7 @@ static struct damos *damon_lru_sort_new_cold_scheme(unsigned int cold_thres) static int damon_lru_sort_apply_parameters(void) { - struct damos *scheme, *next_scheme; + struct damos *scheme; struct damon_addr_range addr_range; unsigned int hot_thres, cold_thres; int err = 0; @@ -350,17 +350,15 @@ static int damon_lru_sort_apply_parameters(void) if (err) return err; - /* free previously set schemes */ - damon_for_each_scheme_safe(scheme, next_scheme, ctx) - damon_destroy_scheme(scheme); - /* aggr_interval / sample_interval is the maximum nr_accesses */ hot_thres = aggr_interval / sample_interval * hot_thres_access_freq / 1000; scheme = damon_lru_sort_new_hot_scheme(hot_thres); if (!scheme) return -ENOMEM; - damon_add_scheme(ctx, scheme); + err = damon_set_schemes(ctx, &scheme, 1); + if (err) + return err; cold_thres = cold_min_age / aggr_interval; scheme = damon_lru_sort_new_cold_scheme(cold_thres);