Message ID | 20230802025606.346758-1-kaleshsingh@google.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f41:0:b0:3e4:2afc:c1 with SMTP id v1csp188227vqx; Tue, 1 Aug 2023 21:03:06 -0700 (PDT) X-Google-Smtp-Source: APBJJlFridky3/bODjSJj6G+1RIV+YxPMP40OSoYK5GDzT/uecrX1KmHFvQM4wpJMaHXuLygY/kG X-Received: by 2002:a05:6512:749:b0:4fd:c923:db59 with SMTP id c9-20020a056512074900b004fdc923db59mr3245538lfs.15.1690948986118; Tue, 01 Aug 2023 21:03:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690948986; cv=none; d=google.com; s=arc-20160816; b=cgI+wdfJhD0F207fP1N/coRYccBltUDE5xofIJNAl+zzZee1hfSeqEgKgCp10gRarv fkQJwM1CVV9g1ODyDclEklCJyrZ7QIuc8cxn1ZEtBOx+sXsykDQcjLDyAxaT5BufdYBt dTBGjo8Sz8u/zJf2NGlACp4XFxXjqqJsUyro9qhWta3fu7rPmBOTU5WvPnHSre0phHyO 8++COEumR4sZNmvXDwJur+OOPVaq2OkeHOJemd2QB2PPFBZhweh4c9kXRumHm8IWyjl0 CSAchI1hqlhjK6xSAoFRO5ivaWUVbQm7Q7DPA3cdiVu+tNw1mAKOWaaytiV2MV8Zhx35 SeLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:mime-version:date :dkim-signature; bh=aqehfJB+hF+Fne+AdGJurbsZIYsQCeOte57mRi2GAJw=; fh=BDzvqUlwbaAoahAbsGdTtGycNDokRNe06l6/GFLJ1Y0=; b=L9TOKhgKPbzf4RJPvhlVnaKMTDiqojZRg/11MnNC8pT+kb9rkwmMgbzBhi2TW4byZC T7AcB4CoERGu0ZP1VucTD7fzJMw1jKX7nDk+uAJhOepLjyr6o5YoTm0AUFqYuWF+vGqj WCxHyaSiQkCoG43jZyi824G2ex6/HQaDmg2j7Bqa0EkKL+AHOT9vKY4tv9QCI8g6QjzG zy3J0hBKcrFB2iH5qjRSIAUsTk9NoK2ojP+dZEZof3AEY8qQccBbkOsmdXFfhQvJhNzc 28BfFpDYe2wdnmO5yH9WUl+z83qVt+XF2imub/WxdbSJvCLgJxQEFii9G14vBHLTzOwZ Gh0g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=33TVVDzX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l20-20020a056402125400b0051e26617526si5839653edw.347.2023.08.01.21.02.42; Tue, 01 Aug 2023 21:03:06 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=33TVVDzX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231296AbjHBC4d (ORCPT <rfc822;maxi.paulin@gmail.com> + 99 others); Tue, 1 Aug 2023 22:56:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46068 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231196AbjHBC4a (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Tue, 1 Aug 2023 22:56:30 -0400 Received: from mail-yw1-x1149.google.com (mail-yw1-x1149.google.com [IPv6:2607:f8b0:4864:20::1149]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 142E0273A for <linux-kernel@vger.kernel.org>; Tue, 1 Aug 2023 19:56:16 -0700 (PDT) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-585f254c41aso48678347b3.1 for <linux-kernel@vger.kernel.org>; Tue, 01 Aug 2023 19:56:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1690944975; x=1691549775; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=aqehfJB+hF+Fne+AdGJurbsZIYsQCeOte57mRi2GAJw=; b=33TVVDzXg6eBl7/Vpt8F6zz+Hj/NOmdXdllc0HT3+fXbEBhkPYtEkaq37eNBBfQ//f huzyAhMvUorpNH56dDYRwA06JZVdYTEAbzfGjbqw3gBWiic0SbSYYIRLI7+dUO6KJeP/ QbLSh8xuVcrhWjh4oWX9BfGiIQ2WhcFjEVln6zdtkNbTrb8Vr/FaB0bbjGe719xWxqpC hL3EQTp/eSWIIOfcyzhoc5/BO66sBZZeI+o1Tma4ICZmtHB5eUiGscJSklwG5yeK8aOP pOTWKEoNcoXV0uOzF2WA7ODrKPaZuVgMaXvYUoulWRPVnXT17L+Vmq1QR0HZFgWxuJek tQWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690944975; x=1691549775; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=aqehfJB+hF+Fne+AdGJurbsZIYsQCeOte57mRi2GAJw=; b=ktUV9uNKEiJ4ZHirx5O0bbupTW3jow9+YcABcY/90FMTlkgKZY9VI/jMHyRmMwVQhx JBzI/JNlllloiyD3XoQqi9FIqv7d8NI8FDa+YPI3HXUQr8Z+lvByw9y1And3f9Sf9MFW PmfL/SpkJUZCB9ap+gjcJZ97w9SxqfWst7L+v5GHysQNda5SsayLKkgfjhCoJtI98g0Q CC5MHwe7YequIvkoUYlbz+rfA5+fV8GjGoyPZUibS1NXbxnrIAb0pXzJiEzivoE+wVDO ehz/U9ph4FvqWkhSrQCdliYWdkJ+eswL1bDCic3vxV9eDuSrEx6HD1vrFj3lObELUnNC KW4Q== X-Gm-Message-State: ABy/qLYm2oDy6nUaHT84s9umZVV0aG7X4rzIfoJRpccm6yDKRDK01y15 V9tm/nl8qbFF6zrfXKeCC6y7uEvQzEkJnIgK8A== X-Received: from kalesh.mtv.corp.google.com ([2620:15c:211:201:aa5f:ff75:318:255]) (user=kaleshsingh job=sendgmr) by 2002:a05:6902:100f:b0:cf9:3564:33cc with SMTP id w15-20020a056902100f00b00cf9356433ccmr116986ybt.13.1690944975112; Tue, 01 Aug 2023 19:56:15 -0700 (PDT) Date: Tue, 1 Aug 2023 19:56:02 -0700 Mime-Version: 1.0 X-Mailer: git-send-email 2.41.0.255.g8b1d071c50-goog Message-ID: <20230802025606.346758-1-kaleshsingh@google.com> Subject: [PATCH v2 1/3] mm-unstable: Multi-gen LRU: Fix per-zone reclaim From: Kalesh Singh <kaleshsingh@google.com> To: yuzhao@google.com, akpm@linux-foundation.org Cc: surenb@google.com, android-mm@google.com, kernel-team@android.com, Kalesh Singh <kaleshsingh@google.com>, stable@vger.kernel.org, Charan Teja Kalla <quic_charante@quicinc.com>, Lecopzer Chen <lecopzer.chen@mediatek.com>, Matthias Brugger <matthias.bgg@gmail.com>, AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>, Suleiman Souhlal <suleiman@google.com>, Oleksandr Natalenko <oleksandr@natalenko.name>, "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>, Qi Zheng <zhengqi.arch@bytedance.com>, Steven Barrett <steven@liquorix.net>, Brian Geffon <bgeffon@google.com>, Barry Song <baohua@kernel.org>, linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773077505451592722 X-GMAIL-MSGID: 1773088523909240268 |
Series |
[v2,1/3] mm-unstable: Multi-gen LRU: Fix per-zone reclaim
|
|
Commit Message
Kalesh Singh
Aug. 2, 2023, 2:56 a.m. UTC
MGLRU has a LRU list for each zone for each type (anon/file) in each
generation:
long nr_pages[MAX_NR_GENS][ANON_AND_FILE][MAX_NR_ZONES];
The min_seq (oldest generation) can progress independently for each
type but the max_seq (youngest generation) is shared for both anon and
file. This is to maintain a common frame of reference.
In order for eviction to advance the min_seq of a type, all the per-zone
lists in the oldest generation of that type must be empty.
The eviction logic only considers pages from eligible zones for
eviction or promotion.
scan_folios() {
...
for (zone = sc->reclaim_idx; zone >= 0; zone--) {
...
sort_folio(); // Promote
...
isolate_folio(); // Evict
}
...
}
Consider the system has the movable zone configured and default 4
generations. The current state of the system is as shown below
(only illustrating one type for simplicity):
Type: ANON
Zone DMA32 Normal Movable Device
Gen 0 0 0 4GB 0
Gen 1 0 1GB 1MB 0
Gen 2 1MB 4GB 1MB 0
Gen 3 1MB 1MB 1MB 0
Now consider there is a GFP_KERNEL allocation request (eligible zone
index <= Normal), evict_folios() will return without doing any work
since there are no pages to scan in the eligible zones of the oldest
generation. Reclaim won't make progress until triggered from a ZONE_MOVABLE
allocation request; which may not happen soon if there is a lot of free
memory in the movable zone. This can lead to OOM kills, although there
is 1GB pages in the Normal zone of Gen 1 that we have not yet tried to
reclaim.
This issue is not seen in the conventional active/inactive LRU since
there are no per-zone lists.
If there are no (not enough) folios to scan in the eligible zones, move
folios from ineligible zone (zone_index > reclaim_index) to the next
generation. This allows for the progression of min_seq and reclaiming
from the next generation (Gen 1).
Qualcomm, Mediatek and raspberrypi [1] discovered this issue independently.
[1] https://github.com/raspberrypi/linux/issues/5395
Fixes: ac35a4902374 ("mm: multi-gen LRU: minimal implementation")
Cc: stable@vger.kernel.org
Cc: Yu Zhao <yuzhao@google.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Reported-by: Charan Teja Kalla <quic_charante@quicinc.com>
Reported-by: Lecopzer Chen <lecopzer.chen@mediatek.com>
Signed-off-by: Kalesh Singh <kaleshsingh@google.com>
---
Changes in v2:
- Add Fixes tag and cc stable
mm/vmscan.c | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
Comments
Il 02/08/23 04:56, Kalesh Singh ha scritto: > MGLRU has a LRU list for each zone for each type (anon/file) in each > generation: > > long nr_pages[MAX_NR_GENS][ANON_AND_FILE][MAX_NR_ZONES]; > The min_seq (oldest generation) can progress independently for each > type but the max_seq (youngest generation) is shared for both anon and > file. This is to maintain a common frame of reference. > > In order for eviction to advance the min_seq of a type, all the per-zone > lists in the oldest generation of that type must be empty. > > The eviction logic only considers pages from eligible zones for > eviction or promotion. > > scan_folios() { > ... > for (zone = sc->reclaim_idx; zone >= 0; zone--) { > ... > sort_folio(); // Promote > ... > isolate_folio(); // Evict > } > ... > } > > Consider the system has the movable zone configured and default 4 > generations. The current state of the system is as shown below > (only illustrating one type for simplicity): > > Type: ANON > > Zone DMA32 Normal Movable Device > > Gen 0 0 0 4GB 0 > > Gen 1 0 1GB 1MB 0 > > Gen 2 1MB 4GB 1MB 0 > > Gen 3 1MB 1MB 1MB 0 > > Now consider there is a GFP_KERNEL allocation request (eligible zone > index <= Normal), evict_folios() will return without doing any work > since there are no pages to scan in the eligible zones of the oldest > generation. Reclaim won't make progress until triggered from a ZONE_MOVABLE > allocation request; which may not happen soon if there is a lot of free > memory in the movable zone. This can lead to OOM kills, although there > is 1GB pages in the Normal zone of Gen 1 that we have not yet tried to > reclaim. > > This issue is not seen in the conventional active/inactive LRU since > there are no per-zone lists. > > If there are no (not enough) folios to scan in the eligible zones, move > folios from ineligible zone (zone_index > reclaim_index) to the next > generation. This allows for the progression of min_seq and reclaiming > from the next generation (Gen 1). > > Qualcomm, Mediatek and raspberrypi [1] discovered this issue independently. > > [1] https://github.com/raspberrypi/linux/issues/5395 > > Fixes: ac35a4902374 ("mm: multi-gen LRU: minimal implementation") > Cc: stable@vger.kernel.org > Cc: Yu Zhao <yuzhao@google.com> > Cc: Andrew Morton <akpm@linux-foundation.org> > Reported-by: Charan Teja Kalla <quic_charante@quicinc.com> > Reported-by: Lecopzer Chen <lecopzer.chen@mediatek.com> > Signed-off-by: Kalesh Singh <kaleshsingh@google.com> Whole series tested on MT8173 Elm Chromebook and MT6795 Xperia M5 as those are low ram devices. Can't reproduce the issue described in your [1] link from RPi. MediaTek: Tested-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> > --- > > Changes in v2: > - Add Fixes tag and cc stable > > mm/vmscan.c | 18 ++++++++++++++---- > 1 file changed, 14 insertions(+), 4 deletions(-) > > diff --git a/mm/vmscan.c b/mm/vmscan.c > index 4039620d30fe..489a4fc7d9b1 100644 > --- a/mm/vmscan.c > +++ b/mm/vmscan.c > @@ -4889,7 +4889,8 @@ static int lru_gen_memcg_seg(struct lruvec *lruvec) > * the eviction > ******************************************************************************/ > > -static bool sort_folio(struct lruvec *lruvec, struct folio *folio, int tier_idx) > +static bool sort_folio(struct lruvec *lruvec, struct folio *folio, struct scan_control *sc, > + int tier_idx) > { > bool success; > int gen = folio_lru_gen(folio); > @@ -4939,6 +4940,13 @@ static bool sort_folio(struct lruvec *lruvec, struct folio *folio, int tier_idx) > return true; > } > > + /* ineligible */ > + if (zone > sc->reclaim_idx) { > + gen = folio_inc_gen(lruvec, folio, false); > + list_move_tail(&folio->lru, &lrugen->folios[gen][type][zone]); > + return true; > + } > + > /* waiting for writeback */ > if (folio_test_locked(folio) || folio_test_writeback(folio) || > (type == LRU_GEN_FILE && folio_test_dirty(folio))) { > @@ -4987,7 +4995,8 @@ static bool isolate_folio(struct lruvec *lruvec, struct folio *folio, struct sca > static int scan_folios(struct lruvec *lruvec, struct scan_control *sc, > int type, int tier, struct list_head *list) > { > - int gen, zone; > + int i; > + int gen; > enum vm_event_item item; > int sorted = 0; > int scanned = 0; > @@ -5003,9 +5012,10 @@ static int scan_folios(struct lruvec *lruvec, struct scan_control *sc, > > gen = lru_gen_from_seq(lrugen->min_seq[type]); > > - for (zone = sc->reclaim_idx; zone >= 0; zone--) { > + for (i = MAX_NR_ZONES; i > 0; i--) { > LIST_HEAD(moved); > int skipped = 0; > + int zone = (sc->reclaim_idx + i) % MAX_NR_ZONES; > struct list_head *head = &lrugen->folios[gen][type][zone]; > > while (!list_empty(head)) { > @@ -5019,7 +5029,7 @@ static int scan_folios(struct lruvec *lruvec, struct scan_control *sc, > > scanned += delta; > > - if (sort_folio(lruvec, folio, tier)) > + if (sort_folio(lruvec, folio, sc, tier)) > sorted += delta; > else if (isolate_folio(lruvec, folio, sc)) { > list_add(&folio->lru, list);
Thanks Kalesh for taking this to upstream. On 8/2/2023 8:26 AM, Kalesh Singh wrote: > MGLRU has a LRU list for each zone for each type (anon/file) in each > generation: > > long nr_pages[MAX_NR_GENS][ANON_AND_FILE][MAX_NR_ZONES]; > The min_seq (oldest generation) can progress independently for each > type but the max_seq (youngest generation) is shared for both anon and > file. This is to maintain a common frame of reference. > > In order for eviction to advance the min_seq of a type, all the per-zone > lists in the oldest generation of that type must be empty. > > The eviction logic only considers pages from eligible zones for > eviction or promotion. > > scan_folios() { > ... > for (zone = sc->reclaim_idx; zone >= 0; zone--) { > ... > sort_folio(); // Promote > ... > isolate_folio(); // Evict > } > ... > } > > Consider the system has the movable zone configured and default 4 > generations. The current state of the system is as shown below > (only illustrating one type for simplicity): > > Type: ANON > > Zone DMA32 Normal Movable Device > > Gen 0 0 0 4GB 0 > > Gen 1 0 1GB 1MB 0 > > Gen 2 1MB 4GB 1MB 0 > > Gen 3 1MB 1MB 1MB 0 > > Now consider there is a GFP_KERNEL allocation request (eligible zone > index <= Normal), evict_folios() will return without doing any work > since there are no pages to scan in the eligible zones of the oldest > generation. Reclaim won't make progress until triggered from a ZONE_MOVABLE > allocation request; which may not happen soon if there is a lot of free > memory in the movable zone. This can lead to OOM kills, although there > is 1GB pages in the Normal zone of Gen 1 that we have not yet tried to > reclaim. > > This issue is not seen in the conventional active/inactive LRU since > there are no per-zone lists. > > If there are no (not enough) folios to scan in the eligible zones, move > folios from ineligible zone (zone_index > reclaim_index) to the next > generation. This allows for the progression of min_seq and reclaiming > from the next generation (Gen 1). > As discussing offline, I think this can make system to spend too much time in scan_folios() in moving the pages from Gen-0 to Gen-1 of the other zone which can result into OOM is not active when necessary. > Qualcomm, Mediatek and raspberrypi [1] discovered this issue independently. > > [1] https://github.com/raspberrypi/linux/issues/5395 > > Fixes: ac35a4902374 ("mm: multi-gen LRU: minimal implementation") > Cc: stable@vger.kernel.org > Cc: Yu Zhao <yuzhao@google.com> > Cc: Andrew Morton <akpm@linux-foundation.org> > Reported-by: Charan Teja Kalla <quic_charante@quicinc.com> > Reported-by: Lecopzer Chen <lecopzer.chen@mediatek.com> > Signed-off-by: Kalesh Singh <kaleshsingh@google.com> We tested this patch on our systems for couple of weeks and aggressive OOM is not observed which otherwise is easily reproducible. Tested-by: Charan Teja Kalla <quic_charante@quicinc.com>
diff --git a/mm/vmscan.c b/mm/vmscan.c index 4039620d30fe..489a4fc7d9b1 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -4889,7 +4889,8 @@ static int lru_gen_memcg_seg(struct lruvec *lruvec) * the eviction ******************************************************************************/ -static bool sort_folio(struct lruvec *lruvec, struct folio *folio, int tier_idx) +static bool sort_folio(struct lruvec *lruvec, struct folio *folio, struct scan_control *sc, + int tier_idx) { bool success; int gen = folio_lru_gen(folio); @@ -4939,6 +4940,13 @@ static bool sort_folio(struct lruvec *lruvec, struct folio *folio, int tier_idx) return true; } + /* ineligible */ + if (zone > sc->reclaim_idx) { + gen = folio_inc_gen(lruvec, folio, false); + list_move_tail(&folio->lru, &lrugen->folios[gen][type][zone]); + return true; + } + /* waiting for writeback */ if (folio_test_locked(folio) || folio_test_writeback(folio) || (type == LRU_GEN_FILE && folio_test_dirty(folio))) { @@ -4987,7 +4995,8 @@ static bool isolate_folio(struct lruvec *lruvec, struct folio *folio, struct sca static int scan_folios(struct lruvec *lruvec, struct scan_control *sc, int type, int tier, struct list_head *list) { - int gen, zone; + int i; + int gen; enum vm_event_item item; int sorted = 0; int scanned = 0; @@ -5003,9 +5012,10 @@ static int scan_folios(struct lruvec *lruvec, struct scan_control *sc, gen = lru_gen_from_seq(lrugen->min_seq[type]); - for (zone = sc->reclaim_idx; zone >= 0; zone--) { + for (i = MAX_NR_ZONES; i > 0; i--) { LIST_HEAD(moved); int skipped = 0; + int zone = (sc->reclaim_idx + i) % MAX_NR_ZONES; struct list_head *head = &lrugen->folios[gen][type][zone]; while (!list_empty(head)) { @@ -5019,7 +5029,7 @@ static int scan_folios(struct lruvec *lruvec, struct scan_control *sc, scanned += delta; - if (sort_folio(lruvec, folio, tier)) + if (sort_folio(lruvec, folio, sc, tier)) sorted += delta; else if (isolate_folio(lruvec, folio, sc)) { list_add(&folio->lru, list);