From nobody Thu Apr 2 00:13:27 2026 Received: from out-171.mta0.migadu.com (out-171.mta0.migadu.com [91.218.175.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B4407396B6E for ; Thu, 5 Mar 2026 11:58:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772711894; cv=none; b=ZAiBksV2+kNcHk5Xjluf6pSSSrIeoHMyq2mBE+C46v1eijWJrHbJatTNSRFOG8Qc9TMjJew4gNP5CnXhBodKe7WT/vzF2OSQ7BPeRBot8wW1hohOjhwh3OQyUe2Vv/+NbppKdW/YP4b5zonLp/c+yE1aoUBOqt1iokQsCDzxpEo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772711894; c=relaxed/simple; bh=q5GNu88ibdKx8MpiuDMplPMbU2D1/ejWOvGMPSbq5qQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JQcD532qoaVeqj1LauZQYKnW8GygM+xhGk7uW8jp4pxY4Hyn8/axQp+V95GIHHYp/hCc1men0BAgUonK3hV3nPR1+9morVzix7SFyBwgc4UieGmydhSmaY7dVucqwXDeTY7DeZtw8RxlBv64ZHp1Q9byHJdnW7VWkiLUh5iBA0M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=ujqCsOj+; arc=none smtp.client-ip=91.218.175.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="ujqCsOj+" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1772711890; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=dTdOluh/9ylRlwKeMfFMFMRs1I9w1KAVDyJhidoOplQ=; b=ujqCsOj+84waaPYa2xYnno8KBb/Qm+dSd/c6JqZOkI6RM+gFwqp6n2JuRJqkK1rcXXat4H XjgzQd8S7LX3qY7gbhceVX88qiX6+EqxKpZnCPnBj5ocrSlYGlx22GDbCpMj1ZDk1S27TU fDyhVT+ARwZLcmddSa0x3SdCYBNT9VQ= From: Qi Zheng To: hannes@cmpxchg.org, hughd@google.com, mhocko@suse.com, roman.gushchin@linux.dev, shakeel.butt@linux.dev, muchun.song@linux.dev, david@kernel.org, lorenzo.stoakes@oracle.com, ziy@nvidia.com, harry.yoo@oracle.com, yosry.ahmed@linux.dev, imran.f.khan@oracle.com, kamalesh.babulal@oracle.com, axelrasmussen@google.com, yuanchu@google.com, weixugc@google.com, chenridong@huaweicloud.com, mkoutny@suse.com, akpm@linux-foundation.org, hamzamahfooz@linux.microsoft.com, apais@linux.microsoft.com, lance.yang@linux.dev, bhe@redhat.com, usamaarif642@gmail.com Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, cgroups@vger.kernel.org, Qi Zheng Subject: [PATCH v6 23/33] mm: do not open-code lruvec lock Date: Thu, 5 Mar 2026 19:52:41 +0800 Message-ID: <2d0bafe7564e17ece46dfd58197af22ce57017dc.1772711148.git.zhengqi.arch@bytedance.com> In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" From: Qi Zheng Now we have lruvec_unlock(), lruvec_unlock_irq() and lruvec_unlock_irqrestore(), but no the paired lruvec_lock(), lruvec_lock_irq() and lruvec_lock_irqsave(). There is currently no use case for lruvec_lock_irqsave(), so only introduce lruvec_lock_irq(), and change all open-code places to use this helper function. This looks cleaner and prepares for reparenting LRU pages, preventing user from missing RCU lock calls due to open-code lruvec lock. Signed-off-by: Qi Zheng Acked-by: Muchun Song Acked-by: Shakeel Butt Reviewed-by: Harry Yoo --- include/linux/memcontrol.h | 5 +++++ mm/vmscan.c | 38 +++++++++++++++++++------------------- 2 files changed, 24 insertions(+), 19 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 0fdfb8044458e..c7c207a830c50 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -1499,6 +1499,11 @@ static inline struct lruvec *parent_lruvec(struct lr= uvec *lruvec) return mem_cgroup_lruvec(memcg, lruvec_pgdat(lruvec)); } =20 +static inline void lruvec_lock_irq(struct lruvec *lruvec) +{ + spin_lock_irq(&lruvec->lru_lock); +} + static inline void lruvec_unlock(struct lruvec *lruvec) { spin_unlock(&lruvec->lru_lock); diff --git a/mm/vmscan.c b/mm/vmscan.c index 024ff870b1a03..08ed278115f70 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -2002,7 +2002,7 @@ static unsigned long shrink_inactive_list(unsigned lo= ng nr_to_scan, =20 lru_add_drain(); =20 - spin_lock_irq(&lruvec->lru_lock); + lruvec_lock_irq(lruvec); =20 nr_taken =3D isolate_lru_folios(nr_to_scan, lruvec, &folio_list, &nr_scanned, sc, lru); @@ -2012,7 +2012,7 @@ static unsigned long shrink_inactive_list(unsigned lo= ng nr_to_scan, mod_lruvec_state(lruvec, item, nr_scanned); mod_lruvec_state(lruvec, PGSCAN_ANON + file, nr_scanned); =20 - spin_unlock_irq(&lruvec->lru_lock); + lruvec_unlock_irq(lruvec); =20 if (nr_taken =3D=3D 0) return 0; @@ -2029,7 +2029,7 @@ static unsigned long shrink_inactive_list(unsigned lo= ng nr_to_scan, mod_lruvec_state(lruvec, item, nr_reclaimed); mod_lruvec_state(lruvec, PGSTEAL_ANON + file, nr_reclaimed); =20 - spin_lock_irq(&lruvec->lru_lock); + lruvec_lock_irq(lruvec); lru_note_cost_unlock_irq(lruvec, file, stat.nr_pageout, nr_scanned - nr_reclaimed); =20 @@ -2108,7 +2108,7 @@ static void shrink_active_list(unsigned long nr_to_sc= an, =20 lru_add_drain(); =20 - spin_lock_irq(&lruvec->lru_lock); + lruvec_lock_irq(lruvec); =20 nr_taken =3D isolate_lru_folios(nr_to_scan, lruvec, &l_hold, &nr_scanned, sc, lru); @@ -2117,7 +2117,7 @@ static void shrink_active_list(unsigned long nr_to_sc= an, =20 mod_lruvec_state(lruvec, PGREFILL, nr_scanned); =20 - spin_unlock_irq(&lruvec->lru_lock); + lruvec_unlock_irq(lruvec); =20 while (!list_empty(&l_hold)) { struct folio *folio; @@ -2173,7 +2173,7 @@ static void shrink_active_list(unsigned long nr_to_sc= an, count_memcg_events(lruvec_memcg(lruvec), PGDEACTIVATE, nr_deactivate); mod_node_page_state(pgdat, NR_ISOLATED_ANON + file, -nr_taken); =20 - spin_lock_irq(&lruvec->lru_lock); + lruvec_lock_irq(lruvec); lru_note_cost_unlock_irq(lruvec, file, 0, nr_rotated); trace_mm_vmscan_lru_shrink_active(pgdat->node_id, nr_taken, nr_activate, nr_deactivate, nr_rotated, sc->priority, file); @@ -3794,9 +3794,9 @@ static void walk_mm(struct mm_struct *mm, struct lru_= gen_mm_walk *walk) } =20 if (walk->batched) { - spin_lock_irq(&lruvec->lru_lock); + lruvec_lock_irq(lruvec); reset_batch_size(walk); - spin_unlock_irq(&lruvec->lru_lock); + lruvec_unlock_irq(lruvec); } =20 cond_resched(); @@ -3956,7 +3956,7 @@ static bool inc_max_seq(struct lruvec *lruvec, unsign= ed long seq, int swappiness if (seq < READ_ONCE(lrugen->max_seq)) return false; =20 - spin_lock_irq(&lruvec->lru_lock); + lruvec_lock_irq(lruvec); =20 VM_WARN_ON_ONCE(!seq_is_valid(lruvec)); =20 @@ -3971,7 +3971,7 @@ static bool inc_max_seq(struct lruvec *lruvec, unsign= ed long seq, int swappiness if (inc_min_seq(lruvec, type, swappiness)) continue; =20 - spin_unlock_irq(&lruvec->lru_lock); + lruvec_unlock_irq(lruvec); cond_resched(); goto restart; } @@ -4006,7 +4006,7 @@ static bool inc_max_seq(struct lruvec *lruvec, unsign= ed long seq, int swappiness /* make sure preceding modifications appear */ smp_store_release(&lrugen->max_seq, lrugen->max_seq + 1); unlock: - spin_unlock_irq(&lruvec->lru_lock); + lruvec_unlock_irq(lruvec); =20 return success; } @@ -4697,7 +4697,7 @@ static int evict_folios(unsigned long nr_to_scan, str= uct lruvec *lruvec, struct mem_cgroup *memcg =3D lruvec_memcg(lruvec); struct pglist_data *pgdat =3D lruvec_pgdat(lruvec); =20 - spin_lock_irq(&lruvec->lru_lock); + lruvec_lock_irq(lruvec); =20 scanned =3D isolate_folios(nr_to_scan, lruvec, sc, swappiness, &type, &li= st); =20 @@ -4706,7 +4706,7 @@ static int evict_folios(unsigned long nr_to_scan, str= uct lruvec *lruvec, if (evictable_min_seq(lrugen->min_seq, swappiness) + MIN_NR_GENS > lrugen= ->max_seq) scanned =3D 0; =20 - spin_unlock_irq(&lruvec->lru_lock); + lruvec_unlock_irq(lruvec); =20 if (list_empty(&list)) return scanned; @@ -4744,9 +4744,9 @@ static int evict_folios(unsigned long nr_to_scan, str= uct lruvec *lruvec, walk =3D current->reclaim_state->mm_walk; if (walk && walk->batched) { walk->lruvec =3D lruvec; - spin_lock_irq(&lruvec->lru_lock); + lruvec_lock_irq(lruvec); reset_batch_size(walk); - spin_unlock_irq(&lruvec->lru_lock); + lruvec_unlock_irq(lruvec); } =20 mod_lruvec_state(lruvec, PGDEMOTE_KSWAPD + reclaimer_offset(sc), @@ -5178,7 +5178,7 @@ static void lru_gen_change_state(bool enabled) for_each_node(nid) { struct lruvec *lruvec =3D get_lruvec(memcg, nid); =20 - spin_lock_irq(&lruvec->lru_lock); + lruvec_lock_irq(lruvec); =20 VM_WARN_ON_ONCE(!seq_is_valid(lruvec)); VM_WARN_ON_ONCE(!state_is_valid(lruvec)); @@ -5186,12 +5186,12 @@ static void lru_gen_change_state(bool enabled) lruvec->lrugen.enabled =3D enabled; =20 while (!(enabled ? fill_evictable(lruvec) : drain_evictable(lruvec))) { - spin_unlock_irq(&lruvec->lru_lock); + lruvec_unlock_irq(lruvec); cond_resched(); - spin_lock_irq(&lruvec->lru_lock); + lruvec_lock_irq(lruvec); } =20 - spin_unlock_irq(&lruvec->lru_lock); + lruvec_unlock_irq(lruvec); } =20 cond_resched(); --=20 2.20.1