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 B31A1C4708C for ; Tue, 6 Dec 2022 02:22:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4EE7C8E0002; Mon, 5 Dec 2022 21:22:25 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 49DF58E0001; Mon, 5 Dec 2022 21:22:25 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 365DE8E0002; Mon, 5 Dec 2022 21:22:25 -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 22CA98E0001 for ; Mon, 5 Dec 2022 21:22:25 -0500 (EST) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id F33521C407A for ; Tue, 6 Dec 2022 02:22:24 +0000 (UTC) X-FDA: 80210282208.22.AFC525C Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by imf18.hostedemail.com (Postfix) with ESMTP id 86E8C1C0009 for ; Tue, 6 Dec 2022 02:22:24 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b="dbIpZ/GO"; spf=pass (imf18.hostedemail.com: domain of nphamcs@gmail.com designates 209.85.221.41 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=1670293344; 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=KeehAapm7ZXRZtRJIFZHdeIO9R9klFHDW166tK18b2A=; b=3aa8b9GEq3CEJqLXGnd53scGv+mB5NLrsUivapqF7NHWh4kGmt+sWkFm/iM1PRdentFqrK jCKKv+c7kzaMfKBLJaQTOOYmlPscTcuavNzQebp9hX0ZPQVKSg6HLVMzNJ/2D16qK0KH08 hflEkAIWpgVNtG0rf5vM01I/rZTBUEc= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b="dbIpZ/GO"; spf=pass (imf18.hostedemail.com: domain of nphamcs@gmail.com designates 209.85.221.41 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=1670293344; a=rsa-sha256; cv=none; b=PXHzxyFOrDZkhV+16E4usKVJreDpFOprN+TsHBri+EjrHA7l+I5WENW5cT+ijrL+SjfQgn Z5DA8q2DfExrtgaLgRdgwu740CvNGn88IwbI1SAuCathm8o9wO0E+5YAN2isvstM509ZW5 Kkpx/bj9zsDHjD8h32tWwu0rQgXrZfA= Received: by mail-wr1-f41.google.com with SMTP id f18so21539262wrj.5 for ; Mon, 05 Dec 2022 18:22:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.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=KeehAapm7ZXRZtRJIFZHdeIO9R9klFHDW166tK18b2A=; b=dbIpZ/GO5LIsCEE5CILRjO56Zfii5s9R4pXrRGRZFoiV88SQ11KOM4GkYhLbWalPS7 48vGdxyoMLUbwQe58AvBpuV7U/cbYY8lNwJ6/Dntibzv24BBM/3TiC3sJwB1NRIwYr9I kcE2x9Az35xvFv7zaXvA3z+E2W/FMiyOQ9t0C/a2BEEHgCBhc63hBlVfNct6gtx7aFaB 9WeN/4FKISvaZqrwB/4yKK7dKByBHPFf04oI9eFsuHeZ3PIIK5J3tI0sPUntFM7JnBKV IoDmrN2CYsvxYS9ro/G1oqMAhAPbd/OE65WQNVWUT6li3GnL+wjmnQfwA+eT2O9inOZW k/WA== 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=KeehAapm7ZXRZtRJIFZHdeIO9R9klFHDW166tK18b2A=; b=abj/7wyH6RtAl68zdIcM0fqlgLirHKh9AnEzpgWajls6sJNYqY4VJ1c5gR9BP5w2vB v5QiHt0RFsoPXgK58a4IWJi8s3W+m5sDVNH1R38htyBnUm9oGQKiVfdEwRauMfNurjVW 6cDXnXAJxcTwynXKw0NwGA/zv0jqww5IwsL2RtZkdDr3+Zld0YA7KPLLBmvOjOh+RWWn IvQzAvA1+FJgVGnbO2IAGvtZKTKZEjqABhIoiMKlUqJwthv553mPBpK7mPGQf00o9DBz kxDxMCrN0B5T8RXR+UJlhdLdGxP6UfEijltSY6JFy3IXRlKU5wqCqG2y3JogE4fywATa FjVg== X-Gm-Message-State: ANoB5pmROhUs8ufUwbvJNdPne1S6MixOZfYT1OTw/LOHlsgUuhawFAeP 5L3nx/yR8nOCRRNsFKsfMpZVvFZpeUZ1tJi2puA= X-Google-Smtp-Source: AA0mqf7vpcGqDj6nmQ8qCTCoSPvin2kOTea5QbVRb0OgJKW/g8n2r3V3e6cD2O5brfqrJFcvQilU23ygJBvMbnFET8E= X-Received: by 2002:a5d:4b45:0:b0:242:1ade:1145 with SMTP id w5-20020a5d4b45000000b002421ade1145mr22524441wrs.483.1670293342943; Mon, 05 Dec 2022 18:22:22 -0800 (PST) MIME-Version: 1.0 References: <20221205175140.1543229-1-nphamcs@gmail.com> <20221205175140.1543229-3-nphamcs@gmail.com> In-Reply-To: From: Nhat Pham Date: Mon, 5 Dec 2022 18:22:11 -0800 Message-ID: Subject: Re: [PATCH v2 2/4] workingset: refactor LRU refault to expose refault recency check To: Yu Zhao 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: rspam05 X-Rspamd-Queue-Id: 86E8C1C0009 X-Stat-Signature: xdqhcnefecf93i887gr966kihrffzu3j X-Spamd-Result: default: False [-2.90 / 9.00]; BAYES_HAM(-6.00)[100.00%]; SORBS_IRL_BL(3.00)[209.85.221.41: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)[gmail.com,none]; RCPT_COUNT_SEVEN(0.00)[8]; DKIM_TRACE(0.00)[gmail.com:+]; TO_MATCH_ENVRCPT_SOME(0.00)[]; ARC_SIGNED(0.00)[hostedemail.com:s=arc-20220608:i=1]; FROM_HAS_DN(0.00)[]; R_DKIM_ALLOW(0.00)[gmail.com:s=20210112]; MID_RHS_MATCH_FROMTLD(0.00)[]; TO_DN_SOME(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[linux-mm@kvack.org]; R_SPF_ALLOW(0.00)[+ip4:209.85.128.0/17:c]; ARC_NA(0.00)[] X-Rspam-User: X-HE-Tag: 1670293344-162617 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 5:29 PM Yu Zhao wrote: > > On Mon, Dec 5, 2022 at 6:19 PM Nhat Pham wrote: > > > > On Mon, Dec 5, 2022 at 3:49 PM Yu Zhao wrote: > > > > > > 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. > > > > (resending this because I forgot to forward to the rest of the > > group!) > > > > Thanks for the comment, Yu! > > > > Personally, I prefer refactoring this piece of logic - I do think that > > it is cleaner than copying the logic into the syscall implementation. > > Let me clarify. > > You can add > lru_gen_test_recent(void *shadow, bool file) > without refactoring the existing > lru_gen_refault(). > > Set the boilerplate aside, you only repeat one line of code, which is > the last line in the new function. > > (The boilerplate code is repeated in many places, and that's why it's > called boilerplate.) Oh maybe I've misunderstood your original comment. Your suggestion is to repeat the eviction recency check in workingset.c (i.e keep the *_gen_refault unchanged - just copy that logic to *_test_recent)?