From patchwork Wed Apr 5 18:54:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yosry Ahmed X-Patchwork-Id: 13202375 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 3107DC7619A for ; Wed, 5 Apr 2023 18:54:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id ABBF76B0074; Wed, 5 Apr 2023 14:54:34 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A6C5C6B0075; Wed, 5 Apr 2023 14:54:34 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8E6A06B0078; Wed, 5 Apr 2023 14:54:34 -0400 (EDT) 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 7D27B6B0074 for ; Wed, 5 Apr 2023 14:54:34 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 59BE1404A2 for ; Wed, 5 Apr 2023 18:54:34 +0000 (UTC) X-FDA: 80648238468.05.9DB906B Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) by imf22.hostedemail.com (Postfix) with ESMTP id 9A0AAC0003 for ; Wed, 5 Apr 2023 18:54:32 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=Ros0vevj; spf=pass (imf22.hostedemail.com: domain of 358MtZAoKCE4E487Eqx2utw44w1u.s421y3AD-220Bqs0.47w@flex--yosryahmed.bounces.google.com designates 209.85.219.202 as permitted sender) smtp.mailfrom=358MtZAoKCE4E487Eqx2utw44w1u.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=1680720872; 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=oB2sMXwt0v6x8lwXtmYlxh/hoioeozIJIVJcuuQJKWA=; b=yX1nmrVIC3v5yxSmH73o4RhIzmR7OcTc6ra5mc+HIFa2NoqlpsLP155a4fkpCEe8ySqOYw PSrvxkpYukJcMQqnVj5IeJCTDLbl+Aq9UvXyQhnPFXH3dMNk4Fqlm2eZiBk6OPpmaL3Jfm gCZFSE2PFG4ql3A57JTStRDBXaQrQms= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=Ros0vevj; spf=pass (imf22.hostedemail.com: domain of 358MtZAoKCE4E487Eqx2utw44w1u.s421y3AD-220Bqs0.47w@flex--yosryahmed.bounces.google.com designates 209.85.219.202 as permitted sender) smtp.mailfrom=358MtZAoKCE4E487Eqx2utw44w1u.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=1680720872; a=rsa-sha256; cv=none; b=XU8BDqykTFjQ1PlU+bCuNx7Olvpcna65cUD6CnROzeMd53uqn9CMj3in4aQvYJcI27cFGU SrL0MdA3W7BuYrzMBcZe+V1nzeRzBh+B0b7hRrsx8iq5yKdnezGtwuPrXo/jJei4xatKfo TWAWV9EcVDCDwfKoeR2yqKmwO8jHCic= Received: by mail-yb1-f202.google.com with SMTP id 192-20020a250dc9000000b00b8bf38f0643so176301ybn.11 for ; Wed, 05 Apr 2023 11:54:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1680720871; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=oB2sMXwt0v6x8lwXtmYlxh/hoioeozIJIVJcuuQJKWA=; b=Ros0vevjUiwI3/TjUKg+KCeA5SHnfksHcC4OK3M0Fn4fXpXuUrynI6b8MaR9/c3jSk kYtK4Ske7kxweFphiQTIVIVAbS/Fuv7jZA8Wq1GWNo0oxzQ5Nh5pojz9jDp+do2ph3Jj IztRjzkxwy2vWa3oGo525fcM6H4ZEmqQU6p4rYHtfJsYsBqy2LUHEZvuMUuNIKTo/uqK Xwb0LLWXZaQYVo8lUIEKsrrCdSMMCxNVxpuQ+1xdxcKxOZL6ys2NO41rWyag1l5oLhzt LVX/O/QEV66s0ajoxgyOizIIfKMnIekWa445aOdc74s+Q8ItuYHAsLFXOFgFRUjGTZ12 4y1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680720871; 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=oB2sMXwt0v6x8lwXtmYlxh/hoioeozIJIVJcuuQJKWA=; b=qLhdUavNHECLzFd4vh8Fe9QkdsyWAloWgoTAjkOfdDf9pPcy9lRBOUo7/bDZR3scXp teVciQfE7Mdd3BGAB998+vNBM2yHJ73+RotIemPquxkkSq3P0Qke08doglZyc+/bUbMc QL4tMUE9YGV2kqBmtOLV24c7CmlEtrkv4I57Rfep5pDhmFCA+KQa/Ill36DnJrqexnm0 btllN7akL5Xb76Koh42fQfOHNaH4oXpx17T5DgH+PQzlWCTPs2oG5+UOBpiqiYI4HDRh HfBvqh79kBJDCuQBCfd5OvcPi0uP0koVs4d3DeVYbofyuNAbVIKQozRdykXl5onuJsCo Cb9Q== X-Gm-Message-State: AAQBX9fTEM8E21FvVZDqlrwIh5yvz1mMBCZZY+ExRuGJurm+aOTdDXwF FKzwa0I/XbmUm4e00A+5vWHTAegyc0ehzaR+ X-Google-Smtp-Source: AKy350ZCAIete9IDtcJDwB8xbNQZBALRdtx0fEvZ0QLo3PyT+UesbYmBb8Uc0roxQG5ktSucSqhPRJ3viu7kH1ie X-Received: from yosry.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:2327]) (user=yosryahmed job=sendgmr) by 2002:a25:d986:0:b0:b8b:eea7:525c with SMTP id q128-20020a25d986000000b00b8beea7525cmr163875ybg.9.1680720871655; Wed, 05 Apr 2023 11:54:31 -0700 (PDT) Date: Wed, 5 Apr 2023 18:54:26 +0000 In-Reply-To: <20230405185427.1246289-1-yosryahmed@google.com> Mime-Version: 1.0 References: <20230405185427.1246289-1-yosryahmed@google.com> X-Mailer: git-send-email 2.40.0.348.gf938b09366-goog Message-ID: <20230405185427.1246289-2-yosryahmed@google.com> Subject: [PATCH v5 1/2] mm: vmscan: ignore non-LRU-based reclaim in memcg reclaim From: Yosry Ahmed To: Andrew Morton , 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 , Dave Chinner Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-xfs@vger.kernel.org, linux-mm@kvack.org, Yosry Ahmed , stable@vger.kernel.org X-Rspam-User: X-Rspamd-Server: rspam03 X-Stat-Signature: jfr98epqyxsn34b6fdydhmaf45xqcg4u X-Rspamd-Queue-Id: 9A0AAC0003 X-HE-Tag: 1680720872-194964 X-HE-Meta: U2FsdGVkX1/Q3hU2sdgWufqB070q6O+8dT1yFW1E7/6iGGRJJp9bu7exNv3p9fCDm6LIoAzDJxFsesDSgWH4s3F7b2dAzInUzvXb5okoxJufnVwV/CRog5FWthYVJ1f2J6KeFSCzYcpPOwnDufZrhKcH85GTlTfqDwgkI4Sqov8imT5yEPXUMH2RuKfmHoU+SC2OBwoX08Y2GOOFbFlh+kwtCDb73R5ticwAu9STnO8FlMFoKljqGtwSDohONDyj6pdqOxJVt3lo8mQavu6sB3t5CLJ/1s8rySPr9cThMxZy8DhoyYaAz3H4qbtYob3l7A7jaL+4t8oL78aHBhzEaabCfn5A+cDTr7GTRm5stCA/TCcNq/u3BTQ8AnNTDuWreg1l5oorYEPl8J+eE+15dFpOigqJF9sR38A14Nk47dGiEI8rtjybfLu3SC9pBZZwfDPId6/TsSj7L3gUusPG2vlVus5u5PW/j8K4XeCEYr56nsxZnDBFOF1lVcWg4L3nfGDIsM6UlDLsaFsVMSc16o7SMJsaWfiMEugqVB1zW/dcjIZC1DoBXhx8vmTWn9LGvockxRlomTqkO1Cvp6eW3KV3ekc1rpe6z+xpHMvWEYTfIE/9pIdN/bHoZF9rx/Y2LLnhzOFZsqn3KSvFvppvsTrgnZdyDUUfi8ewLlV2gcxZ8r3/lgKMXAbNsq9RWJFFHUr5XsZHcuGtv0gO68vmGj6AHO9Igr2sAAxLLTNwUlM3tcSsjtqw+b1qvpWkhGx9uJFKCFHhnC0w5J+qWDgQ8sh59xxxMaDhDucUYZ7hPhADwqIYzHO4gzxEZ4uymIbPhEKwyxW3NwUzQnbg4ewzS5+nCCojoixX+jcSf7EP47VOgdiFXG9h8AosJycHtQ4e5biYTZCZTEaahCnhvyeM7uDWjExe35x1FHiMsr/NlEzpFBd9rzARo0uxXTXvR0HzSm1uongqITtkgP2IRW+ aoC5d5Kh AfKJucLQmFMtWEjl+4nxZR1zAoSxoxMtgZCoMbbKfG6PiyJWFELpqtZT0GldRLvBnRgXGLkS1+h6d6d/DZ8wojPyPHTpJIDCgBpoV6mo2Xu3kx3JCyOD52TAEkXINFQwGgCuqk4EBMTKNUEIYrrRVrJav4OH71qMdQLC/iOynnK28HfKQW/cSYfsXvyznI6VFLk4Uufa6CE6XXtqRNAUXk5KibC5VkW47o46xlYF58xVCE+X8EMAWlpRDud0AMcAOHF3jm/fPmfoylJtYWPyX9wHfmMkOp90GE3rY+LUTShvrv1AJZE2teQsGJjGgrjjD5D3dRXRMr4iKW609fogeZTReeJUFqUtzh56kGW81rf8oYLqBGUx3Qkl3/axajxO2f2ONqQOZh9RX+XthNEi1P1RYLfK0OPEL9tM+zSaz/LY0zSpM5ixTNJB5YL0pdkysgctyFnIJ3Im11Bcp1th4qW9A2L3JOvfwYIPXCnhQvqJ36SoVg6AXKUpxZO5i/6HRQ2572XUF8VCucx010qwhdeOw7aGK3+BgmYz+yDFvRtM0d+dRUVP5ZRU5DS4QzMgALGXmC/C2RkwErPW2bJB7335Fi4Uwxisge94e1DX0dIKMEd7IpFxSBy8/yHctF1MPxJS3B17qmFaQ/tIAReGCPlZ7LkUabn3eknLbAriD6zMg3pqg+vkKK5EF39Xrl/bwB5EVXAgsL11N08MOnE3Zbn08N7MUI+rlOZ9jQ6D0SIcmvFok/+mnIh701Y81UzrC432aWWZAwrjF2axUcvtJTaW4uQs8nDMdpovY 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_slab, 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 (on highmem systems) or xfs buffer pages, there is no simple way to currently 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. Writing to memory.reclaim on the root memcg is considered as cgroup_reclaim(), but for this case we want to include any freed pages, so use the global_reclaim() check instead of !cgroup_reclaim(). 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. The freed pages will be uncharged anyway, and we can charge the memcg the next time around as we usually do memcg reclaim in a retry loop. The next patch performs some cleanups around reclaim_state and adds an elaborate comment explaining this to the code. This patch is kept minimal for easy backporting. Signed-off-by: Yosry Ahmed Cc: stable@vger.kernel.org --- global_reclaim(sc) does not exist in kernels before 6.3. It can be replaced with: !cgroup_reclaim(sc) || mem_cgroup_is_root(sc->target_mem_cgroup) --- mm/vmscan.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/mm/vmscan.c b/mm/vmscan.c index 9c1c5e8b24b8f..c82bd89f90364 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -5346,8 +5346,10 @@ 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; + if (global_reclaim(sc)) { + sc->nr_reclaimed += current->reclaim_state->reclaimed_slab; + current->reclaim_state->reclaimed_slab = 0; + } return success ? MEMCG_LRU_YOUNG : 0; } @@ -6472,7 +6474,7 @@ static void shrink_node(pg_data_t *pgdat, struct scan_control *sc) shrink_node_memcgs(pgdat, sc); - if (reclaim_state) { + if (reclaim_state && global_reclaim(sc)) { sc->nr_reclaimed += reclaim_state->reclaimed_slab; reclaim_state->reclaimed_slab = 0; }