From patchwork Mon Dec 2 03:28:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Zhao X-Patchwork-Id: 13889935 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 E0B83D49795 for ; Mon, 2 Dec 2024 03:28:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6EB2A6B0085; Sun, 1 Dec 2024 22:28:34 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 69BD56B0088; Sun, 1 Dec 2024 22:28:34 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 53D036B0089; Sun, 1 Dec 2024 22:28:34 -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 33F036B0085 for ; Sun, 1 Dec 2024 22:28:34 -0500 (EST) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id B08FA1418E8 for ; Mon, 2 Dec 2024 03:28:33 +0000 (UTC) X-FDA: 82848586002.19.4E50706 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) by imf21.hostedemail.com (Postfix) with ESMTP id 2E9341C0002 for ; Mon, 2 Dec 2024 03:28:10 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=rRlDcwh2; spf=pass (imf21.hostedemail.com: domain of 3XilNZwYKCCcbXcKDRJRRJOH.FRPOLQXa-PPNYDFN.RUJ@flex--yuzhao.bounces.google.com designates 209.85.214.202 as permitted sender) smtp.mailfrom=3XilNZwYKCCcbXcKDRJRRJOH.FRPOLQXa-PPNYDFN.RUJ@flex--yuzhao.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=1733110104; 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=gY9A2hZ07C4gph5EkXou5eK7gRFH6gXGFcx+0iC/Exo=; b=YI9pJYmiT6yhWgOStQUq5ByBL0UjIQ+Tzz4MUV7yG8BmtVFaT33I/lxv+IUvPSTImYN1OD cJBcUreyRND3u67y61/8Y7UZyJK7ZWGYxmfxJ6I4+d2t58jZypYBD8KQpAUWh5RaJP1NiC JfMTiEJchbom3pXAx7MWcQKgYUz1vio= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=rRlDcwh2; spf=pass (imf21.hostedemail.com: domain of 3XilNZwYKCCcbXcKDRJRRJOH.FRPOLQXa-PPNYDFN.RUJ@flex--yuzhao.bounces.google.com designates 209.85.214.202 as permitted sender) smtp.mailfrom=3XilNZwYKCCcbXcKDRJRRJOH.FRPOLQXa-PPNYDFN.RUJ@flex--yuzhao.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1733110104; a=rsa-sha256; cv=none; b=geWpCdHudKhI/XPtcFR7NCjkvvrf5udXGNH8wQB4DfEGr+2lCjrmo4TR7Bpl/xeHJQwGFI V1iCuZxYzzhR287HfUnoQs/0eEYk87yp5XG8x0qMd+iNnAcmim9ZAXAXJeONvUCwY8pXnU y3wOJJuuA8ZlBCTjCNAU7bkz931AeR8= Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-2157145fdb7so12188145ad.3 for ; Sun, 01 Dec 2024 19:28:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1733110111; x=1733714911; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=gY9A2hZ07C4gph5EkXou5eK7gRFH6gXGFcx+0iC/Exo=; b=rRlDcwh2p+jSJQvwfCkeIl2PuSwDs1Gevdtn3ukOU/OxN95Vbhy/r9bfEnngpN89Uh 4/GTthuTlszEgS+/EvPRk2fMsUUN3SB+2fJWTmWaLtAgNFM39L2zuuDmrqdKb6j1lcoY OBcbIVFm/lcPH7Gz35QPzdqmJWziFSz1FI968KDHOaBRwtjAzz/E2nA5s5P9TFbVGh03 TNC46gT6YNie5A+W9PoP81n+C1uYYHIbY8FXYCNcLcKt6yu2RKa1vq6f5LJ9qSptnqfO csBqxUOzIW59iSWorgOu80wGBSmSSfqDEMSP9+IILac+x7G/F9Ve/LGM/gR9ukjtl0XF Ij8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733110111; x=1733714911; 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=gY9A2hZ07C4gph5EkXou5eK7gRFH6gXGFcx+0iC/Exo=; b=FdooTkm+VKUxzWBrWqYgjcN5e4makE0lA+gPykgfY//4HO7EljXNJe8F12f4IHDdy0 LlJP6gEbBOm+UHePv0izJiSnhw2HsBUOgI4mKeoru7xjZgxAH9W+HVy8dZxUhDVQzzE2 SqFMijs/HrKApMVuPyzDIhowAYxo0iS+it4/MkSmdjTbwkcnm0yVWMbBL0P7OYz196rr 17uZypOw8UB2t4BZ2ILBdKcdDUTF7jgvnCwYqtfq+Nn9k53qyprmXmSVAfQdmiFeeR56 kEXSSG+HvaSjpoIZTGTvK4YMy4DUwEh0fuNYBfaXkfjnpqDsHJdp5X0gBYAdIIug9Jq4 oLSQ== X-Gm-Message-State: AOJu0Ywe8dRwiB35h7TMHIkDeEg94B3E/kp0PPDXL1plPZRradvW47+Y XR+Qt/CJ1PdEJ6UiWfq/GulaSmWeM0nEMA6iwi4dgZkinjYYr/5Fx0x6FWsxF4+pLrDYNNSsKZ7 ikQ== X-Google-Smtp-Source: AGHT+IEqTdJXZQhb+wWTbmtYxN0jo2FTMzf/EWYgoLBGFBa+R/zRxwCYD577vOiuDbQ1RP0KS+rm7MbIVxI= X-Received: from plbll14.prod.google.com ([2002:a17:903:90e:b0:215:3fc5:cd3f]) (user=yuzhao job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:e881:b0:215:7b70:79fe with SMTP id d9443c01a7336-2157b707c93mr79972115ad.32.1733110110727; Sun, 01 Dec 2024 19:28:30 -0800 (PST) Date: Sun, 1 Dec 2024 20:28:18 -0700 In-Reply-To: <20241202032823.2741019-1-yuzhao@google.com> Mime-Version: 1.0 References: <20241202032823.2741019-1-yuzhao@google.com> X-Mailer: git-send-email 2.47.0.338.g60cca15819-goog Message-ID: <20241202032823.2741019-2-yuzhao@google.com> Subject: [PATCH mm-unstable v1 1/6] mm/mglru: clean up workingset From: Yu Zhao To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Yu Zhao , Kalesh Singh X-Rspamd-Server: rspam05 X-Stat-Signature: 5txhb8ebxxsmhbz9ddqcxih9rahd9rae X-Rspamd-Queue-Id: 2E9341C0002 X-Rspam-User: X-HE-Tag: 1733110090-547721 X-HE-Meta: U2FsdGVkX1+txdxbQ2oyalWK39jqgQA8nkn0AR78vXISvIOxnT+RWsnps+YYizPV2hHGdCtt7wGgxIC3nzpLuKcHwrc5FU8MEQbnsVRo8lIj76Dy31E0lgYfe3CijqOgoIHdqUwD6XxhoZwa/bF6EFdwwHAfr5ey8JqDOqIV8a/4/aDl6Xv7D8I2m/9YHt3qCHpDvo/ZxDRNcjtcQ1oB5NqEO+yjv4XL3lK06cImdMaGiSuthDXn+SDGKy1snp4oDLBIaArcrWd01ifap/yY5ONVq/2X6xoI2YW3NIohIwP23e6URk8Z2+LSr3tVHA22jjaJJ9KY/pWd94lZYVxwfBFAtj2EXkVuasskOOY5EQ43oMRocECE9VAutzkXLDJ/SNetGi3JSlaPxg7Vtu6Y4SV8rWBoa21u6MVPgMpymlw9K40MNm/UBZmRJ5HNMPfUqE2P5U9mMf/iBGc03syitabU8x042O2TlF3LyWqg7TjpO2MiM3HUJoxfue+lkcaVGcjHnWhe5S014hwbekdrm/wgq73WRam1+cbFjWdBHHOd3UZrrpoTk9gSE0fCcQrYiwaDGDUZ7FRbUKHzyiIU2Rfkeu9hcy3GWkx25uE0qsAsBa4Vx5y19pyxtMfgeAjvgl1ydsQGjXe6PEndrft7gMEHnv9zL11iZT4cvqcg5UaKhY3P0w2qiM/wiSpP57OLmlD7N5aCsmUBKYf+9FtHoCKW5o1rH1Eiu+jCtAmD0aplOvXIPtLeCRhcnghRIPR6msIp+VDDgTzP4z4jlwE9AXhiDpNWeGXSektyEZfO23lNCD2+Gvxcq1DylJYSp3sEJUDhcsQivC0w3gRxsh5Xad+iaT5Ex7+oB+8G+UzGNlJ+HvBa0lfqGw64S2DlEbiUhUXLMjdEGwbp81FhBlC65WwY7pgnashXfJ3KrSD5Ip2FvddKxGBAy3gGoy46VRU4sVjky3iGQ4Rz20ac/Do GGBxGvB5 /MLNDL76ExcixlmnFa0j/ALO4zHN9nKmO7dG6CLIkybXcSzozr3dtCYAzlR9+z1HLRV3YKuO8l9MpGvdsXFueEhY8JQhJEG6GzZmEr1klwl1cGs5pqY7xp7oDhxk+47TVhSZPT67hOtDQmsW1bHSeGg20RP1GrIB7zDzIMz4HMPKgSl26rnTUJPnBwMTJXrr901iDISh9Qpj1QNTH9tK22r2sb3VhungexlQZ130WsW8+wUrtyLL16+3cCXtACf+8Rn+4or7ogyzyroetrS8XdCbWtAcGkS4yQPq/tMZn2q8EdHRD0Oa3GSa+UDK59beQz3tH+Romqtvcj5/IhZ/FLQcRfScU5aqgdJdF5domEK4mYLG7m9uivZ+oOGIB6dLUbBaK//t3QVcvQGjeHUpLTzcyzgZYcT6G4pfedxyN49F1sWgQ3alyxo4OiDbVFoi+/drtN2JZrMXXXvn5A9PDCzAnrC1lwQdNflgh6qryN8U4KpcV/xDxDrQRIqsY+Uwav6eUlyUVAXxhU7soXS3Cm2NqKSz8G5kc/bRC X-Bogosity: Ham, tests=bogofilter, spamicity=0.102394, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Move VM_BUG_ON_FOLIO() to cover both the default and MGLRU paths. Also use a pair of rcu_read_lock() and rcu_read_unlock() within each path, to improve readability. This change should not have any side effects. Signed-off-by: Yu Zhao Tested-by: Kalesh Singh --- mm/workingset.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/mm/workingset.c b/mm/workingset.c index a4705e196545..ad181d1b8cf1 100644 --- a/mm/workingset.c +++ b/mm/workingset.c @@ -428,17 +428,17 @@ bool workingset_test_recent(void *shadow, bool file, bool *workingset, struct pglist_data *pgdat; unsigned long eviction; - rcu_read_lock(); - if (lru_gen_enabled()) { - bool recent = lru_gen_test_recent(shadow, file, - &eviction_lruvec, &eviction, workingset); + bool recent; + rcu_read_lock(); + recent = lru_gen_test_recent(shadow, file, &eviction_lruvec, + &eviction, workingset); rcu_read_unlock(); return recent; } - + rcu_read_lock(); unpack_shadow(shadow, &memcgid, &pgdat, &eviction, workingset); eviction <<= bucket_order; @@ -459,14 +459,12 @@ bool workingset_test_recent(void *shadow, bool file, bool *workingset, * configurations instead. */ eviction_memcg = mem_cgroup_from_id(memcgid); - if (!mem_cgroup_disabled() && - (!eviction_memcg || !mem_cgroup_tryget(eviction_memcg))) { - rcu_read_unlock(); + if (!mem_cgroup_tryget(eviction_memcg)) + eviction_memcg = NULL; + rcu_read_unlock(); + + if (!mem_cgroup_disabled() && !eviction_memcg) return false; - } - - rcu_read_unlock(); - /* * Flush stats (and potentially sleep) outside the RCU read section. * @@ -544,6 +542,8 @@ void workingset_refault(struct folio *folio, void *shadow) bool workingset; long nr; + VM_BUG_ON_FOLIO(!folio_test_locked(folio), folio); + if (lru_gen_enabled()) { lru_gen_refault(folio, shadow); return; @@ -558,7 +558,6 @@ void workingset_refault(struct folio *folio, void *shadow) * is actually experiencing the refault event. Make sure the folio is * locked to guarantee folio_memcg() stability throughout. */ - VM_BUG_ON_FOLIO(!folio_test_locked(folio), folio); nr = folio_nr_pages(folio); memcg = folio_memcg(folio); pgdat = folio_pgdat(folio); From patchwork Mon Dec 2 03:28:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Zhao X-Patchwork-Id: 13889936 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 65E65D4979B for ; Mon, 2 Dec 2024 03:28:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C1CD86B008A; Sun, 1 Dec 2024 22:28:36 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id BCCF66B008C; Sun, 1 Dec 2024 22:28:36 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id ABD906B0092; Sun, 1 Dec 2024 22:28:36 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 861AD6B008A for ; Sun, 1 Dec 2024 22:28:36 -0500 (EST) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 4432B1C7BB8 for ; Mon, 2 Dec 2024 03:28:36 +0000 (UTC) X-FDA: 82848586086.01.3F770E3 Received: from mail-pg1-f202.google.com (mail-pg1-f202.google.com [209.85.215.202]) by imf09.hostedemail.com (Postfix) with ESMTP id B0103140003 for ; Mon, 2 Dec 2024 03:28:26 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=pgKd6v57; spf=pass (imf09.hostedemail.com: domain of 3YSlNZwYKCCoeafNGUMUUMRK.IUSROTad-SSQbGIQ.UXM@flex--yuzhao.bounces.google.com designates 209.85.215.202 as permitted sender) smtp.mailfrom=3YSlNZwYKCCoeafNGUMUUMRK.IUSROTad-SSQbGIQ.UXM@flex--yuzhao.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=1733110106; 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=MW8P2vBtR0tiHVuNXF698UnUQTzNbjkVYUdDrWgvFuo=; b=AY35d5Ky3qe7PMB9JP6BBORgsGEj3Ma+dWlSFps7Aa/EozBTmmyWQyF7viLzWxOsMP0ziz AWVL+EmvaMre1XzlSZrhBb14N8M3qD6wsFGUEhlqriIJQCgq6bujkgRXMtQns2NNSD52At 2sVtUVXWoAqEx05iRzqhf3Z7ce2bkOk= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=pgKd6v57; spf=pass (imf09.hostedemail.com: domain of 3YSlNZwYKCCoeafNGUMUUMRK.IUSROTad-SSQbGIQ.UXM@flex--yuzhao.bounces.google.com designates 209.85.215.202 as permitted sender) smtp.mailfrom=3YSlNZwYKCCoeafNGUMUUMRK.IUSROTad-SSQbGIQ.UXM@flex--yuzhao.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1733110106; a=rsa-sha256; cv=none; b=R/xQhSgFApontObUEYaC27hWcr6ecmAGvq93pSfiCEhoDxLUJhQgUXWrNaz+/cDWd1mqlM 749UzkL6Kr5omYbuK3H47Ma0Oxowoh9rxNigZd/jVR/B78SQt5tvngFKPA/SaQqLkzCFrL ETJVuUN3OXYrtj/9iwgTDya2v0nmz3Q= Received: by mail-pg1-f202.google.com with SMTP id 41be03b00d2f7-7f712829f05so2803709a12.0 for ; Sun, 01 Dec 2024 19:28:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1733110113; x=1733714913; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=MW8P2vBtR0tiHVuNXF698UnUQTzNbjkVYUdDrWgvFuo=; b=pgKd6v579OhzgvwEBfO6oH4HlMBlDtHuzQQWUbUeFL7AihQHu9teJmU7fG9EWeFuNf E7rwunsH8rPKIs6a800ZQ0TU+1s6CL/PVd5sJ2ALxVkuUR5RE5O5NNx9czfsfiGQoIzY rzF+2NSn0FNvVm0mq1tyPZEJVDUbKXlC9jJIKgeo3/qDtBxgjz5YAZcB9sty18YFd1tV KesddcV3ILgy8DTyAJYUu45SoCxG62SckDmf1MC5tlnxYvT+G+Pp4nf9+hTKZgZLX4so B+sDHCc+O/ZqXtqEUlkNc0Zkr1vheWpyD+RXfXlDq3P4sNHTSXdutJRI5oglnOpsZZwY yM2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733110113; x=1733714913; 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=MW8P2vBtR0tiHVuNXF698UnUQTzNbjkVYUdDrWgvFuo=; b=Fmd7cjRND2Vvr6NY2kfp2exlwkuHqnpyI58MRlVtZIrD9cgFQL7f4TxqKEPbv+qcxG 6URkDfKwYlfDzMob+cNCaoIHBZwFuObcziJtSozO+6MRaBegLAXLvht9cYMXSDcAxVK4 rbn4TNXjedLi2zFoazpPZJwclgDyasDq1grhe2jAC2S4MuuPgd+7npoBXLuREIndhm4V lVNn9OHLge2lqmvJHBxNxMUJeBaambvQRNmPfm4A7LEOAlXGEOtXeciybc1e2Y8LpSSp K8c/34evaioy/S4YSOiAEPy4wh+OtyTS891zVYqMVF842TBlG8EYEWxOE9XSGkL5naoS YNIQ== X-Gm-Message-State: AOJu0YxRBopqiKLV9PZUfzxJc5VS6wFB0Z91SXbneuiE8DmJC7NyAxfI HbvyoUXym+Yf3427t32BWKWEFLNEIsodMVwkJGf3l6wnFpcZ9/hlQyRwbT19RiaElAA5d2OwCfC /ug== X-Google-Smtp-Source: AGHT+IFcUZRmwT3M3+dp5We5TbG1PhbrCpT/ilv6sNt1Wnzg29EAa63YEsnLXpC87arqRV9kgWQHWdyeDzU= X-Received: from pgct22.prod.google.com ([2002:a05:6a02:5296:b0:7fb:e344:7ca0]) (user=yuzhao job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a21:6d9e:b0:1db:915b:ab11 with SMTP id adf61e73a8af0-1e0e0b0f11cmr32948241637.24.1733110113337; Sun, 01 Dec 2024 19:28:33 -0800 (PST) Date: Sun, 1 Dec 2024 20:28:19 -0700 In-Reply-To: <20241202032823.2741019-1-yuzhao@google.com> Mime-Version: 1.0 References: <20241202032823.2741019-1-yuzhao@google.com> X-Mailer: git-send-email 2.47.0.338.g60cca15819-goog Message-ID: <20241202032823.2741019-3-yuzhao@google.com> Subject: [PATCH mm-unstable v1 2/6] mm/mglru: optimize deactivation From: Yu Zhao To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Yu Zhao , Bharata B Rao , Kalesh Singh X-Rspamd-Server: rspam05 X-Stat-Signature: 88a7xraqgnqmw8gf4yzucg49ykuzz8go X-Rspamd-Queue-Id: B0103140003 X-Rspam-User: X-HE-Tag: 1733110106-25641 X-HE-Meta: U2FsdGVkX18Qe/R4AO+yyeRJInfksDE7ajvURQLy3zjCDGAYvGnW9yb1bQqlfD7QAnvIlrUaGfceND/vVeIcN/RASK6HiPtWS4q/PeRw786uypKy0qpTw42gzSzo6J8YkNwr0WsQ4opa7dl+2gPSw4WhevsEGkrKvcr3XhQRUMZwr5ipcUxpi6E3fEFa+Hei4AFkFk+A8+cuZtueKvBm5oa4I47w5JqJ+mkfFFzmD/00g9iRxcyun8MymEEAURfXAf42XnLJQqLEogFPCKAR+e875rHsqjwyAlQrGF/PKwcp8FJNcSqMMrwaz5hcpW6mZtvUzeQtJrOtzfZoOrq/Z3t+pYiB1h7Lo3Qqf23Zx7ogHdfVX1v8Z7g6JdBgNmN5BIdHVgvvjZvHUSBuTLooKZczhWrruwU5Cl7ZN2EHwRpKc4eXspYF9p7JFQZewaPpZ9ZWDMX8BzqTyHMQoyH/C7fnz6GzWARUBn386za1RLqk1XcEpT4KIVSar7kpydphT9dUvsUURlr1ol95glOO/1GtFEWjJiphOf6EI6KERypNC2LkJXGG/8AXm3vG8oQfxhgs0yN7cxH74UyFKn/4u063QzPes0ZoUOEjBTdjK6wtcSvZAVQqHKYPtsbK26oe4q8/jsYSxxUlNX2QL6Jr0oHeZpsb7w2odaJ+C+mSD7eYl9UheNy1Wy+Gi9KYujw4qbNyRjGINneb08c5cc2p1ljVzxcUn3AyeofVAoZYJj0OuUIUN2c2pMCV3fDa/NNF1mTLXWi1tHYG4x6qAFMkphvRldgiBLjQVUlUW9nBu+eFAEUWTC2KR0cPyLNBxeEHoR+EcPVvmzmCFI1tZEUnxWJeUeRZzqdkapKZLc+4cBiCi40IBVkde4lPHS1JlTL06FEFB3OCVft+JZ6gIxBYSaeF141ICSzOlPKd0PyJvHKoLV9YpT3UFMy9Fq1SEkRaCDWXWbAdh0jShPxCStw KU1LtkZ3 Dp1tWCG+hWHQA2Xjzk2+5QZJ6OG6+7U689LE7DiYGjrKQGD5GP++d5YCBY91EWTI9tyIvs9XM7T8UMH98+tWYcIuotab2eKw9ZfNIqb5gDAE2MjCi+5me5TXxEfzrfVRxO3sLmOEJCCL4RGVS6genxm+r28hIcnHF2yDn29XUGTnAgOyCOVg4M6J2YGStQYXIDVU3mzmVpDuu7SQjjR6RYxwwK2pLXBabkVwUj8BJ+TzlCoAC++OTDNUWpxc5Ji9WnX2nhc9aUBNXN0zFukX9X7efOgVlxEQ036HHVfbEiGKPHlRU1iqv8r4F7OATNMgkvL8naIWKGFPS554ywNs85NH26UV7ZiZ/H2KYK6sbkZbGMpmjNMmZvwczLhQ3Um47aQFxGOTPm4osShA98MJjMbm1gnDXIK74IGEdpXhsmh4QfA7OMndiquAx+AUSKeXvKcId7LL9f2QwP0G5xCvh4E6gdpEGwFulhIy8IlTPFaRzo00NrRoJRd3j8WE8xg2YB+TNGBRYlTY6vLDUmGV6Hw+7bMU4RDDuOD3gwu+aCsmUSuAx5hv2H8HjRaY/Q9ANxIJaz70kggFTUTic2HuKyRASGnqs4UpE00ZxXhXtws/+Ci0= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000001, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Do not shuffle a folio in the deactivation paths if it is already in the oldest generation. This reduces the LRU lock contention. Before this patch, the contention is reproducible by FIO, e.g., fio -filename=/dev/nvme1n1p2 -direct=0 -thread -size=1024G \ -rwmixwrite=30 --norandommap --randrepeat=0 -ioengine=sync \ -bs=4k -numjobs=400 -runtime=25000 --time_based \ -group_reporting -name=mglru 98.96%--_raw_spin_lock_irqsave folio_lruvec_lock_irqsave | --98.78%--folio_batch_move_lru | --98.63%--deactivate_file_folio mapping_try_invalidate invalidate_mapping_pages invalidate_bdev blkdev_common_ioctl blkdev_ioctl After this patch, deactivate_file_folio() bails out early without taking the LRU lock. A side effect is that a folio can be left at the head of the oldest generation, rather than the tail. If reclaim happens at the same time, it cannot reclaim this folio immediately. Since there is no known correlation between truncation and reclaim, this side effect is considered insignificant. Reported-by: Bharata B Rao Closes: https://lore.kernel.org/CAOUHufawNerxqLm7L9Yywp3HJFiYVrYO26ePUb1jH-qxNGWzyA@mail.gmail.com/ Signed-off-by: Yu Zhao Tested-by: Kalesh Singh --- mm/swap.c | 44 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 37 insertions(+), 7 deletions(-) diff --git a/mm/swap.c b/mm/swap.c index 3a01acfd5a89..15a94be8b0af 100644 --- a/mm/swap.c +++ b/mm/swap.c @@ -379,7 +379,8 @@ static void __lru_cache_activate_folio(struct folio *folio) } #ifdef CONFIG_LRU_GEN -static void folio_inc_refs(struct folio *folio) + +static void lru_gen_inc_refs(struct folio *folio) { unsigned long new_flags, old_flags = READ_ONCE(folio->flags); @@ -406,10 +407,30 @@ static void folio_inc_refs(struct folio *folio) new_flags |= old_flags & ~LRU_REFS_MASK; } while (!try_cmpxchg(&folio->flags, &old_flags, new_flags)); } -#else -static void folio_inc_refs(struct folio *folio) + +static bool lru_gen_clear_refs(struct folio *folio) { + int gen = folio_lru_gen(folio); + int type = folio_is_file_lru(folio); + struct lru_gen_folio *lrugen = &folio_lruvec(folio)->lrugen; + + set_mask_bits(&folio->flags, LRU_REFS_MASK | LRU_REFS_FLAGS, 0); + + /* whether can do without shuffling under the LRU lock */ + return gen == lru_gen_from_seq(READ_ONCE(lrugen->min_seq[type])); } + +#else /* !CONFIG_LRU_GEN */ + +static void lru_gen_inc_refs(struct folio *folio) +{ +} + +static bool lru_gen_clear_refs(struct folio *folio) +{ + return false; +} + #endif /* CONFIG_LRU_GEN */ /** @@ -428,7 +449,7 @@ static void folio_inc_refs(struct folio *folio) void folio_mark_accessed(struct folio *folio) { if (lru_gen_enabled()) { - folio_inc_refs(folio); + lru_gen_inc_refs(folio); return; } @@ -524,7 +545,7 @@ void folio_add_lru_vma(struct folio *folio, struct vm_area_struct *vma) */ static void lru_deactivate_file(struct lruvec *lruvec, struct folio *folio) { - bool active = folio_test_active(folio); + bool active = folio_test_active(folio) || lru_gen_enabled(); long nr_pages = folio_nr_pages(folio); if (folio_test_unevictable(folio)) @@ -589,7 +610,10 @@ static void lru_lazyfree(struct lruvec *lruvec, struct folio *folio) lruvec_del_folio(lruvec, folio); folio_clear_active(folio); - folio_clear_referenced(folio); + if (lru_gen_enabled()) + lru_gen_clear_refs(folio); + else + folio_clear_referenced(folio); /* * Lazyfree folios are clean anonymous folios. They have * the swapbacked flag cleared, to distinguish them from normal @@ -657,6 +681,9 @@ void deactivate_file_folio(struct folio *folio) if (folio_test_unevictable(folio)) return; + if (lru_gen_enabled() && lru_gen_clear_refs(folio)) + return; + folio_batch_add_and_move(folio, lru_deactivate_file, true); } @@ -670,7 +697,10 @@ void deactivate_file_folio(struct folio *folio) */ void folio_deactivate(struct folio *folio) { - if (folio_test_unevictable(folio) || !(folio_test_active(folio) || lru_gen_enabled())) + if (folio_test_unevictable(folio)) + return; + + if (lru_gen_enabled() ? lru_gen_clear_refs(folio) : !folio_test_active(folio)) return; folio_batch_add_and_move(folio, lru_deactivate, true); From patchwork Mon Dec 2 03:28:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Zhao X-Patchwork-Id: 13889937 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 6E8F2D4979C for ; Mon, 2 Dec 2024 03:28:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F2C136B0093; Sun, 1 Dec 2024 22:28:39 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E8C056B0095; Sun, 1 Dec 2024 22:28:39 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CDD006B0096; Sun, 1 Dec 2024 22:28:39 -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 AB5216B0093 for ; Sun, 1 Dec 2024 22:28:39 -0500 (EST) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 260F5A0D37 for ; Mon, 2 Dec 2024 03:28:39 +0000 (UTC) X-FDA: 82848586254.13.A184801 Received: from mail-pg1-f202.google.com (mail-pg1-f202.google.com [209.85.215.202]) by imf25.hostedemail.com (Postfix) with ESMTP id 071A7A000A for ; Mon, 2 Dec 2024 03:28:28 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=xcEad3Y0; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf25.hostedemail.com: domain of 3ZClNZwYKCC0hdiQJXPXXPUN.LXVURWdg-VVTeJLT.XaP@flex--yuzhao.bounces.google.com designates 209.85.215.202 as permitted sender) smtp.mailfrom=3ZClNZwYKCC0hdiQJXPXXPUN.LXVURWdg-VVTeJLT.XaP@flex--yuzhao.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1733110112; a=rsa-sha256; cv=none; b=y6/kLX11X08KTlBjSt9eD5GA4z2Cuvl4JIb2Lo3YNLjtvBfhvBXUQtyxzMq2RNBE1UMkUH AKt/gmrhRCugaFw/HQL4kVexf7ib4h9wl0uRS/xxxocp6l0Buq/uizFhSW2sMorELHt82G YSTK8VwvlU/98Kc7yUocsA0oKDMDZro= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=xcEad3Y0; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf25.hostedemail.com: domain of 3ZClNZwYKCC0hdiQJXPXXPUN.LXVURWdg-VVTeJLT.XaP@flex--yuzhao.bounces.google.com designates 209.85.215.202 as permitted sender) smtp.mailfrom=3ZClNZwYKCC0hdiQJXPXXPUN.LXVURWdg-VVTeJLT.XaP@flex--yuzhao.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1733110112; 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=x/WXMwNfw0sDUCuQfYx8lzIKxCIUKsshP78UrWZEISs=; b=eUQ1XxFU/dj3yUjaFWJp5c34NGvAe1Xl8MsZp10pXZ86TxqqTTE5P2LgyJH7azoKvrfh+Y SV8axWOnnGTDg/Z54z8XH0c8KOQsiM5J603G8Qkj9IG7lJWQ1DXRoXtUL7eLS84HbRzNpj dadLQxiZIeD4avOLNZ48tCZoEj7/Nko= Received: by mail-pg1-f202.google.com with SMTP id 41be03b00d2f7-7fcb7afb4e1so1637297a12.0 for ; Sun, 01 Dec 2024 19:28:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1733110116; x=1733714916; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=x/WXMwNfw0sDUCuQfYx8lzIKxCIUKsshP78UrWZEISs=; b=xcEad3Y0XL8a+QePHhqjMB5H0lwqc0WabdRHVp1GnYip8JEe27IS8xYzMFi+iC6UZq SgzmKVHzDPoe/iuokFMHMEMVsenl2CC8v6Z7yqYIvBy3wpVIAZfcC6PdQ33b1xjlrNzP BUgzNDlpCmZ72dBj+mLrKC0ZQH7ZSL3Du04sn5WAW/N8XxsMsWfRNLdZ4yHAPiyUWjIR bPPoisX7g+x6/HSpqFSPOoSy/GPyE/Ms8EtV4YUpU1T61V+UwRn/rfCobjiNokojKtFP 6wDHiH2KgkfwwJkcZh6s7CSd1eF1o79WzJxFXI/UfYRLhIPcjoC7lq915pcUJlroG30V q7xQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733110116; x=1733714916; 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=x/WXMwNfw0sDUCuQfYx8lzIKxCIUKsshP78UrWZEISs=; b=K4g1HmHfTsenWRSPsz+cypy5Z1pTTkQ1UWpDUoXDYl17rxZZmu7jVXloebBlnLWyOM 4QCupqRshFW3aTuEv8F7DdjR6Fta3Q/yo1qaRc+g4hnN+ISFfXViA5Q4MRC663yosrFC oLKExGpO/vUhIDtq+JZfujrq3025yU2GZPOUcXzKHGCkRkibe+cSKAuTvLgkB509fMYW caW7P4JSGH2G1v54KLkZCaumG1/griw3aIcLnQ3l+icGwDHzQh0/UqJsGtrwWoYskeUq U+cW6eP9IGZ6JhysQezGIwcq9ghS/C4jUeVNW5p2AQXKCFN1qWM+NqLTKtH7p1ahlz+J wK4g== X-Gm-Message-State: AOJu0Yy1Lgs/c4XrqjWNDtUQcOMu7a7+NhuMpXMeby8ZqXRtBzB0UxIA jN1xdefJZMhGGEZHXuUuFM7wtnfkS+qsZAwfUxo0/tQ4EzfV6VWbkTCIWRqqet2H7hMIYwwIWjI I/g== X-Google-Smtp-Source: AGHT+IHAW5SvFK9WKWRally8za44fxEe4BAXpvBuBE3EY9ow0sDIqyR8r9bK5FmMMZg87g/7/m15lzvdzKE= X-Received: from pgbdk1.prod.google.com ([2002:a05:6a02:c81:b0:7fb:dfcf:fb8e]) (user=yuzhao job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:6f0a:b0:1e0:c77c:450d with SMTP id adf61e73a8af0-1e0e0ab4722mr26280457637.1.1733110116061; Sun, 01 Dec 2024 19:28:36 -0800 (PST) Date: Sun, 1 Dec 2024 20:28:20 -0700 In-Reply-To: <20241202032823.2741019-1-yuzhao@google.com> Mime-Version: 1.0 References: <20241202032823.2741019-1-yuzhao@google.com> X-Mailer: git-send-email 2.47.0.338.g60cca15819-goog Message-ID: <20241202032823.2741019-4-yuzhao@google.com> Subject: [PATCH mm-unstable v1 3/6] mm/mglru: rework aging feedback From: Yu Zhao To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Yu Zhao , David Stevens , Kalesh Singh X-Rspam-User: X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 071A7A000A X-Stat-Signature: 1j6iexdu9jroiq7i7o1mthcfdhiwtgqx X-HE-Tag: 1733110108-426024 X-HE-Meta: U2FsdGVkX18DUwHr5ZuDh+P2StZAPeAZ2KU1SSmBbvFAaeH+QDU7skKO/iJsMsx8BDcIu0sBCaTU+D3AeuxYq0giBX8PIX1GQD7EUwGCv73uxF0VzpIFvcFTqxLzzdOWkcSWJdlJEzb8rPopGsPMAd/P1qubPUHNXUsmBAgzqaDEt0TpXTwzbh+gg7s/VKQAqfU8tSx1ALuzzsMnw18vx9yO2xF+yZTIzX1VfbllcEuKeu714cr/Onn2TzRtFl0WH9f3zq9N7jy9MLNY9pvPSJEERNflqbqWjHtq5DKrqusRSEh9qDD7tslwwHpcuI6RrkSCQbwBTbbJ3TE4oujyHUusJy4GExS+8O3itmqF8hXc6TXatFbWxcN9aY4O1BCSoCwOvUSd9VSHFAefi6sK5ZhLJPj9BFR2JHVWjQ2Ty9VcBWyf7RSdQdlYiKwXcmfIk8M/td2rptLHNWlGbVrY4ij9aOPiPyPVENr6Lc8f/s7UDc1J6oRWbR13oSidb7DrVe7oZoVgBJru6iqEOX94sMkvC5Wgx9Ui71QOw/6IL+7sE0FQirjW3L/MlmtxEAQLgcBBInz6Hohbfn4FpT2Xv1jOLa3+oNa8SadJmHluPPsyKdNXCKsQo+JdkEgoTb3aMRIeGf6wZhx23xq6Fl7qUB9/9oeCyYdEHPg/Hwx7en0zPq+dc99JhKMvKGnJm5AyPa45OuRULB2P+jdnEHhoDFC+qUf5M3/dlf1+9tJaHq6ZyjvQesP/YpJXUMSd/J9/WOMXVkVzWy/FUMypM68RDqY9GjayasBgC12bilsazT1t2hal4Pc6mMoBZriLFSjpdO9GkwwCsjsMbiPdZgSxjJOnRdkUar6N7uZxlwRkPMEIS4URxJB/wEL9NREN2ge4DdTiPYjm9qeCQTCxx4E5FSqPMfm3/PJxs0/UbR4NY+Hh5cwqV8ZRwkxhzM7NGXI2hFoSy6lnuejYSilVjiH z/SHtP0p jBYowXMR921PC7L7cyqRb94cK8RcE4xFDAXq8PTV00MC9zSAEM47LT00fitj1Z7kWA1tw53YbwRe+e7P+sLoAo+MCNALE2tXOFjJBAm0E2V8HLnCLaxuDlq1YBws7uG+vIr9+Yvijk6760hnfTlv6szR5hpOA2dU0iyzAH35CrJeSQ1emeSH9OZvCm+AE/w+IT5T6/WnBceIPfp4ibob5540T8KPjPfmjl8X2S57Ng5lpvlNSkNoOBTlTEivQX4Z8rm9VvXe6MaY2Zth7h6ELYUtGhWk3wfBwIWTRtv5Tk8OUPqXk7wCOXK7X4F8zy7kElIhMgesj9wy/9+gjYpTxn0qj1BhtIW1qZQpCut1Wp2ecguQBU6RI7pgoGzZPBKloEo5mnJPM3f87d6rotnrQbv4AElFoqodP5kW+ffqS7PIUxUvDcHRHAR74v6tYd4G+/m4LAwxuyxRvrD2aGv7WE6OSDlyFahh+tLFkfZF7pJ8mbUwurvUzQBXYOCR2fCAop45M/ugCUMl51jS5LQYBVBbSqeVdLolIRVgU+Eh6Qp43ygtrkImsimiJJg== 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: List-Subscribe: List-Unsubscribe: The aging feedback is based on both the number of generations and the distribution of folios in each generation. The number of generations is currently the distance between max_seq and anon min_seq. This is because anon min_seq is not allowed to move past file min_seq. The rationale for that is that file is always evictable whereas anon is not. However, for use cases where anon is a lot cheaper than file: 1. Anon in the second oldest generation can be a better choice than file in the oldest generation. 2. A large amount of file in the oldest generation can skew the distribution, making should_run_aging() return false negative. Allow anon and file min_seq to move independently, and use solely the number of generations as the feedback for aging. Specifically, when both anon and file are evictable, anon min_seq can now be greater than file min_seq, and therefore the number of generations becomes the distance between max_seq and min(min_seq[0],min_seq[1]). And should_run_aging() returns true if and only if the number of generations is less than MAX_NR_GENS. As the first step to the final optimization, this change by itself should not have userspace-visiable effects beyond performance. The next twos patch will take advantage of this change; the last patch in this series will better distribute folios across MAX_NR_GENS. Reported-by: David Stevens Signed-off-by: Yu Zhao Tested-by: Kalesh Singh --- include/linux/mmzone.h | 6 +- mm/vmscan.c | 217 +++++++++++++++++------------------------ 2 files changed, 91 insertions(+), 132 deletions(-) diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index b36124145a16..b998ccc5c341 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -446,8 +446,8 @@ struct lru_gen_folio { unsigned long avg_refaulted[ANON_AND_FILE][MAX_NR_TIERS]; /* the exponential moving average of evicted+protected */ unsigned long avg_total[ANON_AND_FILE][MAX_NR_TIERS]; - /* the first tier doesn't need protection, hence the minus one */ - unsigned long protected[NR_HIST_GENS][ANON_AND_FILE][MAX_NR_TIERS - 1]; + /* can only be modified under the LRU lock */ + unsigned long protected[NR_HIST_GENS][ANON_AND_FILE][MAX_NR_TIERS]; /* can be modified without holding the LRU lock */ atomic_long_t evicted[NR_HIST_GENS][ANON_AND_FILE][MAX_NR_TIERS]; atomic_long_t refaulted[NR_HIST_GENS][ANON_AND_FILE][MAX_NR_TIERS]; @@ -498,7 +498,7 @@ struct lru_gen_mm_walk { int mm_stats[NR_MM_STATS]; /* total batched items */ int batched; - bool can_swap; + int swappiness; bool force_scan; }; diff --git a/mm/vmscan.c b/mm/vmscan.c index 2a8db048d581..00a5aff3db42 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -2623,11 +2623,17 @@ static bool should_clear_pmd_young(void) READ_ONCE((lruvec)->lrugen.min_seq[LRU_GEN_FILE]), \ } +#define evictable_min_seq(min_seq, swappiness) \ + min((min_seq)[!(swappiness)], (min_seq)[(swappiness) != MAX_SWAPPINESS]) + #define for_each_gen_type_zone(gen, type, zone) \ for ((gen) = 0; (gen) < MAX_NR_GENS; (gen)++) \ for ((type) = 0; (type) < ANON_AND_FILE; (type)++) \ for ((zone) = 0; (zone) < MAX_NR_ZONES; (zone)++) +#define for_each_evictable_type(type, swappiness) \ + for ((type) = !(swappiness); (type) <= ((swappiness) != MAX_SWAPPINESS); (type)++) + #define get_memcg_gen(seq) ((seq) % MEMCG_NR_GENS) #define get_memcg_bin(bin) ((bin) % MEMCG_NR_BINS) @@ -2673,10 +2679,16 @@ static int get_nr_gens(struct lruvec *lruvec, int type) static bool __maybe_unused seq_is_valid(struct lruvec *lruvec) { - /* see the comment on lru_gen_folio */ - return get_nr_gens(lruvec, LRU_GEN_FILE) >= MIN_NR_GENS && - get_nr_gens(lruvec, LRU_GEN_FILE) <= get_nr_gens(lruvec, LRU_GEN_ANON) && - get_nr_gens(lruvec, LRU_GEN_ANON) <= MAX_NR_GENS; + int type; + + for (type = 0; type < ANON_AND_FILE; type++) { + int n = get_nr_gens(lruvec, type); + + if (n < MIN_NR_GENS || n > MAX_NR_GENS) + return false; + } + + return true; } /****************************************************************************** @@ -3083,9 +3095,8 @@ static void read_ctrl_pos(struct lruvec *lruvec, int type, int tier, int gain, pos->refaulted = lrugen->avg_refaulted[type][tier] + atomic_long_read(&lrugen->refaulted[hist][type][tier]); pos->total = lrugen->avg_total[type][tier] + + lrugen->protected[hist][type][tier] + atomic_long_read(&lrugen->evicted[hist][type][tier]); - if (tier) - pos->total += lrugen->protected[hist][type][tier - 1]; pos->gain = gain; } @@ -3112,17 +3123,15 @@ static void reset_ctrl_pos(struct lruvec *lruvec, int type, bool carryover) WRITE_ONCE(lrugen->avg_refaulted[type][tier], sum / 2); sum = lrugen->avg_total[type][tier] + + lrugen->protected[hist][type][tier] + atomic_long_read(&lrugen->evicted[hist][type][tier]); - if (tier) - sum += lrugen->protected[hist][type][tier - 1]; WRITE_ONCE(lrugen->avg_total[type][tier], sum / 2); } if (clear) { atomic_long_set(&lrugen->refaulted[hist][type][tier], 0); atomic_long_set(&lrugen->evicted[hist][type][tier], 0); - if (tier) - WRITE_ONCE(lrugen->protected[hist][type][tier - 1], 0); + WRITE_ONCE(lrugen->protected[hist][type][tier], 0); } } } @@ -3257,7 +3266,7 @@ static int should_skip_vma(unsigned long start, unsigned long end, struct mm_wal return true; if (vma_is_anonymous(vma)) - return !walk->can_swap; + return !walk->swappiness; if (WARN_ON_ONCE(!vma->vm_file || !vma->vm_file->f_mapping)) return true; @@ -3267,7 +3276,10 @@ static int should_skip_vma(unsigned long start, unsigned long end, struct mm_wal return true; if (shmem_mapping(mapping)) - return !walk->can_swap; + return !walk->swappiness; + + if (walk->swappiness == MAX_SWAPPINESS) + return true; /* to exclude special mappings like dax, etc. */ return !mapping->a_ops->read_folio; @@ -3355,7 +3367,7 @@ static unsigned long get_pmd_pfn(pmd_t pmd, struct vm_area_struct *vma, unsigned } static struct folio *get_pfn_folio(unsigned long pfn, struct mem_cgroup *memcg, - struct pglist_data *pgdat, bool can_swap) + struct pglist_data *pgdat) { struct folio *folio; @@ -3366,10 +3378,6 @@ static struct folio *get_pfn_folio(unsigned long pfn, struct mem_cgroup *memcg, if (folio_memcg(folio) != memcg) return NULL; - /* file VMAs can contain anon pages from COW */ - if (!folio_is_file_lru(folio) && !can_swap) - return NULL; - return folio; } @@ -3425,7 +3433,7 @@ static bool walk_pte_range(pmd_t *pmd, unsigned long start, unsigned long end, if (pfn == -1) continue; - folio = get_pfn_folio(pfn, memcg, pgdat, walk->can_swap); + folio = get_pfn_folio(pfn, memcg, pgdat); if (!folio) continue; @@ -3510,7 +3518,7 @@ static void walk_pmd_range_locked(pud_t *pud, unsigned long addr, struct vm_area if (pfn == -1) goto next; - folio = get_pfn_folio(pfn, memcg, pgdat, walk->can_swap); + folio = get_pfn_folio(pfn, memcg, pgdat); if (!folio) goto next; @@ -3722,22 +3730,26 @@ static void clear_mm_walk(void) kfree(walk); } -static bool inc_min_seq(struct lruvec *lruvec, int type, bool can_swap) +static bool inc_min_seq(struct lruvec *lruvec, int type, int swappiness) { int zone; int remaining = MAX_LRU_BATCH; struct lru_gen_folio *lrugen = &lruvec->lrugen; + int hist = lru_hist_from_seq(lrugen->min_seq[type]); int new_gen, old_gen = lru_gen_from_seq(lrugen->min_seq[type]); - if (type == LRU_GEN_ANON && !can_swap) + if (type ? swappiness == MAX_SWAPPINESS : !swappiness) goto done; - /* prevent cold/hot inversion if force_scan is true */ + /* prevent cold/hot inversion if the type is evictable */ for (zone = 0; zone < MAX_NR_ZONES; zone++) { struct list_head *head = &lrugen->folios[old_gen][type][zone]; while (!list_empty(head)) { struct folio *folio = lru_to_folio(head); + int refs = folio_lru_refs(folio); + int tier = lru_tier_from_refs(refs); + int delta = folio_nr_pages(folio); VM_WARN_ON_ONCE_FOLIO(folio_test_unevictable(folio), folio); VM_WARN_ON_ONCE_FOLIO(folio_test_active(folio), folio); @@ -3747,6 +3759,9 @@ static bool inc_min_seq(struct lruvec *lruvec, int type, bool can_swap) new_gen = folio_inc_gen(lruvec, folio, false); list_move_tail(&folio->lru, &lrugen->folios[new_gen][type][zone]); + WRITE_ONCE(lrugen->protected[hist][type][tier], + lrugen->protected[hist][type][tier] + delta); + if (!--remaining) return false; } @@ -3758,51 +3773,37 @@ static bool inc_min_seq(struct lruvec *lruvec, int type, bool can_swap) return true; } -static bool try_to_inc_min_seq(struct lruvec *lruvec, bool can_swap) +static bool try_to_inc_min_seq(struct lruvec *lruvec, int swappiness) { int gen, type, zone; bool success = false; struct lru_gen_folio *lrugen = &lruvec->lrugen; - DEFINE_MIN_SEQ(lruvec); VM_WARN_ON_ONCE(!seq_is_valid(lruvec)); - /* find the oldest populated generation */ - for (type = !can_swap; type < ANON_AND_FILE; type++) { - while (min_seq[type] + MIN_NR_GENS <= lrugen->max_seq) { - gen = lru_gen_from_seq(min_seq[type]); + for_each_evictable_type(type, swappiness) { + unsigned long seq; + + for (seq = lrugen->min_seq[type]; seq + MIN_NR_GENS <= lrugen->max_seq; seq++) { + gen = lru_gen_from_seq(seq); for (zone = 0; zone < MAX_NR_ZONES; zone++) { if (!list_empty(&lrugen->folios[gen][type][zone])) goto next; } - - min_seq[type]++; } next: - ; - } - - /* see the comment on lru_gen_folio */ - if (can_swap) { - min_seq[LRU_GEN_ANON] = min(min_seq[LRU_GEN_ANON], min_seq[LRU_GEN_FILE]); - min_seq[LRU_GEN_FILE] = max(min_seq[LRU_GEN_ANON], lrugen->min_seq[LRU_GEN_FILE]); - } - - for (type = !can_swap; type < ANON_AND_FILE; type++) { - if (min_seq[type] == lrugen->min_seq[type]) - continue; - - reset_ctrl_pos(lruvec, type, true); - WRITE_ONCE(lrugen->min_seq[type], min_seq[type]); - success = true; + if (seq != lrugen->min_seq[type]) { + reset_ctrl_pos(lruvec, type, true); + WRITE_ONCE(lrugen->min_seq[type], seq); + success = true; + } } return success; } -static bool inc_max_seq(struct lruvec *lruvec, unsigned long seq, - bool can_swap, bool force_scan) +static bool inc_max_seq(struct lruvec *lruvec, unsigned long seq, int swappiness) { bool success; int prev, next; @@ -3820,13 +3821,11 @@ static bool inc_max_seq(struct lruvec *lruvec, unsigned long seq, if (!success) goto unlock; - for (type = ANON_AND_FILE - 1; type >= 0; type--) { + for (type = 0; type < ANON_AND_FILE; type++) { if (get_nr_gens(lruvec, type) != MAX_NR_GENS) continue; - VM_WARN_ON_ONCE(!force_scan && (type == LRU_GEN_FILE || can_swap)); - - if (inc_min_seq(lruvec, type, can_swap)) + if (inc_min_seq(lruvec, type, swappiness)) continue; spin_unlock_irq(&lruvec->lru_lock); @@ -3870,7 +3869,7 @@ static bool inc_max_seq(struct lruvec *lruvec, unsigned long seq, } static bool try_to_inc_max_seq(struct lruvec *lruvec, unsigned long seq, - bool can_swap, bool force_scan) + int swappiness, bool force_scan) { bool success; struct lru_gen_mm_walk *walk; @@ -3881,7 +3880,7 @@ static bool try_to_inc_max_seq(struct lruvec *lruvec, unsigned long seq, VM_WARN_ON_ONCE(seq > READ_ONCE(lrugen->max_seq)); if (!mm_state) - return inc_max_seq(lruvec, seq, can_swap, force_scan); + return inc_max_seq(lruvec, seq, swappiness); /* see the comment in iterate_mm_list() */ if (seq <= READ_ONCE(mm_state->seq)) @@ -3906,7 +3905,7 @@ static bool try_to_inc_max_seq(struct lruvec *lruvec, unsigned long seq, walk->lruvec = lruvec; walk->seq = seq; - walk->can_swap = can_swap; + walk->swappiness = swappiness; walk->force_scan = force_scan; do { @@ -3916,7 +3915,7 @@ static bool try_to_inc_max_seq(struct lruvec *lruvec, unsigned long seq, } while (mm); done: if (success) { - success = inc_max_seq(lruvec, seq, can_swap, force_scan); + success = inc_max_seq(lruvec, seq, swappiness); WARN_ON_ONCE(!success); } @@ -3957,13 +3956,13 @@ static bool lruvec_is_sizable(struct lruvec *lruvec, struct scan_control *sc) { int gen, type, zone; unsigned long total = 0; - bool can_swap = get_swappiness(lruvec, sc); + int swappiness = get_swappiness(lruvec, sc); struct lru_gen_folio *lrugen = &lruvec->lrugen; struct mem_cgroup *memcg = lruvec_memcg(lruvec); DEFINE_MAX_SEQ(lruvec); DEFINE_MIN_SEQ(lruvec); - for (type = !can_swap; type < ANON_AND_FILE; type++) { + for_each_evictable_type(type, swappiness) { unsigned long seq; for (seq = min_seq[type]; seq <= max_seq; seq++) { @@ -3983,6 +3982,7 @@ static bool lruvec_is_reclaimable(struct lruvec *lruvec, struct scan_control *sc { int gen; unsigned long birth; + int swappiness = get_swappiness(lruvec, sc); struct mem_cgroup *memcg = lruvec_memcg(lruvec); DEFINE_MIN_SEQ(lruvec); @@ -3992,8 +3992,7 @@ static bool lruvec_is_reclaimable(struct lruvec *lruvec, struct scan_control *sc if (!lruvec_is_sizable(lruvec, sc)) return false; - /* see the comment on lru_gen_folio */ - gen = lru_gen_from_seq(min_seq[LRU_GEN_FILE]); + gen = lru_gen_from_seq(evictable_min_seq(min_seq, swappiness)); birth = READ_ONCE(lruvec->lrugen.timestamps[gen]); return time_is_before_jiffies(birth + min_ttl); @@ -4060,7 +4059,6 @@ bool lru_gen_look_around(struct page_vma_mapped_walk *pvmw) unsigned long addr = pvmw->address; struct vm_area_struct *vma = pvmw->vma; struct folio *folio = pfn_folio(pvmw->pfn); - bool can_swap = !folio_is_file_lru(folio); struct mem_cgroup *memcg = folio_memcg(folio); struct pglist_data *pgdat = folio_pgdat(folio); struct lruvec *lruvec = mem_cgroup_lruvec(memcg, pgdat); @@ -4113,7 +4111,7 @@ bool lru_gen_look_around(struct page_vma_mapped_walk *pvmw) if (pfn == -1) continue; - folio = get_pfn_folio(pfn, memcg, pgdat, can_swap); + folio = get_pfn_folio(pfn, memcg, pgdat); if (!folio) continue; @@ -4329,8 +4327,8 @@ static bool sort_folio(struct lruvec *lruvec, struct folio *folio, struct scan_c gen = folio_inc_gen(lruvec, folio, false); list_move_tail(&folio->lru, &lrugen->folios[gen][type][zone]); - WRITE_ONCE(lrugen->protected[hist][type][tier - 1], - lrugen->protected[hist][type][tier - 1] + delta); + WRITE_ONCE(lrugen->protected[hist][type][tier], + lrugen->protected[hist][type][tier] + delta); return true; } @@ -4529,7 +4527,6 @@ static int isolate_folios(struct lruvec *lruvec, struct scan_control *sc, int sw { int i; int type; - int scanned; int tier = -1; DEFINE_MIN_SEQ(lruvec); @@ -4554,21 +4551,23 @@ static int isolate_folios(struct lruvec *lruvec, struct scan_control *sc, int sw else type = get_type_to_scan(lruvec, swappiness, &tier); - for (i = !swappiness; i < ANON_AND_FILE; i++) { + for_each_evictable_type(i, swappiness) { + int scanned; + if (tier < 0) tier = get_tier_idx(lruvec, type); + *type_scanned = type; + scanned = scan_folios(lruvec, sc, type, tier, list); if (scanned) - break; + return scanned; type = !type; tier = -1; } - *type_scanned = type; - - return scanned; + return 0; } static int evict_folios(struct lruvec *lruvec, struct scan_control *sc, int swappiness) @@ -4584,6 +4583,7 @@ static int evict_folios(struct lruvec *lruvec, struct scan_control *sc, int swap struct reclaim_stat stat; struct lru_gen_mm_walk *walk; bool skip_retry = false; + struct lru_gen_folio *lrugen = &lruvec->lrugen; struct mem_cgroup *memcg = lruvec_memcg(lruvec); struct pglist_data *pgdat = lruvec_pgdat(lruvec); @@ -4593,7 +4593,7 @@ static int evict_folios(struct lruvec *lruvec, struct scan_control *sc, int swap scanned += try_to_inc_min_seq(lruvec, swappiness); - if (get_nr_gens(lruvec, !swappiness) == MIN_NR_GENS) + if (evictable_min_seq(lrugen->min_seq, swappiness) + MIN_NR_GENS > lrugen->max_seq) scanned = 0; spin_unlock_irq(&lruvec->lru_lock); @@ -4665,63 +4665,32 @@ static int evict_folios(struct lruvec *lruvec, struct scan_control *sc, int swap } static bool should_run_aging(struct lruvec *lruvec, unsigned long max_seq, - bool can_swap, unsigned long *nr_to_scan) + int swappiness, unsigned long *nr_to_scan) { int gen, type, zone; - unsigned long old = 0; - unsigned long young = 0; - unsigned long total = 0; + unsigned long size = 0; struct lru_gen_folio *lrugen = &lruvec->lrugen; DEFINE_MIN_SEQ(lruvec); - /* whether this lruvec is completely out of cold folios */ - if (min_seq[!can_swap] + MIN_NR_GENS > max_seq) { - *nr_to_scan = 0; + *nr_to_scan = 0; + /* have to run aging, since eviction is not possible anymore */ + if (evictable_min_seq(min_seq, swappiness) + MIN_NR_GENS > max_seq) return true; - } - for (type = !can_swap; type < ANON_AND_FILE; type++) { + for_each_evictable_type(type, swappiness) { unsigned long seq; for (seq = min_seq[type]; seq <= max_seq; seq++) { - unsigned long size = 0; - gen = lru_gen_from_seq(seq); for (zone = 0; zone < MAX_NR_ZONES; zone++) size += max(READ_ONCE(lrugen->nr_pages[gen][type][zone]), 0L); - - total += size; - if (seq == max_seq) - young += size; - else if (seq + MIN_NR_GENS == max_seq) - old += size; } } - *nr_to_scan = total; - - /* - * The aging tries to be lazy to reduce the overhead, while the eviction - * stalls when the number of generations reaches MIN_NR_GENS. Hence, the - * ideal number of generations is MIN_NR_GENS+1. - */ - if (min_seq[!can_swap] + MIN_NR_GENS < max_seq) - return false; - - /* - * It's also ideal to spread pages out evenly, i.e., 1/(MIN_NR_GENS+1) - * of the total number of pages for each generation. A reasonable range - * for this average portion is [1/MIN_NR_GENS, 1/(MIN_NR_GENS+2)]. The - * aging cares about the upper bound of hot pages, while the eviction - * cares about the lower bound of cold pages. - */ - if (young * MIN_NR_GENS > total) - return true; - if (old * (MIN_NR_GENS + 2) < total) - return true; - - return false; + *nr_to_scan = size; + /* better to run aging even though eviction is still possible */ + return evictable_min_seq(min_seq, swappiness) + MIN_NR_GENS == max_seq; } /* @@ -4729,7 +4698,7 @@ static bool should_run_aging(struct lruvec *lruvec, unsigned long max_seq, * 1. Defer try_to_inc_max_seq() to workqueues to reduce latency for memcg * reclaim. */ -static long get_nr_to_scan(struct lruvec *lruvec, struct scan_control *sc, bool can_swap) +static long get_nr_to_scan(struct lruvec *lruvec, struct scan_control *sc, int swappiness) { bool success; unsigned long nr_to_scan; @@ -4739,7 +4708,7 @@ static long get_nr_to_scan(struct lruvec *lruvec, struct scan_control *sc, bool if (mem_cgroup_below_min(sc->target_mem_cgroup, memcg)) return -1; - success = should_run_aging(lruvec, max_seq, can_swap, &nr_to_scan); + success = should_run_aging(lruvec, max_seq, swappiness, &nr_to_scan); /* try to scrape all its memory if this memcg was deleted */ if (nr_to_scan && !mem_cgroup_online(memcg)) @@ -4750,7 +4719,7 @@ static long get_nr_to_scan(struct lruvec *lruvec, struct scan_control *sc, bool return nr_to_scan >> sc->priority; /* stop scanning this lruvec as it's low on cold folios */ - return try_to_inc_max_seq(lruvec, max_seq, can_swap, false) ? -1 : 0; + return try_to_inc_max_seq(lruvec, max_seq, swappiness, false) ? -1 : 0; } static bool should_abort_scan(struct lruvec *lruvec, struct scan_control *sc) @@ -5294,8 +5263,7 @@ static void lru_gen_seq_show_full(struct seq_file *m, struct lruvec *lruvec, s = "rep"; n[0] = atomic_long_read(&lrugen->refaulted[hist][type][tier]); n[1] = atomic_long_read(&lrugen->evicted[hist][type][tier]); - if (tier) - n[2] = READ_ONCE(lrugen->protected[hist][type][tier - 1]); + n[2] = READ_ONCE(lrugen->protected[hist][type][tier]); } for (i = 0; i < 3; i++) @@ -5350,7 +5318,7 @@ static int lru_gen_seq_show(struct seq_file *m, void *v) seq_printf(m, " node %5d\n", nid); if (!full) - seq = min_seq[LRU_GEN_ANON]; + seq = evictable_min_seq(min_seq, MAX_SWAPPINESS / 2); else if (max_seq >= MAX_NR_GENS) seq = max_seq - MAX_NR_GENS + 1; else @@ -5390,23 +5358,14 @@ static const struct seq_operations lru_gen_seq_ops = { }; static int run_aging(struct lruvec *lruvec, unsigned long seq, - bool can_swap, bool force_scan) + int swappiness, bool force_scan) { DEFINE_MAX_SEQ(lruvec); - DEFINE_MIN_SEQ(lruvec); - - if (seq < max_seq) - return 0; if (seq > max_seq) return -EINVAL; - if (!force_scan && min_seq[!can_swap] + MAX_NR_GENS - 1 <= max_seq) - return -ERANGE; - - try_to_inc_max_seq(lruvec, max_seq, can_swap, force_scan); - - return 0; + return try_to_inc_max_seq(lruvec, max_seq, swappiness, force_scan) ? 0 : -EEXIST; } static int run_eviction(struct lruvec *lruvec, unsigned long seq, struct scan_control *sc, @@ -5422,7 +5381,7 @@ static int run_eviction(struct lruvec *lruvec, unsigned long seq, struct scan_co while (!signal_pending(current)) { DEFINE_MIN_SEQ(lruvec); - if (seq < min_seq[!swappiness]) + if (seq < evictable_min_seq(min_seq, swappiness)) return 0; if (sc->nr_reclaimed >= nr_to_reclaim) From patchwork Mon Dec 2 03:28:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Zhao X-Patchwork-Id: 13889938 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 456FFD49798 for ; Mon, 2 Dec 2024 03:28:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4577F6B0099; Sun, 1 Dec 2024 22:28:42 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 408306B009A; Sun, 1 Dec 2024 22:28:42 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 209B26B009B; Sun, 1 Dec 2024 22:28:42 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id F3A706B0099 for ; Sun, 1 Dec 2024 22:28:41 -0500 (EST) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id A2A1C120373 for ; Mon, 2 Dec 2024 03:28:41 +0000 (UTC) X-FDA: 82848586380.25.775F306 Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) by imf25.hostedemail.com (Postfix) with ESMTP id 95F90A000A for ; Mon, 2 Dec 2024 03:28:31 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=ZIqpIJ7Z; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf25.hostedemail.com: domain of 3ZilNZwYKCC8jfkSLZRZZRWP.NZXWTYfi-XXVgLNV.ZcR@flex--yuzhao.bounces.google.com designates 209.85.216.74 as permitted sender) smtp.mailfrom=3ZilNZwYKCC8jfkSLZRZZRWP.NZXWTYfi-XXVgLNV.ZcR@flex--yuzhao.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1733110109; a=rsa-sha256; cv=none; b=vkzYUGUytBRRyNKzcBepmkxPFiCOTwpxOJH7ENNKuASyBAfCGmT4M++chhaKAOIFwFyxfS pVC1f/EiToltqk5zWYf78sSf+UMEBbQFNxV4jPnWa/iiHqO9dP34q4bhcnLBftwxeKlDbf e92fY0d4cxN4NAHx3MNCADVzvw1Ofv8= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=ZIqpIJ7Z; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf25.hostedemail.com: domain of 3ZilNZwYKCC8jfkSLZRZZRWP.NZXWTYfi-XXVgLNV.ZcR@flex--yuzhao.bounces.google.com designates 209.85.216.74 as permitted sender) smtp.mailfrom=3ZilNZwYKCC8jfkSLZRZZRWP.NZXWTYfi-XXVgLNV.ZcR@flex--yuzhao.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1733110109; 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=tAZ7EXnKaWj8C19Di4ja72nho7QoBFM1H+8+YKhOaNc=; b=F92LFK5QMQyaBHfmlvPbWZxMf5A53XpVMDfg4qwxnKkrzLeBytJMSqyGBG1v3cIVqPVi79 GQSuBIae4jEYUUxnoyYfdUAYMOcnEjdc3uhdpDndeYgB9VWJC1V+3MbChl1KHv1Q7VF2yY 0eOAvXlgCp0bNrqut5WymBYn57HO780= Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-2ee9e92a577so866782a91.0 for ; Sun, 01 Dec 2024 19:28:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1733110118; x=1733714918; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=tAZ7EXnKaWj8C19Di4ja72nho7QoBFM1H+8+YKhOaNc=; b=ZIqpIJ7ZGxWqsHMqqiJGpWRjOd+/IA74x6QRxppRAFIMSeF9zeiAncQXbrtLD047HO e3OGmYN3tm4vF/mK+ijOA5ANVvZzis0bZQiu9MM/Yf1ksMVrsnxixjGJSpr6mh8AN/St 3bFSndcRFpMujjm2KUqv8L1WUWUf7DfyWkWZlX+2cYL4aOCke6ZXM6T8fABidA/SIy7/ 2kwbJR1/WJ+nrydRHRit0N1ODoewpQREvkHrpCtuLRWmC4F5Vu2CctvsoDbS7lNII1RZ VVmG6WXzT5y8xwDSrxEuUt4J/Pxe5sQ4zwvOFfHZ+V+YMDk0WBLpUZWmFernEeCrf2T/ DEuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733110118; x=1733714918; 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=tAZ7EXnKaWj8C19Di4ja72nho7QoBFM1H+8+YKhOaNc=; b=aMYA54oltoH+YqgIflkGOLkEcooBuetfeCJleQ0gAbx9xxXnlR8eWhx6okLfDEOcct aePsH0OGl+7pP0Y/JxFALetRQ5hTZG3gKtyc+EOoiO8QVyVU/srzGbOzC/hn1/4XAFLS uIp63p387gBjiBWsWxZ6fQTuZZD8T0oM/X6U79oVoliLninKrGRrtQvxb2pTyaqhu+GI mVDpgsgtzrooicoWBt5aGJm/+8yraQ8PRW5fNlWQyHy3Xw0UNBDJ62bxVwPTyfux1lvU 43AW9+84tQw0tkQDYuAWwezyR2am/NHkX8i7WDth72DVsZRRvCNB2a3aXrgoLaSsTf3k oarQ== X-Gm-Message-State: AOJu0YwEjBiP4jY8a2vnlsKA72+k1xhDwyg5dznr+WoeEINFbalqHJ1w 62vwjQXiIk6F34oY1dcivE5rrTPd/q/9Kikn7Gb1TkCvzuNM0ebUKuzuWZ5jNKAYcETVtCIj5bp +5w== X-Google-Smtp-Source: AGHT+IEv//P/jMaTg8qmYerNeCdqWyYAtY0F42kcb0T+44U79mT8shI+AxtZNoulfnzTgxMAL0SEqCiFUhE= X-Received: from pjbqd4.prod.google.com ([2002:a17:90b:3cc4:b0:2ea:c64d:fccb]) (user=yuzhao job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:5186:b0:2ee:9229:e4bd with SMTP id 98e67ed59e1d1-2ee9229e5d9mr9120161a91.2.1733110118614; Sun, 01 Dec 2024 19:28:38 -0800 (PST) Date: Sun, 1 Dec 2024 20:28:21 -0700 In-Reply-To: <20241202032823.2741019-1-yuzhao@google.com> Mime-Version: 1.0 References: <20241202032823.2741019-1-yuzhao@google.com> X-Mailer: git-send-email 2.47.0.338.g60cca15819-goog Message-ID: <20241202032823.2741019-5-yuzhao@google.com> Subject: [PATCH mm-unstable v1 4/6] mm/mglru: rework type selection From: Yu Zhao To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Yu Zhao , David Stevens , Kalesh Singh X-Stat-Signature: q71hffn4hzfu4ou8riape3c4mpo6rfa9 X-Rspam-User: X-Rspamd-Queue-Id: 95F90A000A X-Rspamd-Server: rspam08 X-HE-Tag: 1733110111-945105 X-HE-Meta: U2FsdGVkX1+rIU/x9YA94u/VswJweGKNoWBWtE4qvTHKeXc3CWGQwnb2nA0mE8OuLxKfFot+C1hW/qpWAaQYoMlupM31GEC8rYu7CgbLI30bRRrrWrUzwtpKTtGW77RECzK7qyKAoBJs8fmKNrjSEi0ivTGB8eQLhaXUKvU91qi+XTlO3Tqo7H/mawqK8el0V3TXIzqC2x/6sIYovP/G4oYf+JNHTllDr6MHakTrN1PIXfvS2McvWvMKM4PWzP+FYp1yuXwoJ1FesLJJszwNEAwuSrxKp0Srm7Ags/xsQxgu0mz6b3KJ9Mg8Zo2oFOOUoSFhqW4L8LWyp/ylc+SQjHuZK4tIRnXjOV0hvUulJLAcJJIy3vFspkG5CjpqTWgDnHx5p535WZFYtdcKboHm3iMKjz6NpRMIpFaCaqewFXTYSHD77ObSNJ+dWC3htvgKe3QIYhoU+JkiqqmoGTsC22xF5gyswJLmid5dOTKyTNUSbSlMclzbEWEXcFpgNzvJ2NfxZfWtaInObsYMha1yvf31dGKwJCB88619lXTZXPQkRCPk4S4JsRHpZF2a/zeU5lXZ8uowBsWksYvbcGQghpH4f0ZdK73YwyJEipIwBvi4WBKQL8mR1bd51FDYtCKSMmCkZ4ck9hilpKTHn7iTlCzTfakevCZCpuOnC2LkQ+862U/nwSsZdkPHrSnlNadx1V1RtL6db/0qeYz0Ijk98dDa7O6yBAghdIWxq5BwkQRiAUfH/n9w69vTYy0/caMJpQKQyatr1Pb5houRl94XRJwwr3NFaPSJQeLwtSftU05llkik2FqZL94p2eCrakEYxClgDH1s1KA3p4K3FEjj31CPQwdGtUf22IEkwVM8wi2bIW5F5UeF9A/xqCmKO7/0FYN+UK5tSsqxu39W9zwusGoBPxkbjnBQgLJTOc+7mKCdwRcFO8kCKKcxLahqg5O2AvoHdBuoYPsqR2Jdavk rGJhsciD 8wvYQ9xzheRuzfSGVUIoHHDRNmoOQsJjK6ZqrIkz89/tj5heG39y3/yod1A6I2/EYKZ/tys1unabzl4szovj/dPQuvsLbGMASmyvPuCx3TjSvGYw1tP02x2B4hlqjTO1l367nFoMRkNUxZDnbCqT5xqiqCA7Y+VLhcXueZRfh7PKuQYYiR9zn52ldvJpo/SwDapfCz2huWg+kZ+G1WHQ9/Vqn96pXhxqg9cuxmTYKW2B/2msrqh/wC9pkhN1ivH+KJJNqFcf0H/03cHoddUavRvOC0XCrLuhdtOspAD7w49lKQ8/rBeTCDTQrvYOTvE4vRk8jRSoiTj0cKh+W9X2joAmILfgDu/dX45ld0AaRyHNmPM6SQCBhKF4ULYFdR+plfD7bE57o9Co40v3N1xsJ6U1GdYYsJNsdnQd6iS3roEPOXwaCpoMDDt7rTl+5GfeC2RqnhbAqGKnJ7H1sfcmfPT461zX+mj3Hw3cBDSZoddOiD0sqtTm1/FQHKPc5mByXRCzc9L4XaEzaXUCuRhj4zccDzdPdnzOPL7YQHtnwJjtNrWkJ+eVhsi1vDw== X-Bogosity: Ham, tests=bogofilter, spamicity=0.002814, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: With anon and file min_seq being able to move independently, rework type selection so that it is based on the total refaults from all tiers of each type. Also allow a type to be selected until that type reaches MIN_NR_GENS, and therefore abs_diff(min_seq[0],min_seq[1]) now can be 2 (MAX_NR_GENS-MIN_NR_GENS) instead of 1. Since some tiers of a selected type can have higher refaults than the first tier of the other type, use a less larger gain factor 2:3 instead of 1:2, in order for those tiers in the selected type to be better protected. As an intermediate step to the final optimization, this change by itself should not have userspace-visiable effects beyond performance. Reported-by: David Stevens Signed-off-by: Yu Zhao Tested-by: Kalesh Singh --- mm/vmscan.c | 82 +++++++++++++++++------------------------------------ 1 file changed, 26 insertions(+), 56 deletions(-) diff --git a/mm/vmscan.c b/mm/vmscan.c index 00a5aff3db42..307ae8b03d0d 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -3089,15 +3089,20 @@ struct ctrl_pos { static void read_ctrl_pos(struct lruvec *lruvec, int type, int tier, int gain, struct ctrl_pos *pos) { + int i; struct lru_gen_folio *lrugen = &lruvec->lrugen; int hist = lru_hist_from_seq(lrugen->min_seq[type]); - pos->refaulted = lrugen->avg_refaulted[type][tier] + - atomic_long_read(&lrugen->refaulted[hist][type][tier]); - pos->total = lrugen->avg_total[type][tier] + - lrugen->protected[hist][type][tier] + - atomic_long_read(&lrugen->evicted[hist][type][tier]); + pos->refaulted = pos->total = 0; pos->gain = gain; + + for (i = tier % MAX_NR_TIERS; i <= min(tier, MAX_NR_TIERS - 1); i++) { + pos->refaulted += lrugen->avg_refaulted[type][i] + + atomic_long_read(&lrugen->refaulted[hist][type][i]); + pos->total += lrugen->avg_total[type][i] + + lrugen->protected[hist][type][i] + + atomic_long_read(&lrugen->evicted[hist][type][i]); + } } static void reset_ctrl_pos(struct lruvec *lruvec, int type, bool carryover) @@ -4480,13 +4485,13 @@ static int get_tier_idx(struct lruvec *lruvec, int type) struct ctrl_pos sp, pv; /* - * To leave a margin for fluctuations, use a larger gain factor (1:2). + * To leave a margin for fluctuations, use a larger gain factor (2:3). * This value is chosen because any other tier would have at least twice * as many refaults as the first tier. */ - read_ctrl_pos(lruvec, type, 0, 1, &sp); + read_ctrl_pos(lruvec, type, 0, 2, &sp); for (tier = 1; tier < MAX_NR_TIERS; tier++) { - read_ctrl_pos(lruvec, type, tier, 2, &pv); + read_ctrl_pos(lruvec, type, tier, 3, &pv); if (!positive_ctrl_err(&sp, &pv)) break; } @@ -4494,68 +4499,34 @@ static int get_tier_idx(struct lruvec *lruvec, int type) return tier - 1; } -static int get_type_to_scan(struct lruvec *lruvec, int swappiness, int *tier_idx) +static int get_type_to_scan(struct lruvec *lruvec, int swappiness) { - int type, tier; struct ctrl_pos sp, pv; - int gain[ANON_AND_FILE] = { swappiness, MAX_SWAPPINESS - swappiness }; + if (!swappiness) + return LRU_GEN_FILE; + + if (swappiness == MAX_SWAPPINESS) + return LRU_GEN_ANON; /* - * Compare the first tier of anon with that of file to determine which - * type to scan. Also need to compare other tiers of the selected type - * with the first tier of the other type to determine the last tier (of - * the selected type) to evict. + * Compare the sum of all tiers of anon with that of file to determine + * which type to scan. */ - read_ctrl_pos(lruvec, LRU_GEN_ANON, 0, gain[LRU_GEN_ANON], &sp); - read_ctrl_pos(lruvec, LRU_GEN_FILE, 0, gain[LRU_GEN_FILE], &pv); - type = positive_ctrl_err(&sp, &pv); + read_ctrl_pos(lruvec, LRU_GEN_ANON, MAX_NR_TIERS, swappiness, &sp); + read_ctrl_pos(lruvec, LRU_GEN_FILE, MAX_NR_TIERS, MAX_SWAPPINESS - swappiness, &pv); - read_ctrl_pos(lruvec, !type, 0, gain[!type], &sp); - for (tier = 1; tier < MAX_NR_TIERS; tier++) { - read_ctrl_pos(lruvec, type, tier, gain[type], &pv); - if (!positive_ctrl_err(&sp, &pv)) - break; - } - - *tier_idx = tier - 1; - - return type; + return positive_ctrl_err(&sp, &pv); } static int isolate_folios(struct lruvec *lruvec, struct scan_control *sc, int swappiness, int *type_scanned, struct list_head *list) { int i; - int type; - int tier = -1; - DEFINE_MIN_SEQ(lruvec); - - /* - * Try to make the obvious choice first, and if anon and file are both - * available from the same generation, - * 1. Interpret swappiness 1 as file first and MAX_SWAPPINESS as anon - * first. - * 2. If !__GFP_IO, file first since clean pagecache is more likely to - * exist than clean swapcache. - */ - if (!swappiness) - type = LRU_GEN_FILE; - else if (min_seq[LRU_GEN_ANON] < min_seq[LRU_GEN_FILE]) - type = LRU_GEN_ANON; - else if (swappiness == 1) - type = LRU_GEN_FILE; - else if (swappiness == MAX_SWAPPINESS) - type = LRU_GEN_ANON; - else if (!(sc->gfp_mask & __GFP_IO)) - type = LRU_GEN_FILE; - else - type = get_type_to_scan(lruvec, swappiness, &tier); + int type = get_type_to_scan(lruvec, swappiness); for_each_evictable_type(i, swappiness) { int scanned; - - if (tier < 0) - tier = get_tier_idx(lruvec, type); + int tier = get_tier_idx(lruvec, type); *type_scanned = type; @@ -4564,7 +4535,6 @@ static int isolate_folios(struct lruvec *lruvec, struct scan_control *sc, int sw return scanned; type = !type; - tier = -1; } return 0; From patchwork Mon Dec 2 03:28:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Zhao X-Patchwork-Id: 13889939 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 1F414D49798 for ; Mon, 2 Dec 2024 03:28:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A4A026B009B; Sun, 1 Dec 2024 22:28:44 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 9D12D6B009C; Sun, 1 Dec 2024 22:28:44 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 84A886B009D; Sun, 1 Dec 2024 22:28:44 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 6081D6B009B for ; Sun, 1 Dec 2024 22:28:44 -0500 (EST) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 27280C1973 for ; Mon, 2 Dec 2024 03:28:44 +0000 (UTC) X-FDA: 82848586464.07.6314D18 Received: from mail-pf1-f201.google.com (mail-pf1-f201.google.com [209.85.210.201]) by imf03.hostedemail.com (Postfix) with ESMTP id 312262000B for ; Mon, 2 Dec 2024 03:28:36 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=IBfduiEe; spf=pass (imf03.hostedemail.com: domain of 3aSlNZwYKCDIminVOcUccUZS.QcaZWbil-aaYjOQY.cfU@flex--yuzhao.bounces.google.com designates 209.85.210.201 as permitted sender) smtp.mailfrom=3aSlNZwYKCDIminVOcUccUZS.QcaZWbil-aaYjOQY.cfU@flex--yuzhao.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1733110111; a=rsa-sha256; cv=none; b=wEuB3hpAKB8UvId0SeBqd/ToQObk6UV/yy1bUIfJ8Do5bcpzI+aKtXEfVe2iZ+4GUHKiu2 yboEs/XzW4HJClKXqSQCJH5W4G0rVPoZ7kGA969etO6+SucmtjW2LwhAAOwWSlul5zW1/6 HtAIzXdjMnZCZHde6AjkyjFaYalOCAo= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=IBfduiEe; spf=pass (imf03.hostedemail.com: domain of 3aSlNZwYKCDIminVOcUccUZS.QcaZWbil-aaYjOQY.cfU@flex--yuzhao.bounces.google.com designates 209.85.210.201 as permitted sender) smtp.mailfrom=3aSlNZwYKCDIminVOcUccUZS.QcaZWbil-aaYjOQY.cfU@flex--yuzhao.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=1733110111; 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=KW2cgcwHB51Y5IYZaisd+Bp0HxAyG3VEQ4AUms4DlWs=; b=HBGOc/3+RwPb3Zm90r5xELRTFseZX0gK7sCFZpDi6J4ucLD4a3Be+0NwzPHokdxX3MXHDG DdG2sguwoqHASZnfh1jtRj6YiGR4KOmqG+q+lRZeMuRHmq3K9gr+wj+Jlp6Q96pm87UU+h KCM1EYuaENJRwUCQ9EjzanmLmBEjwn0= Received: by mail-pf1-f201.google.com with SMTP id d2e1a72fcca58-725164ccd4dso3045532b3a.1 for ; Sun, 01 Dec 2024 19:28:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1733110121; x=1733714921; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=KW2cgcwHB51Y5IYZaisd+Bp0HxAyG3VEQ4AUms4DlWs=; b=IBfduiEenVDI36d/CIlCyWFt+KCEPJs1lLOviVV75CgDIgwFtdnFj3NxpJsDfAMAMZ VathYJ6VrpG44lz3JzDZiyVTaAF8BDf50i7MebScF71nS3Smjf1yr6KATRZqSRCGpLYU 2eOPErsp0PVSthGakWfnihRBxxhglaSx3qQqmVBryWW6L0eCztcAGCVdNUAemIxyqLgI qbLYfNw0ez8HNN8yQ1dpJwsGYJEuHy5l+lEbpqEA5LwMvICRdGNi701vSCz2WoMCcHIH FDqg7JUalhWfUyf0rGF9JtWNciw9upYepjeuQuRTzphuTka6N/ZvzcNRW/iOhgRD9dka BamA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733110121; x=1733714921; 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=KW2cgcwHB51Y5IYZaisd+Bp0HxAyG3VEQ4AUms4DlWs=; b=Y39ytAorJxMG4hhiZnJtpP1MINmcNKdsIDMHPm74GCDatNPCN7bevmDw0lbvhQit9c CUaD56LbFblh2ye57F1VKjSLThkRVBSxxVcCswrtaCYoPHEGo+O71Ju1z/DpF32INHui b4FLjfyAVZaeJgRxIqBR5ioB5UHXnm762SZKYgNK+wtPAqZzNvY6cTMuMu6LAUDE6pfv 4oRg/ue0udgUf3f4rJKadBgxYqigmGXL9Ay0cZQFDjXVigMzvNQfV8vypjESc7ti1m2q tvKPc4Pk9y8+krv6N8BBs4Lj6JO+Z94do9W/zFaBzqxQADLpvGt2LCee667og+lMVTH6 c+Ow== X-Gm-Message-State: AOJu0YzMWGL9wilNlozFJ2rueYVP6okWCY/PUeCgDNCygqmGKtwUkva7 QTLffoxvaN79/3z9WA1N9THFPbPIjREyaDnM5pn2gAfDlO3HLhCJzWOhAiCP5O5b9ThPRwWe7/o MQg== X-Google-Smtp-Source: AGHT+IGV/8vBTUsUxmc+joe52tDW4U0gAzmSevdVnbajr1Q1NEr3Inb6b68KRcu10pksEIJ78suAm86dnjs= X-Received: from plgp12.prod.google.com ([2002:a17:902:ebcc:b0:212:3f35:e4bd]) (user=yuzhao job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:2452:b0:215:609f:3f9e with SMTP id d9443c01a7336-215609f4515mr110182305ad.40.1733110121122; Sun, 01 Dec 2024 19:28:41 -0800 (PST) Date: Sun, 1 Dec 2024 20:28:22 -0700 In-Reply-To: <20241202032823.2741019-1-yuzhao@google.com> Mime-Version: 1.0 References: <20241202032823.2741019-1-yuzhao@google.com> X-Mailer: git-send-email 2.47.0.338.g60cca15819-goog Message-ID: <20241202032823.2741019-6-yuzhao@google.com> Subject: [PATCH mm-unstable v1 5/6] mm/mglru: rework refault detection From: Yu Zhao To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Yu Zhao , Kairui Song , Kalesh Singh X-Rspamd-Queue-Id: 312262000B X-Stat-Signature: 3xaodedf7par89xatcey8nm9yeuxtp7f X-Rspam-User: X-Rspamd-Server: rspam09 X-HE-Tag: 1733110116-523369 X-HE-Meta: U2FsdGVkX1/J28lnKksU8oXNzMKQM9gsJmdhi2ti6aRrFwBwg+bXkzvPH28Kex3ru04lvtbSmEgSxGteTJ6KDz6638/D3CUnsZKYjPiUrtPMGP7wrGi6vLCtNHStdMOXLRa4O/U0mxeXZ9IkQv6faTs281QBGKZD5fMHFhUUYY2DLn8xxe/bcnFiVCCuFHTI0tac4cnWxjxmC0FHz2r/kt20S5zLs/5PFkei+ooekLEJ7JqFPkdOr6vcNhc76Tgz1BUqOWkImfvO/MrEDFNqXbrqT96MGdOktd4d3lDDvOnliVfjPX/JBC8I7styGX06sU8gVsyPeG9PPLV/P9jJYS4E9R0aKanyxQVlLkbYl3GqaQZAtuTi2/Fe2aX7amTkwByW5r3uRfVX+1M4zLKZO4fwE/2VtaeH9exK+SwsQ/uf/FRNpkN2KVBT/LFVELmTMPrXvlfMiUJ0NaLEX7mT8iWJ2U7vBO0sxHX9zadlE6VDdQSuDr23jEa9I9DA/fAh8fBbJFYTCQSmtPX0mR4W1FzzJfVvT7Dzu+Z9yx7LOWaUtFfg3UzVYBWkWPbXVwST4tST6SlR3aq+7m//ceGVcVQvbqV0GE1L4tk2oYQI2vr7auTDRHlV0rE5merpoNFjvy0oyYvt9h0mOW8jv8djJNETsoc4P7UwyJVv/mFA73T+0sKOVLrYBBeQI6/EtfWmxTXdV7nQyWzieczZCtomQfdBWXUfNgBVw3y2Zxovc8qmg+BcQsmZxCmBXUto1bG2A5g6ZpfVVnMCdFAsoOD/my4rtQyI+wdbKpCRGNXXouVtcNXq4NY0WgYlIrcENP286sxutI6IZ7X0avrmp4d/GGfg+bUloo4ZiiWnWnWAnrC7F0mQUFC6naW3DByRUkMmnYMd4QLgynSmH+LPbN+7r/eAczLockL1jLZbmOTFJCOLGrKULav4cnCdZ8Bwwkz/62+9k323+qBjrwWH1eh QiTlgYxM wrYtASypMcrpaqQ2MXsw9Np3aUlbCyDzg+NDI8XKyT80SyXCgOsV4s6Sb5zfJOnlcOgyzEDRV8Mp0/ZuAkExrh9jLkEFLdU2LUhU/yGs1zbgrvyK/SLVebnao7U62mdRCJTSsEtN/qB1NSUtFh3zljGMwbPltg7u5EvgWIA9gyypvV0YQdGJDcwubTn20MmSJa11f4Rx0K30nqm0tr42CaXcnjc2kqGIJ94bSfBh0EQf9CykJ+IQEtItrFLt+8z+72kE0i4OJNWmlJKTpV85EZQA1uF8HJylDKUjEzHdneBeVDHq98AF2LZ4qzCtLzpmQcf4SefkhwZ3TktfidBohXImJAsi+BHs6J8bK+wzCwrrqw8kGeeatQl5FMiOkEE9h+suiFSfmLFWmbWXn65DTeN5X/VWcqRjo9QlkpeUqpzYSG0V3FH1YAY/+DuJlD3XAO0V1A2Bt6TlAv+50jOnUC0FJlbmyg3P3B5SZ7YvE36uxbkioTiV5xQie7hlnUf/OTWWHZOI848He81u5BJU30XyX8QKGvSL/HhM8oqLyAFxAk+W3JRgYemBp5AeOC+0UQI5DPECaFyMniiL7tVBMj0rtR6fLbmVD7XTS09pQSx5CFdM= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000778, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: With anon and file min_seq being able to move independently, rework workingset protection as well so that the comparison of refaults between anon and file is always on an equal footing. Specifically, make lru_gen_test_recent() return true for refaults happening within the distance of MAX_NR_GENS. For example, if min_seq of a type is max_seq-MIN_NR_GENS, refaults from min_seq-1, i.e., max_seq-MIN_NR_GENS-1, are also considered recent, since the distance max_seq-(max_seq-MIN_NR_GENS-1), i.e., MIN_NR_GENS+1 is less than MAX_NR_GENS. As an intermediate step to the final optimization, this change by itself should not have userspace-visiable effects beyond performance. Reported-by: Kairui Song Closes: https://lore.kernel.org/CAOUHufahuWcKf5f1Sg3emnqX+cODuR=2TQo7T4Gr-QYLujn4RA@mail.gmail.com/ Signed-off-by: Yu Zhao Tested-by: Kalesh Singh --- mm/workingset.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/mm/workingset.c b/mm/workingset.c index ad181d1b8cf1..2c310c29f51e 100644 --- a/mm/workingset.c +++ b/mm/workingset.c @@ -260,11 +260,11 @@ static void *lru_gen_eviction(struct folio *folio) * Tests if the shadow entry is for a folio that was recently evicted. * Fills in @lruvec, @token, @workingset with the values unpacked from shadow. */ -static bool lru_gen_test_recent(void *shadow, bool file, struct lruvec **lruvec, +static bool lru_gen_test_recent(void *shadow, struct lruvec **lruvec, unsigned long *token, bool *workingset) { int memcg_id; - unsigned long min_seq; + unsigned long max_seq; struct mem_cgroup *memcg; struct pglist_data *pgdat; @@ -273,8 +273,10 @@ static bool lru_gen_test_recent(void *shadow, bool file, struct lruvec **lruvec, memcg = mem_cgroup_from_id(memcg_id); *lruvec = mem_cgroup_lruvec(memcg, pgdat); - min_seq = READ_ONCE((*lruvec)->lrugen.min_seq[file]); - return (*token >> LRU_REFS_WIDTH) == (min_seq & (EVICTION_MASK >> LRU_REFS_WIDTH)); + max_seq = READ_ONCE((*lruvec)->lrugen.max_seq); + max_seq &= EVICTION_MASK >> LRU_REFS_WIDTH; + + return abs_diff(max_seq, *token >> LRU_REFS_WIDTH) < MAX_NR_GENS; } static void lru_gen_refault(struct folio *folio, void *shadow) @@ -290,7 +292,7 @@ static void lru_gen_refault(struct folio *folio, void *shadow) rcu_read_lock(); - recent = lru_gen_test_recent(shadow, type, &lruvec, &token, &workingset); + recent = lru_gen_test_recent(shadow, &lruvec, &token, &workingset); if (lruvec != folio_lruvec(folio)) goto unlock; @@ -331,7 +333,7 @@ static void *lru_gen_eviction(struct folio *folio) return NULL; } -static bool lru_gen_test_recent(void *shadow, bool file, struct lruvec **lruvec, +static bool lru_gen_test_recent(void *shadow, struct lruvec **lruvec, unsigned long *token, bool *workingset) { return false; @@ -432,8 +434,7 @@ bool workingset_test_recent(void *shadow, bool file, bool *workingset, bool recent; rcu_read_lock(); - recent = lru_gen_test_recent(shadow, file, &eviction_lruvec, - &eviction, workingset); + recent = lru_gen_test_recent(shadow, &eviction_lruvec, &eviction, workingset); rcu_read_unlock(); return recent; } From patchwork Mon Dec 2 03:28:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Zhao X-Patchwork-Id: 13889956 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 AD810D4979B for ; Mon, 2 Dec 2024 03:28:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D7D606B009F; Sun, 1 Dec 2024 22:28:47 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D080A6B00A0; Sun, 1 Dec 2024 22:28:47 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B578C6B00A1; Sun, 1 Dec 2024 22:28:47 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 916126B009F for ; Sun, 1 Dec 2024 22:28:47 -0500 (EST) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 1D8E514096C for ; Mon, 2 Dec 2024 03:28:47 +0000 (UTC) X-FDA: 82848586506.27.053E273 Received: from mail-pf1-f202.google.com (mail-pf1-f202.google.com [209.85.210.202]) by imf02.hostedemail.com (Postfix) with ESMTP id 6D3DD80017 for ; Mon, 2 Dec 2024 03:28:23 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=BrOqkAXa; spf=pass (imf02.hostedemail.com: domain of 3bClNZwYKCDUplqYRfXffXcV.TfdcZelo-ddbmRTb.fiX@flex--yuzhao.bounces.google.com designates 209.85.210.202 as permitted sender) smtp.mailfrom=3bClNZwYKCDUplqYRfXffXcV.TfdcZelo-ddbmRTb.fiX@flex--yuzhao.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1733110114; a=rsa-sha256; cv=none; b=ezOhqodslHgXsstuJlgneUkkhWzdmdvBhwxqR/xnm8oh9oSbOvyZDpxMFwM5yet0gXjd18 XvX1WV+kLWV6lp175b3ZgMbHW7BIvyPdfM4LULjPfSaE8xCMwI/RbfQb5AJFEOrx8edZFF x5kpL+jCVSorKoQpFjoPPyoxJjvXpso= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=BrOqkAXa; spf=pass (imf02.hostedemail.com: domain of 3bClNZwYKCDUplqYRfXffXcV.TfdcZelo-ddbmRTb.fiX@flex--yuzhao.bounces.google.com designates 209.85.210.202 as permitted sender) smtp.mailfrom=3bClNZwYKCDUplqYRfXffXcV.TfdcZelo-ddbmRTb.fiX@flex--yuzhao.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=1733110114; 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=BvWndkZRxUQKcSNfCHGoPvm0GSvrs+kEGSE2WqldNLQ=; b=S6TM4JnI7UZTzvjXI3g4KyhoKkCBRyeSWRIEb590iz2inFyWCvDRIcu9ooEV6OY3d9mXNJ PIH7llUxf6ONhvWQ+joUd6N6ikI8M8/EaMz4fd44MPq7FD4JF7L6JB+6GuYz1SB4c59QzR bGauy6zIJOIHLsM4Ze0LXu1m4aMEwz0= Received: by mail-pf1-f202.google.com with SMTP id d2e1a72fcca58-724f7c09c58so3438182b3a.3 for ; Sun, 01 Dec 2024 19:28:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1733110124; x=1733714924; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=BvWndkZRxUQKcSNfCHGoPvm0GSvrs+kEGSE2WqldNLQ=; b=BrOqkAXaTOubPtPg5q/BTfaifUWhKDTvdQ0VBZN9qGT5wtsJ8ZmA4joZ0xS8S60vIo icc7m/wiI1C5iWCnw9U05HjXHnmwnUNFF08ZstsUCeEFFpcHJyeqnuBkcP2MTee9SX/N 8BLGzilC773NLwsZPnIJc4zkM4k/2AEHkbSzaZazTu1XBsjWvQNYSQOqmzXJ4jdRyYm0 2cqHENFFsOJJNCXdBodKkEZgYZiHMkcEiaNR+RM0o4TmtUALuTrnSiCiyEKfZR4uTpBE UQYovehtXfckfuP+ZyQjZrMr1joYde9q1jzYNG/JQqKkNfzEK5n/TR8bVkueij1RliXO z3bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733110124; x=1733714924; 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=BvWndkZRxUQKcSNfCHGoPvm0GSvrs+kEGSE2WqldNLQ=; b=UeNNGzPnOxxNUoShDim3WRaW0kSNmotL6LEMnCptF8z7V6lBFmsxrzS2eOh07vs8l3 iAov/f6qKLSREVoiH7VrM9lD5fR7QO4E+0T4QPNSR1ZwpdzT5thoYuHBSTibDqpmY4Ov Ru7Cp/zbfFzDYnjw2WNmNtLut/rzaj9FTVS1HZweZpxzVoQ8Y9rW2p9Wmb6uvLa5OHSI TD9WhcEUMiSlpDzy84b4uhaj96bPItpO6V8Ud+kogFmr+/gYUjUoKBz9jorFnPo00+IN Zkkp3Vvad20J3kqJYnhH7mBgeeu5TPjPs48PHrR88U9qAfejYm/qtpEm1XZppkVQ8TRu Kw7Q== X-Gm-Message-State: AOJu0YyVcaDv8DaD4RMJ7tLAx7ui9dUV5FFdBiJZZuQlFNU5a4OVOTfw G6QKiZ/SNO2yJXnim6fMEBkyExS+764zw1EAhiQ9R1ZAWs66yFVeAw6ucnUPfVysP8OXWKy55ST oew== X-Google-Smtp-Source: AGHT+IGJfXFyJDfTnw8syjDzCFP5jl4QJOglLlAZddTWEdrxEee7GkBEtJ1pnnBYF/Jy386iMe6GpXcCDI4= X-Received: from pfxa23.prod.google.com ([2002:a05:6a00:1d17:b0:724:f837:b7ee]) (user=yuzhao job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:1a8b:b0:724:fcff:505b with SMTP id d2e1a72fcca58-7253007218fmr28839036b3a.14.1733110124020; Sun, 01 Dec 2024 19:28:44 -0800 (PST) Date: Sun, 1 Dec 2024 20:28:23 -0700 In-Reply-To: <20241202032823.2741019-1-yuzhao@google.com> Mime-Version: 1.0 References: <20241202032823.2741019-1-yuzhao@google.com> X-Mailer: git-send-email 2.47.0.338.g60cca15819-goog Message-ID: <20241202032823.2741019-7-yuzhao@google.com> Subject: [PATCH mm-unstable v1 6/6] mm/mglru: rework workingset protection From: Yu Zhao To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Yu Zhao , Kairui Song , Kalesh Singh X-Rspamd-Queue-Id: 6D3DD80017 X-Stat-Signature: tfdxw17a1frteaq6u9s9fi8jnud7xntw X-Rspam-User: X-Rspamd-Server: rspam09 X-HE-Tag: 1733110103-5498 X-HE-Meta: U2FsdGVkX1/pj619VR8GZuJY6bQoB91RzhqQSuGtrb1J0BFndVutkAcMCdUigglGMiTL+T5PaqxVDDe8f8weR6D2B44dRJjwbP4AASNInNMiPkPEiSsZC6qHdAK5wl8JUrkPsG+2FvJjaSbzjcYeB4dj8EaFuq/TwtGmZef68/YuY9kroISO7CQUa9oYV/lKVrwmL6gRBBxRfauxcqk31NHePseJ0Fg4mkANj4kg/6ZXA2jBJAQ2bdayMinhyZvKYUxKF+g1zJ0i5TnCCPtNE/CQddCDuXj78sxQzYHFtb+cVy+6l6JU25pZYxfXmxfyVLfCIMKvUyrPGZwtGN07dd5kXziv0+opLw5FowRG1WAlE10dlw0emjr6/TMFrbfIVqbyCQ/8kSNdMs+MqXBLHj2ZsnVbKalJlpXil/js7lFYWJ/DjYtOFpclRRLB0kGYe917Cs/q1oJGiyb71ow3TZaCrJJXzHdG2H5h2Xbw2vXAMWTgaIvUWSAmLY/wqeXs6f7uKEoJTEwauT4LJugBsjZp2pR2eKf7WXenXqgVfxIVIjYjlIIcDEzMMMhiYtw4gy2entubNwDEOQ0IyaNXS4qsIzYJcDuGTYBZs9hcAEQnjpZZl3KXWN8LcxQ0Q+rkQDrXKbKXEn0FGhc5oxgSVa5pO6M8W78pX2bnv6GlHww/9tBSMaKe0WoCmjfspYonjgFLlb197P4eBPCubm7qVvHC3CUXJRN5ABCsn0zRIa8b8Fc4B8sdF/x1WzKgNOgcXxU0yrPOa9xd6P/iXU3IDBiS+sfzJzOVSRA1xOqOV+UkLn2pk44bmIlU2Xyvy73MX7QAJRcV8deEul7AJbR9j60EFsUID4i3n8s0aVvIgL6PRvQ+vHaglpiq7hcJPf/40RjzD5kptkJma3GzmAP0g6fRLVVRlg/iyq1Ka9wP3e3Af+ZOXtdWJkh07VGDvINjMnoN3YeAPEgN+PWEUyB Drpe7P2m 05xzMeDZrvVioBGPZkywllosivsRMYV4+V/NWhmrP1AlzoOf+3aPkWQrnT741e8V/bV05KXo+dhELd0g+Kk7UzmRRB9Z/GCzTfvMzdEMgu+WTs5lHHXOjxc6ej6bZvg+h3QQm/e0p5jvdueZKLch1NjaUUISjxdNu7U4SEMCPgMvQnkQcsvONM+mh3YkT4AdIPocesFJXiwsBLKNlVrjIgSFAPYtqdynOnKFqAOFOMpzQYn6vTfpsU7mGpU9LpTDvwxlbmzbHDeaFtkMVZXsytQWaKpu5UhVTJ7q0WO5wTqdAo6GVrs3/tGMq8dXWrKlrE1sOcRksjMSRgCBl3QwAKY1UKaegzucFXylYLW65zd2zayvg0up5CUHIa1z/lWbDOOWEqYeBYj9x64JLuhy/iWlm/dCw1+dx3zgc/nD7TJ6fWv913jjngjxlauRQCiDdJf0m93xf+DfLsBI+5y/gVe2SktZ/4Zc/ghALrTmGTG1CPmYuZEj7CTUhvsH6g4xmgIrxRwE9TLBl4PX2YePAW2dvr57jxboSE/ANsuIaW69y2gZfFK2DZRmQ+7HAUevkYLP3yc18YZINMCVEA21fgaFGQzigZNVSbij+6dala40swkw= 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: List-Subscribe: List-Unsubscribe: With the aging feedback no longer considering the distribution of folios in each generation, rework workingset protection to better distribute folios across MAX_NR_GENS. This is achieved by reusing PG_workingset and PG_referenced/LRU_REFS_FLAGS in a slightly different way. For folios accessed multiple times through file descriptors, make lru_gen_inc_refs() set additional bits of LRU_REFS_WIDTH in folio->flags after PG_referenced, then PG_workingset after LRU_REFS_WIDTH. After all its bits are set, i.e., LRU_REFS_FLAGS|BIT(PG_workingset), a folio is lazily promoted into the second oldest generation (min_seq+1) in the eviction path. And when folio_inc_gen() does that, it clears LRU_REFS_FLAGS so that lru_gen_inc_refs() can start over. For this case, LRU_REFS_MASK is only valid when PG_referenced is set. For folios accessed multiple times through page tables, folio_update_gen() from a page table walk or lru_gen_set_refs() from a rmap walk sets PG_referenced after the accessed bit is cleared for the first time. Thereafter, those two paths set PG_workingset and promote folios to the youngest generation. Like folio_inc_gen(), folio_update_gen() also clears PG_referenced. For this case, LRU_REFS_MASK is not used. For both cases above, after PG_workingset is set on a folio, it remains until this folio is either reclaimed, or "deactivated" by lru_gen_clear_refs(). It can be set again if lru_gen_test_recent() returns true upon a refault. When adding folios to the LRU lists, lru_gen_distance() distributes them as follows: +---------------------------------+---------------------------------+ | Accessed thru page tables | Accessed thru file descriptors | +---------------------------------+---------------------------------+ | PG_active (set while isolated) | | +----------------+----------------+----------------+----------------+ | PG_workingset | PG_referenced | PG_workingset | LRU_REFS_FLAGS | +---------------------------------+---------------------------------+ |<--------- MIN_NR_GENS --------->| | |<-------------------------- MAX_NR_GENS -------------------------->| After this patch, some typical client and server workloads showed improvements under heavy memory pressure. For example, Python TPC-C, which was used to benchmark a different approach [1] to better detect refault distances, showed a significant decrease in total refaults: Before After Change Time (seconds) 10801 10801 0% Executed (transactions) 41472 43663 +5% workingset_nodes 109070 120244 +10% workingset_refault_anon 5019627 7281831 +45% workingset_refault_file 1294678786 554855564 -57% workingset_refault_total 1299698413 562137395 -57% [1] https://lore.kernel.org/20230920190244.16839-1-ryncsn@gmail.com/ Reported-by: Kairui Song Closes: https://lore.kernel.org/CAOUHufahuWcKf5f1Sg3emnqX+cODuR=2TQo7T4Gr-QYLujn4RA@mail.gmail.com/ Signed-off-by: Yu Zhao Tested-by: Kalesh Singh --- include/linux/mm_inline.h | 94 +++++++++++++------------ include/linux/mmzone.h | 82 +++++++++++++--------- mm/swap.c | 23 +++--- mm/vmscan.c | 142 +++++++++++++++++++++++--------------- mm/workingset.c | 31 ++++----- 5 files changed, 211 insertions(+), 161 deletions(-) diff --git a/include/linux/mm_inline.h b/include/linux/mm_inline.h index 1b6a917fffa4..adc879c3e19f 100644 --- a/include/linux/mm_inline.h +++ b/include/linux/mm_inline.h @@ -133,31 +133,25 @@ static inline int lru_hist_from_seq(unsigned long seq) return seq % NR_HIST_GENS; } -static inline int lru_tier_from_refs(int refs) +static inline int lru_tier_from_refs(int refs, bool workingset) { VM_WARN_ON_ONCE(refs > BIT(LRU_REFS_WIDTH)); - /* see the comment in folio_lru_refs() */ - return order_base_2(refs + 1); + /* see the comment on MAX_NR_TIERS */ + return workingset ? MAX_NR_TIERS - 1 : order_base_2(refs); } static inline int folio_lru_refs(struct folio *folio) { unsigned long flags = READ_ONCE(folio->flags); - bool workingset = flags & BIT(PG_workingset); + if (!(flags & BIT(PG_referenced))) + return 0; /* - * Return the number of accesses beyond PG_referenced, i.e., N-1 if the - * total number of accesses is N>1, since N=0,1 both map to the first - * tier. lru_tier_from_refs() will account for this off-by-one. Also see - * the comment on MAX_NR_TIERS. + * Return the total number of accesses including PG_referenced. Also see + * the comment on LRU_REFS_FLAGS. */ - return ((flags & LRU_REFS_MASK) >> LRU_REFS_PGOFF) + workingset; -} - -static inline void folio_clear_lru_refs(struct folio *folio) -{ - set_mask_bits(&folio->flags, LRU_REFS_MASK | LRU_REFS_FLAGS, 0); + return ((flags & LRU_REFS_MASK) >> LRU_REFS_PGOFF) + 1; } static inline int folio_lru_gen(struct folio *folio) @@ -223,11 +217,46 @@ static inline void lru_gen_update_size(struct lruvec *lruvec, struct folio *foli VM_WARN_ON_ONCE(lru_gen_is_active(lruvec, old_gen) && !lru_gen_is_active(lruvec, new_gen)); } +static inline int lru_gen_distance(struct folio *folio, bool reclaiming) +{ + /* + * Distance until eviction (larger values provide stronger protection): + * +-------------------------------------+-------------------------------------+ + * | Accessed through page tables and | Accessed through file descriptors | + * | promoted by folio_update_gen() | and protected by folio_inc_gen() | + * +-------------------------------------+-------------------------------------+ + * | PG_active (only set while isolated) | | + * +------------------+------------------+------------------+------------------+ + * | PG_workingset | PG_referenced | PG_workingset | LRU_REFS_FLAGS | + * +-------------------------------------+-------------------------------------+ + * | 3 | 2 | 1 | 0 | + * +-------------------------------------+-------------------------------------+ + * |<----------- MIN_NR_GENS ----------->| | + * |<------------------------------ MAX_NR_GENS ------------------------------>| + */ + if (reclaiming) + return 0; + + if (folio_test_active(folio)) + return MIN_NR_GENS + folio_test_workingset(folio); + + if (folio_test_workingset(folio)) + return MIN_NR_GENS - 1; + + if (!folio_is_file_lru(folio) && !folio_test_swapcache(folio)) + return MIN_NR_GENS - 1; + + if (folio_test_reclaim(folio) && (folio_test_dirty(folio) || folio_test_writeback(folio))) + return MIN_NR_GENS - 1; + + return 0; +} + static inline bool lru_gen_add_folio(struct lruvec *lruvec, struct folio *folio, bool reclaiming) { + int dist; unsigned long seq; unsigned long flags; - unsigned long mask; int gen = folio_lru_gen(folio); int type = folio_is_file_lru(folio); int zone = folio_zonenum(folio); @@ -237,40 +266,17 @@ static inline bool lru_gen_add_folio(struct lruvec *lruvec, struct folio *folio, if (folio_test_unevictable(folio) || !lrugen->enabled) return false; - /* - * There are four common cases for this page: - * 1. If it's hot, i.e., freshly faulted in, add it to the youngest - * generation, and it's protected over the rest below. - * 2. If it can't be evicted immediately, i.e., a dirty page pending - * writeback, add it to the second youngest generation. - * 3. If it should be evicted first, e.g., cold and clean from - * folio_rotate_reclaimable(), add it to the oldest generation. - * 4. Everything else falls between 2 & 3 above and is added to the - * second oldest generation if it's considered inactive, or the - * oldest generation otherwise. See lru_gen_is_active(). - */ - if (folio_test_active(folio)) - seq = lrugen->max_seq; - else if ((type == LRU_GEN_ANON && !folio_test_swapcache(folio)) || - (folio_test_reclaim(folio) && - (folio_test_dirty(folio) || folio_test_writeback(folio)))) - seq = lrugen->max_seq - 1; - else if (reclaiming || lrugen->min_seq[type] + MIN_NR_GENS >= lrugen->max_seq) - seq = lrugen->min_seq[type]; + + dist = lru_gen_distance(folio, reclaiming); + if (dist < MIN_NR_GENS) + seq = lrugen->min_seq[type] + dist; else - seq = lrugen->min_seq[type] + 1; + seq = lrugen->max_seq + dist - MIN_NR_GENS - 1; gen = lru_gen_from_seq(seq); flags = (gen + 1UL) << LRU_GEN_PGOFF; /* see the comment on MIN_NR_GENS about PG_active */ - mask = LRU_GEN_MASK; - /* - * Don't clear PG_workingset here because it can affect PSI accounting - * if the activation is due to workingset refault. - */ - if (folio_test_active(folio)) - mask |= LRU_REFS_MASK | BIT(PG_referenced) | BIT(PG_active); - set_mask_bits(&folio->flags, mask, flags); + set_mask_bits(&folio->flags, LRU_GEN_MASK | BIT(PG_active), flags); lru_gen_update_size(lruvec, folio, -1, gen); /* for folio_rotate_reclaimable() */ diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index b998ccc5c341..28f6f5b40dba 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -332,66 +332,88 @@ enum lruvec_flags { #endif /* !__GENERATING_BOUNDS_H */ /* - * Evictable pages are divided into multiple generations. The youngest and the + * Evictable folios are divided into multiple generations. The youngest and the * oldest generation numbers, max_seq and min_seq, are monotonically increasing. * They form a sliding window of a variable size [MIN_NR_GENS, MAX_NR_GENS]. An * offset within MAX_NR_GENS, i.e., gen, indexes the LRU list of the * corresponding generation. The gen counter in folio->flags stores gen+1 while - * a page is on one of lrugen->folios[]. Otherwise it stores 0. + * a folio is on one of lrugen->folios[]. Otherwise it stores 0. * - * A page is added to the youngest generation on faulting. The aging needs to - * check the accessed bit at least twice before handing this page over to the - * eviction. The first check takes care of the accessed bit set on the initial - * fault; the second check makes sure this page hasn't been used since then. - * This process, AKA second chance, requires a minimum of two generations, - * hence MIN_NR_GENS. And to maintain ABI compatibility with the active/inactive - * LRU, e.g., /proc/vmstat, these two generations are considered active; the - * rest of generations, if they exist, are considered inactive. See - * lru_gen_is_active(). + * After a folio is faulted in, the aging needs to check the accessed bit at + * least twice before handing this folio over to the eviction. The first check + * clears the accessed bit from the initial fault; the second check makes sure + * this folio hasn't been used since then. This process, AKA second chance, + * requires a minimum of two generations, hence MIN_NR_GENS. And to maintain ABI + * compatibility with the active/inactive LRU, e.g., /proc/vmstat, these two + * generations are considered active; the rest of generations, if they exist, + * are considered inactive. See lru_gen_is_active(). * - * PG_active is always cleared while a page is on one of lrugen->folios[] so - * that the aging needs not to worry about it. And it's set again when a page - * considered active is isolated for non-reclaiming purposes, e.g., migration. - * See lru_gen_add_folio() and lru_gen_del_folio(). + * PG_active is always cleared while a folio is on one of lrugen->folios[] so + * that the sliding window needs not to worry about it. And it's set again when + * a folio considered active is isolated for non-reclaiming purposes, e.g., + * migration. See lru_gen_add_folio() and lru_gen_del_folio(). * * MAX_NR_GENS is set to 4 so that the multi-gen LRU can support twice the * number of categories of the active/inactive LRU when keeping track of * accesses through page tables. This requires order_base_2(MAX_NR_GENS+1) bits - * in folio->flags. + * in folio->flags, masked by LRU_GEN_MASK. */ #define MIN_NR_GENS 2U #define MAX_NR_GENS 4U /* - * Each generation is divided into multiple tiers. A page accessed N times - * through file descriptors is in tier order_base_2(N). A page in the first tier - * (N=0,1) is marked by PG_referenced unless it was faulted in through page - * tables or read ahead. A page in any other tier (N>1) is marked by - * PG_referenced and PG_workingset. This implies a minimum of two tiers is - * supported without using additional bits in folio->flags. + * Each generation is divided into multiple tiers. A folio accessed N times + * through file descriptors is in tier order_base_2(N). A folio in the first + * tier (N=0,1) is marked by PG_referenced unless it was faulted in through page + * tables or read ahead. A folio in the last tier (MAX_NR_TIERS-1) is marked by + * PG_workingset. A folio in any other tier (1flags. * * In contrast to moving across generations which requires the LRU lock, moving * across tiers only involves atomic operations on folio->flags and therefore * has a negligible cost in the buffered access path. In the eviction path, - * comparisons of refaulted/(evicted+protected) from the first tier and the - * rest infer whether pages accessed multiple times through file descriptors - * are statistically hot and thus worth protecting. + * comparisons of refaulted/(evicted+protected) from the first tier and the rest + * infer whether folios accessed multiple times through file descriptors are + * statistically hot and thus worth protecting. * * MAX_NR_TIERS is set to 4 so that the multi-gen LRU can support twice the * number of categories of the active/inactive LRU when keeping track of * accesses through file descriptors. This uses MAX_NR_TIERS-2 spare bits in - * folio->flags. + * folio->flags, masked by LRU_REFS_MASK. */ #define MAX_NR_TIERS 4U #ifndef __GENERATING_BOUNDS_H -struct lruvec; -struct page_vma_mapped_walk; - #define LRU_GEN_MASK ((BIT(LRU_GEN_WIDTH) - 1) << LRU_GEN_PGOFF) #define LRU_REFS_MASK ((BIT(LRU_REFS_WIDTH) - 1) << LRU_REFS_PGOFF) +/* + * For folios accessed multiple times through file descriptors, + * lru_gen_inc_refs() sets additional bits of LRU_REFS_WIDTH in folio->flags + * after PG_referenced, then PG_workingset after LRU_REFS_WIDTH. After all its + * bits are set, i.e., LRU_REFS_FLAGS|BIT(PG_workingset), a folio is lazily + * promoted into the second oldest generation (min_seq+1) in the eviction path. + * And when folio_inc_gen() does that, it clears LRU_REFS_FLAGS so that + * lru_gen_inc_refs() can start over. Note that for this case, LRU_REFS_MASK is + * only valid when PG_referenced is set. + * + * For folios accessed multiple times through page tables, folio_update_gen() + * from a page table walk or lru_gen_set_refs() from a rmap walk sets + * PG_referenced after the accessed bit is cleared for the first time. + * Thereafter, those two paths set PG_workingset and promote folios to the + * youngest generation. Like folio_inc_gen(), folio_update_gen() also clears + * PG_referenced. Note that for this case, LRU_REFS_MASK is not used. + * + * For both cases above, after PG_workingset is set on a folio, it remains until + * this folio is either reclaimed, or "deactivated" by lru_gen_clear_refs(). It + * can be set again if lru_gen_test_recent() returns true upon a refault. + */ +#define LRU_REFS_FLAGS (LRU_REFS_MASK | BIT(PG_referenced)) + +struct lruvec; +struct page_vma_mapped_walk; + #ifdef CONFIG_LRU_GEN enum { @@ -406,8 +428,6 @@ enum { NR_LRU_GEN_CAPS }; -#define LRU_REFS_FLAGS (BIT(PG_referenced) | BIT(PG_workingset)) - #define MIN_LRU_BATCH BITS_PER_LONG #define MAX_LRU_BATCH (MIN_LRU_BATCH * 64) diff --git a/mm/swap.c b/mm/swap.c index 15a94be8b0af..320b959b74c6 100644 --- a/mm/swap.c +++ b/mm/swap.c @@ -387,24 +387,19 @@ static void lru_gen_inc_refs(struct folio *folio) if (folio_test_unevictable(folio)) return; + /* see the comment on LRU_REFS_FLAGS */ if (!folio_test_referenced(folio)) { - folio_set_referenced(folio); + set_mask_bits(&folio->flags, LRU_REFS_MASK, BIT(PG_referenced)); return; } - if (!folio_test_workingset(folio)) { - folio_set_workingset(folio); - return; - } - - /* see the comment on MAX_NR_TIERS */ do { - new_flags = old_flags & LRU_REFS_MASK; - if (new_flags == LRU_REFS_MASK) - break; + if ((old_flags & LRU_REFS_MASK) == LRU_REFS_MASK) { + folio_set_workingset(folio); + return; + } - new_flags += BIT(LRU_REFS_PGOFF); - new_flags |= old_flags & ~LRU_REFS_MASK; + new_flags = old_flags + BIT(LRU_REFS_PGOFF); } while (!try_cmpxchg(&folio->flags, &old_flags, new_flags)); } @@ -414,7 +409,7 @@ static bool lru_gen_clear_refs(struct folio *folio) int type = folio_is_file_lru(folio); struct lru_gen_folio *lrugen = &folio_lruvec(folio)->lrugen; - set_mask_bits(&folio->flags, LRU_REFS_MASK | LRU_REFS_FLAGS, 0); + set_mask_bits(&folio->flags, LRU_REFS_FLAGS | BIT(PG_workingset), 0); /* whether can do without shuffling under the LRU lock */ return gen == lru_gen_from_seq(READ_ONCE(lrugen->min_seq[type])); @@ -495,7 +490,7 @@ void folio_add_lru(struct folio *folio) folio_test_unevictable(folio), folio); VM_BUG_ON_FOLIO(folio_test_lru(folio), folio); - /* see the comment in lru_gen_add_folio() */ + /* see the comment in lru_gen_distance() */ if (lru_gen_enabled() && !folio_test_unevictable(folio) && lru_gen_in_fault() && !(current->flags & PF_MEMALLOC)) folio_set_active(folio); diff --git a/mm/vmscan.c b/mm/vmscan.c index 307ae8b03d0d..826b459e1880 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -862,6 +862,31 @@ enum folio_references { FOLIOREF_ACTIVATE, }; +#ifdef CONFIG_LRU_GEN +/* + * Only used on a mapped folio in the eviction (rmap walk) path, where promotion + * needs to be done by taking the folio off the LRU list and then adding it back + * with PG_active set. In contrast, the aging (page table walk) path uses + * folio_update_gen(). + */ +static bool lru_gen_set_refs(struct folio *folio) +{ + /* see the comment on LRU_REFS_FLAGS */ + if (!folio_test_referenced(folio) && !folio_test_workingset(folio)) { + set_mask_bits(&folio->flags, LRU_REFS_MASK, BIT(PG_referenced)); + return false; + } + + set_mask_bits(&folio->flags, LRU_REFS_FLAGS, BIT(PG_workingset)); + return true; +} +#else +static bool lru_gen_set_refs(struct folio *folio) +{ + return false; +} +#endif /* CONFIG_LRU_GEN */ + static enum folio_references folio_check_references(struct folio *folio, struct scan_control *sc) { @@ -870,7 +895,6 @@ static enum folio_references folio_check_references(struct folio *folio, referenced_ptes = folio_referenced(folio, 1, sc->target_mem_cgroup, &vm_flags); - referenced_folio = folio_test_clear_referenced(folio); /* * The supposedly reclaimable folio was found to be in a VM_LOCKED vma. @@ -888,6 +912,16 @@ static enum folio_references folio_check_references(struct folio *folio, if (referenced_ptes == -1) return FOLIOREF_KEEP; + if (lru_gen_enabled()) { + if (!referenced_ptes) + return FOLIOREF_RECLAIM; + + lru_gen_set_refs(folio); + return FOLIOREF_ACTIVATE; + } + + referenced_folio = folio_test_clear_referenced(folio); + if (referenced_ptes) { /* * All mapped folios start out with page table @@ -1092,11 +1126,6 @@ static unsigned int shrink_folio_list(struct list_head *folio_list, if (!sc->may_unmap && folio_mapped(folio)) goto keep_locked; - /* folio_update_gen() tried to promote this page? */ - if (lru_gen_enabled() && !ignore_references && - folio_mapped(folio) && folio_test_referenced(folio)) - goto keep_locked; - /* * The number of dirty pages determines if a node is marked * reclaim_congested. kswapd will stall and start writing @@ -3163,16 +3192,19 @@ static int folio_update_gen(struct folio *folio, int gen) VM_WARN_ON_ONCE(gen >= MAX_NR_GENS); + /* see the comment on LRU_REFS_FLAGS */ + if (!folio_test_referenced(folio) && !folio_test_workingset(folio)) { + set_mask_bits(&folio->flags, LRU_REFS_MASK, BIT(PG_referenced)); + return -1; + } + do { /* lru_gen_del_folio() has isolated this page? */ - if (!(old_flags & LRU_GEN_MASK)) { - /* for shrink_folio_list() */ - new_flags = old_flags | BIT(PG_referenced); - continue; - } + if (!(old_flags & LRU_GEN_MASK)) + return -1; - new_flags = old_flags & ~(LRU_GEN_MASK | LRU_REFS_MASK | LRU_REFS_FLAGS); - new_flags |= (gen + 1UL) << LRU_GEN_PGOFF; + new_flags = old_flags & ~(LRU_GEN_MASK | LRU_REFS_FLAGS); + new_flags |= ((gen + 1UL) << LRU_GEN_PGOFF) | BIT(PG_workingset); } while (!try_cmpxchg(&folio->flags, &old_flags, new_flags)); return ((old_flags & LRU_GEN_MASK) >> LRU_GEN_PGOFF) - 1; @@ -3196,7 +3228,7 @@ static int folio_inc_gen(struct lruvec *lruvec, struct folio *folio, bool reclai new_gen = (old_gen + 1) % MAX_NR_GENS; - new_flags = old_flags & ~(LRU_GEN_MASK | LRU_REFS_MASK | LRU_REFS_FLAGS); + new_flags = old_flags & ~(LRU_GEN_MASK | LRU_REFS_FLAGS); new_flags |= (new_gen + 1UL) << LRU_GEN_PGOFF; /* for folio_end_writeback() */ if (reclaiming) @@ -3374,9 +3406,11 @@ static unsigned long get_pmd_pfn(pmd_t pmd, struct vm_area_struct *vma, unsigned static struct folio *get_pfn_folio(unsigned long pfn, struct mem_cgroup *memcg, struct pglist_data *pgdat) { - struct folio *folio; + struct folio *folio = pfn_folio(pfn); + + if (folio_lru_gen(folio) < 0) + return NULL; - folio = pfn_folio(pfn); if (folio_nid(folio) != pgdat->node_id) return NULL; @@ -3753,8 +3787,7 @@ static bool inc_min_seq(struct lruvec *lruvec, int type, int swappiness) while (!list_empty(head)) { struct folio *folio = lru_to_folio(head); int refs = folio_lru_refs(folio); - int tier = lru_tier_from_refs(refs); - int delta = folio_nr_pages(folio); + bool workingset = folio_test_workingset(folio); VM_WARN_ON_ONCE_FOLIO(folio_test_unevictable(folio), folio); VM_WARN_ON_ONCE_FOLIO(folio_test_active(folio), folio); @@ -3764,8 +3797,14 @@ static bool inc_min_seq(struct lruvec *lruvec, int type, int swappiness) new_gen = folio_inc_gen(lruvec, folio, false); list_move_tail(&folio->lru, &lrugen->folios[new_gen][type][zone]); - WRITE_ONCE(lrugen->protected[hist][type][tier], - lrugen->protected[hist][type][tier] + delta); + /* don't count the workingset being lazily promoted */ + if (refs + workingset != BIT(LRU_REFS_WIDTH) + 1) { + int tier = lru_tier_from_refs(refs, workingset); + int delta = folio_nr_pages(folio); + + WRITE_ONCE(lrugen->protected[hist][type][tier], + lrugen->protected[hist][type][tier] + delta); + } if (!--remaining) return false; @@ -4138,12 +4177,10 @@ bool lru_gen_look_around(struct page_vma_mapped_walk *pvmw) continue; } - old_gen = folio_lru_gen(folio); - if (old_gen < 0) - folio_set_referenced(folio); - else if (old_gen != new_gen) { - folio_clear_lru_refs(folio); - folio_activate(folio); + if (lru_gen_set_refs(folio)) { + old_gen = folio_lru_gen(folio); + if (old_gen >= 0 && old_gen != new_gen) + folio_activate(folio); } } @@ -4304,7 +4341,8 @@ static bool sort_folio(struct lruvec *lruvec, struct folio *folio, struct scan_c int zone = folio_zonenum(folio); int delta = folio_nr_pages(folio); int refs = folio_lru_refs(folio); - int tier = lru_tier_from_refs(refs); + bool workingset = folio_test_workingset(folio); + int tier = lru_tier_from_refs(refs, workingset); struct lru_gen_folio *lrugen = &lruvec->lrugen; VM_WARN_ON_ONCE_FOLIO(gen >= MAX_NR_GENS, folio); @@ -4326,14 +4364,17 @@ static bool sort_folio(struct lruvec *lruvec, struct folio *folio, struct scan_c } /* protected */ - if (tier > tier_idx || refs == BIT(LRU_REFS_WIDTH)) { - int hist = lru_hist_from_seq(lrugen->min_seq[type]); - + if (tier > tier_idx || refs + workingset == BIT(LRU_REFS_WIDTH) + 1) { gen = folio_inc_gen(lruvec, folio, false); - list_move_tail(&folio->lru, &lrugen->folios[gen][type][zone]); + list_move(&folio->lru, &lrugen->folios[gen][type][zone]); - WRITE_ONCE(lrugen->protected[hist][type][tier], - lrugen->protected[hist][type][tier] + delta); + /* don't count the workingset being lazily promoted */ + if (refs + workingset != BIT(LRU_REFS_WIDTH) + 1) { + int hist = lru_hist_from_seq(lrugen->min_seq[type]); + + WRITE_ONCE(lrugen->protected[hist][type][tier], + lrugen->protected[hist][type][tier] + delta); + } return true; } @@ -4353,8 +4394,7 @@ static bool sort_folio(struct lruvec *lruvec, struct folio *folio, struct scan_c } /* waiting for writeback */ - if (folio_test_locked(folio) || writeback || - (type == LRU_GEN_FILE && dirty)) { + if (writeback || (type == LRU_GEN_FILE && dirty)) { gen = folio_inc_gen(lruvec, folio, true); list_move(&folio->lru, &lrugen->folios[gen][type][zone]); return true; @@ -4383,13 +4423,12 @@ static bool isolate_folio(struct lruvec *lruvec, struct folio *folio, struct sca return false; } - /* see the comment on MAX_NR_TIERS */ + /* see the comment on LRU_REFS_FLAGS */ if (!folio_test_referenced(folio)) - folio_clear_lru_refs(folio); + set_mask_bits(&folio->flags, LRU_REFS_MASK, 0); /* for shrink_folio_list() */ folio_clear_reclaim(folio); - folio_clear_referenced(folio); success = lru_gen_del_folio(lruvec, folio, true); VM_WARN_ON_ONCE_FOLIO(!success, folio); @@ -4585,25 +4624,16 @@ static int evict_folios(struct lruvec *lruvec, struct scan_control *sc, int swap continue; } - if (folio_test_reclaim(folio) && - (folio_test_dirty(folio) || folio_test_writeback(folio))) { - /* restore LRU_REFS_FLAGS cleared by isolate_folio() */ - if (folio_test_workingset(folio)) - folio_set_referenced(folio); - continue; - } - - if (skip_retry || folio_test_active(folio) || folio_test_referenced(folio) || - folio_mapped(folio) || folio_test_locked(folio) || - folio_test_dirty(folio) || folio_test_writeback(folio)) { - /* don't add rejected folios to the oldest generation */ - set_mask_bits(&folio->flags, LRU_REFS_MASK | LRU_REFS_FLAGS, - BIT(PG_active)); - continue; - } - /* retry folios that may have missed folio_rotate_reclaimable() */ - list_move(&folio->lru, &clean); + if (!skip_retry && !folio_test_active(folio) && !folio_mapped(folio) && + !folio_test_dirty(folio) && !folio_test_writeback(folio)) { + list_move(&folio->lru, &clean); + continue; + } + + /* don't add rejected folios to the oldest generation */ + if (!lru_gen_distance(folio, false)) + set_mask_bits(&folio->flags, LRU_REFS_FLAGS, BIT(PG_active)); } spin_lock_irq(&lruvec->lru_lock); diff --git a/mm/workingset.c b/mm/workingset.c index 2c310c29f51e..2fe142aebd07 100644 --- a/mm/workingset.c +++ b/mm/workingset.c @@ -239,7 +239,8 @@ static void *lru_gen_eviction(struct folio *folio) int type = folio_is_file_lru(folio); int delta = folio_nr_pages(folio); int refs = folio_lru_refs(folio); - int tier = lru_tier_from_refs(refs); + bool workingset = folio_test_workingset(folio); + int tier = lru_tier_from_refs(refs, workingset); struct mem_cgroup *memcg = folio_memcg(folio); struct pglist_data *pgdat = folio_pgdat(folio); @@ -253,7 +254,7 @@ static void *lru_gen_eviction(struct folio *folio) hist = lru_hist_from_seq(min_seq); atomic_long_add(delta, &lrugen->evicted[hist][type][tier]); - return pack_shadow(mem_cgroup_id(memcg), pgdat, token, refs); + return pack_shadow(mem_cgroup_id(memcg), pgdat, token, workingset); } /* @@ -282,8 +283,9 @@ static bool lru_gen_test_recent(void *shadow, struct lruvec **lruvec, static void lru_gen_refault(struct folio *folio, void *shadow) { bool recent; - int hist, tier, refs; + int hist, tier; bool workingset; + unsigned long refs; unsigned long token; struct lruvec *lruvec; struct lru_gen_folio *lrugen; @@ -305,23 +307,20 @@ static void lru_gen_refault(struct folio *folio, void *shadow) hist = lru_hist_from_seq(READ_ONCE(lrugen->min_seq[type])); /* see the comment in folio_lru_refs() */ - refs = (token & (BIT(LRU_REFS_WIDTH) - 1)) + workingset; - tier = lru_tier_from_refs(refs); + refs = (token & (BIT(LRU_REFS_WIDTH) - 1)) + 1; + tier = lru_tier_from_refs(refs, workingset); atomic_long_add(delta, &lrugen->refaulted[hist][type][tier]); - mod_lruvec_state(lruvec, WORKINGSET_ACTIVATE_BASE + type, delta); - /* - * Count the following two cases as stalls: - * 1. For pages accessed through page tables, hotter pages pushed out - * hot pages which refaulted immediately. - * 2. For pages accessed multiple times through file descriptors, - * they would have been protected by sort_folio(). - */ - if (lru_gen_in_fault() || refs >= BIT(LRU_REFS_WIDTH) - 1) { - set_mask_bits(&folio->flags, 0, LRU_REFS_MASK | BIT(PG_workingset)); + /* see folio_add_lru() where folio_set_active() happens */ + if (lru_gen_in_fault()) + mod_lruvec_state(lruvec, WORKINGSET_ACTIVATE_BASE + type, delta); + + if (workingset) { + folio_set_workingset(folio); mod_lruvec_state(lruvec, WORKINGSET_RESTORE_BASE + type, delta); - } + } else if (refs) + set_mask_bits(&folio->flags, LRU_REFS_MASK, refs << LRU_REFS_PGOFF); unlock: rcu_read_unlock(); }