From patchwork Tue Feb 28 08:50:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yosry Ahmed X-Patchwork-Id: 13154535 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 2AC84C64EC7 for ; Tue, 28 Feb 2023 08:50:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9FF9B6B007B; Tue, 28 Feb 2023 03:50:12 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 988916B007D; Tue, 28 Feb 2023 03:50:12 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 828DA6B007E; Tue, 28 Feb 2023 03:50:12 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 721996B007B for ; Tue, 28 Feb 2023 03:50:12 -0500 (EST) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 48B79ABCE7 for ; Tue, 28 Feb 2023 08:50:12 +0000 (UTC) X-FDA: 80516078664.11.9FB8110 Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) by imf27.hostedemail.com (Postfix) with ESMTP id 8BD5740008 for ; Tue, 28 Feb 2023 08:50:10 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=Qx1HMjnO; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf27.hostedemail.com: domain of 3QcD9YwoKCN4YOSRYAHMEDGOOGLE.COMLINUX-MMKVACK.ORG@flex--yosryahmed.bounces.google.com designates 209.85.128.201 as permitted sender) smtp.mailfrom=3QcD9YwoKCN4YOSRYAHMEDGOOGLE.COMLINUX-MMKVACK.ORG@flex--yosryahmed.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1677574210; 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=th38ntbA4Oc2oiVVTEFN7kVCZXMfBHW5bqzoJX/NKxM=; b=6PYAxpPEL4AGZlCyB96siDuRNya7FmUGNLCgAo0adNpe26wOR2VmD5T7v/2RFfgS7YWMzu U47EuHhVJH4b1BW1Dgx5leHm2byX5bBDIx3wXiasnycJ9dxD/FqwxDqO7yr9kHWj39M0Bo Cd7jPWsWeMTJi1GiIFTe+4GWBm9wZCs= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=Qx1HMjnO; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf27.hostedemail.com: domain of 3QcD9YwoKCN4YOSRYAHMEDGOOGLE.COMLINUX-MMKVACK.ORG@flex--yosryahmed.bounces.google.com designates 209.85.128.201 as permitted sender) smtp.mailfrom=3QcD9YwoKCN4YOSRYAHMEDGOOGLE.COMLINUX-MMKVACK.ORG@flex--yosryahmed.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1677574210; a=rsa-sha256; cv=none; b=onbYtLXOfbK7U6a5ETMYLcmDv2w2Yoizf4MQX5e7gGRRtVUqhmQ2U5QKJ086Y3Gv/a58zE s7/qBha8XcBC+fSvYr/c3u3rBoU6lvsDgHVmCZ3K+yyxoLzheaAFjkGYSg5quldEV6Jclq bRCDl8FadGquNrpkAJ8eDY/5h1/mkoE= Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-536cad819c7so197084357b3.6 for ; Tue, 28 Feb 2023 00:50:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1677574209; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=th38ntbA4Oc2oiVVTEFN7kVCZXMfBHW5bqzoJX/NKxM=; b=Qx1HMjnOH9OsA3ycuQn28p/IaZ+Hp3kNuLp2QUi9h0Ycfnoty+yQNpg+WRxNuY/vYp jOY7XFohXtJylm8Zhy5PNGpA0U7IS0oAfCING0t+nz1L/hwrLlAjdn6QB4BQ7g4vN6HH OAiYlZHTTmYK4E/ibEh6T98sf4VZmgYow+qhvCLJm9G0PRCymGehRtI1hbaEgguuPSwP c7t1cNU/lIriIMXf5vdSZTLjo71hA+1rjgeHrdym+NEDcQOTi8Gy7EZ3GPG7NMQg7zho MG8uusZE7ELVwRFmlhIaXFZ9jTXMsB870R8rLfTvIx/zMtY4Y5kaKuhA8atMfdGBrjnt RIMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677574209; 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=th38ntbA4Oc2oiVVTEFN7kVCZXMfBHW5bqzoJX/NKxM=; b=McsPlu7tp39cu1tAFx9jjq3evi5X5hmDBQjKwpaUaf2pVXRnSSqbher7d6FjrFocA0 od96DNfcZs15CXGT/+bXB3m/1lOTPDhgbeGPSCS+DHcQJ7RNn523BOk2DqdFd2x9vs/+ O39Wo1DMYGF0ZvZkJ/oetwbV87KLdcErdpgZygv3Qxi8Cvg+L4rbvH/Ssqd53PDc09si UJyRxUZjY5O3KOIr43rURVqdV7Yi/gkd5+VjLNWEbY/yS1ie3XhQ20STF0+0V9XtsDTw VDCVrMa97PFci9Z6plrCfl3DaZK08KGLkr7mFCxcevbrIw97OBewM6qQSrtwplkthltO oOUg== X-Gm-Message-State: AO0yUKVvk++zphAMVDD3JC0iNzhQSfRlRSR8SA9cZvlSOigZHD4IGi/z lffVnpvsmg1p9NIwcTOBSiIiwzUVwrSxR7gv X-Google-Smtp-Source: AK7set+DvIV3bw19wB6Hwqeb1fxI1Ob9E6fp4FkYQsDq5MINr8X9kGIXdnH2rMDNI8ge0fm/8/tJGYKLqoW41WxG X-Received: from yosry.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:2327]) (user=yosryahmed job=sendgmr) by 2002:a81:ad67:0:b0:525:2005:7dc2 with SMTP id l39-20020a81ad67000000b0052520057dc2mr1184169ywk.1.1677574209698; Tue, 28 Feb 2023 00:50:09 -0800 (PST) Date: Tue, 28 Feb 2023 08:50:02 +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-3-yosryahmed@google.com> Subject: [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-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 8BD5740008 X-Stat-Signature: xpm7jsp53oz97y7gju5qym6g7cyeum7x X-HE-Tag: 1677574210-988675 X-HE-Meta: U2FsdGVkX1+GIOLfMICXcsHSaCioI08rz8YKcSSTOc/hq+Qoj2ak4MqnmF/ZjaVyXQnztegubwvzhuG2pJL7hjjYZhTTiWeQ1gNE39sjBJHgEjtsTksiYUJi8jtgFcDIiiZaptM7938UoTxsdcvR3EHOsKR8AgghD6QXJ+5XCqPlGPdpCrkJm3HhGA5KLHScNkQybaW8RcTxOq/3Mv64tCspENgi734Spc7Fe7aexESBB5dRCBWXIFbneccYacLKDsWq1M60yVyOTprMD1Y17tdr1U/4lQnVyLRo6M60zdMdGNetq1SMjqc2U1uVFvnK1+neXJ5GcBKBr4sRQoL8UhWCpEUE0RhIEyKCZx/00OV/rznPmVAT6fHRgTCFV/lZDYgMmbBQQjX5BkfUjgRrFHYMYCuuQsHYmTdB+JpRM8FD1uI+jlIBuAlTEXYr8wZDsJPYE83VJgTp8Se4HzxETP/Q8LdJPAqX8gfAwRFKewNmi0DwYpeJKt0ZifzQRySLRWjst0189LQ/rUfI+wUukmUfWAQwOwbvjQbExPyEtjPMFr/n61iTxXlRIMARSvqpnw368KdzM4Ckj1bQlXxQT8vSFxBSE6dUDQGVr1YpFTa01piPy4BofhJfB5dV00FWicB0SoDKSQU9yY6VJiokZIPQDxJAR1Lv+Z4D454wACndSYrxpKimFTDsqp2fFILfBUiCTzihMzkAJm52rOIOnqlqEpOvtnqWjAAa8XmOZcfMGfn6KySiD8EX74IeDmfTvIg3eQ403ApFbZDu+unnGSCprl6OlIH9fgHYXeEWYDaO68Cy5baMbZA0pWuXoHB53paURSmVe8UhkC0raecIIg6IXxloOFZA99m4rAPm9qmaEC+koybKMHbJW17UpP9sT+s4I3kzTNIljN6I/WQLMseNYbDFGBOGGQM99k46VzlYEe/SopBk6SKCjvfvBgMpkN7FLp6CZ3mep9FoE2f nk5jWpFL TN3cZUomgVMaObgMMnwdfl6iYqU0/Sp/r3fyHAs8OOrP+AmUzJXCPGBMib1WSXcK7ktTBbvAWV+wMzMUxGZAqIU8pz5BNE38yiU9ueedUfYX4CQ6o+nvPuudT8ww45zELtGQ7rffKml+7PFNJxx8bFvCoxWUPvQgVG3jODFHF9mGekWIWQwor3+wLmUE0WnLg+ptNfkeQEVf7NlMF5f1oBJ56KZeDI+gqXajzUzV5mUgs1ES2Gb0RAbNYG/84krXcAWv2zBSE3IxZShL064w6L8jJtzNZGwzMS/6Sa5xhzn+rAZGlmb02O0d4HIkpacsgoGRUBzzjxgjFGazdpJ5dltrGAkTmSzyyi2/YkZPjV4RO+Uzkewi3GTzO+mhvVX8JGYmTrhr9Oof/IgWwv2mSY1Uj+Vj7I6H3Nfkf4OkNoistiK2M8phfsYfLtuMaHq06yT7NH56vRRyARd966Jx/fete1PhoRYV3mq+eolwqHRe5y/Cgeyv9+CSp8ITXQdVkwpbfNvMXZ0wZAF2ZkSnOHNmgWmh8EB+P+5/EHQ5PWBIP4ZTFUGT0YweQeiQkpMqht5ELBqKMZqrhMjSRIRFw+TzuanR6ZPhd5dBXrZZZSzOBE/h2cs+Z7A7vuI58kvUmS8rJpk4gMkzjf7PuInZ9N2auf3V3tL+XFZaJWXJl1T+Sy6MIWAL9tdBT8jQOhiE0jW1qquTEZCZ+wt4jrZbGKh//ztfNsabEhT6a 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 (on highmem systems) 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. 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. Signed-off-by: Yosry Ahmed --- mm/vmscan.c | 50 +++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 39 insertions(+), 11 deletions(-) diff --git a/mm/vmscan.c b/mm/vmscan.c index 8846531e85a4..c53659221965 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -188,6 +188,16 @@ struct scan_control { */ int vm_swappiness = 60; +static bool cgroup_reclaim(struct scan_control *sc) +{ + return sc->target_mem_cgroup; +} + +static bool global_reclaim(struct scan_control *sc) +{ + return !sc->target_mem_cgroup || mem_cgroup_is_root(sc->target_mem_cgroup); +} + static void set_task_reclaim_state(struct task_struct *task, struct reclaim_state *rs) { @@ -217,7 +227,35 @@ EXPORT_SYMBOL(report_freed_pages); static void add_non_vmscan_reclaimed(struct scan_control *sc, struct reclaim_state *rs) { - if (rs) { + /* + * Currently, reclaim_state->reclaimed includes three types of pages + * freed outside of vmscan: + * (1) Slab pages. + * (2) Clean file pages from pruned inodes. + * (3) XFS freed buffer pages. + * + * For all of these cases, we have no way of finding out whether these + * pages were related to the memcg under reclaim. For example, a freed + * slab page could have had only a single object charged to the memcg + * under reclaim. Also, populated inodes are not on shrinker LRUs + * anymore except on highmem systems. + * + * Instead of over-reporting the reclaimed pages in a memcg reclaim, + * only count such pages in system-wide reclaim. This prevents + * unnecessary retries during memcg charging and false positive from + * proactive reclaim (memory.reclaim). + * + * For uncommon cases were the freed pages were actually significantly + * charged to the memcg under reclaim, and we end up under-reporting, it + * should be fine. The freed pages will be uncharged anyway, even if + * they are not reported 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 + * under-reporting, but it's probably not worth the complexity for now. + */ + if (rs && !cgroup_reclaim(sc)) { sc->nr_reclaimed += rs->reclaimed; rs->reclaimed = 0; } @@ -463,16 +501,6 @@ void reparent_shrinker_deferred(struct mem_cgroup *memcg) up_read(&shrinker_rwsem); } -static bool cgroup_reclaim(struct scan_control *sc) -{ - return sc->target_mem_cgroup; -} - -static bool global_reclaim(struct scan_control *sc) -{ - return !sc->target_mem_cgroup || mem_cgroup_is_root(sc->target_mem_cgroup); -} - /** * writeback_throttling_sane - is the usual dirty throttling mechanism available? * @sc: scan_control in question