From patchwork Tue Feb 28 08:50:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yosry Ahmed X-Patchwork-Id: 13154537 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1D523C64ED6 for ; Tue, 28 Feb 2023 08:50:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229580AbjB1IuV (ORCPT ); Tue, 28 Feb 2023 03:50:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33118 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230432AbjB1IuQ (ORCPT ); Tue, 28 Feb 2023 03:50:16 -0500 Received: from mail-pf1-x44a.google.com (mail-pf1-x44a.google.com [IPv6:2607:f8b0:4864:20::44a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 63DE57AB6 for ; Tue, 28 Feb 2023 00:50:08 -0800 (PST) Received: by mail-pf1-x44a.google.com with SMTP id p5-20020a056a0026c500b005cbeecd5c0dso4761680pfw.3 for ; Tue, 28 Feb 2023 00:50:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1677574208; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=tgJC52QM6QqWzETYUfTKUV+TRKWCtnTb99Tc/z4xtcc=; b=QpsaKClBM6T/l157IH+7qI9Rdj6857P2of63Qy25b1ULux6HWBa7tPwczUKR822sQm Jtu4ES6VL+1NRykXmz5aiv4K55zgEU1gyffkFKfifRDKyIBnA0uJ1jjdMSq3yLorLuby A7J9nOJUGetgqw5d1Alpv1sY4oIyc7bWZD02dBipyIYqxTGJWAjh1Aoxhy0vJ4ZuLYiU ZcI+vNG4fis3fO4Q1DKAztlEJeJR69f7liSjn2WRt9qFaSe5iB8T7zMWLuiVof/9K0MV SOrTQToIej9jdyCvxdFzm7JPtyyAS6uRvP9Ms6dFChBa7ZvjPPagDLqcGbXyvNXqmUa6 KqIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677574208; 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=tgJC52QM6QqWzETYUfTKUV+TRKWCtnTb99Tc/z4xtcc=; b=Omdq6AvDCGLcQN2KFc5eMwO+eNh0PgfUgiLqkJ7itOB7wXcJMkpmj4sd9fLRBorDkD ARMyrKW/c/Szk+Gir/YH6TRkFO3Y/IcH6ehsU9HshtOFEZBOTPWYD9DHX1zyFg8NS+H5 kCe3Iw/qDY8FrcRYJRq4w2E9OCVqwTdPhHQGW+8G9mcHxSs93T09aIlUTOSC6nOzuhpm KjlzfRAH//HLUdZN+6BWWZ8LwRvv9rc5RbkZqvpwHFIshnwQ9aLKutc2IrfSYdqMSzbX J1CYEBx8jOLc2AsL3g+9HAdorJV8N7R1WQzkeVSz525U8kKwIJfVI4GnluORUAaufiTR SPlA== X-Gm-Message-State: AO0yUKUN26SiTY8EbWjrHkfPEUDWEaQKpHY69choe2nW+k7XaINYqP+0 oSpEPn68cTXhSWnawdQhUYMUmK+FwNWs7/ye X-Google-Smtp-Source: AK7set8t0cooG+i7Em12R7p9gzkWi0x9flCtehwMdDtbP+QKpSIaBR21aL7xJpXfLxb2tbubY3iK1iSuvetMpUhV X-Received: from yosry.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:2327]) (user=yosryahmed job=sendgmr) by 2002:a63:b21b:0:b0:502:f4c6:3992 with SMTP id x27-20020a63b21b000000b00502f4c63992mr521403pge.4.1677574207767; Tue, 28 Feb 2023 00:50:07 -0800 (PST) Date: Tue, 28 Feb 2023 08:50:01 +0000 In-Reply-To: <20230228085002.2592473-1-yosryahmed@google.com> Mime-Version: 1.0 References: <20230228085002.2592473-1-yosryahmed@google.com> X-Mailer: git-send-email 2.39.2.722.g9855ee24e9-goog Message-ID: <20230228085002.2592473-2-yosryahmed@google.com> Subject: [PATCH v1 1/2] 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 Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-xfs@vger.kernel.org, linux-mm@kvack.org, Yosry Ahmed Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org 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)