From patchwork Tue Apr 15 02:45:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Muchun Song X-Patchwork-Id: 14051361 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 7565EC369B4 for ; Tue, 15 Apr 2025 02:46:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E8D3E28019B; Mon, 14 Apr 2025 22:46:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E13742800C2; Mon, 14 Apr 2025 22:46:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C8F6728019B; Mon, 14 Apr 2025 22:46:40 -0400 (EDT) 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 A665A2800C2 for ; Mon, 14 Apr 2025 22:46:40 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 1D7381CC58F for ; Tue, 15 Apr 2025 02:46:41 +0000 (UTC) X-FDA: 83334740202.11.728F6CA Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) by imf10.hostedemail.com (Postfix) with ESMTP id 3D368C0005 for ; Tue, 15 Apr 2025 02:46:39 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=FWkelz0H; spf=pass (imf10.hostedemail.com: domain of songmuchun@bytedance.com designates 209.85.216.43 as permitted sender) smtp.mailfrom=songmuchun@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1744685199; 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=FoWdLHOi8MZDe7tFGtzR8WCw9Q33zyNjsUf4A8uDwIg=; b=3Rc+9p2VIYoUU3bqcmZuHeFED3KFqQd6xZdeOWsEZhSNfcRJzGNKQmrShPiWf5Ddh15Bho NLLPymWScpOcDQ6UMwidSWTRhrfW9/Lg5oidjZVz0bpXZS6e/SMSMqY2gImrZ5UyFG3nRb pjVvHHhgX584UPOgzn/snWq1UWBu1j0= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=FWkelz0H; spf=pass (imf10.hostedemail.com: domain of songmuchun@bytedance.com designates 209.85.216.43 as permitted sender) smtp.mailfrom=songmuchun@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744685199; a=rsa-sha256; cv=none; b=Vm8Uef5Ymr4n+z2oyBzZ5hfJ5t3IUxP1NoEh5BelfKAOfa1Bm/r8LFORhjfHWacwzROgbI 9fsHuDl0d7XUvYb3WHA3azf4/iY66WhT9XYVSmTe7F1kVPhH1T9L7xBOb+jXDGEhZvnm+m NqZ9xkBygoah9i5WwsdTzGa17WYclXA= Received: by mail-pj1-f43.google.com with SMTP id 98e67ed59e1d1-2ff799d99dcso4702081a91.1 for ; Mon, 14 Apr 2025 19:46:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1744685198; x=1745289998; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=FoWdLHOi8MZDe7tFGtzR8WCw9Q33zyNjsUf4A8uDwIg=; b=FWkelz0HhiFzBlUnqNWAvRKamGKJUTvJZkwzHP3MLa+w3Qx02hk/KPtqrcmuWPI8Gp 271UMKupBbOPW8TNz/V5Whxv01OG1FbFK1zHIyTNefTTJvXB6WaKSC2sNEhgZ5WFhgzD 7j9PYjBN72WYch5/HPOWqGchtu1C1pIghsOvcGFNqhfZBT3hMcTlcNXJE39ptP7RGcnt un4WcCFoVTdbWPfFJSPewXs1GUCtzlh9eEnVh2TsbYA910xxVfnDT1P0I2n07NFnlf3M qGp1rCc1iP+UlIfgq2e7rOYwVPJ4oUnHlNJNx3728qggs34FvCvIutKBTVY/ZOKqERTl W3jg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744685198; x=1745289998; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FoWdLHOi8MZDe7tFGtzR8WCw9Q33zyNjsUf4A8uDwIg=; b=b9B9yKYsvFyEnz18p1xYymtljARzrWZjSRIagu6Mn1uJIG8d0ErohbLsJ8yrC3ECpK 74WRm39Ct3aPJuqIw6b75vSXKGp+hEZJfFVZG/z+YZsX6Om1QCFc5YQEia1OZKRF4kkC jJAB4OkIr74S9cSatfkSgbE+6YsPW324TgoWQoetOphFB0GCHNSEyViglBEo1fA/m35h NVr0BkMWVliVDbznEMSIr589mWZxO4UBduhzQ0euhszd6ast6/Nf0krUi5DOHtG/nYia 4UYIPb87K8cfJLms0Dzy5mirAb+JMIQFzI9jomnC7JHtDyOsF1QjzxKdBxDBVsrDk+mu y/ng== X-Forwarded-Encrypted: i=1; AJvYcCUjDenKR+qkNFnH+5x/zrRgLpVQZiMUF+fPtDzQOWUejPOHU8vPoa/27cki5b1PRKJUQ+8XoaCwrA==@kvack.org X-Gm-Message-State: AOJu0Yx3DFjPSe26+cMLwRug5udcSnVil9ofqkfuyR5mTAjTt+DnbfKJ 0EedbUgPxRN8Rc0UeIL00Gb6OBJ0FjzNSo8GovWLTPGhG4yxtZ1l+C079HIUCEE= X-Gm-Gg: ASbGncujO023DFscQESXNh9Y8qdXS8XEWsXsUNvr4NtwjJgpoM1MtCJQm4cYjrc/uLe +dEQzCXtMYQgPEAwt2wj3+IwuFuCQj6dVr6F/mEP2v8sU92K8YMrv4lEC8MUrzodCS13SsjsioW 0jtDUEwhu/CWBJBAX6INkRXHo+5wn2BpsfL6GtyKen3T+5IW8wQILfoB0cb0n0jsXhw+w6JPQwn ct2EDPh0QkNTx3IYLqyduByZRqOYfeTVFYim8ea/3Zk5mtmCFoLpTnvp7DjOZ10dvzV0g+EE2LN ll4dQtUU/6oe2LzWr0vpBrKMdSlqTFW2fWPIYZrzPNbvICpf1STY2c8oKuYiRfpZ1YHHlmmMiME nIFM3ehY= X-Google-Smtp-Source: AGHT+IEKT/drxov/S/IJkMzk/bPhvMbUiZuHxa6kWkMhcuX0SINcw3+8GdOiNf/WYjYHBQMzkgoxKg== X-Received: by 2002:a17:90b:2f0b:b0:2f6:f32e:90ac with SMTP id 98e67ed59e1d1-30823639726mr23171470a91.11.1744685198109; Mon, 14 Apr 2025 19:46:38 -0700 (PDT) Received: from PXLDJ45XCM.bytedance.net ([61.213.176.5]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22ac7ccac49sm106681185ad.217.2025.04.14.19.46.33 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 14 Apr 2025 19:46:37 -0700 (PDT) From: Muchun Song To: hannes@cmpxchg.org, mhocko@kernel.org, roman.gushchin@linux.dev, shakeel.butt@linux.dev, muchun.song@linux.dev, akpm@linux-foundation.org, david@fromorbit.com, zhengqi.arch@bytedance.com, yosry.ahmed@linux.dev, nphamcs@gmail.com, chengming.zhou@linux.dev Cc: linux-kernel@vger.kernel.org, cgroups@vger.kernel.org, linux-mm@kvack.org, hamzamahfooz@linux.microsoft.com, apais@linux.microsoft.com, Muchun Song Subject: [PATCH RFC 08/28] mm: vmscan: refactor move_folios_to_lru() Date: Tue, 15 Apr 2025 10:45:12 +0800 Message-Id: <20250415024532.26632-9-songmuchun@bytedance.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250415024532.26632-1-songmuchun@bytedance.com> References: <20250415024532.26632-1-songmuchun@bytedance.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 3D368C0005 X-Stat-Signature: pf7o9gnqb8tzkpd1a1a445ozjb4dfepu X-HE-Tag: 1744685199-934166 X-HE-Meta: U2FsdGVkX1+g+lDkhADyybp1UnU4U7Ug64HHqhe1c4j2MNxWyBDcV12+FXgj/cbvrrpyd+Et2Dkl2yysAgFadCWTRtkKuHrfQPQnqbBVjHTCvULgl4mEVT9Xgl8/lpkikzt+Xtuv3JkzcBp1wDHzAMC6yBAGY15XLIw7H3NIXjBgEn7+TjTUg0/iAManRqe/IEz4VJJv7PKiiVmo6RDuDzWvI/+j3lp6Jn6BokuTdE+5KiP7CLSgn5JmYuVUYPevm5t89s0MxkK4KubkQnA9JJsv2AXEbdPeGyqxbp55sZSYgZQhz+o7tMAH2BgTtU2oTWCwaZEE12HUKz59+nUxmEt37CLtdeKQ4ZeLu+M//WCfi2WIaVrIRpW/G9U1+4ZTbsSpWClnOLGkLt/qp6XAFXeMWPhhYlxLnaRpc2UM7DLMl6UDb3i3Q7hH78FXPeXzxDC2N2NBHVVOK4StZVshQ3blE/Y7O1HC55M+v0T2KERl+Bq/F4aZ0PPjBPHU6F+gpuU654k0TqCAO/nwmyOWhG7YSd7RMzqsKGe3BGtfCGAp7KR1M57SrsW263O7Mqgl7Bn3YmwCOEHRIm440C78PzMmDQl4Jxxuep3r+EQK53qgUNHnEUEUfSlIEG3m+a1DEWbT7R+mWJo+hxkcc7BH93VcUcTs3N87fs3xcQX6TnsTHpCyDpdmdPMob1URxZnHybn5+dFLU5LFv/3+YYhRC0LfI3iJd2QR7khn3uAMAkpYHORBwqzRlsgNjxJr3OCV3xXpIhZ1RQdjZBXDKBpMxDvmNid/xh953gmkBOgMRE1Ar/W6vOHoo90pSKdquVGK1+KOeyGF16M99xYwKpdGIXBz201U85kBa7yh/bbatmqN1Zj8aqIaATkc/GTuLuIn43mwPZlcz/ucyLIKgzvqu8ONPXLsn7yNcgCBSQYhn6Imtis5srjahslOR9MkUvUTRZjQZigUejzgSGqs8fJ g3ystd2V 10irJrwwzZvXFr4uU2YYOHVL0nQzcrthke9WyM6YjuCm7sL9WpTAkYFNVzjCCLto4pXXTBmnXqjnZgft1Rh6E0v9vUQd6CEHHwAyGFSZb4s+G17VuPMcSFGVHFfaqqKyW00kL/BUjxOlFlCxkm/nz3dZ6YkViLWTx2R98n3UDz5I4EVbyz6ZyINmHQE97m7xHHIEuqqaRpeNuHop+aD1Qvswxf27pAvrkOMGOtWkC5MrVNcLjsxUmgDFLCJD2jvRygB7AlSB71wkm5aSoxDSGX/BcMLwO8gQQIX+Cm7B65aTNOclGasuL8/PKWpcgpYoA4Cho6lir8ts/UFfr44MZtoFiikW2TGcXpjydsD4Y+uc6ulA= 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: In a subsequent patch, we'll reparent the LRU folios. The folios that are moved to the appropriate LRU list can undergo reparenting during the move_folios_to_lru() process. Hence, it's incorrect for the caller to hold a lruvec lock. Instead, we should utilize the more general interface of folio_lruvec_relock_irq() to obtain the correct lruvec lock. This patch involves only code refactoring and doesn't introduce any functional changes. Signed-off-by: Muchun Song --- mm/vmscan.c | 51 +++++++++++++++++++++++++-------------------------- 1 file changed, 25 insertions(+), 26 deletions(-) diff --git a/mm/vmscan.c b/mm/vmscan.c index a76b3cee043d..eac5e6e70660 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -1901,24 +1901,27 @@ static bool too_many_isolated(struct pglist_data *pgdat, int file, /* * move_folios_to_lru() moves folios from private @list to appropriate LRU list. * - * Returns the number of pages moved to the given lruvec. + * Returns the number of pages moved to the appropriate lruvec. + * + * Note: The caller must not hold any lruvec lock. */ -static unsigned int move_folios_to_lru(struct lruvec *lruvec, - struct list_head *list) +static unsigned int move_folios_to_lru(struct list_head *list) { int nr_pages, nr_moved = 0; + struct lruvec *lruvec = NULL; struct folio_batch free_folios; folio_batch_init(&free_folios); while (!list_empty(list)) { struct folio *folio = lru_to_folio(list); + lruvec = folio_lruvec_relock_irq(folio, lruvec); VM_BUG_ON_FOLIO(folio_test_lru(folio), folio); list_del(&folio->lru); if (unlikely(!folio_evictable(folio))) { - spin_unlock_irq(&lruvec->lru_lock); + lruvec_unlock_irq(lruvec); folio_putback_lru(folio); - spin_lock_irq(&lruvec->lru_lock); + lruvec = NULL; continue; } @@ -1940,19 +1943,15 @@ static unsigned int move_folios_to_lru(struct lruvec *lruvec, folio_unqueue_deferred_split(folio); if (folio_batch_add(&free_folios, folio) == 0) { - spin_unlock_irq(&lruvec->lru_lock); + lruvec_unlock_irq(lruvec); mem_cgroup_uncharge_folios(&free_folios); free_unref_folios(&free_folios); - spin_lock_irq(&lruvec->lru_lock); + lruvec = NULL; } continue; } - /* - * All pages were isolated from the same lruvec (and isolation - * inhibits memcg migration). - */ VM_BUG_ON_FOLIO(!folio_matches_lruvec(folio, lruvec), folio); lruvec_add_folio(lruvec, folio); nr_pages = folio_nr_pages(folio); @@ -1961,11 +1960,12 @@ static unsigned int move_folios_to_lru(struct lruvec *lruvec, workingset_age_nonresident(lruvec, nr_pages); } + if (lruvec) + lruvec_unlock_irq(lruvec); + if (free_folios.nr) { - spin_unlock_irq(&lruvec->lru_lock); mem_cgroup_uncharge_folios(&free_folios); free_unref_folios(&free_folios); - spin_lock_irq(&lruvec->lru_lock); } return nr_moved; @@ -2033,9 +2033,9 @@ static unsigned long shrink_inactive_list(unsigned long nr_to_scan, nr_reclaimed = shrink_folio_list(&folio_list, pgdat, sc, &stat, false); - spin_lock_irq(&lruvec->lru_lock); - move_folios_to_lru(lruvec, &folio_list); + move_folios_to_lru(&folio_list); + local_irq_disable(); __mod_lruvec_state(lruvec, PGDEMOTE_KSWAPD + reclaimer_offset(sc), stat.nr_demoted); __mod_node_page_state(pgdat, NR_ISOLATED_ANON + file, -nr_taken); @@ -2044,7 +2044,7 @@ static unsigned long shrink_inactive_list(unsigned long nr_to_scan, __count_vm_events(item, nr_reclaimed); __count_memcg_events(lruvec_memcg(lruvec), item, nr_reclaimed); __count_vm_events(PGSTEAL_ANON + file, nr_reclaimed); - spin_unlock_irq(&lruvec->lru_lock); + local_irq_enable(); lru_note_cost(lruvec, file, stat.nr_pageout, nr_scanned - nr_reclaimed); @@ -2183,16 +2183,15 @@ static void shrink_active_list(unsigned long nr_to_scan, /* * Move folios back to the lru list. */ - spin_lock_irq(&lruvec->lru_lock); - - nr_activate = move_folios_to_lru(lruvec, &l_active); - nr_deactivate = move_folios_to_lru(lruvec, &l_inactive); + nr_activate = move_folios_to_lru(&l_active); + nr_deactivate = move_folios_to_lru(&l_inactive); + local_irq_disable(); __count_vm_events(PGDEACTIVATE, nr_deactivate); __count_memcg_events(lruvec_memcg(lruvec), PGDEACTIVATE, nr_deactivate); __mod_node_page_state(pgdat, NR_ISOLATED_ANON + file, -nr_taken); - spin_unlock_irq(&lruvec->lru_lock); + local_irq_enable(); if (nr_rotated) lru_note_cost(lruvec, file, 0, nr_rotated); @@ -4723,14 +4722,15 @@ static int evict_folios(struct lruvec *lruvec, struct scan_control *sc, int swap set_mask_bits(&folio->flags, LRU_REFS_FLAGS, BIT(PG_active)); } - spin_lock_irq(&lruvec->lru_lock); - - move_folios_to_lru(lruvec, &list); + move_folios_to_lru(&list); + local_irq_disable(); walk = current->reclaim_state->mm_walk; if (walk && walk->batched) { walk->lruvec = lruvec; + spin_lock(&lruvec->lru_lock); reset_batch_size(walk); + spin_unlock(&lruvec->lru_lock); } __mod_lruvec_state(lruvec, PGDEMOTE_KSWAPD + reclaimer_offset(sc), @@ -4741,8 +4741,7 @@ static int evict_folios(struct lruvec *lruvec, struct scan_control *sc, int swap __count_vm_events(item, reclaimed); __count_memcg_events(memcg, item, reclaimed); __count_vm_events(PGSTEAL_ANON + type, reclaimed); - - spin_unlock_irq(&lruvec->lru_lock); + local_irq_enable(); list_splice_init(&clean, &list);