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 DD415C4332F for ; Fri, 16 Dec 2022 19:21:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 788668E0006; Fri, 16 Dec 2022 14:21:56 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 7393C8E0001; Fri, 16 Dec 2022 14:21:56 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5B2438E0006; Fri, 16 Dec 2022 14:21:56 -0500 (EST) 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 4A9D08E0001 for ; Fri, 16 Dec 2022 14:21:56 -0500 (EST) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 1B8721412D3 for ; Fri, 16 Dec 2022 19:21:56 +0000 (UTC) X-FDA: 80249139432.03.D1B0B2D Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) by imf25.hostedemail.com (Postfix) with ESMTP id 5BF75A0003 for ; Fri, 16 Dec 2022 19:21:54 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=bLCK2hqN; spf=pass (imf25.hostedemail.com: domain of nphamcs@gmail.com designates 209.85.216.45 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=1671218514; 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=vv+thd7vIkF/6s5f+OnkQTnAW47GFJCu28QWCY4TZv1nAOXUsuEW5loyStYKsLsTpoQd7W Ds3dg7NGQenD86mzuKZghNJ8t8mXETg4nYUreNTnWMxFKRGCofaWKwbAAo0hUQiRyGDHt4 pR1zcTRo4CbbGsBx8mRIY095PCnrHFI= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=bLCK2hqN; spf=pass (imf25.hostedemail.com: domain of nphamcs@gmail.com designates 209.85.216.45 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=1671218514; a=rsa-sha256; cv=none; b=B93nM5vd/Bul4cgiV5AOVj3xPgFbsi7P4w713jl7unp29WmrNt9AOM9ddhVvlwvmztyY5a 4MyMBxxcuZkMVgriHtNvQijY6Ltto6evWBHc7qORKwpTv7w3vcyBQeJG2ZdlMCqdQQYspV jLPLpPxxK4cmr9P1rBqAKW6lU9S6MJc= Received: by mail-pj1-f45.google.com with SMTP id v13-20020a17090a6b0d00b00219c3be9830so3328715pjj.4 for ; Fri, 16 Dec 2022 11:21:54 -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=bLCK2hqNYii/SsuUXicmahKFilm2y4LcmrGmBqCz6pUsilTWoASCwxc5AO4LkgY3GK BNDtUeOhpeK0OZJemExWg+NJLRLCmUtTrkCMfeba5o4kgT13f1nupOwKsbt0XPUqhYqI kkWz6T/+1q6oITzCcCVnfELipcygpGvxD+qEEhJMyjr+0b2zkF5e5UD6FCnTPriEQBkI z3OnhM/2gar1E8V7Z/DnlFlygglYKXpXsw9P7BciJ0kqjkCxtM7fCq937BfA/KhDKlCy qusCzpwm8/LQI382ikTfyrstyx14AtV+mjzebb+NL2RAzHM0fbstMWma32uyciV1qlTB PHQw== 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=yF3c3FIqbcN2g1ZcNL7fYdgNgDr3a1mgsfZMWcZwbvfxZG2HHGG4wyUn0azvXzF1t0 T917kwNtpKtLzU2D74LVkxsBTbmg1eow/AhpS5wHhxB/CyckfSiDuV5TOicf2QaNIter 4jRSW7Y6rFDaN+cTBvEWthKSON+CZQGh4cxO7hTfllkT8Iur73x5MOX4RqidNHzsZ3TA evaOswaSYkpwTqW5sedNo5erbTCbefU4tUQVky+drbbAxK0JGncasBJt3+We2oz/0h4P PgU+LDMnjBtE1RfOq8K3cwrmxKb9ZDXVYrr7BY0zpW8geNjzBQE2Zuc1tAapOK4jg6bq tqKA== X-Gm-Message-State: ANoB5plY7q/YjL3Lbf2LDRmCQkn0Arw98BBndVd7uUgzUWiMLXvBwjFF /Lxb/2dW0goR0NLCs8vUA80= X-Google-Smtp-Source: AA0mqf7XjbbHvBcGpWGYcKcB2pbEbhG53XHIzX/B65NQolULlkjq9BvuiIdLGc8YSdD0HDuycD39uA== X-Received: by 2002:a17:902:c213:b0:189:aa51:e27f with SMTP id 19-20020a170902c21300b00189aa51e27fmr43162444pll.44.1671218513304; Fri, 16 Dec 2022 11:21:53 -0800 (PST) Received: from localhost (fwdproxy-prn-120.fbsv.net. [2a03:2880:ff:78::face:b00c]) by smtp.gmail.com with ESMTPSA id q15-20020a17090311cf00b0018912c37c8fsm1982895plh.129.2022.12.16.11.21.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Dec 2022 11:21:52 -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 v4 2/4] workingset: refactor LRU refault to expose refault recency check Date: Fri, 16 Dec 2022 11:21:47 -0800 Message-Id: <20221216192149.3902877-3-nphamcs@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221216192149.3902877-1-nphamcs@gmail.com> References: <20221216192149.3902877-1-nphamcs@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 5BF75A0003 X-Rspam-User: X-Stat-Signature: qxkyyfbt4gxca5hg37qbycayhe7kipep X-HE-Tag: 1671218514-782087 X-HE-Meta: U2FsdGVkX19IFkoMwmYMYpOefanUVjsz8YhLGr5Hod07x+olFnYDgkGcGEefq+fAtVaxPm+JDJj7CRWwsPII3ARHvqJSV+DhBKu09OtIhHLQVfItqI6VMclm2XmjjncY76CY8qs5JHL0e2xZCVi+efUMHlNRPTDO0hscTcSxQIJjuvyKs+ZUq8F0V65YP5ezFJL8SKEQ7RQEr0ZF0XWA2bzfQfoQ3AYZb/OiJbYQWQalx0mZJzPuXGFJ+IyDmXyuwTEjnDPwRFrZv1LRQh82yRb4EkzyNvdKdX88tfr011miSLJue/znylhevX6FAgtQ07UNE0RZ0BDU+l03Dg4Xg0TN6fVp0m1xssQlU8Qsjy9CYm05akH4fw4y8UtqL1CDxCq+TykBZCsDoTlvr4o6HJGhLlAxwDtMCm0FBY4KEYa6MBDB+WmpoXJxqLfQRye3nK1XJUqBesVKf/FWHSglBV2gs1drWxf8KCE6oIfE2tRqmQKE8NGKLh3+LNKB19GVwL0WOpTIIZ7gt/hjG43rXggl9DAMw/HbVJtzw78YaPRd9RniqRHpGzTTMvxGh9j/bUTPTCDQ8nKJ7Zd5FJ9c2fUUS2IhLi/BtgQO9mQSbCdkqUqTkujLVuMFS/j9YP5MrHJHTJUu1owncQWqV8hQl1ixjFOcVquUoIkGaFV0rXwrbZ2F/42mzz+yjJSbyKLmVqD5pgITotDBhWBfNrCmoR+ZrkjjqaRaY1EjPxUwNGSq4f/krZ10vgP4BSRBR0y+JVTMK4pan2VHvgvryY/XEooGJeMlmOyfKpAXU2YSNYgZBNeTxep9wHoAW5bRYPEuGaCS/VGuz1Pby685yu2lmzzR/Zc3fh075wqUfSj2HN+KW2AiLVXCt6zBH579O1B8zooSH1JNSLp5i4cHWkuOtr15CZxkjIs6wmJwVJYELxUTksi/Q8dRfe/vL6gCCTNXOmfTMHdGaVuzsQgZLS8 /9by15By fmwN4Vpu80oTDYcErepjYp3VVsHh0Oe92t6q9l1/FBvmX0NTfVxfeVnH46CFxK4DX8LnTVgEAcMIDJkWvefcG3DO6P3u/9U49sGCbKyrFyhacfcuLrcIaUSNEZXauN3yCha6y X-Bogosity: Ham, tests=bogofilter, spamicity=0.000021, 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(); } -- 2.30.2