From patchwork Thu Dec 8 20:28:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nhat Pham X-Patchwork-Id: 13068846 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 C5712C4167B for ; Thu, 8 Dec 2022 20:28:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5D5F88E0007; Thu, 8 Dec 2022 15:28:15 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 584F18E0001; Thu, 8 Dec 2022 15:28:15 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3FE2F8E0007; Thu, 8 Dec 2022 15:28:15 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 2FA0D8E0001 for ; Thu, 8 Dec 2022 15:28:15 -0500 (EST) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id EE73F40375 for ; Thu, 8 Dec 2022 20:28:14 +0000 (UTC) X-FDA: 80220276108.04.CE26FDE Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) by imf05.hostedemail.com (Postfix) with ESMTP id 48AED100016 for ; Thu, 8 Dec 2022 20:28:13 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=bEy+D57v; spf=pass (imf05.hostedemail.com: domain of nphamcs@gmail.com designates 209.85.216.43 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=1670531293; 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=HrPDf/9rdHRb66FM/5ioNOV5BcRP2aeYNAosdnP8fIw=; b=7gbhKx/ATuyIR0XcLXk80zskYE7dQYr3VarwfEWKQtNncJTAT8HsToo9CTJ0bk5uITsvd7 ob8SLYDJ89MPdCrY9E9h88QdOvJNaL1wXGdeoG0TxSshe7z+icRIJlGKmKRe587VNGjuEf sY1vEr9d37xJACIsz4l/jrpFBjN1H3U= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=bEy+D57v; spf=pass (imf05.hostedemail.com: domain of nphamcs@gmail.com designates 209.85.216.43 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=1670531293; a=rsa-sha256; cv=none; b=b6/CKGOMEBJlXxcjnLuQEsQ9fIxPgDLbaNdHFuvPSGU/m/Mup9e4ad+yNbYvjsT4yDpl1w GWVwChyNmRmJJgqTfslbh6J6UcPSOI70Fg0PGAgCoE3RzPeKleVR2WPa5LicohUKegWvu0 xpcsjZV6JPpQ+DR/LgOMA2s1sjS2iL4= Received: by mail-pj1-f43.google.com with SMTP id w4-20020a17090ac98400b002186f5d7a4cso5881770pjt.0 for ; Thu, 08 Dec 2022 12:28:12 -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=HrPDf/9rdHRb66FM/5ioNOV5BcRP2aeYNAosdnP8fIw=; b=bEy+D57vWPlDdJZNJwhqWKPdncwerv9AN9R7aXydKslKdjGvubZG5uBvBSqdZ+vgy6 SeOSaIAKQZOgVVntFUNb2wi6PTmDfVoP7YlBZdhKJqoaW+fkwb9jEo2UeoJ6n1RKubqK /acb7+DhSOCvImRfxxur15emgCdH37yK2sBoJ4nINcbOxDXYCYWlAt0TT94g8zQOi1sf kidz6a460J9c7P2EFdtkmhMEiiprO0YyYe9iIeLy0I/SCj91cumqevDn5C4ijKhEovFq XtrDWJ6C2D1ZGzwI8FXRT1WyJfQ8E+6/EktACCCp7JzR6XWJ+E2soDQ4Kd9n4Tnyr7n/ SGoQ== 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=HrPDf/9rdHRb66FM/5ioNOV5BcRP2aeYNAosdnP8fIw=; b=URl3vxYLF7s7YSCSYwLcIPMjbxNYG69NjQ0qNMKlvM9hnbjHFSzog4Q8rlfAKpJbN5 y4f5ZSfrIjO731Uugvci8VNrlCAK0p0eftSWPNnTIAhG2E1BHyYHcmCjyoTZV7jhFcYe PxzrhPGNeMvbDRUDGK8iNqmrdYy5H4ouC1vvsxEq6VSKqv6qJLDlfLOXTnxaFnPGm3zS UwtrokAEI0CXz/gka1LHxlhmpMTP15eNY8A7htICakYl9dpY7ORdGP1JJcamyqfCVwJw 9PzlK4yYrb3XvhgH6JRlAop4B0ZYlKOYDZ2KV0Zpp/yimtOJxyv69k4kcsQM4UQrwZz9 7yGg== X-Gm-Message-State: ANoB5plKdkqK7LnfYHX4zM6M0fRjjEfFtSQXhqb9YRreBObVAWDf1Qyg r3D/NdLcVV6H80Oes2f+uqo= X-Google-Smtp-Source: AA0mqf5mZzIIFsAFsksyghH585zqEwzLSeOa+lkEJP2NOFdmLWBycKzJiVfedchfsSL0YoI9CMmwIg== X-Received: by 2002:a17:90a:e50e:b0:219:41d0:8fc1 with SMTP id t14-20020a17090ae50e00b0021941d08fc1mr50644688pjy.173.1670531292091; Thu, 08 Dec 2022 12:28:12 -0800 (PST) Received: from localhost (fwdproxy-prn-014.fbsv.net. [2a03:2880:ff:e::face:b00c]) by smtp.gmail.com with ESMTPSA id x14-20020a170902ec8e00b001897916be2bsm17035238plg.268.2022.12.08.12.28.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Dec 2022 12:28:11 -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 v3 2/4] workingset: refactor LRU refault to expose refault recency check Date: Thu, 8 Dec 2022 12:28:06 -0800 Message-Id: <20221208202808.908690-3-nphamcs@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221208202808.908690-1-nphamcs@gmail.com> References: <20221208202808.908690-1-nphamcs@gmail.com> MIME-Version: 1.0 X-Stat-Signature: o5k3zc6du6destmntjw1mxj5psnkdaxi X-Rspam-User: X-Rspamd-Queue-Id: 48AED100016 X-Rspamd-Server: rspam06 X-HE-Tag: 1670531293-27231 X-HE-Meta: U2FsdGVkX1+4wpkM1qtG6S3XkJtzGz8kM7Uz0uN0KroKrM+mkV7RgO8iwNFnnPcc+RfVsLLoMtEcaF7f9hc3aptrGq3XNmbxuykeouEW4lcZtYlx/uWwHuhJukVmIjYXYUaqw9oMoGIaDAbXhAauZa0S9puUEUQzgylhPGUVung6F8M6zX74lRCE6HcespLTNwulfPx1ec9B/tv1Pr27SWmymTY9uzWRtqzIabuIgc5cu67Hu1wH43s6CjOMnrGybFlLrea3j0D1HYo6sgE/vNQYGshzeHmVinPlKjTzU+35Ecphk3Le8/wP//5yT11zoJlYBX1mUNSJ5/c8+ifGkn2hBBXVYqGIKgQsJZlNb8TBCBa6qg0iz3S0PMxmjHlVxsv6MSSCXvst2z5FrF5J3jJ92kHwRA+FFyX/StDcEv/YS6RUNL99tP1+oqRQRB26VTnd8YV5VMlvYp2sM464LpmywhoYKFWvjEh2zIFYadsQ0qcL3r/hf36CChOYisA7vg5orkcafj6LTUXtRe/JaI4VIQ56lh/gaMZ6qtuC1ANrpZDcxGQd6FVYbbo7MNb2ZDdMbdOaabw58XQoZnfvi0CLMmnideKXkr7ODpHtw0lkoou/61NAJ6H6eyOqNuAus/pSo98IhPrnBFz9Ba2Uuc41cOb6+om4vaJ9f4urtIJoiLPpvsgwqluGcR+61bQciTqD80PSlZEHNksWlp81LlXJ3v2moKlk088gQBBzDmVVP8Zjd+SUT7/LusUpZ98qjanlh2djg91fcI9J5gfmPh0zdbmCcI5huck7tN8mLUjHMsRUl7VISSStp1fWhcvRXbdQjY6W8Tw0L9/igI7S4lczghEiH82j3EVdayDSZgKDWxTMcce7OqYWfdIuyl8xhGRmEriHGw1g25GWb3T08qBaOPz3M/le/4PX21GXkce7q/G0wMFcvGJrNN9dGWf2H/wvWhsE4s6xjAWiTVC cpzaiVh6 K9XUd3EO1rOOzo65bekD5QeqQOVE52ZZ3TP7J1km4LkCGbv7Hj1gTwnljw3KNqQOftpQwxgieYfJdLzehzCj0Y/UIWFkOtA4r8WqjioQhU/pVFmas+ucbkCoNaReN5veTyI3n X-Bogosity: Ham, tests=bogofilter, spamicity=0.000003, 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(-) -- 2.30.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..4a06869392a1 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(); }