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 F0593C4708C for ; Mon, 5 Dec 2022 23:49:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4C48D8E0002; Mon, 5 Dec 2022 18:49:38 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 475FA8E0001; Mon, 5 Dec 2022 18:49:38 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 33C3D8E0002; Mon, 5 Dec 2022 18:49:38 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 240628E0001 for ; Mon, 5 Dec 2022 18:49:38 -0500 (EST) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id F1E221A0C71 for ; Mon, 5 Dec 2022 23:49:37 +0000 (UTC) X-FDA: 80209897194.27.84B2C02 Received: from mail-ua1-f54.google.com (mail-ua1-f54.google.com [209.85.222.54]) by imf22.hostedemail.com (Postfix) with ESMTP id 9A6B5C0011 for ; Mon, 5 Dec 2022 23:49:37 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=RtbFU+Vp; spf=pass (imf22.hostedemail.com: domain of yuzhao@google.com designates 209.85.222.54 as permitted sender) smtp.mailfrom=yuzhao@google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1670284177; 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-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=ldNCDX/APtWVkIDjTqA4OBk1LuXyTxcfhfZyvH0Ni2g=; b=wliBO0RO+p708TgotDwvH0SDbI1EEotAVZhzntRwXgsDMF/hyJQFHvQx4Rf1i+ORA98g7q TG1bPVL5KtxBGGaUd9UtBFkvebjovVCvowIt4sICZcbgss/RG0GLmgWEhC2gSElouZiEPG lWbsD4bNeAgFOlReEZh33bVcUa9fdJo= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=RtbFU+Vp; spf=pass (imf22.hostedemail.com: domain of yuzhao@google.com designates 209.85.222.54 as permitted sender) smtp.mailfrom=yuzhao@google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1670284177; a=rsa-sha256; cv=none; b=OH2x5uZ7O4/dN6kDgVnjxpYld2M+QADi3i98cRLgpGFEs9FioaafPdSeSrmXqbokf1lG5y B/FHIBMXGlpB7p25fFMB/9o2JJ8NswMIkO4yT3yFWjsUwXfptW7+EoZ0ZSO6QYhv1kzUqs tTjdaAgsx5+jnBCiFn5efvPeFdlWDw8= Received: by mail-ua1-f54.google.com with SMTP id 97so4472386uam.0 for ; Mon, 05 Dec 2022 15:49:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=ldNCDX/APtWVkIDjTqA4OBk1LuXyTxcfhfZyvH0Ni2g=; b=RtbFU+VptCoVMwYp/9anhqVtRxjzIpSgurgnR3UUHtESxVF+O+ny/vbUm57kY0xgNp FwSVBpLyTzRh8LfcLcaynRTeXlgkGIuudO+jvb9xXpx6y+YqvtIsFmqzlpfRD5GhK2/j ZbJ/vH3oKKXMSPwyDtUSeOANh5hMZDq2lGvfMT04FrJ2zPo0ktDKx8LbmFTujezFTpE5 fT+9lIwMVg0yPpy3Uq8ysO3IYRV8cuwd30wRevtPTE0rxh2wyKXSZ5xOZ3zkiJX7iffa o50EKtEOuD9nOyQVCLfs1DUU3yupoHkCsHOBPGWiWqnVcL6cyTYd56J/RA4Tw0j+l6gO i5ug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ldNCDX/APtWVkIDjTqA4OBk1LuXyTxcfhfZyvH0Ni2g=; b=n8xtVZdC6s/Oz8nUwp5BAkMeit2oO0astGmfFbteyioQ9MUkWH5MzuR/3T2mjvNNxq Rif8kA+uLmanFcguVr3mOwn+6Y1OuPDS4wf6xb7nbwopCKBvXOz4o1ub6xYlOcCvapyu qe5i6OmgRJ76v0tjZCwtfW/dlVNT02XDBzUJlboKKA1G/mz+O+CxBXVgro3+jml+q4h6 /TYgAGSiLxEP05NQKIOGH98mX15y5YU3LORd9O7SPc3ZjoHWGeYtX15UbOurs8xKWmKn N7a5ECCNpH1hlmCHLzjtmw+KSs6734C/cX1p1unXRsDnOllbFFA05TwbRmPLha68JgQq dszQ== X-Gm-Message-State: ANoB5pmui5qFXCvViV9dhOSd0JjMuuyulOwsTcynJn4WgD9yED/ikgFZ BeaD4EbaCQKt5pgk4E/rDsHbnll4QuaPedFMwCS66Q== X-Google-Smtp-Source: AA0mqf7eHzYF3qJPbgjyqywlKuykP0mrWTOTufXeNzSWSHZsnY+hlLkqylq5ISEM9jmyEmJRVSEcVypadzRGWtsgq+Q= X-Received: by 2002:ab0:5517:0:b0:409:5403:c18 with SMTP id t23-20020ab05517000000b0040954030c18mr38761352uaa.51.1670284176750; Mon, 05 Dec 2022 15:49:36 -0800 (PST) MIME-Version: 1.0 References: <20221205175140.1543229-1-nphamcs@gmail.com> <20221205175140.1543229-3-nphamcs@gmail.com> In-Reply-To: <20221205175140.1543229-3-nphamcs@gmail.com> From: Yu Zhao Date: Mon, 5 Dec 2022 16:49:00 -0700 Message-ID: Subject: Re: [PATCH v2 2/4] workingset: refactor LRU refault to expose refault recency check To: Nhat Pham Cc: akpm@linux-foundation.org, hannes@cmpxchg.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, bfoster@redhat.com, willy@infradead.org, kernel-team@meta.com Content-Type: text/plain; charset="UTF-8" X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 9A6B5C0011 X-Rspam-User: X-Stat-Signature: 8dxu9be1t6oruyh1xghebsqreheexpb5 X-Spamd-Result: default: False [-2.90 / 9.00]; BAYES_HAM(-6.00)[99.99%]; SORBS_IRL_BL(3.00)[209.85.222.54:from]; BAD_REP_POLICIES(0.10)[]; RCVD_NO_TLS_LAST(0.10)[]; MIME_GOOD(-0.10)[text/plain]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; DMARC_POLICY_ALLOW(0.00)[google.com,reject]; RCPT_COUNT_SEVEN(0.00)[8]; DKIM_TRACE(0.00)[google.com:+]; TO_MATCH_ENVRCPT_SOME(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[linux-mm@kvack.org]; R_DKIM_ALLOW(0.00)[google.com:s=20210112]; ARC_SIGNED(0.00)[hostedemail.com:s=arc-20220608:i=1]; FROM_HAS_DN(0.00)[]; R_SPF_ALLOW(0.00)[+ip4:209.85.128.0/17:c]; TO_DN_SOME(0.00)[]; ARC_NA(0.00)[] X-HE-Tag: 1670284177-805494 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: On Mon, Dec 5, 2022 at 10:51 AM Nhat Pham wrote: > > 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 | 143 +++++++++++++++++++++++++++++-------------- > 2 files changed, 99 insertions(+), 45 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..44b331ce3040 100644 > --- a/mm/workingset.c > +++ b/mm/workingset.c > @@ -244,6 +244,30 @@ 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, 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))); > +} Nit: not refactoring actually looks cleaner to me -- there are only a few lines of duplicated code and you can get rid of 4 parameters including the unused workingset in the next patch.