From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A4E67606D061 for ; Fri, 13 Nov 2026 18:56:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=bXI2J06z Received: by kanga.kvack.org (Postfix) id C0EEF6B05CB; Fri, 13 Nov 2026 13:56:53 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id BE6A76B05CD; Fri, 13 Nov 2026 13:56:53 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AAB2D6B05CB; Fri, 13 Nov 2026 13:56:53 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 5C0436B05CB for ; Fri, 13 Nov 2026 13:56:53 -0500 (EST) Received: from smtpin27.hostedemail.com (lb01a-stub [10.200.18.249]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 42FBE1201F4 for ; Fri, 13 Nov 2026 18:56:52 +0000 (UTC) X-FDA: 85431002664.27.D68B462 Received: from tor.source.kernel.org (tor.source.kernel.org [172.105.4.254]) by imf24.hostedemail.com (Postfix) with ESMTP id 9F420180003 for ; Fri, 13 Nov 2026 18:56:50 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20260515 header.b=bXI2J06z; spf=pass (imf24.hostedemail.com: domain of baohua@kernel.org designates 172.105.4.254 as permitted sender) smtp.mailfrom=baohua@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1794596210; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=8b2BNlI9D/dTvm+pNy8yi6bMbbcURwn+cQ+yjC30tMI=; b=L2e4X5VRW9FKIJVfTbjbYQ6JWHreD04amQY9E/jnWMqzM6mIF8w5MSN6SAUNIUXayRawJk nhZdwpLipIUMCmv5tW5sUNVMOEgk3YxlPIwrJTheW2M7d9F536x22EnoUDZ0A9EtVJQnkn pzw2TVLFLIkigeSm5Mo6F4Iul4bSaeU= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20260515 header.b=bXI2J06z; spf=pass (imf24.hostedemail.com: domain of baohua@kernel.org designates 172.105.4.254 as permitted sender) smtp.mailfrom=baohua@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; d=hostedemail.com; s=arc-20220608; cv=none; t=1794596210; b=pkZpJgUWt5vsAxI9Td6zGmvj8VjQnqguseTad85JV6+hRcYhaSGWhs8QYrxK+exYjCvtkK ieLz+aF93+R9Mj2+p0eYwwfU2ld33tq55J9qQUmMN5qcieILaxssmOWX1idplItHq+AxNc meaK4JYFQJsymCiN4+b1v7LcRD7o5h4= Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) by tor.source.kernel.org (Postfix) with ESMTP id 3C52763319; Fri, 13 Nov 2026 18:56:50 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3C55B1F000C4; Fri, 13 Nov 2026 18:56:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1794596209; bh=8b2BNlI9D/dTvm+pNy8yi6bMbbcURwn+cQ+yjC30tMI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=bXI2J06zqS4ZMTGM2ywcmXZMT6M5NchVfkrpb3+jmFMX0GouWWfQtvL19PqvwjRbG uXyoa+cGma3kCNC6ndYJrY0oeLu9Ensr4Ya6TdLkoVSKIoAg8Uzuo2l5h7p3eO3fXp O0tUN/ofRqvlsoMR3ByVCopBGWCCl8MoU/OxIAhtAuPe9ph5A5vPhbEDhuqhzebBKP sLhtxxhU22vHjynQLcTIt0S/UgbOpgNIAuIC/q/JJe0rbe2SMV8TYQRSJh4sWcUNbp +jtNJCGMK4Y5TLQlTTlzMNVHmq81BpoSASl9pq7xE7J+ggD4khO99VH1MB+QpgMrWO e9M1HLuIaAPCg== From: "Barry Song (Xiaomi)" To: akpm@linux-foundation.org, linux-mm@kvack.org Cc: axelrasmussen@google.com, baolin.wang@linux.alibaba.com, baoquan.he@linux.dev, hannes@cmpxchg.org, hui.zhu@linux.dev, kasong@tencent.com, kunwu.chan@gmail.com, liam@infradead.org, lianux.mm@gmail.com, linux-kernel@vger.kernel.org, liuxiang.277@bytedance.com, lyugaofei@xiaomi.com, mhocko@kernel.org, mhocko@suse.com, qi.zheng@linux.dev, ridong.chen@linux.dev, rppt@kernel.org, ryncsn@gmail.com, shakeel.butt@linux.dev, surenb@google.com, wangzicheng@honor.com, weixugc@google.com, yuanchu@google.com, zhangbo56@xiaomi.com, zhuhui@kylinos.cn, sidchintamaneni@gmail.com, "Barry Song (Xiaomi)" Subject: [PATCH v8 12/16] mm/mglru: Restrict eviction accounting to eligible zones Date: Sat, 14 Nov 2026 02:55:37 +0800 Message-Id: <20261113185541.70203-13-baohua@kernel.org> X-Mailer: git-send-email 2.39.3 (Apple Git-146) In-Reply-To: <20261113185541.70203-1-baohua@kernel.org> References: <20261113185541.70203-1-baohua@kernel.org> X-Archived-By: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: 8kdrtao7gen4oa8c5nep1w99czkjgwfe X-Rspamd-Server: rspam01 X-Rspam-User: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_PASS, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=4.0.1 X-Rspamd-Queue-Id: 9F420180003 X-HE-Tag: 1794596210-945258 X-HE-Meta: U2FsdGVkX19yQjafPRtDlxjS79/NpeLTEUaAtrXaCHmY1/xic8yZchX/3wZ4eEVYHgDt+AHdBDbIcv5jrBkYowEUEmexNfXLVO5Ynicev57udkcizG87lbYHD+DGN44r8X2ArmxwtmgIg8HYzZN2BvUVLgZVqhyChrTAXa2nOH3VgbdPTNQc1n/HceKtiB40RkJYeNMzBceTdBHpfa317yLpx/YVLP5s8XvT5n/zv4LZ3olwBk5w6SeGFcFQ5h17iSbNA/0co1diSUqP6MHDDC94cmL8O98+ZXzQay6ev27yLsCXhmFDN3lmuXb73OZ53kWb+70N1aSye4Gnrig5u0XJ4co9y7A0G07B5B0Uwbz7I2cAIxqWItmBD4jK6IViN8MSNUJvFIb8kzX3h1xc75w6EwyRGk4UbqWCpu7RPwGaXXSlh9EpIE5Yz3PtwlL+F2a2XGuZ0axngo/iMFm8lDivzBZx1+APGsX0JYhlLmJp9Spyba/wFa0PMBBKcIMZsHuMGP7LgT67Tjj4uHkvaCUuuDmnO0grT3EpZMpYQYBJpzushGb5MYjy2nFR3yYp4rvMYu/sOrz2ceBksiqZZh9uM+rkP9DF0R3MHkMU1mDsAcOc7092rNCIJHASVoZF8Te7PPWtB/Ke9MjNSbTrcEnCZf/e42BU/vPaf16BMsuWQtL+EW2IP8qx6iP6HJ1kJhXb1P7DzB5njYqp1nLbnB+g3XGl039IH4gsRIMIfw3lwOj5vIXQcSh292Hbg2biLEb/J2umQYqUD4l24Uh1LJvSpNV2pwURHR7LkTJegupjwNplUDG8RoCdrlJ759dPvb3q5Qeu9ja/A1QEZyHroFCMaKxRSmsWZRK5cWBRNYxH6DPRRb5P1QdUClXN+iUturbmBGEwkj5gFylJDUnC/AQT0WesHAzBtMYdUXE02/gOigpj3dy4ljYM8HqvGnm3Rs5ofkRJbyg/l3LlVSE QtkgShw4 HmgcHnUGrGYYYsT3+abMHEG11DAxAjHx1Ie/gEj7O+n04jopk0NirwfW8mt0zTrIXABJfbrZVOezkezsf6J9rAuFrq9hGcsVzEOQellH5w6wcV+UsKB6PasfGtCb62aNWAIVDxq4BANZCJ6QVbCNcz9duEfskDBa3uYdibGl5MNHo+GNZx47c+SDgd1Yc5eQ8IQou7BdCucA8XPlmDLRSQJ5hzLZPh68rtJFcNg5wmJFiRt9JJSyWTVK2t+RbeZvhvqUZVCAWDi2FK6sKgnLOE22ZdwTUtkckxNZItAnF8ijRtCnEH0K9H84fEg+XDwCRy2hbJOjQDLZWCbQ= Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on aws-us-west-2-korg-listserv-alma10-1 For both lruvec_evictable_size() and lru_gen_imbalanced(), only count eligible zones up to sc->reclaim_idx. This avoids overestimating the number of pages available for scanning and allows aging to proceed more promptly when eligible zones contain few folios. lru_gen_age_node() uses lruvec_is_reclaimable() to determine whether any memcg has generations old enough to reclaim under min_ttl. If none are reclaimable, it may trigger OOM. However, lruvec_is_reclaimable() also uses lruvec_is_sizable() to estimate the LRU size. Previously, lruvec_is_sizable() counted folios across all zones. With accounting now restricted to zones up to sc->reclaim_idx, the estimated size may be significantly smaller, potentially leading to premature OOM. To avoid this, skip the sizing check when reclaim is restricted to zones below ZONE_NORMAL. As in __alloc_pages_may_oom(), triggering OOM for low-zone allocations is generally pointless. Furthermore, defer the sizing check until reclaim reaches a very low sc->priority to reduce the risk of premature OOM. Co-developed-by: Bo Zhang Signed-off-by: Bo Zhang Signed-off-by: Barry Song (Xiaomi) --- mm/trace_vmscan.h | 4 ++-- mm/vmscan.c | 26 ++++++++++++++++---------- mm/vmscan.h | 5 +++-- 3 files changed, 21 insertions(+), 14 deletions(-) diff --git a/mm/trace_vmscan.h b/mm/trace_vmscan.h index 565c56428364..9dafdb5bd3ce 100644 --- a/mm/trace_vmscan.h +++ b/mm/trace_vmscan.h @@ -488,9 +488,9 @@ TRACE_EVENT(mm_mglru_aging, unsigned long seq = max_seq - MAX_NR_GENS + 1 + i; __entry->nr_anon[i] = - lruvec_gen_size(lrugen, LRU_GEN_ANON, seq); + lruvec_gen_size(lrugen, LRU_GEN_ANON, seq, MAX_NR_ZONES); __entry->nr_file[i] = - lruvec_gen_size(lrugen, LRU_GEN_FILE, seq); + lruvec_gen_size(lrugen, LRU_GEN_FILE, seq, MAX_NR_ZONES); } __entry->nid = lruvec_pgdat(lruvec)->node_id; __entry->priority = sc->priority; diff --git a/mm/vmscan.c b/mm/vmscan.c index 9071f8889b5c..6ed47089a330 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -4205,8 +4205,8 @@ static void set_initial_priority(struct pglist_data *pgdat, struct scan_control sc->priority = clamp(priority, DEF_PRIORITY / 2, DEF_PRIORITY); } -static void lruvec_evictable_size(struct lruvec *lruvec, int swappiness, - unsigned long nr[]) +static void lruvec_evictable_size(struct lruvec *lruvec, struct scan_control *sc, + int swappiness, unsigned long nr[]) { int type; unsigned long seq; @@ -4219,7 +4219,7 @@ static void lruvec_evictable_size(struct lruvec *lruvec, int swappiness, for_each_evictable_type(type, swappiness) { for (seq = min_seq[type]; seq <= max_seq; seq++) - nr[type] += lruvec_gen_size(lrugen, type, seq); + nr[type] += lruvec_gen_size(lrugen, type, seq, sc->reclaim_idx + 1); } } @@ -4228,7 +4228,7 @@ static bool lruvec_is_sizable(struct lruvec *lruvec, struct scan_control *sc) unsigned long total, sizes[ANON_AND_FILE]; int swappiness = get_swappiness(lruvec, sc); - lruvec_evictable_size(lruvec, swappiness, sizes); + lruvec_evictable_size(lruvec, sc, swappiness, sizes); total = sizes[LRU_GEN_ANON] + sizes[LRU_GEN_FILE]; /* whether the size is big enough to be helpful */ @@ -4247,7 +4247,13 @@ static bool lruvec_is_reclaimable(struct lruvec *lruvec, struct scan_control *sc if (mem_cgroup_below_min(NULL, memcg)) return false; - if (!lruvec_is_sizable(lruvec, sc)) + /* + * As in __alloc_pages_may_oom(), avoid triggering OOM for low-zone + * allocations. Also, defer the LRU size check until reclaim reaches + * a very low priority to avoid premature OOM. + */ + if (sc->priority <= 1 && sc->reclaim_idx >= ZONE_NORMAL && + !lruvec_is_sizable(lruvec, sc)) return false; gen = lru_gen_from_seq(evictable_min_seq(min_seq, swappiness)); @@ -5088,9 +5094,9 @@ static bool lru_gen_imbalanced(struct lruvec *lruvec, struct scan_control *sc, for_each_evictable_type(type, swappiness) { unsigned long seq; - youngest[type] = lruvec_gen_size(lrugen, type, max_seq); + youngest[type] = lruvec_gen_size(lrugen, type, max_seq, sc->reclaim_idx + 1); for (seq = min_seq[type]; seq < max_seq; seq++) - old[type] += lruvec_gen_size(lrugen, type, seq); + old[type] += lruvec_gen_size(lrugen, type, seq, sc->reclaim_idx + 1); } /* the vast majority of pages sit in the youngest gen */ @@ -5143,7 +5149,7 @@ static void lru_gen_prepare_scan(struct lruvec *lruvec, struct scan_control *sc, { unsigned long total; - lruvec_evictable_size(lruvec, swappiness, nr_to_scan); + lruvec_evictable_size(lruvec, sc, swappiness, nr_to_scan); total = nr_to_scan[LRU_GEN_ANON] + nr_to_scan[LRU_GEN_FILE]; total = apply_proportional_protection(memcg, sc, total); @@ -5854,7 +5860,7 @@ static int lru_gen_seq_show(struct seq_file *m, void *v) char mark = full && seq < min_seq[type] ? 'x' : ' '; seq_printf(m, " %10lu%c", - lruvec_gen_size(lrugen, type, seq), mark); + lruvec_gen_size(lrugen, type, seq, MAX_NR_ZONES), mark); } seq_putc(m, '\n'); @@ -5907,7 +5913,7 @@ static int run_eviction(struct lruvec *lruvec, unsigned long seq, struct scan_co if (sc->nr_reclaimed >= nr_to_reclaim) return 0; - lruvec_evictable_size(lruvec, swappiness, nr_to_scan); + lruvec_evictable_size(lruvec, sc, swappiness, nr_to_scan); lru_gen_balance_scan(lruvec, swappiness, nr_to_reclaim - sc->nr_reclaimed, nr_to_scan); diff --git a/mm/vmscan.h b/mm/vmscan.h index c6b583fc7493..2599d7c614ac 100644 --- a/mm/vmscan.h +++ b/mm/vmscan.h @@ -119,12 +119,13 @@ struct scan_control { #ifdef CONFIG_LRU_GEN /* The number of pages of @type in the generation @seq, summed over all zones */ static inline unsigned long lruvec_gen_size(struct lru_gen_folio *lrugen, - int type, unsigned long seq) + int type, unsigned long seq, + int max_zone) { int gen = lru_gen_from_seq(seq); unsigned long size = 0; - for (int zone = 0; zone < MAX_NR_ZONES; zone++) + for (int zone = 0; zone < max_zone; zone++) size += max(READ_ONCE(lrugen->nr_pages[gen][type][zone]), 0L); return size; -- 2.39.3 (Apple Git-146)