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: 13154534 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 9BE36C7EE31 for ; Tue, 28 Feb 2023 08:50:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 321FB6B0075; Tue, 28 Feb 2023 03:50:11 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 2AD556B0078; Tue, 28 Feb 2023 03:50:11 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 124C36B007B; Tue, 28 Feb 2023 03:50:11 -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 F1A516B0075 for ; Tue, 28 Feb 2023 03:50:10 -0500 (EST) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id BF2A6121371 for ; Tue, 28 Feb 2023 08:50:10 +0000 (UTC) X-FDA: 80516078580.24.A490E97 Received: from mail-pf1-f202.google.com (mail-pf1-f202.google.com [209.85.210.202]) by imf30.hostedemail.com (Postfix) with ESMTP id 0952580011 for ; Tue, 28 Feb 2023 08:50:08 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=QpsaKClB; spf=pass (imf30.hostedemail.com: domain of 3P8D9YwoKCNwWMQPW8FKCBEMMEJC.AMKJGLSV-KKIT8AI.MPE@flex--yosryahmed.bounces.google.com designates 209.85.210.202 as permitted sender) smtp.mailfrom=3P8D9YwoKCNwWMQPW8FKCBEMMEJC.AMKJGLSV-KKIT8AI.MPE@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=1677574209; 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=tgJC52QM6QqWzETYUfTKUV+TRKWCtnTb99Tc/z4xtcc=; b=NgEbCQ0ETeJkoWjKnwXYCmckPQtaJxOOnEQt4k+NTzmyf5wbS9ZxsdZK9MFge2y6xSId02 CrSLaSGsCIr+2cERMaY9OuDg+LXewa5eUCp29I+3OWrC2Gqlr/UxqfpYMJzTFbQLtcEokK ZRM6onML8J89vRm1z8uM3zWrLPcqpXg= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=QpsaKClB; spf=pass (imf30.hostedemail.com: domain of 3P8D9YwoKCNwWMQPW8FKCBEMMEJC.AMKJGLSV-KKIT8AI.MPE@flex--yosryahmed.bounces.google.com designates 209.85.210.202 as permitted sender) smtp.mailfrom=3P8D9YwoKCNwWMQPW8FKCBEMMEJC.AMKJGLSV-KKIT8AI.MPE@flex--yosryahmed.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1677574209; a=rsa-sha256; cv=none; b=mcQer18pAij4KCISMYl4KaD1Ub8bdX0+n3kndXuxd+nb82WsfFqM30LTcN1ftL7zDKBvBi 3AT6OfBXQSwBRjGMSRqBMR48I7Q70jgR9GBzUFy7keG1LrQOBJpimj1s0VXqD9kPhYNNRY qFazNvQeU/uoO7u6GxX+cYTERcbOPfo= Received: by mail-pf1-f202.google.com with SMTP id a10-20020a056a000c8a00b005fc6b117942so1839304pfv.2 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=E5dVp7YheiZ8SWugXKQgt0LE+KtviaWCSZKaDzoOLjMOj2OQV4LQMpd5YYIeZ7zXFp CSz8ynZxkYi5hrRaMqqdUpB/5W3a8A5Rit2wkWylNJ9NTThcApAqpitlvVLpFuId+Bam S3l5haxl7DHGkOqpOUja+8LHECu2CpiOYrEisV0IRBlnSTaYfOdaKP+UNckxEpHwQZMn Gf1jr5JAK1QjpMViizj507YCfmb6XzAsAWapdLbc5xv2CQQOP1WoYOnF2gyivVO2QXe5 8oV5PJFINJ8t8rIwjq7dZHPYRIpWiFFLKTQVV28X4+C2At6WFSwzFYgO6QSKVYkMmno2 Rmkg== X-Gm-Message-State: AO0yUKW6QdS7OylQL58keq3bVWxyuqs+mKCafsQ87NNAdRsp5tB1GPi0 aXd7va0PFsKpJ6dBc7wEGYg3zSe0XM+bBo6l 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 X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 0952580011 X-Stat-Signature: n3x3ie17om48nxjdahdzc8hnnahzq3wn X-HE-Tag: 1677574208-872245 X-HE-Meta: U2FsdGVkX18/TEguOGpeFLTUgCtlzF9s1svyg0hE1dvSQZvaxhiYYtQjpWddyC9Ouse4AFOnqh5Xf7lgmT47yJnOfHyS3gaLI1YSeTd10V4xcZ5bf2ntk8Ut34Ozx3FuovnnrvI+zpVNaHqDb4t4yix3Ei9xjQLfYGyJoc2dFZ738+wIZZZDrJC5X72gyXqHywODFY08Sd3Sv7+NxOLJgNohuxW2K+TTM0PMfE++cZiF4fCv/vhNv/WGjcK9IRBQ16yj5Eb5yR4gWqAbQf2GSElmeJ/0NJm1MJF9T0L3XfVk1+tX5l02bEbLiSNL+B3VM12fyeX7zvIsuO9wZyakfWnf4wTBieQVb7sfDPifZ6YfPUm4WkAKs0ptFj96YOnM+QIZjEexwowrwewOqHA+ElWUdm4N/d7B5Svq1r84QjHF01yoN43e3A0ojmO/P0YBWVxxL8g/pa0pJM2qXLeqOw20xYelB2Tlu6h7vOPwxCL9RXamEWyXQapWqToy48pK6yn1m7Aif00pWnS4umhxMnSMskTZp6PFSCQbq9WkXl6K1uy88AOX6XRbHcAPgU+bShISMngqipo2Jd2nA//y2UA8Jg/ety0DsoKB5BdxzjYSAAlseclxqtNF80ff4Ny56cNNR1TYk2riHzbd59bxWLCjF86Ej5Oci5NkhZ0quqdRqfiR+IfXaP5pZje78hpMji/vvpTyhqdQX9tK23s51f/Xnc36hm/DMzMWW+pQJNwInbbb5imuL/a/fBc1QY9qKv2Z/PBKBl8xgS3eT1/bQLGAAbCCEx9cWb326ZYH4c4eVur/tqUBc8iVcm3F3wZ24X/pkv3jvqvHvcEL6ul3jwzQZOEXkeCFT526cg5arzWGHSjb33sepu7P0e1NBrNLPMlLC4fAlPytSrDV51XV48ogGkhYdpy04XBL252Y5c1w+V+RCHE8vys+B4/JjLWn0vzdRTsnLS1dGCHrV8p Fe9YJSjq /EyPcrDKFh1SboDoLDdVSX8L6eTKMFjlYIMlkGA3WssM2YSSufOx16IaAs11OfmYPQVUi+Wjqz57j1nvfZG89sCOVxSTsfpD9RB1v9hPcRAjMnCZdJ7yLN/DygYXzm6Y9JObGIXk1yeA0o6ZBVJ3eYs+cu5i5Ar7kccbIJ4PYycDE769fiIqmn6U8xrQiAhKF7DZ+SIzGEB1uO3Ai3/dyqDHSAQwlnlc8fIN2NzEFxrNe+JHq4N5zngwSj6HZqgz07McBEk57Tmvt3jv5E5YOJdKh+84NCFciIGUHt4t+qAdmmKdMCXd5vurhFapl20UZ68jedFAXuHtuK9KdfGWdU0ZUSXoD2+OvbQ4YbV/O9Tsml/CeGZQbbb8+yQ0EQJd3OmDQqj2uKks5GPsUPCbd7+o67741w2YJr9yNEc7lPK8tFxvvK1EtgIksR7MiaFZCdEqqlFNckQvCHyImdKzMCJEUNNgdvsaAe6g3/cFpwjyF+j7gD6tgKK1TGKKJ9JyDZI1K/oVLjDCqPDFOPn0Kt2FggfFgwi21fZuLvU1NkhSZtD7kRCf8LuZ+VqTo2Y572SWygoDT7ucbYobfZm1k9hATVgiUm9+zVWnxIqa743c3gyt7AsEgHd5/QYb0Ev+GDCFa4roz6/LpgtHyNInlxbONsV0l3NSyKqMpE3CIwSLDZNHPffb5LAL0fVTUkveDMcgNrL1v9vw3Ebwe84x24O/Dv61tEWVRcEQwl8Q6nG6Bb3jxYMNWveONL2UjKpOmVXmUV3VEp75CQBtce1imgVfKPw== 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. 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)