From patchwork Thu Feb 2 23:32:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yosry Ahmed X-Patchwork-Id: 13126805 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 51D54C636D3 for ; Thu, 2 Feb 2023 23:32:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CCF936B007B; Thu, 2 Feb 2023 18:32:38 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id C5BCE6B007D; Thu, 2 Feb 2023 18:32:38 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AD23E6B007E; Thu, 2 Feb 2023 18:32:38 -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 9C7696B007B for ; Thu, 2 Feb 2023 18:32:38 -0500 (EST) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 6FD0BA0D0A for ; Thu, 2 Feb 2023 23:32:38 +0000 (UTC) X-FDA: 80423953596.11.8F8288A Received: from mail-pf1-f201.google.com (mail-pf1-f201.google.com [209.85.210.201]) by imf22.hostedemail.com (Postfix) with ESMTP id A5461C0012 for ; Thu, 2 Feb 2023 23:32:36 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=OvrbEiCp; spf=pass (imf22.hostedemail.com: domain of 3E0jcYwoKCDoukonuWdiaZckkcha.Ykihejqt-iigrWYg.knc@flex--yosryahmed.bounces.google.com designates 209.85.210.201 as permitted sender) smtp.mailfrom=3E0jcYwoKCDoukonuWdiaZckkcha.Ykihejqt-iigrWYg.knc@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=1675380756; 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=jMfzYGpjLscA+cSHKjv+qODVcyrrlHVghJg0aaO0KBk=; b=CU8A9nmEPcUwTDpHyGWXw/xijh09gGh2Jhm/2CByHwYvuYNI2kZR9q4AppaF1jRygoEvDI 0j7rIenSeJfSQU5TZsUin+Z+cCazwIysOj791eH9xaJXR0rKZVpzIlq/KxraxnmN8zX+hE MpIfgOrrrET+U2i2yafcP91NcegKD6Y= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=OvrbEiCp; spf=pass (imf22.hostedemail.com: domain of 3E0jcYwoKCDoukonuWdiaZckkcha.Ykihejqt-iigrWYg.knc@flex--yosryahmed.bounces.google.com designates 209.85.210.201 as permitted sender) smtp.mailfrom=3E0jcYwoKCDoukonuWdiaZckkcha.Ykihejqt-iigrWYg.knc@flex--yosryahmed.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1675380756; a=rsa-sha256; cv=none; b=5yyJYaIv6bj+qd4VUGphA+4IDv7jpf7emjqcNslp4bO46jjaOGdjiKAi/in9Ro0F5+Pb+X T5Fp5+7aF+Sh7K8V9+M0dliO/bkZ7vq+xcm0krzREuFGx1QxEonI/Ym5nrI6mjCZRLebs6 qZNxNSeUDj/RKEAti5j/xc156uvBsyg= Received: by mail-pf1-f201.google.com with SMTP id y5-20020aa78545000000b00593b071cb99so1687331pfn.4 for ; Thu, 02 Feb 2023 15:32:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=jMfzYGpjLscA+cSHKjv+qODVcyrrlHVghJg0aaO0KBk=; b=OvrbEiCpGPYcK17eFl9Y8Nb0T74F1qeKRRPkLoOMDwdi/dRXxR6NuAQjAW9zXsUR0O NeVP3CBQfbmSZRDn3VjHms7iVR+lkrD9000HVofhlapWdM0H6OVWwh++RAm98vZ+5dhx bufiNX/dvrtyw3cumBPhgl4x+7y0E+G53ahhpnQuHNJSZ5luwRgX/jLAWcgel9dI3QjA SRu0TbgVgGpsoeFXfGAVryIKlsdRcV06r0T1Ttoz+3041WIcgTRlSdDg+usnZ1TMOPDz Rf9IFZN9Y+yLtQ9bRc+UBoG9YZg5Aztk+JWK5oqw6+zVPOqc/gIiW520ZtukWzKTIrxg lJvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=jMfzYGpjLscA+cSHKjv+qODVcyrrlHVghJg0aaO0KBk=; b=6k7pO/Y9zj858nVS3Cjqn/V80jMZ8cMrhZfU9hArKPTJeUTQh8zV7oUbdz4GBjTEzG R9E50qZ1enfTQUbKNmqLrZXKx02+zskN3aIrPAX4v1V7qEovi5+NlXx93bcLwyKrpXZS DwJE68J22yKvx09Zg2QIQBM3oJJSus0SIN5XeCiutGsosTuV+qf1rrIxhRp8Ni8oxQ98 YmZc0mJ4MltFuAtTUnJS126/EneJHPztISRzWxBIUw0rMrq7JW6DoJx6/xRaoJ9q8J8j u6lKPo8jShooewtxDApHkic0/JHgA7MiBZX3NE4BNbO9wKhtzUg4QrJPwgRe0HM0BTZi Nbrg== X-Gm-Message-State: AO0yUKWCo5LmI0vKqHldok+tJX0BriCA7mjzxXhmugxZW9d6sOrQIUss RmsbBFDZPx3HV+uVSK8WhhD/tGQRNLsATDj2 X-Google-Smtp-Source: AK7set9GQneKggPkDbKmlHsZPDxNqqKNqpt3nFbEgf1JtVVy4xckZ6axh9mOcnrxgc0XPi+3Fc6kG5az9ihIBd8Y X-Received: from yosry.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:2327]) (user=yosryahmed job=sendgmr) by 2002:a17:90a:7f93:b0:22c:aacd:86c5 with SMTP id m19-20020a17090a7f9300b0022caacd86c5mr992815pjl.76.1675380755306; Thu, 02 Feb 2023 15:32:35 -0800 (PST) Date: Thu, 2 Feb 2023 23:32:28 +0000 In-Reply-To: <20230202233229.3895713-1-yosryahmed@google.com> Mime-Version: 1.0 References: <20230202233229.3895713-1-yosryahmed@google.com> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog Message-ID: <20230202233229.3895713-2-yosryahmed@google.com> Subject: [RFC 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-Rspamd-Queue-Id: A5461C0012 X-Stat-Signature: 8boworjwdbhgrj85xnqmfyi4yq8zp8fh X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1675380756-887002 X-HE-Meta: U2FsdGVkX18FnKf5S8CCVBHF+mJNKJqqJLgcGf7bxwwlLzLZg8oFqe0THNKBURN39zf5z0KMqEsnE1kSsLwdkD8tdrpx2FQT3FwCYHvrRNA95Mwc2h9biE6rX9EpuMhDaGJ51nDZCtQjE/S/5LMlcBJ1wuFRL+6lYbOPKj5z/Xeu7EGhkAUuExTjSiKITXtpPQHxP8K20m0FgUKDp1+yOMMrDRl2ImjIs0w76fOvLhEDnsfOiTX69QUW8e2jdJgnStPlpALU4kKni7ZIwYAc1q1oEfUGZeUxJfCiWO4HfTjfASHu7U3hfk9XV40rHQe9hU9QIfq6bWN8tAd97yCwkhhgLURQXN6vDbbhqNTpbw+3LVEUnhQh8HjId1YHpBUp49fXFilNWZVsVZ5FmcxP5H6T+Fe+VpVI964gRvvoFGw2GU1BguldkjtBk2M4EJA9Cyyyx9VbyQxPJ7pSFoRX4nqYkFRfXYtlmUqFC55RlWSWdC15N6jS5aGnPz7RakStFgZcWA6s7M74nxZNHUkAC+hx+sfhpFV+/qjTatbDDaa/NzIXsuPRjCWTDVGsPfi9Bh77mImVsJs2Uq/aDVzyRJlXuUA6sCu/F4WKx5LJwTrcAZq6ls0eNmWoG0QM7n0UVl1UQ1+Qp7+Ub9EHVnPCnBryP7xX2dnJlVaVEQ9JmwhFZmPIaLJMdbZgsztgBn1RxWHhZUIIKi75pW96hezQJMhl5usSu+CR/ZAerC+ddDehJUQmK8vHbmz0giLUDRbb3FAKFEUDRjpnh5h0ku+IyH7uGqyIqaUiwe/5P/cX9a5c2fCygNe5jpQOuZwBTktOsAibUkzhyR064wsg63u7l2q5doZQ6p+E2wrnUxn+a4EHOhATFv1MjD6HmT1TalfnpKM6qq7bxkM1A6Wuqq2zPAVL1MRcjIR2FKYPFqlNTfGZirADrGjAju67jTO9x5gQTfmkWHNdv2t3GllxrR5 CgDoQzVw uu/ULi/89IGQA+9SbDCSvjXvhr+6waE/nqEVBH9nkoe4t9FzfujRXax7T+BEnEr29ZElQaR5dmDEg2x9D23pQ7wnicNk/2u04BAcRY2JhS+IcdGjodBOBr8OzHQ49GsHLzHq/GulZCFMb3BttOmvvXL3nuHOkYWsoNL0C9XFEAe7gt/mJ6k1KpKjs3IgiCj2F5ySm8fnHK1w81PmKmsDaJeNQuv3mgD/ViL12Thh0Jd2yQW1ddHn33tf/7Z3WigqJE5MipmlS/AQBRUyxFArCY/c67r8UMiF9mWlYuJ3msu9yq0+MlHAVUesfD5oN8wBxppjZozx2Y7Y6deqWHE0DDFKn4gDRXzKkPZKM8XpV8gzZP5EVuGOgof0lMD4ufZf3sBTwuhfAprSeU6DGq1MbmvexYtyfD8o3TX52J4IuYgptnXDVW7lKCZ14qd80XQbbY2Z5XRA6nQotbwpY+Cu0SCFGg3wF/E61XAhbQUsCAsZZc4iwP21hB5hHArK2FxRGf0K7XGh9VvQCoYsAaLX3ohPxyKOM/KSP/Jw6h/V2sW+S9zaYgbw7E8MCB0jZwx5XmdOUDdEDflveq6S6AMJL0bR/nPzojIkJ6M+APcasOm4pk7R4c+6TDNZx9uOLSNr0j/87kK8zEeeHc2BUbWgrVaLuvt2oGwvUqJq/sy5XCBfBl1xgXa83kpY944SXiMMQLClry5AD8+i/RYQqy00p2kAQ1hmvDUDGrqSQLD+TdntzdaC+v2ZQU5wueXVI+bDYvXOqq+8ObxDkmYkHKO/3kVXfCA== 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 | 17 +++++++++++++++-- 7 files changed, 26 insertions(+), 16 deletions(-) diff --git a/fs/inode.c b/fs/inode.c index f453eb58fd03..adf0a7725054 100644 --- a/fs/inode.c +++ b/fs/inode.c @@ -863,8 +863,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 2787b84eaf12..bc1d8b326453 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 29300fc1289a..452db5913356 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -1395,8 +1395,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(folio, 0), 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 13459c69095a..5145ad2467e9 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(folio, 0), order); } diff --git a/mm/vmscan.c b/mm/vmscan.c index bd6637fcd8f9..63a27d2f6f31 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -204,6 +204,19 @@ 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; +} + LIST_HEAD(shrinker_list); DECLARE_RWSEM(shrinker_rwsem); @@ -6169,8 +6182,8 @@ 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; + sc->nr_reclaimed += reclaim_state->reclaimed; + reclaim_state->reclaimed = 0; } /* Record the subtree's reclaim efficiency */ From patchwork Thu Feb 2 23:32:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yosry Ahmed X-Patchwork-Id: 13126806 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 37CB6C64EC4 for ; Thu, 2 Feb 2023 23:32:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B4BDC6B007D; Thu, 2 Feb 2023 18:32:40 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id AD2436B007E; Thu, 2 Feb 2023 18:32:40 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 94D9B6B0080; Thu, 2 Feb 2023 18:32:40 -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 7F58C6B007D for ; Thu, 2 Feb 2023 18:32:40 -0500 (EST) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 3C050AB82A for ; Thu, 2 Feb 2023 23:32:40 +0000 (UTC) X-FDA: 80423953680.27.2250C56 Received: from mail-pg1-f201.google.com (mail-pg1-f201.google.com [209.85.215.201]) by imf18.hostedemail.com (Postfix) with ESMTP id 6109A1C0010 for ; Thu, 2 Feb 2023 23:32:38 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=hOhCADwP; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf18.hostedemail.com: domain of 3FUjcYwoKCDwwmqpwYfkcbemmejc.amkjglsv-kkitYai.mpe@flex--yosryahmed.bounces.google.com designates 209.85.215.201 as permitted sender) smtp.mailfrom=3FUjcYwoKCDwwmqpwYfkcbemmejc.amkjglsv-kkitYai.mpe@flex--yosryahmed.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1675380758; 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=0NNiCqwzESyAJCUAtzOveFlWcEoCPQvaoYU5oWya4UE=; b=MjwBDmRiI4g4d6x8EVUqwMlwdUZhAz9CwbzgBXI8uJRG8nlXh3H5wYAKRkSjjlLl+dEaCG o5Gd1cvoPDPo3EDn2IPYooVqzGZuW3Xtju8QE2ql01kWaf5qPku5ivTOx9Ygg8KIzc9Kng /qu3YNKyEk2rjrNGZl4Ned9xCmJlXwg= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=hOhCADwP; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf18.hostedemail.com: domain of 3FUjcYwoKCDwwmqpwYfkcbemmejc.amkjglsv-kkitYai.mpe@flex--yosryahmed.bounces.google.com designates 209.85.215.201 as permitted sender) smtp.mailfrom=3FUjcYwoKCDwwmqpwYfkcbemmejc.amkjglsv-kkitYai.mpe@flex--yosryahmed.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1675380758; a=rsa-sha256; cv=none; b=AOjrOmI6d/4h1OEqZIGgEJ8u5gN2URXhTOI7i5MnOcns+qpX0Rz5nTEFAQSoWMy2dpC+oR 2ErorT2hhQWjKpD0xQV8Nuh7nm8/CXXUQwVrzijnfG63HaYKSRZHo+d0zXQIZ/P2fdcaBY MM2crFJZGROPPW3J54Ceyg3PuVSFDmY= Received: by mail-pg1-f201.google.com with SMTP id x3-20020a654143000000b004f2f2dafb21so596635pgp.0 for ; Thu, 02 Feb 2023 15:32:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=0NNiCqwzESyAJCUAtzOveFlWcEoCPQvaoYU5oWya4UE=; b=hOhCADwPkxUGmi7V1P/nnFPjlarle5tUS/LLXkpE2OMQZSESuPz1Yg7ch5+w2lQPvZ Tg/E8g4ve+TuLwEeRfChTbEYbLJeSDJDBhmLL+z83Q3UbkFRR/7iALI3n//9YzuETtUk /td2TUtQtadczPSW8P9uXTi/L7bXWxzWMSBHRmqrt9SBSEfcBH/jtfBlcjWv7c1f+PLe QQJMnYWOv7ywl4B7eaZ7s3dALT60pveMbI3kcs7UOtDp14gKlyebUk9ejlg7acW+153Z oPfBCDEgRhQOIX+ZejkUx9YYjTBJC43e4lfmtvzzmccRB1Rl0AHErHGP8WlCALz8YStS jSAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=0NNiCqwzESyAJCUAtzOveFlWcEoCPQvaoYU5oWya4UE=; b=VnvHVzGj3T7+Neiohmu2bWQzZM0W64uozSaRoZSSfqeMAljHR6C5Lv3JCYdHaLWp+A 8a6G+52PN/KpEK460vlhQf4tqYiqNtW4Kc/Qd6w1TApkoo3RgkUPr2Kz74i7xOtPfroZ MFRUtfWaIHXnE1lz9cCRfGYiPetove/csU3K/cGdZfZ3wUvkr7CFYd3nwFbKG1odhhAJ ytJsMYDewBHSJuB9ljOhzOQ9NpvcsnHmW+dQsL977wO324B1Ne/iJH3i+c/sgWoyoRh6 O0GU4Xbkx54mhRnIW3wSkziCQgOtAOCPFcwT9kjVLQ1FNrB2LVgSYbxD+SA4LFx+kZ1W vNRg== X-Gm-Message-State: AO0yUKX2WbSaEgcUhpWFc4yp1/9MrozvsC1vMrIz8WpG+/e000xwfMym q1HdCuGevrngWuXzLsb+XoRw/jaWsXjJ8cCi X-Google-Smtp-Source: AK7set/gX+d7qL2VYRm0mNT1mURMK3jqpTnNExhfErr1wouO0vmd1XoXrrDp0BwbdxbCN+7oo8RXZwzOeOx6nPe4 X-Received: from yosry.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:2327]) (user=yosryahmed job=sendgmr) by 2002:a17:903:1c8:b0:193:9ec:fc13 with SMTP id e8-20020a17090301c800b0019309ecfc13mr1942596plh.33.1675380757137; Thu, 02 Feb 2023 15:32:37 -0800 (PST) Date: Thu, 2 Feb 2023 23:32:29 +0000 In-Reply-To: <20230202233229.3895713-1-yosryahmed@google.com> Mime-Version: 1.0 References: <20230202233229.3895713-1-yosryahmed@google.com> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog Message-ID: <20230202233229.3895713-3-yosryahmed@google.com> Subject: [RFC PATCH v1 2/2] mm: vmscan: ignore non-LRU-based reclaim in memcg reclaim 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-Rspamd-Queue-Id: 6109A1C0010 X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: 9ozryxkqbauqscisf5t9uaosb3eyjazt X-HE-Tag: 1675380758-811068 X-HE-Meta: U2FsdGVkX18OPq0QmaS5I2asethHJC6/D5g1YLwWr6YxsaiEpoJINVC8yqGvByW8tlQ0HRaReL8myKRJTfP9rfFrNT3zqx+QZnr7h3wDOo5v4JeFTWQzDmygVN6CtYwKfbTUbWvIaR+uAhHQ3PPWCzsHGv+5mqAxNDFQJOyGKcMhMRsPQKP1klJ8aEoeNPvYVNSXvvGz1u+k4/5rJNyGcKmLWZ0muPloEbqjjag8u6Z/FAyvH2Sr+4iFyOoK7XNFIzjcj5EtK2myrA/nrD8npqS2tt2l8d4KhPDfYw7IOUlgUj8XaNe2oIHWyaWmWWQ4TyalOM0OFm4fq3jgiA+XVa7h+pnMl9c3dPSjCzzYfS9qayC45xqNM64E81CnSNJIek04M+N0/uMQkANf9EosNAC2uH61WzptBLShQqxubQy7KEjMtFDSgD/V1tB1LjzgIjXqSkXYMFQ6y2PRhDzOZA2JZz8xyfnBTFiYG2TQfF0CA4M/MAehGNR0s4+NMfXg5OfN0RK8+SbltPJqfOr1fIW6gdGVU0s4FwDx5AAbXZQZ4q7stG67u1rOPemoLCtaOk7ou3neFryUHQs0OTURoJh4hQY8nHIr22tl8Y0Fkp4BflqZ5rPRkhyixvP/SZXVlcRMnTVCnaMdWsQKBRP5/AXT/RhkP0bRy58VOsLrVxVigLBbQ5/56zqZ1NavYfc0Lr33ISrvhegN9k3WW3Z6n2Bw9dR8sJvv8Bz7Oh/+bg4aow5ROgXcI1EB/EFle4rgwlLwZ+GgughZ8ulqaSQjTnLa8zdQDwa7SpWbsjq2wBHk0UEIh+R2Bq2cdZmHKjT3jNHWDzJc2aN0uqwl8zO89DLnzor2PAJCluEL6UmxCYeRcwIMwxn2N1pT9ui/3Fft1pnG/V0POTbN+8N5eQYPT1g9oVBaoAhv8bp4tBvnUxDl8LFprGFTEJZ4h4JNS+6WdUnmBdd9EfeMxjkykZd I/WI4O4k GlJi1vrNJjpGPcBWbkdcnPsnIRkR9TdWOZhdGlzUhAiwxZqVxNwpNFCjASYN8GPcRKRzx0Sf2NRPUPXSLACmTs15tDi+YEvHrI4JIuVKZi95cAxl5sAopW3V7blByDRwonJfOqzmEzg9Zpv2Zbf5cALmcMesj8alEBAPLfvzZQInPmDHVvXLnUsDmHnJ8RDypvoO1lzZe9R1309EAeZQbpJfTSBQKl4nGRAhYjXq+m4lUraiIKE1rDCbPNCGk0XyIW1muzDYS8xKOgJGnIiIvdQiJb9PZHFmE92P5DnwpJHicOn4Geq2N8kpO2AXTZyyEPBuLbw9twHZV11KnSTMMnQwdTrhzipuLwrjxEKeUMgvRR4150NJ6V1+03B6z9/WaeAb9+u6i18f7VoAQfgS3yGjtvuoE9GygB7JIYtsrb2Tx/rX7wzgkd0iMVd37apdd6ub68HUeJwHiPT89wdc8fAq9DjFtsN6gy5GlnNi5BpitJmxOkJ39YGsiVFircqMDJwbd5lq/m/+LK1Hqi58FZRFGlaa+QPeHu7+eiLAkd4ngVCEZzoMgy6JSwnK2ZI9DR0gFhrv8A1D4lv95eDdegIdXxTNjSwBXygDdR+fITkZtxm2wX274XGOpf/YpW7KgXmADjLi7qPpXfZnWFBCV83GsIXry5KvojucDcS1EBKZ8wqoasPtAbgwF6xXcAafCwWOlL0WWeLTxYfIJ1CSnpjXjzIR8/fU6natF 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: We keep track of different types of reclaimed pages through reclaim_state->reclaimed, and we add them to the reported number of reclaimed pages. For non-memcg reclaim, this makes sense. For memcg reclaim, we have no clue if those pages are charged to the memcg under reclaim. Slab pages are shared by different memcgs, so a freed slab page may have only been partially charged to the memcg under reclaim. The same goes for clean file pages from pruned inodes or xfs buffer pages, there is no way to link them to the memcg under reclaim. Stop reporting those freed pages as reclaimed pages during memcg reclaim. This should make the return value of writing to memory.reclaim, and may help reduce unnecessary reclaim retries during memcg charging. Generally, this should make the return value of try_to_free_mem_cgroup_pages() more accurate. In some limited cases (e.g. freed a slab page that was mostly charged to the memcg under reclaim), the return value of try_to_free_mem_cgroup_pages() can be underestimated, but this should be fine as it is mostly called in a retry loop. Signed-off-by: Yosry Ahmed --- mm/vmscan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/vmscan.c b/mm/vmscan.c index 63a27d2f6f31..207998b16e5f 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -6181,7 +6181,7 @@ static void shrink_node(pg_data_t *pgdat, struct scan_control *sc) shrink_node_memcgs(pgdat, sc); - if (reclaim_state) { + if (reclaim_state && !cgroup_reclaim(sc)) { sc->nr_reclaimed += reclaim_state->reclaimed; reclaim_state->reclaimed = 0; }