From patchwork Thu Mar 9 09:31:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yosry Ahmed X-Patchwork-Id: 13167119 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 F3612C6FD1F for ; Thu, 9 Mar 2023 09:31:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8F810280003; Thu, 9 Mar 2023 04:31:34 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 8A85D6B0078; Thu, 9 Mar 2023 04:31:34 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 72C7E280003; Thu, 9 Mar 2023 04:31:34 -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 6500B6B0075 for ; Thu, 9 Mar 2023 04:31:34 -0500 (EST) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 348321404B9 for ; Thu, 9 Mar 2023 09:31:34 +0000 (UTC) X-FDA: 80548842108.14.A13E32B Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) by imf28.hostedemail.com (Postfix) with ESMTP id 68548C0013 for ; Thu, 9 Mar 2023 09:31:32 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=BIspgDfg; spf=pass (imf28.hostedemail.com: domain of 3c6cJZAoKCBAE487Eqx2utw44w1u.s421y3AD-220Bqs0.47w@flex--yosryahmed.bounces.google.com designates 209.85.214.202 as permitted sender) smtp.mailfrom=3c6cJZAoKCBAE487Eqx2utw44w1u.s421y3AD-220Bqs0.47w@flex--yosryahmed.bounces.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=1678354292; 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=h6SnRTgbJt8uctknxsPWdjBgy9HatQBYNy5scoYuFng=; b=CxJh3n2j1eAfrS26mT70phbvqHXUhlFKqT+dsvCylTHMWZY9f9GoMAoATW+gMrP1AN1M51 E2Jws5F2BZgkbzyhzUJT62G4F2ZOkBbtzfo43ppYpUNwRRPcA4Q3NiNOIvyyqFpTacWXPf fRdwcD3m7Gyzf8+hfILqNDlmwsp3WxY= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=BIspgDfg; spf=pass (imf28.hostedemail.com: domain of 3c6cJZAoKCBAE487Eqx2utw44w1u.s421y3AD-220Bqs0.47w@flex--yosryahmed.bounces.google.com designates 209.85.214.202 as permitted sender) smtp.mailfrom=3c6cJZAoKCBAE487Eqx2utw44w1u.s421y3AD-220Bqs0.47w@flex--yosryahmed.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1678354292; a=rsa-sha256; cv=none; b=wYzTSRYErNAYuBBWJwCZ94YW+VtWhBbIe/sWxId1cizEDtp0lnb9r+n2rbgrRdebRgcvq5 XpnFwhRCU1p8kqN8vLnFsbzBpCuOlxJeu/3TRRPKm7oC+j9AHaFGqrVLVEFLiNul4f6hcQ XDLrsmDNED3t9Bg8WDlK2NQH4u1rTQA= Received: by mail-pl1-f202.google.com with SMTP id bh9-20020a170902a98900b0019e506b80d0so826218plb.13 for ; Thu, 09 Mar 2023 01:31:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1678354291; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=h6SnRTgbJt8uctknxsPWdjBgy9HatQBYNy5scoYuFng=; b=BIspgDfgpDn4bkLxtBabsOU9Uhv4DiqHmpsyEYFdYYQOsugC1O3FyPc6aDReE1SUAN 5uV0uFO+sQlWKI/40WV3HZDPsDyksERJrVxwFRis6lKh0WsNGujWmErL0jVg9DFJ7Sxd IuVjwB/VEOvIqca+ISasnf6kTvYtPtyS5xSUuEuv0nl1KwuTEi21GUVG3fYoJYL/P/IC HyKUQOiXj+7FJ83bqgaNXvvsRkza48cZcoJSntHuv6rgRw6VPmYf64OIgEh4BzpyXPFS xbI1nWERtwBhK1R2RwjpugpOVd7LTuQKHDFNUS6dv8MWFgB5hNM2IG1rMMNwqORxP1qi hAOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678354291; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=h6SnRTgbJt8uctknxsPWdjBgy9HatQBYNy5scoYuFng=; b=rkc91QcqC0mvJPpYw1XwPmLD92xel8dN+npCdrO+zRSiYzN5lPUvsypRTH2XPP1TrH YFBDFGqVogE/HTuujRsXafg9b1i9hovAPrmdVXe++Gbq6QDYs6f3mLM7ZW6PZoOfu0Dh dCJmJc71E7i9nwe3MGuvwYAQaS6oD5mvZTViNKrvuSLANGknGBVA8+o5lVqlxEU+9Hyl SOwYffx1+j1fEtZwaXk1eR+s3RX5W+AATmdSC+d3ID6QHFa4v+O4cnNLK4yEDJIfcrcK Bbav2w9vBHYofoOHWMfbuWNbKVbzD1W6kG2p+Aar1k9I+DSDHtjf3PLG7IYb2aC4BDqQ tvZA== X-Gm-Message-State: AO0yUKWg7Cacne8DFqJckqXwO9g3U2dN8L8/qegrcOGkfcH0ZhRP2kk8 IcYcXE93lVTN5lPLPQa6v6I2xjHaSZOxAp+B X-Google-Smtp-Source: AK7set/xvyeflSxZY0dqmtHjFakw/c6fvI1rhtdCuvGq7DrJIicLLxLjDK/zNls11ytQyWAWIJilVYP0U74iRmT+ X-Received: from yosry.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:2327]) (user=yosryahmed job=sendgmr) by 2002:a17:902:ef8a:b0:19a:9434:af24 with SMTP id iz10-20020a170902ef8a00b0019a9434af24mr8176829plb.10.1678354291238; Thu, 09 Mar 2023 01:31:31 -0800 (PST) Date: Thu, 9 Mar 2023 09:31:08 +0000 In-Reply-To: <20230309093109.3039327-1-yosryahmed@google.com> Mime-Version: 1.0 References: <20230309093109.3039327-1-yosryahmed@google.com> X-Mailer: git-send-email 2.40.0.rc0.216.gc4246ad0f0-goog Message-ID: <20230309093109.3039327-3-yosryahmed@google.com> Subject: [PATCH v2 2/3] mm: vmscan: refactor updating reclaimed pages in reclaim_state From: Yosry Ahmed 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, Yosry Ahmed X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 68548C0013 X-Stat-Signature: ba6tnggxs1cgtcc7137qhua41z8781u6 X-Rspam-User: X-HE-Tag: 1678354292-788470 X-HE-Meta: U2FsdGVkX18vLNLFWiaEyAOwUXlXDRwVx9w0FbMV5grsiUVtYdiqmXKJ8JpP8Y9GRTWCwm60NPFzZkMBD8TH2a7dUCNuepViH/uwvEKd1C6zz+Ix1SMsGWZpV5EBjCnM59RSpOxvOfI/fpihSjEBsdB4hsaRQj5nIDL/zIGuENZij9UKzOuAhTz7F0jTsh2Bql1dj0sEDlypiVs8yQ7kMl6S0REIE+p38kaxIZRNV4UJ2j1uznwJKM7dNIfC+96I71K45qAuA3DjpDWdxZrafGWqA6qqyioUzLz+aaK9EPYQIgIpLj3Ea4K6AZV7oi4+EXsfBaW7WBA3gDAbyoOapjS0yg+RHPnRHtarU9cGa6teJn2sauNIDQDU0kYg7Z2j7+j1YRSK6d0tXJf09j9FL+CR+ec34PQA6Nd0gtR1IID81kTeSp2iPfrkz6WrfQPONdBH+0L1AuIx4mXiFlbOu3d5JIIoNl2UXxYuE3LoAUE4WQoAOUQA6PJse6CgIQZTHILrIpIQ850DWtrbMqZGK5xobUFxkco7K2UudK0TXLunw+FbPzIao8qDWwV4T8GvgnDTzSo5L0EzOm71AuFTpHWwkPHuj6nzHOFG6bbGprdWkLetHn08lY4WkxJz6+YwU//d3eHupeUsKQoGTZ5/6iaiMHupMq/3V3z46hrvhov3eXsBxMNNS6Y+gECvMQCbw5drSLNChvWHKYhDi3KpiS4e8N+tqBereiM+pco2I1MQxW1voPayECGSmkeaOrvNayzfdCKntxNQTirafBEToHfaQaUjcgE0QapxybfaId6LP9p/2Vatb7AzUnbuLlcXkhm2pYAVTVdesouQd3t5C4T90yzIHNP4EfhTleTcO96lbBrBrBqegfRwW/GM2ZMZilGYsn1bWW1r/1fpaOBCAsDD2t8wiIQAmXMz0YRIMPciDlpIJIyJ9ci0tMpMUE3z8DayCJuR1tCg4y1cxNf B4G5Hs2g aSWH8iKnelnka5r6sqJIecTnHozlxQ9txJd24ItvgLZ2B6+1Pa80nnZtgEKDOmpnXVo67FN/J3OlRPOZy5k5o9BY0vBQ7yjiFYdpT/jQB6lIUVuQuigle7PNb3TtYTR70CqlNTeGw6e0RTqjiM7pCBV3uTF0M6UdDk9WjBOwg0YUnaNPP7ZfA3MPHd33Xk+FKAy9acm8nH+NwMNhKLs1SmQp/+tEpQTHBWeIAPQz94C4XXHZQfQQ2O3KIkdiaGZuF06BeHnOgGyiFXPSLmoNFgE7sm7AFIv+2KxsIFke/kYkVl6XtLSebaMrpVqkqqOjh2XtjMa/SZQkVQvBeIMkQuAhBI/0RWGbD9OehA6OOa+8E7uLHD9RK6O28A9TfECXJLnUMz9qpiKh0UO1dygLQrTz+XA2BEDbPSHHxclLTJDkhrachEkVRKnYElh51xMrUK5lPE4fEvyBrHIc+BOZA6bPB02xmkvTxF+pG2S3eerwF4NvOWZPPLYB36ZaS9nGOzVHZVriW+ECOuoEhu2JvCQq1u67YLv6Nmd+nG4YIbaf2x+0brBo3w5XBGTdNklYmnDT/4/NmorshjtBiYPeQcNET87tg5Jm/C3AaEIaL93W71DXhxAY/IBMO7UI3yRGveBM1soVXbAnK593BNRDJIGDWfKw7ADbVX3PlD5M1x+1TPwRykSWHle6zKZZMO4Jp2e12gGilLt8b53eqo9Yq2t82tpezWIb9ZhQOU0QHN4L55GaSOopdSDhpIHRpg7QxpEVeskQdaTSoiMQF7hl/sUMNQQ== 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: 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, so that future changes to this logic are contained within mm/vmscan.c. 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 | 36 ++++++++++++++++++++++++++++++------ 7 files changed, 41 insertions(+), 20 deletions(-) diff --git a/fs/inode.c b/fs/inode.c index 4558dc2f1355..e60fcc41faf1 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; + mm_account_reclaimed_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..589ea2731931 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 mm_account_reclaimed_pages(unsigned long pages); + #ifdef __KERNEL__ struct address_space; diff --git a/mm/slab.c b/mm/slab.c index dabc2a671fc6..64bf1de817b2 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; + mm_account_reclaimed_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..79cc8680c973 100644 --- a/mm/slob.c +++ b/mm/slob.c @@ -61,7 +61,7 @@ #include #include -#include /* struct reclaim_state */ +#include /* mm_account_reclaimed_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; - + mm_account_reclaimed_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..7aa30eef8235 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -11,7 +11,7 @@ */ #include -#include /* struct reclaim_state */ +#include /* mm_account_reclaimed_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; + mm_account_reclaimed_pages(pages); unaccount_slab(slab, order, s); __free_pages(&folio->page, order); } diff --git a/mm/vmscan.c b/mm/vmscan.c index fef7d1c0f82b..a3e38851b34a 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -511,6 +511,34 @@ static void set_task_reclaim_state(struct task_struct *task, task->reclaim_state = rs; } +/* + * mm_account_reclaimed_pages(): account reclaimed pages outside of LRU-based + * reclaim + * @pages: number of pages reclaimed + * + * If the current process is undergoing a reclaim operation, increment the + * number of reclaimed pages by @pages. + */ +void mm_account_reclaimed_pages(unsigned long pages) +{ + if (current->reclaim_state) + current->reclaim_state->reclaimed += pages; +} +EXPORT_SYMBOL(mm_account_reclaimed_pages); + +/* + * flush_reclaim_state(): add pages reclaimed outside of LRU-based reclaim to + * scan_control->nr_reclaimed. + */ +static void flush_reclaim_state(struct scan_control *sc, + struct reclaim_state *rs) +{ + if (rs) { + sc->nr_reclaimed += rs->reclaimed; + rs->reclaimed = 0; + } +} + static long xchg_nr_deferred(struct shrinker *shrinker, struct shrink_control *sc) { @@ -5346,8 +5374,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; + flush_reclaim_state(sc, current->reclaim_state); return success ? MEMCG_LRU_YOUNG : 0; } @@ -6472,10 +6499,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; - } + flush_reclaim_state(sc, reclaim_state); /* Record the subtree's reclaim efficiency */ if (!sc->proactive)