Received: by 2002:a05:6359:c8b:b0:c7:702f:21d4 with SMTP id go11csp437252rwb; Sat, 17 Sep 2022 07:54:28 -0700 (PDT) X-Google-Smtp-Source: AMsMyM66018iKS0MwRzwNp/IYEA+HKitkWswfoMqdEb3jGuC2ZQlQZv2DhhtKq7JiBOzpPXFan6J X-Received: by 2002:a17:906:6a07:b0:77d:f99c:5ab8 with SMTP id qw7-20020a1709066a0700b0077df99c5ab8mr6998955ejc.544.1663426468495; Sat, 17 Sep 2022 07:54:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663426468; cv=none; d=google.com; s=arc-20160816; b=RAdUFA9zSDyT7uPyR9TUTKW/5sgoUTSw5X0jOfG68hrbEyegSem6LBJ9dL8l5ZOtvt trd2j/siECp0iHYehH0uSQ3QSNA7lWlBLCNTJshQlJZQyl6Hkx/fsV/MYKPzHKh9acfZ HjQgbSSGlMTrKHdC3aemuJJCT7o/Fkr0oEwUYQSj1FnQWNZlE1YJMiJqFE0IoB0zAewZ Rskl3FQQS5+p4awKSF37NDwfdlbVrDtKY5fHNKGscVgjoI2wrjqaYn1pyB2i6ZZRvGjs WWAplaybhWvn329r02/tK9XCTXo+mvfywTjmWa/WUQWrXAaEOlp6XGZnAztBDLetv7mf Q1dw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:message-id:date:subject:cc:to:from :dkim-signature; bh=acjlS1iDHXhmVGFkLODmzml9Wjz6bw4G2sgkuSolMsE=; b=lFOGe9U1VUNT9Yed78/xxHWZULPUR+lnJgBckq7GtQzJdrx9fN3IrN56H8fHtl57hi S90Z5bt1fjcgNwC9jvaKcPuCGG/2ToW7Yf25N504AxT2l/aYknfdhl89P8kDmJK3xmwZ K/cYiBIR/iN8beVyY6lLqfPzw/qeqVwOdF5siPdnaJrWPrOGvar9/jl8+CO2CgKLV9zf kiMNI9ENjYnV/Zgk4pTaqZC+HSLOIBhpgOsE/5Kzcxirhntq7TZ3veoRRPx4utvNZPUS h4EUiOpwjjFswja5MgVa2T54op6cd6YQ9469bKn6WO6q+q4nTNoF0pcXzopDLLgXfpi/ OeJw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=De9EFBz2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g36-20020a056402322400b0045366941d36si3847625eda.297.2022.09.17.07.54.02; Sat, 17 Sep 2022 07:54:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=De9EFBz2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229586AbiIQN6G (ORCPT + 99 others); Sat, 17 Sep 2022 09:58:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55828 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229447AbiIQN6E (ORCPT ); Sat, 17 Sep 2022 09:58:04 -0400 Received: from mail-pj1-x1030.google.com (mail-pj1-x1030.google.com [IPv6:2607:f8b0:4864:20::1030]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 912E230F5F for ; Sat, 17 Sep 2022 06:58:03 -0700 (PDT) Received: by mail-pj1-x1030.google.com with SMTP id s14-20020a17090a6e4e00b0020057c70943so2510064pjm.1 for ; Sat, 17 Sep 2022 06:58:03 -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=acjlS1iDHXhmVGFkLODmzml9Wjz6bw4G2sgkuSolMsE=; b=De9EFBz2Cs4MyGwgN7o2yiTJyv7QVqJIeJuFcgWsHlu0lMT0gLJ1BUlR3Xc83qerc6 2yTzARoaS/tNasaEpDNMSkjI0P8NY2VY+rF5L7CO5bqsRAugMf4wSvbElB4V6ZkB2NEa PNgFoZg8uoxloHUXzMdTHz6SskFpUnHhnoExysLMhNpp/OWoAz7IvXnV6krn5nbIYqGH t2aknnB9iF2gavHBd/E+v/rw61ZnsWAr99QAaOjbsO5vlZLQOOM8ITZUieWUwKNsKZHn ehz5seyhYaoLgYjqN387PE6VnG7d/0ra2J/WAtcNKIw4nUfl3ubR2Fly1II3oaVoR8QC xr5g== 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=acjlS1iDHXhmVGFkLODmzml9Wjz6bw4G2sgkuSolMsE=; b=5wZ7NEEZPUjV5pTvMiKwLUt59oKFmWPLIW+EgG5DJwsJwEjqpr+MAx7HNYRwMFDLqY RTKHJoVBJ8503nrvRZCVEoy2/kCXKkLJjGjeB37RazJIK3/LpHd1Uf/Aogpd/J/u8JYe PrJgYdprdKouBE3UVvT7BdvZYY9+zfrQsVkG3OrjOeivzrKMjuJwTE0z2x3qC5ylLSZ3 IHbRH/NQz2QmnUz5UX3k0ePEIXNUUTbwsKsI5s0/R32nsYReejJ01wfSo92YNG7Xvf8h gZsbX00zPcvUDbtraCJA0Qy9fEmy/2h9TW9Dt6KY49MDZSQ0PNhJF2aqjdXRDixSqhER i1YQ== X-Gm-Message-State: ACrzQf3djc3Y2FaaEZjlCSnOunogOUhj81jgd6eqitLj8bJy0UDYh4Pk fNfp7SpCOYvn2iP63b/gAQ== X-Received: by 2002:a17:902:f684:b0:178:2fe:9f4b with SMTP id l4-20020a170902f68400b0017802fe9f4bmr4514695plg.60.1663423082992; Sat, 17 Sep 2022 06:58:02 -0700 (PDT) Received: from localhost.localdomain ([43.132.141.8]) by smtp.gmail.com with ESMTPSA id x12-20020a170902ec8c00b001709b9d292esm17202667plg.268.2022.09.17.06.58.00 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 17 Sep 2022 06:58:02 -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 v2] mm/damon: rename damon_pageout_score() to damon_cold_score() Date: Sat, 17 Sep 2022 21:56:54 +0800 Message-Id: <1663423014-28907-1-git-send-email-kaixuxia@tencent.com> X-Mailer: git-send-email 1.8.3.1 X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Kaixu Xia In the beginning there is only one damos_action 'DAMOS_PAGEOUT' that need to get the coldness score of a region for a scheme, which using damon_pageout_score() to do that. But now there are also other damos_action actions need the coldness score, so rename it to damon_cold_score() to make more sense. Signed-off-by: Kaixu Xia Reviewed-by: SeongJae Park --- v2: -keep the order of switch cases in damon_pa_scheme_score(). mm/damon/ops-common.c | 2 +- mm/damon/ops-common.h | 2 +- mm/damon/paddr.c | 4 ++-- mm/damon/vaddr.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mm/damon/ops-common.c b/mm/damon/ops-common.c index 9310df72e1c5..75409601f934 100644 --- a/mm/damon/ops-common.c +++ b/mm/damon/ops-common.c @@ -130,7 +130,7 @@ int damon_hot_score(struct damon_ctx *c, struct damon_region *r, return hotness; } -int damon_pageout_score(struct damon_ctx *c, struct damon_region *r, +int damon_cold_score(struct damon_ctx *c, struct damon_region *r, struct damos *s) { int hotness = damon_hot_score(c, r, s); diff --git a/mm/damon/ops-common.h b/mm/damon/ops-common.h index 52329ff361cd..8d82d3722204 100644 --- a/mm/damon/ops-common.h +++ b/mm/damon/ops-common.h @@ -12,7 +12,7 @@ struct page *damon_get_page(unsigned long pfn); void damon_ptep_mkold(pte_t *pte, struct mm_struct *mm, unsigned long addr); void damon_pmdp_mkold(pmd_t *pmd, struct mm_struct *mm, unsigned long addr); -int damon_pageout_score(struct damon_ctx *c, struct damon_region *r, +int damon_cold_score(struct damon_ctx *c, struct damon_region *r, struct damos *s); int damon_hot_score(struct damon_ctx *c, struct damon_region *r, struct damos *s); diff --git a/mm/damon/paddr.c b/mm/damon/paddr.c index dfeebffe82f4..e1a4315c4be6 100644 --- a/mm/damon/paddr.c +++ b/mm/damon/paddr.c @@ -287,11 +287,11 @@ static int damon_pa_scheme_score(struct damon_ctx *context, { switch (scheme->action) { case DAMOS_PAGEOUT: - return damon_pageout_score(context, r, scheme); + return damon_cold_score(context, r, scheme); case DAMOS_LRU_PRIO: return damon_hot_score(context, r, scheme); case DAMOS_LRU_DEPRIO: - return damon_pageout_score(context, r, scheme); + return damon_cold_score(context, r, scheme); default: break; } diff --git a/mm/damon/vaddr.c b/mm/damon/vaddr.c index f53c2ff2bcc8..ea94e0b2c311 100644 --- a/mm/damon/vaddr.c +++ b/mm/damon/vaddr.c @@ -673,7 +673,7 @@ static int damon_va_scheme_score(struct damon_ctx *context, switch (scheme->action) { case DAMOS_PAGEOUT: - return damon_pageout_score(context, r, scheme); + return damon_cold_score(context, r, scheme); default: break; } -- 2.27.0