From patchwork Sat Sep 17 13:56:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kaixu Xia X-Patchwork-Id: 12979163 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 8B0AAECAAD3 for ; Sat, 17 Sep 2022 13:58:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C42F08D0002; Sat, 17 Sep 2022 09:58:04 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BCA748D0001; Sat, 17 Sep 2022 09:58:04 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A6B138D0002; Sat, 17 Sep 2022 09:58:04 -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 947208D0001 for ; Sat, 17 Sep 2022 09:58:04 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 62B4E1A08C8 for ; Sat, 17 Sep 2022 13:58:04 +0000 (UTC) X-FDA: 79921731288.27.196E6A1 Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) by imf25.hostedemail.com (Postfix) with ESMTP id 20BDDA00D4 for ; Sat, 17 Sep 2022 13:58:03 +0000 (UTC) Received: by mail-pj1-f47.google.com with SMTP id i15-20020a17090a4b8f00b0020073b4ac27so2126554pjh.3 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=Pv3u7C1mboigw8mt1VxmJ5/AQNtrFBW1xIs//bvOgju1vO6GxUqpEnciLaBfUSKF4/ MwYPBIIQR7EbUtkaNBR1qzcmNV89+a7NOkc7V+yEmA6gwRTKg4T5kCVu+uw1Q2LNj6tF 8nf9LrEWq1wY09dINFP/3ilSCxbVQ0jbbnn7IPXO0P8buglXlhSzZgpohduVfQdaQPgU CfUI5/eZcG5Fc/wghuT2Ga6uDC+tSydFoyxnNehrR0cLjmEDaDfntGa90wQJPfDj6OLV zWKLQo0xuogNPPBlSUqFs69QpNED57g0I0/N3ALp8+fydI8R9pcqnQc1nHpw4QjAWfm3 9B5w== X-Gm-Message-State: ACrzQf37QV2mVSRqHuEv980B2WZ0KaHsQ3++wUnWwiVQV4IJFDL/k9uN JYjeNj2Sm3qevSzZxZUAnA== X-Google-Smtp-Source: AMsMyM6dzD5mG5WjhrfYQ6G/JjxcIHkZbdztnI+4WHm0wAFcbeRU0c08FGTUABEE8s7ABC+TcywBXw== 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 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1663423084; 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=acjlS1iDHXhmVGFkLODmzml9Wjz6bw4G2sgkuSolMsE=; b=KHKWvXGplgR4RGDcxeMH5zVlAa+NC77TML0TGhQaU3pUjLTd0qORWm/nKWL+MFggTJNkCq F8S4z62Y2Vy27qTNgDViyP1THJAy2hqPQhW+atQvwN/BwGt4hJgJQC8biFY+MYJRSFtxNF 0sUKt0zVEkvcebmfpGH5cdYhVWYNB64= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=De9EFBz2; spf=pass (imf25.hostedemail.com: domain of xiakaixu1987@gmail.com designates 209.85.216.47 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=1663423084; a=rsa-sha256; cv=none; b=yCDg2d35y25dRPQGz/PJC7ISczXeBu9KaQz1d+oRjAeSi4+2xl1bbeBXOJJK7xyykon3TL WkdFt4nJmyJx7CScv/+IZIyf8KcFRdb3kjztVBhLAZMxuNughqRfyY/OoS/td1Q/BDrR2s D/NFLuzQQBy/HD5D3PATxKVWcD550KA= X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 20BDDA00D4 X-Rspam-User: Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=De9EFBz2; spf=pass (imf25.hostedemail.com: domain of xiakaixu1987@gmail.com designates 209.85.216.47 as permitted sender) smtp.mailfrom=xiakaixu1987@gmail.com; dmarc=pass (policy=none) header.from=gmail.com X-Stat-Signature: ypp7jmsp68jfrxk9yza8e3rssxytzjhb X-HE-Tag: 1663423083-895076 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 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; }