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 27E68ECAAD3 for ; Sat, 17 Sep 2022 09:41:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1CE498D0002; Sat, 17 Sep 2022 05:41:11 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 157A98D0001; Sat, 17 Sep 2022 05:41:11 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F39CB8D0002; Sat, 17 Sep 2022 05:41:10 -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 DD3FB8D0001 for ; Sat, 17 Sep 2022 05:41:10 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id A5D991207DF for ; Sat, 17 Sep 2022 09:41:10 +0000 (UTC) X-FDA: 79921083900.23.64210ED Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by imf24.hostedemail.com (Postfix) with ESMTP id 4DB2E1800D2 for ; Sat, 17 Sep 2022 09:41:09 +0000 (UTC) Received: by mail-pl1-f172.google.com with SMTP id jm11so23571912plb.13 for ; Sat, 17 Sep 2022 02:41:09 -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=I2k6FBkPq2fQ+qY+MPawIgHovGyQd2pxR4RTiazNyF8=; b=dajvXB6kZu8KO+gyPyFElF2PIjCqvUmoEXdq2fOMtfG++18dZaL1b843kJfZfLJSO3 7E3nMhS96Qf1BL+yuOZDmsi4YE4FugYd8/68MOGaaaFiGro9ryPlvtqbyhfFGiL5BfXr NspXhgjzr/VCkLZiV5addqJo5r3svDhKKLsNexNgoXeMbkig1LnJRr2h42FPBjkz3oU6 EvFQC1KhUsH3e6IHe7ErqM8rSvA0YB3KvvGqy79N9hMA4aM/dO/YdaNHvGUf5QBgOxbZ HObPOftpFzZXJ2qJab132C4wQhg0xnweWSR/R6bSJ62L+qfu+5WDTaok4GkWYRZJeCmb wqDw== 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=I2k6FBkPq2fQ+qY+MPawIgHovGyQd2pxR4RTiazNyF8=; b=4mXk4aow2x4obgxkAIJdyYiTb4ssU0cJs179D2KH83qSELkXMp/aoF1q2uRyjAYv2t /yi5srvY3ymZY2yWLBK+j4cIH1fYNbf9XSWYKFjpHNRFIXJPEJrh/tjXECIYi24bjdY9 WiP9uGAX73u96YCYxbjq86eRnuartIQj30nC6+epj6wtDLy0La/F70kDdcHpyP+leLVG 2+ERtnIBqta39RDm+mw6IE5Z4pDO2mYFmSipJaO1pw9I5hzlkp7CYXfyuBmA5HHxf8cy 46aObpsEqTllrEp/zJaxGRIhO78gDkgICnSn1XI4vjNj5lsHQTJO6+Wt4J5D8RubiJkx Jyxg== X-Gm-Message-State: ACrzQf0qkuZ8Cyxmx5OtxNyEDxtZIaF7hFQVcm+AlBYWl2bEQOt8z7EO I993FCf2RS+bu9bXGjCG/A== X-Google-Smtp-Source: AMsMyM7ln3m0NecF9yNpxgD75PxgQiwoGa5iE4K0cnpq0dyZyINyb2ggzi7tkMEzvoxMVtf79NTzDA== X-Received: by 2002:a17:90b:390e:b0:202:affa:1c91 with SMTP id ob14-20020a17090b390e00b00202affa1c91mr20791969pjb.233.1663407668074; Sat, 17 Sep 2022 02:41:08 -0700 (PDT) Received: from localhost.localdomain ([43.132.141.3]) by smtp.gmail.com with ESMTPSA id t10-20020a1709027fca00b001714c36a6e7sm16310677plb.284.2022.09.17.02.41.05 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 17 Sep 2022 02:41:06 -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: rename damon_pageout_score() to damon_cold_score() Date: Sat, 17 Sep 2022 17:39:18 +0800 Message-Id: <1663407558-21316-1-git-send-email-kaixuxia@tencent.com> X-Mailer: git-send-email 1.8.3.1 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1663407669; 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=I2k6FBkPq2fQ+qY+MPawIgHovGyQd2pxR4RTiazNyF8=; b=TGmlrEVSw8d6e3P4rxDGTcntwJG+GI5BXHflAwPDnA9vxuuQb2VKXgwh1hwJIHpVnMvkQ+ 9EnqvSI7Z5zOS8kx0QVWg1MyqBIuFguGCKxiF4abGUjhiS9ZHq2btAg7F5/FwAZSzhKL/C DMmkvSgwSmL7EMYB1IhsWm0DbFfxShw= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=dajvXB6k; spf=pass (imf24.hostedemail.com: domain of xiakaixu1987@gmail.com designates 209.85.214.172 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=1663407669; a=rsa-sha256; cv=none; b=2WqBT8LBqlUofd9GnBTWk87yY6e9L3BBUR47mH12C//6PEXmlBYgrdDgKimVb6y/gVPm9p 2/3/YZGvQk6Nk/WqMnxLWo5qnvP/ncqQwLmXbP6CMD9TlJWaAP32chvk3wzAouZjF8yI3I NI8xaNrgwR3rjiljL++WV3T7Teot3lA= Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=dajvXB6k; spf=pass (imf24.hostedemail.com: domain of xiakaixu1987@gmail.com designates 209.85.214.172 as permitted sender) smtp.mailfrom=xiakaixu1987@gmail.com; dmarc=pass (policy=none) header.from=gmail.com X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 4DB2E1800D2 X-Stat-Signature: 5u69qoobzto3em6gfdfpkfy8iwqtb9g7 X-Rspam-User: X-HE-Tag: 1663407669-698915 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 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 --- mm/damon/ops-common.c | 2 +- mm/damon/ops-common.h | 2 +- mm/damon/paddr.c | 5 ++--- mm/damon/vaddr.c | 2 +- 4 files changed, 5 insertions(+), 6 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..e495146e49e9 100644 --- a/mm/damon/paddr.c +++ b/mm/damon/paddr.c @@ -287,11 +287,10 @@ static int damon_pa_scheme_score(struct damon_ctx *context, { switch (scheme->action) { case DAMOS_PAGEOUT: - return damon_pageout_score(context, r, scheme); + case DAMOS_LRU_DEPRIO: + 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); 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