From patchwork Wed Mar 8 03:27:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nhat Pham X-Patchwork-Id: 13165171 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 16E80C678D5 for ; Wed, 8 Mar 2023 03:27:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 69FE06B0072; Tue, 7 Mar 2023 22:27:59 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 650E4280002; Tue, 7 Mar 2023 22:27:59 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4F1716B0074; Tue, 7 Mar 2023 22:27:59 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 3EF166B0072 for ; Tue, 7 Mar 2023 22:27:59 -0500 (EST) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 03B531203FA for ; Wed, 8 Mar 2023 03:27:58 +0000 (UTC) X-FDA: 80544297078.11.CA7A7F4 Received: from mail-pg1-f174.google.com (mail-pg1-f174.google.com [209.85.215.174]) by imf30.hostedemail.com (Postfix) with ESMTP id 0408880006 for ; Wed, 8 Mar 2023 03:27:55 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b="gwHanh3/"; spf=pass (imf30.hostedemail.com: domain of nphamcs@gmail.com designates 209.85.215.174 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=1678246076; 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=MG+emPX7mJCXZkl6Cr6yWLCcFG6GIk8J4ic4wm50wUs=; b=kFZnZ7SZHLqcNEgkyT0UW65s7D8/gYOAVijwXbwtrHPUSZGDZH5aJxZFmoYyBs1aGKaEIx jjItlZGRpRrTQf4emEEwa6ojEMdwklSIqBwSzoR0hPRPu1PBKD6WUZZic/iIa2jej7riDV hrdqZ8luKv+K4QDYa0joUoCXvouMDoM= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b="gwHanh3/"; spf=pass (imf30.hostedemail.com: domain of nphamcs@gmail.com designates 209.85.215.174 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=1678246076; a=rsa-sha256; cv=none; b=MP0hwht9wfUk0G+qSBFRSA4KyqLIX+03zquDVT97GQHG5Ewvm+F6NZ6tNFPxvVmWl+/CNx mLQWTuSEZdiae1RYcdDjNYSr0AdO6oQvOCPjWYyj6ztTN4kJ8952eEEk8U8GC3XzF2Jtvk nIhvEyauF2cidr6RJyE+mgEmO+iks68= Received: by mail-pg1-f174.google.com with SMTP id 16so8861564pge.11 for ; Tue, 07 Mar 2023 19:27:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678246075; 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=MG+emPX7mJCXZkl6Cr6yWLCcFG6GIk8J4ic4wm50wUs=; b=gwHanh3/+3jcVMEXte6zwnnreeVvlAGntpzYNNlhQ3m0tM9wm7rWZzX7U3mOYKnI/r gjdqy1lNCmj2OYl8DKQgkHxbKczJufnikis0x1b86T8GU4e3i94QJZ5a5HL9aIB38VX+ hEWTMAIgzfTcUOehNXKDs7QZSWS3ZNnchiuMrc32ApZpQEp7+q9UC+sXuwLl1qO7m6di 1wokNPuwJdUt/Q+DinlBURSAeMNMf8zccw1y10ipzzIxcxUnUsFLRcCf15qST/rY1ya9 Z+xpnSqpq07lJTLhPqtasbunr0kNPJJ76TrNF9Ha/Ydzhv4xQHKxdKuZmySazyQ5CYB3 mI4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678246075; 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=MG+emPX7mJCXZkl6Cr6yWLCcFG6GIk8J4ic4wm50wUs=; b=FJLrelEojbfA0bMo1SkBgnB9JLoeNb2MKgubk4QeFcjlfriMFfUw13VvdeCKECcpEf gA6z/LbYCd8DqhGrMLvYtrAyIRtt2nnMmgJhO85L8SwK4u0qYcPfBMCT4qNsLIBv6x0B nXN1u8FHhvyFLscPuKEaB9DICfndza/XJw/KTyIO4n03I/aMpFf8OEpVU6mDq0nAwC2t hMM78eF9M1zldCahdfCXbZ5MxQIFK/Aeuq3GIMXNzT2Lv9VabbLAkyiTOBsARZsF2myX QaSse3rn/29+f8z7I7UaTtBYTHDUK2npGcUdhqOLX7qxmTqFoCnzj3nQmDu0nWn/y5fo 1/WQ== X-Gm-Message-State: AO0yUKWrKXamu0u4LI/uZfj429silbIAFA7GHLu3AT3IEX1vElT6cXSz XfAq0Yv9QoC7zOaqdFXXz7g= X-Google-Smtp-Source: AK7set/gyvdCmRvWxyT7dMhBOzKnh6PWRLsfgAPuQBEkacCvkq/y7p/raE5mMHMQMnyKMwVDVJRDUg== X-Received: by 2002:a05:6a00:cd:b0:5a8:cbcc:4b58 with SMTP id e13-20020a056a0000cd00b005a8cbcc4b58mr16717628pfj.12.1678246074792; Tue, 07 Mar 2023 19:27:54 -0800 (PST) Received: from localhost ([113.161.42.54]) by smtp.gmail.com with ESMTPSA id v24-20020a62a518000000b005dca6f0046dsm8827078pfm.12.2023.03.07.19.27.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Mar 2023 19:27:54 -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, arnd@arndb.de, linux-api@vger.kernel.org, kernel-team@meta.com Subject: [PATCH v11 1/3] workingset: refactor LRU refault to expose refault recency check Date: Tue, 7 Mar 2023 19:27:46 -0800 Message-Id: <20230308032748.609510-2-nphamcs@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230308032748.609510-1-nphamcs@gmail.com> References: <20230308032748.609510-1-nphamcs@gmail.com> MIME-Version: 1.0 X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 0408880006 X-Stat-Signature: yh6npeexqfynoncwq3ej1fyp5q3phko7 X-Rspam-User: X-HE-Tag: 1678246075-595877 X-HE-Meta: U2FsdGVkX1+m8GtmnMLKfMItnSjmWZwaaSqa9ZBXFUIEuAclQove0gtU9ilCRc29WL9JyxxDlIy7ew5jG05yBpvUAYBgl8Vau3SwbLEv4DLEfBzZ7oqdWsfELCz+TXU8xfxLISJ1aoQMOOp3GM502tEEXTVAo2OnCwtw7cyBO9D8Z3G6dtCqGQROhaNcGacMwCFieX2gICyatQFeRWtMhRpuL2q2Orwzz1DCDQMOvZn57ArZiSS+xgSsAzNqledarDMkMM7fDGaLKotkri5vF5zuQiStl3zBo0NEemxfYCHUxIx9ksqBk72Ppxte8ClYL5fmKo38PYj3HHNFxT4pq/Lj4MoXG2buHTOtcuoFT4oC59BEZK2Fibu3ZpW1x5Vw7G04yiIZScM7fyxaaeAr2FpBn0TbJtHDyy2zXZMhU2efATHpwDUrcEHItAbYcVYFTpMgR9C5sBh50CTG9uOCFBbV3uRUypMFj9oEI2A376isLOxwHtb56k3BiWiztw6kLhE25a1LtpZA9SloSfuGwMAn1A2aVYN2AnBG/sJSEOcGzLB0g3rzZ8GCxcFUkX/w+zIAV6Q074MzLWfBf9s33Zs+gG45B/2OQvRwm97+0PfGFvcOXWjCK3FRUSyTGx7ctoz4bTOVChf1Jj+AoTdpzgXuYMB4fDLOGpgCOaWbFhlPhEzwItI5w0NWDVv9QKDa26E23etp310Uq5DVOIUVBIizS2w7uYkXscDrsxrwhhjrHr4oJy+rD8CFYxVelG0WhgPcbOlkKGj2+8t4XITOZh8RqelSPmZeOe01EcdP7kE6W0IEzvaRhVp3hQKhqUp8ZXctwAGvcn/ysXFeE/hLnZyYJ8318ul01C0mEIsgPuf0tEtsHffljCVu0p785+hDtHrAb/E2aJYbHDPYd7l1jbJBOocUYNAuG0bxseER7i0J4T9tPzlFsjBVvhgiQ1h0ZQfhEfdZ3G0kcFA44qp +EcH6Keh Ab8MvuHj5z970dTDFZAWsaQBqY3oYM4hA8peztTv8XEwt7d8jH6C2FeV2G+IX9tTxCDPc9U7dqMgn1Dj+T3HqyvZoV9+4mB+bEQP/FtfA0nRSevV/oveSzrsmDq6ADtn35W/B39kSshtRw/iPhnNiSevlLOPqTCvY5bxQ5GK8DGuz/wx/CbvqjIPPfbXfevTOek294cIq9JbbBaJxafXshzTf29aUTGCAJmApSxhD/rQVzcXPEVGbIWIZ2XdOP14wTuv4q1PtkT3l7aZ8Zb2xVZXyKsRIYDkQmleas23NpTGsaff1mOmbmBJ0ZSJZaY+ScReOpxUqTPomxRY+QDsoCGOO6wqKYS4R74gRNNEb+u84hBUcCgErVZ/HUxL4WF5mTiEA9hP7dGXIWJScTnguVPR0he0gpWNvetF4WIBZqC+XJk09c77A97cSCE+7mTKCI6tmW+umWyS9v0Y= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000100, 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 | 145 +++++++++++++++++++++++++++++-------------- 2 files changed, 100 insertions(+), 46 deletions(-) -- 2.39.2 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..a60729c1b766 100644 --- a/mm/workingset.c +++ b/mm/workingset.c @@ -244,6 +244,29 @@ static void *lru_gen_eviction(struct folio *folio) return pack_shadow(mem_cgroup_id(memcg), pgdat, token, refs); } +/* + * Tests if the shadow entry is for a folio that was recently evicted. + * Fills in @memcgid, @pglist_data, @token, @workingset with the values + * unpacked from shadow. + */ +static bool lru_gen_test_recent(void *shadow, bool file, int *memcgid, + struct pglist_data **pgdat, unsigned long *token, bool *workingset) +{ + struct mem_cgroup *eviction_memcg; + struct lruvec *lruvec; + struct lru_gen_struct *lrugen; + unsigned long min_seq; + + 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; @@ -258,23 +281,22 @@ static void lru_gen_refault(struct folio *folio, void *shadow) int type = folio_is_file_lru(folio); int delta = folio_nr_pages(folio); - unpack_shadow(shadow, &memcg_id, &pgdat, &token, &workingset); - - if (pgdat != folio_pgdat(folio)) - return; - rcu_read_lock(); + if (!lru_gen_test_recent(shadow, type, &memcg_id, &pgdat, &token, + &workingset)) + goto unlock; + memcg = folio_memcg_rcu(folio); if (memcg_id != mem_cgroup_id(memcg)) goto unlock; + if (pgdat != folio_pgdat(folio)) + return; + lruvec = mem_cgroup_lruvec(memcg, pgdat); lrugen = &lruvec->lrugen; - min_seq = READ_ONCE(lrugen->min_seq[type]); - if ((token >> LRU_REFS_WIDTH) != (min_seq & (EVICTION_MASK >> LRU_REFS_WIDTH))) - goto unlock; hist = lru_hist_from_seq(min_seq); /* see the comment in folio_lru_refs() */ @@ -306,6 +328,12 @@ static void *lru_gen_eviction(struct folio *folio) return NULL; } +static bool lru_gen_test_recent(void *shadow, bool file, int *memcgid, + struct pglist_data **pgdat, unsigned long *token, bool *workingset) +{ + return false; +} + static void lru_gen_refault(struct folio *folio, void *shadow) { } @@ -374,39 +402,34 @@ void *workingset_eviction(struct folio *folio, struct mem_cgroup *target_memcg) } /** - * 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. + * workingset_test_recent - tests if the shadow entry is for a folio that was + * recently evicted. Also fills in @workingset with the value unpacked from + * shadow. + * @shadow: the shadow entry to be tested. + * @file: whether the corresponding folio is from the file lru. + * @workingset: where the workingset value unpacked from shadow should + * be stored. + * + * Return: true if the shadow is for a recently evicted folio; false otherwise. */ -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, &memcgid, &pgdat, &eviction, + 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,7 +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(); + + /* + * 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); + + if (!workingset_test_recent(shadow, file, &workingset)) goto out; folio_set_active(folio);