From patchwork Wed Jan 4 23:10:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nhat Pham X-Patchwork-Id: 13089182 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 660D6C54EBC for ; Wed, 4 Jan 2023 23:11:03 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E47AA8E0001; Wed, 4 Jan 2023 18:11:02 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id DA8BD900002; Wed, 4 Jan 2023 18:11:02 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BFB728E0003; Wed, 4 Jan 2023 18:11:02 -0500 (EST) 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 ACD9F8E0001 for ; Wed, 4 Jan 2023 18:11:02 -0500 (EST) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 77F57160760 for ; Wed, 4 Jan 2023 23:11:02 +0000 (UTC) X-FDA: 80318663964.30.5FC7238 Received: from mail-pg1-f175.google.com (mail-pg1-f175.google.com [209.85.215.175]) by imf01.hostedemail.com (Postfix) with ESMTP id B3FC940004 for ; Wed, 4 Jan 2023 23:11:00 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b="FVyF3/gV"; spf=pass (imf01.hostedemail.com: domain of nphamcs@gmail.com designates 209.85.215.175 as permitted sender) smtp.mailfrom=nphamcs@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1672873860; a=rsa-sha256; cv=none; b=kw92TXaQKnQqDsGZKQpPtoX08vPm+VXKmPiC3MnkV2IWiTw+ac+NdEk1lTqCF1ApHB34OP /lmhVxCr6eLysA23Nt3K4TI+6mW7jt1SESJbaI6tHe58Okhxad9yziKO5bP8cmCk0xDyDe CQDKuPIsXXJ0lkI4yDD7l+TRFp7hJEg= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b="FVyF3/gV"; spf=pass (imf01.hostedemail.com: domain of nphamcs@gmail.com designates 209.85.215.175 as permitted sender) smtp.mailfrom=nphamcs@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1672873860; 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:in-reply-to:references:references:dkim-signature; bh=YRguhEw3CY77NjO4ltDj62CfZtUxun2rreMj0XQVN6o=; b=e29G34dxS1Dy1zeVnXACCsKyqwb9qSEelLF5PoHY+O+FwhxlnqB1BdJVz9iA30LPT7m+Ps sCDsYlZcNSzDF+PW4Hy7zTi2HqQfI4RFJ8RdDa3xDKo5V8/f/tUV0cObiX6RjcD9Zp5MSZ ltHUf+UxKtgGgMVQyJHGxwJl8zopuLA= Received: by mail-pg1-f175.google.com with SMTP id h192so18516318pgc.7 for ; Wed, 04 Jan 2023 15:11:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YRguhEw3CY77NjO4ltDj62CfZtUxun2rreMj0XQVN6o=; b=FVyF3/gVe3ARIGfgW9nhT1QjatOnyKsZZp9poD7NhPKIVs7wzTvzqFh6nuBC2/T1st 6MiVwqYSwEAawuDKYt48jliWlQR7a9rLqts8J95ADpzfgLskuxMSHs8I9walhxmfPMIA AMAKUTPRQr1+//sRK+oRWOtL3XGUvVnFldJq1QUl5xOD7RIjdFTUWrYLdwKXvbvG9YQL rcprsx4aVhGWNFaeN/g5BDoJYyNOszPAaVm6w/6s/f3eLeM0YmHTa78ng+TmjKXPrZ2x gueZyrdX1b4tGYDtLOvUFvAX7sc19JqPTaIMqLlpV6xanwMQTjoRgGS57VJz/TvMHixr 68LA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YRguhEw3CY77NjO4ltDj62CfZtUxun2rreMj0XQVN6o=; b=GVPV+vsXs51QDvKGP6m4pqoRM3ehdAUstssvprgWSR6ABB+PBGCvCVZJ48V7NfiKuD 5mgUe96dOIJ+Uye5sVOk9L2wGiNBcAZjcEyRW+cJ1upC+o/QA2EIrQkIHyPNKxITDLri WcT76RY4kRaB1ItIr/dHqvQEdcdztjHSRrpVFFBmfyZE+nvJiHbvdFoNvajZhulm9/QI GpM4Lk1dg4XY/1OHF6ONwzIXmF/W6LlJJVNg7GYRDDxU0bUoYWF3am6T7vy/GQWzh17F g+nAyzXE94m4xcNfg5GId4COQ6kGF8WX9jhgCzjYrAaHkR1hY+YEStGSFcvf4SJc1FtS R24Q== X-Gm-Message-State: AFqh2koPdPjYAVkf7qDebyX1N5Blzs5mb432kj54qkrE1HMdZVtMBEct nWKWTfoDxGDFCZfqEu6Ke/o= X-Google-Smtp-Source: AMrXdXtA4D2lE/TpwyaUnXuyj3yzHbo48zrNA1EgBxqoIt98qEwuBLyeSAI6MQlKlPzRAIONEL1ZLw== X-Received: by 2002:aa7:88c3:0:b0:580:963d:8064 with SMTP id k3-20020aa788c3000000b00580963d8064mr63487290pff.20.1672873859587; Wed, 04 Jan 2023 15:10:59 -0800 (PST) Received: from localhost (fwdproxy-prn-116.fbsv.net. [2a03:2880:ff:74::face:b00c]) by smtp.gmail.com with ESMTPSA id c21-20020a621c15000000b00581498190efsm17072522pfc.161.2023.01.04.15.10.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Jan 2023 15:10:59 -0800 (PST) From: Nhat Pham To: akpm@linux-foundation.org Cc: hannes@cmpxchg.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, bfoster@redhat.com, willy@infradead.org, kernel-team@meta.com Subject: [PATCH v5 1/3] workingset: refactor LRU refault to expose refault recency check Date: Wed, 4 Jan 2023 15:10:55 -0800 Message-Id: <20230104231057.2632639-2-nphamcs@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230104231057.2632639-1-nphamcs@gmail.com> References: <20230104231057.2632639-1-nphamcs@gmail.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Queue-Id: B3FC940004 X-Rspamd-Server: rspam01 X-Stat-Signature: zctx9npsixqc877sgg73yqtinig7iccu X-HE-Tag: 1672873860-81583 X-HE-Meta: U2FsdGVkX18XPF//06bTSyHcVO9MMtZtvxFG5pW3llzrT1ouECs2B8hRw9Twm9xHzb0Om2F7LjF1egPz0eiCXUXjUBaWuRCd9MiSdHf7mmhsc2EwjwyiYqg+5enb0iMwAkw0IGh6aA8DN6ng/8dqQy0AI4pMe1lHWgaChRt8Hzng+4QnTV0p3805z74sng3XV4Z79LOwNpxT61eqO4qYAOyzV4QbO0bhrwG2/zQgvN73VrF7lybPDixnbQ5JmNOscnEoqtp1K9zCI17OfvwOBRslamRHKX8Le2qVSydzeR//gD8hspWOAN9UXiNUxQIRBiZs7JR8I4ry3LB+3dx2ZnKAbxoVaEtOuohGXUWsh5zbhWVu5JqkcDBMmbxOsS6O8Re9XOTBSLIdwqpKHiHvHku4jftFP7r5p0l+HkAVQ6ybLzjcxLy7Sn73spSOzZsqTuKLC16AayHjZIStDLftX8zYxJGF2sEwxb/ctaBMgWSIaay6RE2iyAcDNWMuKWaeXqdKFazeQbnUQNaiyC1xWYk/mtKmXjPinuRACJUwVlovtQ169cjR7LMysZVsrlOwwvzWDCkswtBmoWslDHgu/pG4fO8bMAVTmiZuRFKPVNT4vk9RtbGHsVAfl20dnxzRQ48Usi5Xvfd75uRegH6pmEYX7/qYkTlO0jVkXM2bKUA503QQ9sQVlGKum1JtUV5X5eVSO2h7btWxEmMC+4RYIyQSERqJPBwZmKqy8BahJBbgqBl5NYjmBVmaPFhh0J9UVJ1QpnOgV60eRK2KEYpEBcyCqzhnVDpt6qt8DoEUYSOBmuwqhtC7SimjVAasOd6Ibv5Xunbybfe722yjlUs3xsvGB7cP1W7M6hW/vMNf5DEWMJxTLMLbWvSjMiUf6dpqF6kDWXppEfNhiLrHJ6nN5RVhNHDKcV2gl9Dc/GUc3FpapOSFEce2K1Yf4037h1UZxvRYv8as9QN2mFZTJBX iR9RtC9o 4eLXSQzGskRLzvPVPEMUbfSpDGiPh/T6y2hSEBHEyn1XndTh6IWxuLLMII63dA+45pLlC7oxh+Jy8vZ67MN9Czzj8j57wk1yOghYJjUKVJc77kVPFcsHMwF2Yf0UTyd6yhpeD X-Bogosity: Ham, tests=bogofilter, spamicity=0.001245, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: In preparation for computing recently evicted pages in cachestat, refactor workingset_refault and lru_gen_refault to expose a helper function that would test if an evicted page is recently evicted. Signed-off-by: Nhat Pham --- include/linux/swap.h | 1 + mm/workingset.c | 129 ++++++++++++++++++++++++++++++------------- 2 files changed, 92 insertions(+), 38 deletions(-) diff --git a/include/linux/swap.h b/include/linux/swap.h index a18cf4b7c724..dae6f6f955eb 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h @@ -361,6 +361,7 @@ static inline void folio_set_swap_entry(struct folio *folio, swp_entry_t entry) } /* linux/mm/workingset.c */ +bool workingset_test_recent(void *shadow, bool file, bool *workingset); void workingset_age_nonresident(struct lruvec *lruvec, unsigned long nr_pages); void *workingset_eviction(struct folio *folio, struct mem_cgroup *target_memcg); void workingset_refault(struct folio *folio, void *shadow); diff --git a/mm/workingset.c b/mm/workingset.c index 79585d55c45d..006482c4e0bd 100644 --- a/mm/workingset.c +++ b/mm/workingset.c @@ -244,6 +244,33 @@ static void *lru_gen_eviction(struct folio *folio) return pack_shadow(mem_cgroup_id(memcg), pgdat, token, refs); } +/* + * Test if the folio is recently evicted. + * + * As a side effect, also populates the references with + * values unpacked from the shadow of the evicted folio. + */ +static bool lru_gen_test_recent(void *shadow, bool file, bool *workingset) +{ + struct mem_cgroup *eviction_memcg; + struct lruvec *lruvec; + struct lru_gen_struct *lrugen; + unsigned long min_seq; + + int memcgid; + struct pglist_data *pgdat; + unsigned long token; + + unpack_shadow(shadow, &memcgid, &pgdat, &token, workingset); + eviction_memcg = mem_cgroup_from_id(memcgid); + + lruvec = mem_cgroup_lruvec(eviction_memcg, pgdat); + lrugen = &lruvec->lrugen; + + min_seq = READ_ONCE(lrugen->min_seq[file]); + return !((token >> LRU_REFS_WIDTH) != (min_seq & (EVICTION_MASK >> LRU_REFS_WIDTH))); +} + static void lru_gen_refault(struct folio *folio, void *shadow) { int hist, tier, refs; @@ -306,6 +333,11 @@ static void *lru_gen_eviction(struct folio *folio) return NULL; } +static bool lru_gen_test_recent(void *shadow, bool file, bool *workingset) +{ + return true; +} + static void lru_gen_refault(struct folio *folio, void *shadow) { } @@ -373,40 +405,31 @@ void *workingset_eviction(struct folio *folio, struct mem_cgroup *target_memcg) folio_test_workingset(folio)); } -/** - * workingset_refault - Evaluate the refault of a previously evicted folio. - * @folio: The freshly allocated replacement folio. - * @shadow: Shadow entry of the evicted folio. +/* + * Test if the folio is recently evicted by checking if + * refault distance of shadow exceeds workingset size. * - * Calculates and evaluates the refault distance of the previously - * evicted folio in the context of the node and the memcg whose memory - * pressure caused the eviction. + * As a side effect, populate workingset with the value + * unpacked from shadow. */ -void workingset_refault(struct folio *folio, void *shadow) +bool workingset_test_recent(void *shadow, bool file, bool *workingset) { - bool file = folio_is_file_lru(folio); struct mem_cgroup *eviction_memcg; struct lruvec *eviction_lruvec; unsigned long refault_distance; unsigned long workingset_size; - struct pglist_data *pgdat; - struct mem_cgroup *memcg; - unsigned long eviction; - struct lruvec *lruvec; unsigned long refault; - bool workingset; + int memcgid; - long nr; + struct pglist_data *pgdat; + unsigned long eviction; - if (lru_gen_enabled()) { - lru_gen_refault(folio, shadow); - return; - } + if (lru_gen_enabled()) + return lru_gen_test_recent(shadow, file, workingset); - unpack_shadow(shadow, &memcgid, &pgdat, &eviction, &workingset); + unpack_shadow(shadow, &memcgid, &pgdat, &eviction, workingset); eviction <<= bucket_order; - rcu_read_lock(); /* * Look up the memcg associated with the stored ID. It might * have been deleted since the folio's eviction. @@ -425,7 +448,8 @@ void workingset_refault(struct folio *folio, void *shadow) */ eviction_memcg = mem_cgroup_from_id(memcgid); if (!mem_cgroup_disabled() && !eviction_memcg) - goto out; + return false; + eviction_lruvec = mem_cgroup_lruvec(eviction_memcg, pgdat); refault = atomic_long_read(&eviction_lruvec->nonresident_age); @@ -447,21 +471,6 @@ void workingset_refault(struct folio *folio, void *shadow) */ refault_distance = (refault - eviction) & EVICTION_MASK; - /* - * The activation decision for this folio is made at the level - * where the eviction occurred, as that is where the LRU order - * during folio reclaim is being determined. - * - * However, the cgroup that will own the folio is the one that - * is actually experiencing the refault event. - */ - nr = folio_nr_pages(folio); - memcg = folio_memcg(folio); - pgdat = folio_pgdat(folio); - lruvec = mem_cgroup_lruvec(memcg, pgdat); - - mod_lruvec_state(lruvec, WORKINGSET_REFAULT_BASE + file, nr); - mem_cgroup_flush_stats_delayed(); /* * Compare the distance to the existing workingset size. We @@ -483,8 +492,51 @@ void workingset_refault(struct folio *folio, void *shadow) NR_INACTIVE_ANON); } } - if (refault_distance > workingset_size) + + return refault_distance <= workingset_size; +} + +/** + * workingset_refault - Evaluate the refault of a previously evicted folio. + * @folio: The freshly allocated replacement folio. + * @shadow: Shadow entry of the evicted folio. + * + * Calculates and evaluates the refault distance of the previously + * evicted folio in the context of the node and the memcg whose memory + * pressure caused the eviction. + */ +void workingset_refault(struct folio *folio, void *shadow) +{ + bool file = folio_is_file_lru(folio); + struct pglist_data *pgdat; + struct mem_cgroup *memcg; + struct lruvec *lruvec; + bool workingset; + long nr; + + if (lru_gen_enabled()) { + lru_gen_refault(folio, shadow); + return; + } + + rcu_read_lock(); + + nr = folio_nr_pages(folio); + memcg = folio_memcg(folio); + pgdat = folio_pgdat(folio); + lruvec = mem_cgroup_lruvec(memcg, pgdat); + + if (!workingset_test_recent(shadow, file, &workingset)) { + /* + * The activation decision for this folio is made at the level + * where the eviction occurred, as that is where the LRU order + * during folio reclaim is being determined. + * + * However, the cgroup that will own the folio is the one that + * is actually experiencing the refault event. + */ goto out; + } folio_set_active(folio); workingset_age_nonresident(lruvec, nr); @@ -498,6 +550,7 @@ void workingset_refault(struct folio *folio, void *shadow) mod_lruvec_state(lruvec, WORKINGSET_RESTORE_BASE + file, nr); } out: + mod_lruvec_state(lruvec, WORKINGSET_REFAULT_BASE + file, nr); rcu_read_unlock(); }