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 26BF8C64EC7 for ; Tue, 28 Feb 2023 08:52:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9FE486B0073; Tue, 28 Feb 2023 03:52:07 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 9AE236B007B; Tue, 28 Feb 2023 03:52:07 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 875A96B007D; Tue, 28 Feb 2023 03:52:07 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 78F0D6B0073 for ; Tue, 28 Feb 2023 03:52:07 -0500 (EST) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 40538121393 for ; Tue, 28 Feb 2023 08:52:07 +0000 (UTC) X-FDA: 80516083494.11.80EBD10 Received: from mail-ed1-f47.google.com (mail-ed1-f47.google.com [209.85.208.47]) by imf21.hostedemail.com (Postfix) with ESMTP id 712CC1C0016 for ; Tue, 28 Feb 2023 08:52:05 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=by2YIoMC; spf=pass (imf21.hostedemail.com: domain of yosryahmed@google.com designates 209.85.208.47 as permitted sender) smtp.mailfrom=yosryahmed@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=1677574325; 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=6BbjsTlIxZF7sHybz8w08FCH3QFWqUyFfeqt4CnEYMk=; b=w9MW10S+wFEl5GxYiapd9dAxGHE2n9zNsx54lct1jShhzoU5iS5PSs3WBDT3kSYKVLB7Yu BBC4l0kYYbTQKH6IXnp32XjhcA585uk9CIXXJ9L609kZg9ReCIJkg5PYm0JgtKltaetx2l MhCb1iOy170elNiPrn2ef3Izgpp3H80= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=by2YIoMC; spf=pass (imf21.hostedemail.com: domain of yosryahmed@google.com designates 209.85.208.47 as permitted sender) smtp.mailfrom=yosryahmed@google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1677574325; a=rsa-sha256; cv=none; b=M4uDxkld6rCx25df4FHOT2s/n5wRDSidt6udMMUn1ULigl9flJAID5q9RnJ3EWU1Nb1QYV 7gJ0xq2oE3Lre3fKVZfAEXEAVwhg41k54ayfLGXp3yDvJSWFQWJzoTwudEsViMojsK9ycj WIOzUU7fjWLH66O+CpZ0rkf5gI/XQKw= Received: by mail-ed1-f47.google.com with SMTP id h16so36686414edz.10 for ; Tue, 28 Feb 2023 00:52:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1677574324; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=6BbjsTlIxZF7sHybz8w08FCH3QFWqUyFfeqt4CnEYMk=; b=by2YIoMCcWOIsp0h7rKr5/1LFUIxzFGmSxl99O34nCM0YlDHzM4rBFyU9Sa2r9Rm+U /74o8KO6R1+V7S2sTO4iNDbYU3ylNZajBCgi77hc242nQrClVTmoEdczLpCLwID/X2CY DqEgjZqLRBj72UE3teWtOms462JbYAhPq/M89CAfZNMHi5aipDaO2rxKektFUe8S6Zrc 2lM4SRcc7EXHbmL3+xf8Ylzkf6Dkkz8VUdvKSoPakkNoPMb9b49XN2m/SzwbQ9KRHHh6 7yQjg6MoQadlNdv2CVYShkBYtfxFiQ+AX3ylCJ2Usg/3LT4nAkxvCSip8l+EhtbuzxmE d+ww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677574324; 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=6BbjsTlIxZF7sHybz8w08FCH3QFWqUyFfeqt4CnEYMk=; b=mDRbEXajWbne/HTpf+F5QV5ud+3nk/whzNTNF/1imGQI0xjWdMHwXRYkjEghUB1k/b vhasgwGXcPT2MMaSkZARnXEvEtqi8vLRh6T3k9DS5q1EKYN0ndEhkZFyvrdyULdRJy/W xgEZ6bOMun8rgddGkZEe2kx13FtcAMz4RSPkE7kDr2NU+4xTOIe/tLSO56FwmRVDhf0m CT1ZDOTvqx9Nmfs3m12z55eB5vxeoK37gJT2Q6CAXRUNoUL8r+25IeB7SsKntsoNtcjS DrDdueMszyTe4QBD4zF+E0WDQ3NOfPk1tw5e7SSFpUYJWr52IcdUQQso/JGqIPJ6Edlc 5u8w== X-Gm-Message-State: AO0yUKVswqDBubS/IGmH55eA0mug75onzD9v7C5tkp1ek09I4vkI8Gt9 PDLPEyBNMd7iigtCRu7N7bg+liexTbBYrEVlkn9KWQ== X-Google-Smtp-Source: AK7set+w89B+Be1v0debpVNCQWtTsMmurjr+6Hg6eEuZILDCabx9cDMZRer1q1pSjmvz3ufnokuECDI4H5cGbZmUkaA= X-Received: by 2002:a17:906:fe06:b0:8f8:edfc:b68b with SMTP id wy6-20020a170906fe0600b008f8edfcb68bmr1909988ejb.6.1677574323871; Tue, 28 Feb 2023 00:52:03 -0800 (PST) MIME-Version: 1.0 References: <20230228085002.2592473-1-yosryahmed@google.com> <20230228085002.2592473-2-yosryahmed@google.com> In-Reply-To: <20230228085002.2592473-2-yosryahmed@google.com> From: Yosry Ahmed Date: Tue, 28 Feb 2023 00:51:27 -0800 Message-ID: Subject: Re: [PATCH v1 1/2] mm: vmscan: refactor updating reclaimed pages in reclaim_state To: Alexander Viro , "Darrick J. Wong" , Christoph Lameter , David Rientjes , Joonsoo Kim , Vlastimil Babka , Roman Gushchin , Hyeonggon Yoo <42.hyeyoo@gmail.com>, "Matthew Wilcox (Oracle)" , Miaohe Lin , David Hildenbrand , Johannes Weiner , Peter Xu , NeilBrown , Shakeel Butt , Michal Hocko , Yu Zhao Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-xfs@vger.kernel.org, linux-mm@kvack.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 712CC1C0016 X-Stat-Signature: babfec3jih4531h3n6pm149ashmgpdga X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1677574325-180954 X-HE-Meta: U2FsdGVkX19c1SqIV4NBGzzIsQ7fdM0KP0N5+sMCRWxW/NK8DEVrIuFleELhF9F6GTvJK4KkWOIaaKCcKOAsIDHx5qT7/sLwMpw9l0uxXsH3kJrLczY0OlJxeZJfi1BCjK2U6J9et5eyZaZ2m/wnFE0mEKjltp5PFqiAZlv6AD92hFkznn1VSOchTXGF++I+nM446Z49KI55r1D690mxVMFMADes2CSRxeTlGxevx7FZfeP07prXOBiQweVCBZYRBI2Z/xliADQUXLvPk1uwkaFRsyY0JrRR7+2VRGH8RnRfV4Ju2QPEwxfQoxbhLl6wCVDpdUMHsEG/qyy5PXPnOgbeGSeM7UhOq1Ot/2N++JrJkrf37hOlyl77wfeaM1VlRhrnPl9sU58deNIJgz8Pwoo2l0KuL7E6tDKIvyp96/xO5ZhUCIALBrKfl2zP/Fv+gJl3D7OKzVm09jlGeQ/O342MBwEhXESIyfz09e4rT8AuWRLiamsLET6SuzB4EzBvLA75HKfeQGPWpxUhqZqFwmVVa37q6dNbXSyQQkRIlJaG656IfqQbzH3r8r9nEPcCOv7lnDPKw9Sac5wojiUrIAtIbULMFcIxTAgoDxkHOLk9Nz4jtcirS2SxlU7Y1xZNadWNDtvGLRP2xKvRmsqos7iWM2J/8+J3RxwETVVsf0HzQvIKPts3KzsaV2PU/1qLJQdBkMOqw94epTrdH4Fbkwqfjd2X421O/WZBuru3DIigKD4x49rWt8UqVFhdDOtaXc0gxYRsLZX7CuULAzgJ3G0gvjaQOWhTfd93enKHXBEtguMwZQp4UxXWkMS07b8yKHpXmx+14SNr2ALLnxqIkHhX6mk4Ea7I0FmVwcd06ZJVI9AEEZNrgVq6DklmldaeeR+WiNt2yEDQKY/GP6Wc7LAC+kMGGZjCrQVNer5Flth1npHZ81Fi5yjzJqZfAZj6Xehf4g36YWoUfbCPzvG siWUKe5i jTmdL2kEAfTNmwknvF/ljqn4WsBstHq+Wr7CVjxVaOxNqwyM+iJHoPcF0TqwsCdrjxp14cu83Ebf5tImka9998+7nd83U8CwWZQjtTlnvK0ZgwiODwyx27rcTuMbxZcPmyF5rvIjhtgrW8mxGuGk+ZrebuL094egL0ka6I/S9626rIGG7rdoABP72RpMSojwLoDQId3oOPAq4mAYroRoJ6JcWhBYMtX1/zS0nczajYq5/WRnpVrApruERC0IaJHy6dfHFkFJ2eb595XC5/BAZG5qGo3egNU+eY+qVcf7cZ3iS1+ckY/EUSNMBiwqvbSMA3gM9vwN/DDwGfjUfawhuXxbKL3fpVksf4VF3aYUpjcvK2WEExq512c8MSdwrYWXzcUEP 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: +Yu Zhao On Tue, Feb 28, 2023 at 12:50 AM Yosry Ahmed wrote: > > During reclaim, we keep track of pages reclaimed from other means than > LRU-based reclaim through scan_control->reclaim_state->reclaimed_slab, > which we stash a pointer to in current task_struct. > > However, we keep track of more than just reclaimed slab pages through > this. We also use it for clean file pages dropped through pruned inodes, > and xfs buffer pages freed. Rename reclaimed_slab to reclaimed, and add > a helper function that wraps updating it through current. > > Signed-off-by: Yosry Ahmed > --- > fs/inode.c | 3 +-- > fs/xfs/xfs_buf.c | 3 +-- > include/linux/swap.h | 5 ++++- > mm/slab.c | 3 +-- > mm/slob.c | 6 ++---- > mm/slub.c | 5 ++--- > mm/vmscan.c | 31 +++++++++++++++++++++++++------ > 7 files changed, 36 insertions(+), 20 deletions(-) > > diff --git a/fs/inode.c b/fs/inode.c > index 4558dc2f1355..1022d8ac7205 100644 > --- a/fs/inode.c > +++ b/fs/inode.c > @@ -864,8 +864,7 @@ static enum lru_status inode_lru_isolate(struct list_head *item, > __count_vm_events(KSWAPD_INODESTEAL, reap); > else > __count_vm_events(PGINODESTEAL, reap); > - if (current->reclaim_state) > - current->reclaim_state->reclaimed_slab += reap; > + report_freed_pages(reap); > } > iput(inode); > spin_lock(lru_lock); > diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c > index 54c774af6e1c..060079f1e966 100644 > --- a/fs/xfs/xfs_buf.c > +++ b/fs/xfs/xfs_buf.c > @@ -286,8 +286,7 @@ xfs_buf_free_pages( > if (bp->b_pages[i]) > __free_page(bp->b_pages[i]); > } > - if (current->reclaim_state) > - current->reclaim_state->reclaimed_slab += bp->b_page_count; > + report_freed_pages(bp->b_page_count); > > if (bp->b_pages != bp->b_page_array) > kmem_free(bp->b_pages); > diff --git a/include/linux/swap.h b/include/linux/swap.h > index 209a425739a9..525f0ae442f9 100644 > --- a/include/linux/swap.h > +++ b/include/linux/swap.h > @@ -153,13 +153,16 @@ union swap_header { > * memory reclaim > */ > struct reclaim_state { > - unsigned long reclaimed_slab; > + /* pages reclaimed outside of LRU-based reclaim */ > + unsigned long reclaimed; > #ifdef CONFIG_LRU_GEN > /* per-thread mm walk data */ > struct lru_gen_mm_walk *mm_walk; > #endif > }; > > +void report_freed_pages(unsigned long pages); > + > #ifdef __KERNEL__ > > struct address_space; > diff --git a/mm/slab.c b/mm/slab.c > index dabc2a671fc6..325634416aab 100644 > --- a/mm/slab.c > +++ b/mm/slab.c > @@ -1392,8 +1392,7 @@ static void kmem_freepages(struct kmem_cache *cachep, struct slab *slab) > smp_wmb(); > __folio_clear_slab(folio); > > - if (current->reclaim_state) > - current->reclaim_state->reclaimed_slab += 1 << order; > + report_freed_pages(1 << order); > unaccount_slab(slab, order, cachep); > __free_pages(&folio->page, order); > } > diff --git a/mm/slob.c b/mm/slob.c > index fe567fcfa3a3..71ee00e9dd46 100644 > --- a/mm/slob.c > +++ b/mm/slob.c > @@ -61,7 +61,7 @@ > #include > > #include > -#include /* struct reclaim_state */ > +#include /* report_freed_pages() */ > #include > #include > #include > @@ -211,9 +211,7 @@ static void slob_free_pages(void *b, int order) > { > struct page *sp = virt_to_page(b); > > - if (current->reclaim_state) > - current->reclaim_state->reclaimed_slab += 1 << order; > - > + report_freed_pages(1 << order); > mod_node_page_state(page_pgdat(sp), NR_SLAB_UNRECLAIMABLE_B, > -(PAGE_SIZE << order)); > __free_pages(sp, order); > diff --git a/mm/slub.c b/mm/slub.c > index 39327e98fce3..165319bf11f1 100644 > --- a/mm/slub.c > +++ b/mm/slub.c > @@ -11,7 +11,7 @@ > */ > > #include > -#include /* struct reclaim_state */ > +#include /* report_freed_pages() */ > #include > #include > #include > @@ -2063,8 +2063,7 @@ static void __free_slab(struct kmem_cache *s, struct slab *slab) > /* Make the mapping reset visible before clearing the flag */ > smp_wmb(); > __folio_clear_slab(folio); > - if (current->reclaim_state) > - current->reclaim_state->reclaimed_slab += pages; > + report_freed_pages(pages); > unaccount_slab(slab, order, s); > __free_pages(&folio->page, order); > } > diff --git a/mm/vmscan.c b/mm/vmscan.c > index 9c1c5e8b24b8..8846531e85a4 100644 > --- a/mm/vmscan.c > +++ b/mm/vmscan.c > @@ -200,6 +200,29 @@ static void set_task_reclaim_state(struct task_struct *task, > task->reclaim_state = rs; > } > > +/* > + * reclaim_report_freed_pages: report pages freed outside of LRU-based reclaim > + * @pages: number of pages freed > + * > + * If the current process is undergoing a reclaim operation, > + * increment the number of reclaimed pages by @pages. > + */ > +void report_freed_pages(unsigned long pages) > +{ > + if (current->reclaim_state) > + current->reclaim_state->reclaimed += pages; > +} > +EXPORT_SYMBOL(report_freed_pages); > + > +static void add_non_vmscan_reclaimed(struct scan_control *sc, > + struct reclaim_state *rs) > +{ > + if (rs) { > + sc->nr_reclaimed += rs->reclaimed; > + rs->reclaimed = 0; > + } > +} > + > LIST_HEAD(shrinker_list); > DECLARE_RWSEM(shrinker_rwsem); > > @@ -5346,8 +5369,7 @@ static int shrink_one(struct lruvec *lruvec, struct scan_control *sc) > vmpressure(sc->gfp_mask, memcg, false, sc->nr_scanned - scanned, > sc->nr_reclaimed - reclaimed); > > - sc->nr_reclaimed += current->reclaim_state->reclaimed_slab; > - current->reclaim_state->reclaimed_slab = 0; > + add_non_vmscan_reclaimed(sc, current->reclaim_state); > > return success ? MEMCG_LRU_YOUNG : 0; > } > @@ -6472,10 +6494,7 @@ static void shrink_node(pg_data_t *pgdat, struct scan_control *sc) > > shrink_node_memcgs(pgdat, sc); > > - if (reclaim_state) { > - sc->nr_reclaimed += reclaim_state->reclaimed_slab; > - reclaim_state->reclaimed_slab = 0; > - } > + add_non_vmscan_reclaimed(sc, reclaim_state); > > /* Record the subtree's reclaim efficiency */ > if (!sc->proactive) > -- > 2.39.2.722.g9855ee24e9-goog >