From patchwork Thu Apr 13 10:40:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yosry Ahmed X-Patchwork-Id: 13210091 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 A9716C77B61 for ; Thu, 13 Apr 2023 10:40:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 47CED6B0072; Thu, 13 Apr 2023 06:40:43 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 404DF900004; Thu, 13 Apr 2023 06:40:43 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2F468900003; Thu, 13 Apr 2023 06:40:43 -0400 (EDT) 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 2249B6B0072 for ; Thu, 13 Apr 2023 06:40:43 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id D3BC71A02BE for ; Thu, 13 Apr 2023 10:40:42 +0000 (UTC) X-FDA: 80676024324.17.D185203 Received: from mail-pg1-f201.google.com (mail-pg1-f201.google.com [209.85.215.201]) by imf23.hostedemail.com (Postfix) with ESMTP id E11B1140014 for ; Thu, 13 Apr 2023 10:40:39 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=7DaELoYb; spf=pass (imf23.hostedemail.com: domain of 3Jtw3ZAoKCOUfVZYfHOTLKNVVNSL.JVTSPUbe-TTRcHJR.VYN@flex--yosryahmed.bounces.google.com designates 209.85.215.201 as permitted sender) smtp.mailfrom=3Jtw3ZAoKCOUfVZYfHOTLKNVVNSL.JVTSPUbe-TTRcHJR.VYN@flex--yosryahmed.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1681382440; a=rsa-sha256; cv=none; b=EDGQY7P6ixZn2mHDfGWifZCDiYXlamjK/S/DcSMoFVyeCm1WDK+rNQlzJ/a3UPe1JcmHe0 Q5hftvzvvSRNRbdgCmOD9JXvPDg/9A0D3SJKrxrrFsyNJ8TTV5EUsjKgz0A2JBTR0EvZA1 gsihLbT2kFtLmNjsepY0boCwOetQhCs= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=7DaELoYb; spf=pass (imf23.hostedemail.com: domain of 3Jtw3ZAoKCOUfVZYfHOTLKNVVNSL.JVTSPUbe-TTRcHJR.VYN@flex--yosryahmed.bounces.google.com designates 209.85.215.201 as permitted sender) smtp.mailfrom=3Jtw3ZAoKCOUfVZYfHOTLKNVVNSL.JVTSPUbe-TTRcHJR.VYN@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=1681382440; 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=xGnocY4pIBEOyCy1J5p5K30k0wCvlbaawbxDP+ACQr8=; b=el5HEjUODKDTgjQY3FZintVlRiVRxTCXYIPy3xxngOrWj6CBmmlyt0CGE0lwUdeFqZ3pHs 2O26yH02vNhthEuVJKtdKwta5+YB6lrabFHOwz9wFqCNaV4K4pAcsv4o05rhsG+4xcvQb8 Nlhm/ZPJ9Lkeqs773O/PA/uzce8jqsY= Received: by mail-pg1-f201.google.com with SMTP id r78-20020a632b51000000b00513d1de5204so11884957pgr.15 for ; Thu, 13 Apr 2023 03:40:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1681382439; x=1683974439; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=xGnocY4pIBEOyCy1J5p5K30k0wCvlbaawbxDP+ACQr8=; b=7DaELoYbwDJCrNtZlmfg9Wt1StcR4uFr/DcPD/2pe3cLhlNGHN0Vo/cQ7EdPJo7up0 8bmCI0JQEmCL566Vot7ySRXaEZ0Q9wHFt3Sh9NvXD+gSBVNkrXxQorzAPrPz3sL21Jvg UkLNapMN9bhRXj3lO4/bDPz8UGmnAz0jlApmptNFgfyGVpKdYVctpDwfppNvGRrl4WXx hDn5QBpGHzMAOlfKXhd4xxjuLNGoae6rpvwcD9uDypxIntJ4NI1CR6tegrXbWE9t7vA4 LHSI7L2dX5euMSDWQaeHCt4S6p/b4GKxns2a9UeAtjH7MQxy0QVqfkDsaHQMGS5XAPuo 907w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681382439; x=1683974439; 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=xGnocY4pIBEOyCy1J5p5K30k0wCvlbaawbxDP+ACQr8=; b=VJXwTp7jNe5GU32VkeOMP1+RLUqgkRg+2fM2zwwyfBFlosep3dks57cHdHrY5ATldg 502AANOhWuceqelACO9MUUJDQfVQfw+ognXKnL6I3X+RHdDk95ZPpGb8SOaUvOnkLGep YWHCFZcoA4w5MiogmwdvvxUTDAeHhoNFvFQkSmeJGQ7RdV8TwgyAgeV+MlPvgd3bNr2L SE52moORpsQ4mKxU1lG/ACJuOMiv1YRgA5kjvpceB5DrCC8uSSVei7kXJERdnkGPdOw5 rwr4bYFl7ECNPnG4Sopazya2qTVwGk0sMXkdsZHBpOniK1CD5SoDCLKINPgMO+HLwZCo gCww== X-Gm-Message-State: AAQBX9fT7QZ44v8JXonGrvNEVVeGJUpGFKWhACO9gGqfY8OHYiz5klx3 x3Nhf0lRkLxf6bjVZjULQCcYVD0lVvh5pF51 X-Google-Smtp-Source: AKy350a/CmtWydI2qt+GCIKlEW3m+RGe6OazzLUzw02C2znW4S1CHo0XCY6i4wYnjhyCBrNF8AH/yKwjvGLojZVt X-Received: from yosry.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:2327]) (user=yosryahmed job=sendgmr) by 2002:a65:51c7:0:b0:51a:f873:2645 with SMTP id i7-20020a6551c7000000b0051af8732645mr331971pgq.9.1681382438784; Thu, 13 Apr 2023 03:40:38 -0700 (PDT) Date: Thu, 13 Apr 2023 10:40:32 +0000 In-Reply-To: <20230413104034.1086717-1-yosryahmed@google.com> Mime-Version: 1.0 References: <20230413104034.1086717-1-yosryahmed@google.com> X-Mailer: git-send-email 2.40.0.577.gac1e443424-goog Message-ID: <20230413104034.1086717-2-yosryahmed@google.com> Subject: [PATCH v6 1/3] 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 , Tim Chen 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-Queue-Id: E11B1140014 X-Rspamd-Server: rspam01 X-Stat-Signature: o6wi375bxb6jr3qr6c1kuer6kdkp4b35 X-HE-Tag: 1681382439-198226 X-HE-Meta: U2FsdGVkX182DizDLetY9zqRoCTW4EdQaAIKCw61AGgvbFRcZ5lkz024V03idBMa0E6HAr6fWT6+Pg/1/Hb5vI/r4BNaBdO7Ndz8PT679Jiank559uv5SRDn1MJWkZOauHIXL4dkqS7rbjbd+dj8so4r5/6032zAdFkW7i3BooxJQsvWVQRwUfNZkUppqNeuZ685dDYR6JgF+07cZIxFCsK7KwfUAViryYcAXXYTapMva++jq38OeUuLdEus+WgFwBRVMgiTtmPiKvy1k0nVSwqlgy1/Hz/AM54jxPLHd2Bln5tyyas9HDKCc0Ulm8sD0t+Mru4Npu4YEk0AVQc3CrIc1KpvEy1dJ7aRZR2vikxhgLJ+YvhtSgbIaEEAeQ9QK/g8poqieZt2CUwmU35AimFKF4F3b1fwluQUvu6LWBoJ+S77fyaBz/VrWoKtY79TBhH5uFTsw6vv3WDlvLqb+KvQxvM4vEYgwyQ4hqC9d9a7Uan1FtlDvyKbk8usAurPT1GNMZWDCtP1IPDdp0VSwqL2UtmOUgHhAkY/uhb2odT8iRCeT1hpFMu4Fj+jP7l6ELF7UAhWSNjq4FdfmxSOzA/78P2HjfZ1XxnfeaG8oGcNX+Y4uKYdxFnO7lpaysPO+r2+BLRTjxDpeLR6qyXVDti8LDPWARry4bmXP5YMjM66II4SOd9bZMKlyIqdCG0g9vxYIxm6PYz5JpusJR3jrnnh8u2p2BCXRPH30xIhhmXwP5FF5tzenN0Lg6S/YeJdZAMASK2qcG8we38hP9IW7RjFAchi/4u/vom2NELQoMeG6HQipCGkEH0Y57QElEEHldazzx6rCfXzqyjSr4Vegzbsy7dPaFyLT3z4OWThvJrOoBHOe2U/ilkqhP6iM/hM2YjXK2OyyaK7QQlIegvS1SikuTq7E3k+M+1zPKueUssYZRiCi0OGkJgnjIXOxMXvpA5K4gX+zYP6z2b4gyA 1YNiOJoK 1YNWmxpqbIt5+wdKixzS+aVu35aNehY9iVnLPfP7Cf7sIiI40ToRN6IrLHjgoXVNHNX81/rg1haeVgES+NyRetW9f1OjzQdVMbFZeXN0ICiC9avO1fzGn+QEkJbtJQDrkVz6kzzv2gtX9cqiTe02OlEO661gikdMXRbKCZR5pOjeBCPHOoTJF2G5OL2A3t55n1U8wui9UJg9CpWcT5FPBgUa24utW1bQIfevW5nrIs1WYEL1pGtk1UpfAdKrtANAuCZUEIPsDziwihNmFZh/udRSWodL1kkBDzqE/UVXB8hzjSkPKWKTIAghs+GgSmM1DAVs3R6llLOK/d5ASdy2PngVaVSlXi04G7YJxMLPPeWygmPFU1LfeeOAnGRAbZm217Ivv4cBTA7hhOND5CQSTkplW1iNSKAGQ8SnrnpP8fU3TD9iN5ngU8caMqD6fpBEua/HYNHh+gDTfAx7ZFgc/UpDATNWf8fwMOCTNQSRO0q/ZTYqfxLPtJXZQzoHKmX5EmaBcnJ0ZlU/DqN13awQ5lvehDVv8OphdzajpM4YV/UUKoUC63RrN+YBsUje9cMNCw7EmFjGRPfutqAluwRlcxstYnKDE+VlgS1k7HEYOI8i9tQGGhna4Z3k3dyJgo2DHIwrv8sCi3rLk0sByW5fCPYcDEW4fLPTl6XP/pho/Lg4/WdKol7k4MRHY4Hh6tePYYCG7933yiofuVFBr/vxe8YC2x5uQPHN87T7P 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. Fixes: f2fe7b09a52b ("mm: memcg/slab: charge individual slab objects instead of pages") Signed-off-by: Yosry Ahmed Acked-by: David Hildenbrand Acked-by: Michal Hocko --- mm/vmscan.c | 49 ++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 42 insertions(+), 7 deletions(-) diff --git a/mm/vmscan.c b/mm/vmscan.c index 9c1c5e8b24b8..be657832be48 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -511,6 +511,46 @@ static bool writeback_throttling_sane(struct scan_control *sc) } #endif +/* + * 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) +{ + /* + * Currently, reclaim_state->reclaimed includes three types of pages + * freed outside of vmscan: + * (1) Slab pages. + * (2) Clean file pages from pruned inodes (on highmem systems). + * (3) XFS freed buffer pages. + * + * For all of these cases, we cannot universally link the pages to a + * single memcg. For example, a memcg-aware shrinker can free one object + * charged to the target memcg, causing an entire page to be freed. + * If we count the entire page as reclaimed from the memcg, we end up + * overestimating the reclaimed amount (potentially under-reclaiming). + * + * Only count such pages for global reclaim to prevent under-reclaiming + * from the target memcg; preventing unnecessary retries during memcg + * charging and false positives from proactive reclaim. + * + * For uncommon cases where the freed pages were actually mostly + * charged to the target memcg, we end up underestimating the reclaimed + * amount. This should be fine. The freed pages will be uncharged + * anyway, even if they are not counted here properly, and we will be + * able to make forward progress in charging (which is usually in a + * retry loop). + * + * We can go one step further, and report the uncharged objcg pages in + * memcg reclaim, to make reporting more accurate and reduce + * underestimation, but it's probably not worth the complexity for now. + */ + if (current->reclaim_state && global_reclaim(sc)) { + sc->nr_reclaimed += current->reclaim_state->reclaimed; + current->reclaim_state->reclaimed = 0; + } +} + static long xchg_nr_deferred(struct shrinker *shrinker, struct shrink_control *sc) { @@ -5346,8 +5386,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); return success ? MEMCG_LRU_YOUNG : 0; } @@ -6450,7 +6489,6 @@ static void shrink_node_memcgs(pg_data_t *pgdat, struct scan_control *sc) static void shrink_node(pg_data_t *pgdat, struct scan_control *sc) { - struct reclaim_state *reclaim_state = current->reclaim_state; unsigned long nr_reclaimed, nr_scanned; struct lruvec *target_lruvec; bool reclaimable = false; @@ -6472,10 +6510,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); /* Record the subtree's reclaim efficiency */ if (!sc->proactive)