From nobody Thu Dec 18 00:10:46 2025 Received: from mail-pf1-f202.google.com (mail-pf1-f202.google.com [209.85.210.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BC96E1DFD1 for ; Fri, 6 Dec 2024 00:31:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733445096; cv=none; b=I4FwaujjRmcLm+nihaB2eegW1zk3YXvtWkJ5d+lh7C4PmSt9Ut0ahxI745Tf0kmkNUXIp3BtbUKiahAwa+Kpc5OdCWZ70fAvSXdhF3jfETgI5ha9h5AC/WB1mwSNjqKNsIhAgICDHPW0rBjGY52khsCNIRdR6W3GftTyCiZ4U+w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733445096; c=relaxed/simple; bh=XiSEz2JJBtdIoxT7K/+uOXzsYf9JPp/DAxpitCZzgn0=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=hOydbRsFvvCbglrzXiL0Ma7/QCFLLe3daB8E3SSmceBwQzQ4YTg7B0ggsfTaa0adK3S4qKXGiIIjxE6+2cAteWPX2h44pG2kKA04XFIrkBcSuwPgw+ia+NL9QZK5det89s2ymUGCS9DdkMC068nkjqaDOZtaLbjRv33BPGYmXeE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--yuzhao.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=XT2a2La0; arc=none smtp.client-ip=209.85.210.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--yuzhao.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="XT2a2La0" Received: by mail-pf1-f202.google.com with SMTP id d2e1a72fcca58-7250da8a2a5so1298547b3a.0 for ; Thu, 05 Dec 2024 16:31:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1733445094; x=1734049894; darn=vger.kernel.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=XT2a2La0jZahTt4IX3OAYfCuTwLLPGy2XHv40fX100H2N3eaF9AVmLuHtkrF8oLY/A 3lqFUXwH8Q2zQdf16DHtBWweucklRJqOIpyxXXKYujUq+Ob+whcguBvRclhHaVekyfCo lWdSpE95QeelTEJLXYvzHktwbtusrIJnT2dVwe40b0D4WZ2a7kLLgVZW2UetpS1cpnFj vrITU6z02k72Jqpfv2Z/GqhfjZlfTKbu4AZPx9x3OHK77L69KdIsI5McXOflmUueYksw 0d3uH1XqsMsIO6gpUXMNX+RHnhyEFpamfTlskkf7DsmBZgIf3VfIVz322wLZLYx0D4Rn agxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733445094; x=1734049894; 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=PfvevMvOxk3goLRGDfKyFapXy2l47VQ7GX0/oCeNc/+E032/QWChUYtIJbd2LekT0e LKwIqdRaYMDYPzKp3xFxCRuTexumqkaT1xNhW4Qs8D4vn9WpdDnIqz3OaUn7/hdza0RQ xzWfL8DYFHVmE/mjC15QkiOdZSTL06zu4kcmVkKgAwwIG6Tuxq2hW9KdCoGi1lcypNBI yoNhXuQxGBSxinb8geAzD38OiaSIgfkJRUcNY8+L+s6NkVdt0+GNiUgrd90Osxbe04RW 65oIlr+JZ6AJdzt1OeP1RIv3z/4AZQKQfQFaCCMHfvX5UMPdkcUwkFFEdWsxOZKUFqoX Vtng== X-Forwarded-Encrypted: i=1; AJvYcCXT/sm87Cb0fzzf0xAprgYB6f4ZAQJXmMjJJ0mJveFgsWsH5xGP/lnUlvDh6IWj8xujPLaMyaDdprakhlk=@vger.kernel.org X-Gm-Message-State: AOJu0YwghwKVbufK0Z2MwmTrraAOurCq/ml8DZPAFiHiMVGSkEzNY2LR YsQdpZ8Et2XU5N6+BaWcAjitKpos6Tf3dnbKgaqgxSs43mvqDplG+z/wDe+xqoj/mXtpXNpGcG8 KDg== X-Google-Smtp-Source: AGHT+IG6Au9pfRghDcM8iM0cy1enSAIDDkXjALs9OLLc2AlZ1mMtncq3AmviK9jGO8YbyJSyYoHMLUHAqO4= X-Received: from pfbc10.prod.google.com ([2002:a05:6a00:ad0a:b0:725:8ee5:e458]) (user=yuzhao job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:8d6:b0:725:8f15:f897 with SMTP id d2e1a72fcca58-725b80e4a9dmr2046628b3a.4.1733445094214; Thu, 05 Dec 2024 16:31:34 -0800 (PST) Date: Thu, 5 Dec 2024 17:31:21 -0700 In-Reply-To: <20241206003126.1338283-1-yuzhao@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20241206003126.1338283-1-yuzhao@google.com> X-Mailer: git-send-email 2.47.0.338.g60cca15819-goog Message-ID: <20241206003126.1338283-2-yuzhao@google.com> Subject: [PATCH mm-unstable v2 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 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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; =20 - rcu_read_lock(); - if (lru_gen_enabled()) { - bool recent =3D lru_gen_test_recent(shadow, file, - &eviction_lruvec, &eviction, workingset); + bool recent; =20 + rcu_read_lock(); + recent =3D lru_gen_test_recent(shadow, file, &eviction_lruvec, + &eviction, workingset); rcu_read_unlock(); return recent; } =20 - + rcu_read_lock(); unpack_shadow(shadow, &memcgid, &pgdat, &eviction, workingset); eviction <<=3D bucket_order; =20 @@ -459,14 +459,12 @@ bool workingset_test_recent(void *shadow, bool file, = bool *workingset, * configurations instead. */ eviction_memcg =3D 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 =3D 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 *shad= ow) bool workingset; long nr; =20 + 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 *shad= ow) * 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 =3D folio_nr_pages(folio); memcg =3D folio_memcg(folio); pgdat =3D folio_pgdat(folio); --=20 2.47.0.338.g60cca15819-goog From nobody Thu Dec 18 00:10:46 2025 Received: from mail-oa1-f74.google.com (mail-oa1-f74.google.com [209.85.160.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C9C2438384 for ; Fri, 6 Dec 2024 00:31:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733445099; cv=none; b=Ap9dqP06/ekVpyz8gQupDPx13s5MDfzttUjo1MXXjWg70NGiuhCpCvP3qkm/Tj7vAEVr2Zc+N0WGCeMNTJrqAkpGS1aGQdKrIn4whY7tKL6vLwaEPdYOfJb8Tf9zaax01f6cgGhPF/zpQXj7BenPeaQitnd/sN2Txjv3T6Df7LM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733445099; c=relaxed/simple; bh=1hD1lletugdyH+qz+YPYmDUibRXlcEodpBsnm0JbD9I=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=rwdIv7wiMVonbEA9OQBVMVYvypJVG6UJZYMiwHfMxOnOLrO4764+ubX16kBcr73+yHErS3R9+GmWlvpiccn2+XErxsBsxlabaY4X6mZCB2CIvcF5DOcG1hFhBG2eT8deUWttI+CVxE1N4nh9MvKxIqxyJs22awmJIcnXluYoib4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--yuzhao.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=Iuxx1ITB; arc=none smtp.client-ip=209.85.160.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--yuzhao.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="Iuxx1ITB" Received: by mail-oa1-f74.google.com with SMTP id 586e51a60fabf-29e4a2e4d82so2029448fac.1 for ; Thu, 05 Dec 2024 16:31:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1733445097; x=1734049897; darn=vger.kernel.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=Iuxx1ITB+fDgH+vJFMe7sT2Iv1lDYccP+du2DgRXZ3u4aA75i6OH80vHK4wrupHE9G Kb2O+D72X9sddTFeweJwtY3qPbmoz2sK0P8egLwDf/2QGpqbINEoUDwca9S482dQ+Vv2 1c0Yd7WchhB8La2S0YCRWzq480NfSUbVGE+ZTLspn7MvsAc7Kjtz6nwHyplwWcDjGIsc /h/W3k3o6P2+2Ag6gj9q3f4AZrNNFc7/7Tw8EJp07f2m7NANO9XXToN04kYB81OXVpQ6 Rr13arydU5U1NJc0+1wX/fT5hO8J8pyHpBJ9UbRudnB6ELbtqwVL472OEbjBS+MDE408 MWEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733445097; x=1734049897; 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=MzMax/czVG84ub7kiU/oj4DPy2GyrTcHqtUkzIlfqFZZ43ats1fObRwUxuaGo1mJ80 RGDb5mq1DLNR0UndsBcUZtyzwvPj2uM02KQHL1AQBr1GFFYV2vIoDiPiWLYZWQIDR2Xf SJ5eJFtgVPIMkLa5jBpvELikuJA9ZuMXPHw+DsrYPHihRC26AudmBnqqwksiEksN3m7l X69bEWOlDxhtAxLIMJrmqQyJqUWqP57k9GkRJ57ooA79bXhaYxck1/i8mvX+DN86H3iu z3MBDBeGC6N5YwdMm+ywQHKtcehcImDzo8inzBS3WXrxNwc+3Ux9ZxAu0LR7cKhakdmz ALUQ== X-Forwarded-Encrypted: i=1; AJvYcCVP2NW7HYb9XNhHHF+efBYWGEy3tpkigcZvka3TK6dK//OK7G+fzvOh22UamybQQrisj0LT1wAw+jv/s6s=@vger.kernel.org X-Gm-Message-State: AOJu0YzC0oeNHOQzXztdp65pEK8qBZSvu1J6LIvJjOPszwyw5yhOrcru 87itU8dxl42/8NYVEPQ0rFKkAS093LElkaPdZVjRhAdDxZrovft2XZ4FxV7/4QYVKSwdyCuC3Zv zaA== X-Google-Smtp-Source: AGHT+IHG56U6ff/2ISJCA5gXcXDrcTLQkj6CAfollUPpPgK2o7iXSrjbLgXvQK+fFy4kFbchimZeACpqNOE= X-Received: from oabra18.prod.google.com ([2002:a05:6871:6112:b0:29e:9a9e:5041]) (user=yuzhao job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6870:d90c:b0:29e:4b63:d7 with SMTP id 586e51a60fabf-29f731a2894mr1012088fac.1.1733445096951; Thu, 05 Dec 2024 16:31:36 -0800 (PST) Date: Thu, 5 Dec 2024 17:31:22 -0700 In-Reply-To: <20241206003126.1338283-1-yuzhao@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20241206003126.1338283-1-yuzhao@google.com> X-Mailer: git-send-email 2.47.0.338.g60cca15819-goog Message-ID: <20241206003126.1338283-3-yuzhao@google.com> Subject: [PATCH mm-unstable v2 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 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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=3D/dev/nvme1n1p2 -direct=3D0 -thread -size=3D1024G \ -rwmixwrite=3D30 --norandommap --randrepeat=3D0 -ioengine=3Dsync \ -bs=3D4k -numjobs=3D400 -runtime=3D25000 --time_based \ -group_reporting -name=3Dmglru 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 *fo= lio) } =20 #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 =3D READ_ONCE(folio->flags); =20 @@ -406,10 +407,30 @@ static void folio_inc_refs(struct folio *folio) new_flags |=3D 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 =3D folio_lru_gen(folio); + int type =3D folio_is_file_lru(folio); + struct lru_gen_folio *lrugen =3D &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 =3D=3D 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 */ =20 /** @@ -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; } =20 @@ -524,7 +545,7 @@ void folio_add_lru_vma(struct folio *folio, struct vm_a= rea_struct *vma) */ static void lru_deactivate_file(struct lruvec *lruvec, struct folio *folio) { - bool active =3D folio_test_active(folio); + bool active =3D folio_test_active(folio) || lru_gen_enabled(); long nr_pages =3D folio_nr_pages(folio); =20 if (folio_test_unevictable(folio)) @@ -589,7 +610,10 @@ static void lru_lazyfree(struct lruvec *lruvec, struct= folio *folio) =20 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; =20 + if (lru_gen_enabled() && lru_gen_clear_refs(folio)) + return; + folio_batch_add_and_move(folio, lru_deactivate_file, true); } =20 @@ -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_ge= n_enabled())) + if (folio_test_unevictable(folio)) + return; + + if (lru_gen_enabled() ? lru_gen_clear_refs(folio) : !folio_test_active(fo= lio)) return; =20 folio_batch_add_and_move(folio, lru_deactivate, true); --=20 2.47.0.338.g60cca15819-goog From nobody Thu Dec 18 00:10:46 2025 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 669D53B2BB for ; Fri, 6 Dec 2024 00:31:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733445102; cv=none; b=OHd4jsBFEAix2C0Ud0Eh8FMrd47YnacQvGg6D6f/0xuaiIQizGvSWKsPO6u21z8bIoOYT8/prR5Zw/Vf2nzyeZVjQHyxfiI5GEodN1x9ZYHz3UTMp2ahiRS1xjxvyZklN4fDkRgg6RlLsxzMbgu4FKGJZBvY7Geot1GF/ZzGf9w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733445102; c=relaxed/simple; bh=SdBdoFZBzDFJ4xCZGlyHPtZBQmr1hom1R/GUYtzyBBc=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=GNBDf0Xw/qMdCQRj+Cv8wqJWOLqIWqkZiY/YHdjZ9E7wUk+VZTRE2clut+gNDWY2S+D3Jw5ZR3DHlvWTH+Vb+wC9eOMMCVew+G6yoL5d8u5v4j69xTlWLhQyTr198AYhTHbQ9Wdb+eQ+bkQE7Tq8Zekuih2qfMf8oP/wA/tLaCQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--yuzhao.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=NpZaBTjB; arc=none smtp.client-ip=209.85.214.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--yuzhao.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="NpZaBTjB" Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-2154e1cdf72so16690955ad.3 for ; Thu, 05 Dec 2024 16:31:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1733445100; x=1734049900; darn=vger.kernel.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=NpZaBTjBoGXDe7ArlH7sUtENl4c/1jSKZ6qnjQtrLlSo+/ywA10MaukAy1JKSfyD9y RH1nbEjoxptWpkFJB8RrvEZ8Pkpvy7sDOxIUahGCqRwBpj/AjaLBdqHQqjcWyrn2Omhy bF4BNB+vytAlT/5YjubpXc7tdwbiKrb93BH9cmJDtg1TOnqExXT4E6lhFXyZ0I7TW1qD czTDshtvtwWSAmsh6zGr5vvvSJGiYIryo6GNskjQP0GQ11lZH3b369i8NwWG7ojtvCuD CmnKGT575qHd+Dbp7fbixowUF76qHNlRMUOlZJMcyGSy8wwkgxiHHTRyIMDYOmbXvvve QWUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733445100; x=1734049900; 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=FY8DTC+lORYQeEcOMVsQiu0eQNDsHaYrcYP/6O4kyOxvHnDcIbBzX55GWs7w3ugRIy ItV9FwpspOnHP4ke3psom8WkoNvhVaOcm8ChVwOfdahAsgfIkV/rUakCE8T4hlkgSgEO Y+hy3KNzkwGVNKFjvQxavOLnJPks7cndgUE1rPRBeZD4fg7P14FZ1I3uGmsrIh8+fT+5 z2sWztmZ8deziTjk5q1mgkUw3OYFAuk+0tFhO8QJ6nosjUI25DdoFw1vmWNlHuFe/nit 3AsfP5orKo0BVtW9aIKFwCsGwE41jkeFQMW0rrivPjZIxECddA0F9TFCIsEB9oijAybX ESXQ== X-Forwarded-Encrypted: i=1; AJvYcCVI6DHEFGz9K2jQFhbFefmYknqy4NC+UFhC/3BWATO4Y2P84ViAWlt9pdtkau6aobzoa3SE1yQLxXPe0r0=@vger.kernel.org X-Gm-Message-State: AOJu0YyTCHnna/aLE6fjbooib8Ay6xYCZYfFonbWUFKdS+1tWU+4qLgL VNCs0CRvBw8plBzf9Uh/8Nh0IZn5f1O55I8BNVDFy0kTtUlMnNhh8y3CI1O1wAq6rvCY3pk6I/D Zgw== X-Google-Smtp-Source: AGHT+IGARiTmCyLkm3u7hD+Znks+begLp6HQetG4yLAdPKodzK2Xx8PDWX1HYfje4Mbo+dqEamZnBwYUV6c= X-Received: from pltf4.prod.google.com ([2002:a17:902:74c4:b0:215:ac55:d3e1]) (user=yuzhao job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:41d0:b0:215:8af7:eff8 with SMTP id d9443c01a7336-21614dc710amr11353915ad.52.1733445099701; Thu, 05 Dec 2024 16:31:39 -0800 (PST) Date: Thu, 5 Dec 2024 17:31:23 -0700 In-Reply-To: <20241206003126.1338283-1-yuzhao@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20241206003126.1338283-1-yuzhao@google.com> X-Mailer: git-send-email 2.47.0.338.g60cca15819-goog Message-ID: <20241206003126.1338283-4-yuzhao@google.com> Subject: [PATCH mm-unstable v2 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 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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; }; =20 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]), \ } =20 +#define evictable_min_seq(min_seq, swappiness) \ + min((min_seq)[!(swappiness)], (min_seq)[(swappiness) !=3D MAX_SWAPPINESS]) + #define for_each_gen_type_zone(gen, type, zone) \ for ((gen) =3D 0; (gen) < MAX_NR_GENS; (gen)++) \ for ((type) =3D 0; (type) < ANON_AND_FILE; (type)++) \ for ((zone) =3D 0; (zone) < MAX_NR_ZONES; (zone)++) =20 +#define for_each_evictable_type(type, swappiness) \ + for ((type) =3D !(swappiness); (type) <=3D ((swappiness) !=3D MAX_SWAPPIN= ESS); (type)++) + #define get_memcg_gen(seq) ((seq) % MEMCG_NR_GENS) #define get_memcg_bin(bin) ((bin) % MEMCG_NR_BINS) =20 @@ -2673,10 +2679,16 @@ static int get_nr_gens(struct lruvec *lruvec, int t= ype) =20 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) >=3D MIN_NR_GENS && - get_nr_gens(lruvec, LRU_GEN_FILE) <=3D get_nr_gens(lruvec, LRU_GEN= _ANON) && - get_nr_gens(lruvec, LRU_GEN_ANON) <=3D MAX_NR_GENS; + int type; + + for (type =3D 0; type < ANON_AND_FILE; type++) { + int n =3D get_nr_gens(lruvec, type); + + if (n < MIN_NR_GENS || n > MAX_NR_GENS) + return false; + } + + return true; } =20 /*************************************************************************= ***** @@ -3083,9 +3095,8 @@ static void read_ctrl_pos(struct lruvec *lruvec, int = type, int tier, int gain, pos->refaulted =3D lrugen->avg_refaulted[type][tier] + atomic_long_read(&lrugen->refaulted[hist][type][tier]); pos->total =3D lrugen->avg_total[type][tier] + + lrugen->protected[hist][type][tier] + atomic_long_read(&lrugen->evicted[hist][type][tier]); - if (tier) - pos->total +=3D lrugen->protected[hist][type][tier - 1]; pos->gain =3D gain; } =20 @@ -3112,17 +3123,15 @@ static void reset_ctrl_pos(struct lruvec *lruvec, i= nt type, bool carryover) WRITE_ONCE(lrugen->avg_refaulted[type][tier], sum / 2); =20 sum =3D lrugen->avg_total[type][tier] + + lrugen->protected[hist][type][tier] + atomic_long_read(&lrugen->evicted[hist][type][tier]); - if (tier) - sum +=3D lrugen->protected[hist][type][tier - 1]; WRITE_ONCE(lrugen->avg_total[type][tier], sum / 2); } =20 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, unsig= ned long end, struct mm_wal return true; =20 if (vma_is_anonymous(vma)) - return !walk->can_swap; + return !walk->swappiness; =20 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, unsi= gned long end, struct mm_wal return true; =20 if (shmem_mapping(mapping)) - return !walk->can_swap; + return !walk->swappiness; + + if (walk->swappiness =3D=3D MAX_SWAPPINESS) + return true; =20 /* 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 } =20 static struct folio *get_pfn_folio(unsigned long pfn, struct mem_cgroup *m= emcg, - struct pglist_data *pgdat, bool can_swap) + struct pglist_data *pgdat) { struct folio *folio; =20 @@ -3366,10 +3378,6 @@ static struct folio *get_pfn_folio(unsigned long pfn= , struct mem_cgroup *memcg, if (folio_memcg(folio) !=3D memcg) return NULL; =20 - /* file VMAs can contain anon pages from COW */ - if (!folio_is_file_lru(folio) && !can_swap) - return NULL; - return folio; } =20 @@ -3425,7 +3433,7 @@ static bool walk_pte_range(pmd_t *pmd, unsigned long = start, unsigned long end, if (pfn =3D=3D -1) continue; =20 - folio =3D get_pfn_folio(pfn, memcg, pgdat, walk->can_swap); + folio =3D get_pfn_folio(pfn, memcg, pgdat); if (!folio) continue; =20 @@ -3510,7 +3518,7 @@ static void walk_pmd_range_locked(pud_t *pud, unsigne= d long addr, struct vm_area if (pfn =3D=3D -1) goto next; =20 - folio =3D get_pfn_folio(pfn, memcg, pgdat, walk->can_swap); + folio =3D get_pfn_folio(pfn, memcg, pgdat); if (!folio) goto next; =20 @@ -3722,22 +3730,26 @@ static void clear_mm_walk(void) kfree(walk); } =20 -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 =3D MAX_LRU_BATCH; struct lru_gen_folio *lrugen =3D &lruvec->lrugen; + int hist =3D lru_hist_from_seq(lrugen->min_seq[type]); int new_gen, old_gen =3D lru_gen_from_seq(lrugen->min_seq[type]); =20 - if (type =3D=3D LRU_GEN_ANON && !can_swap) + if (type ? swappiness =3D=3D MAX_SWAPPINESS : !swappiness) goto done; =20 - /* prevent cold/hot inversion if force_scan is true */ + /* prevent cold/hot inversion if the type is evictable */ for (zone =3D 0; zone < MAX_NR_ZONES; zone++) { struct list_head *head =3D &lrugen->folios[old_gen][type][zone]; =20 while (!list_empty(head)) { struct folio *folio =3D lru_to_folio(head); + int refs =3D folio_lru_refs(folio); + int tier =3D lru_tier_from_refs(refs); + int delta =3D folio_nr_pages(folio); =20 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 ty= pe, bool can_swap) new_gen =3D folio_inc_gen(lruvec, folio, false); list_move_tail(&folio->lru, &lrugen->folios[new_gen][type][zone]); =20 + 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; } =20 -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 =3D false; struct lru_gen_folio *lrugen =3D &lruvec->lrugen; - DEFINE_MIN_SEQ(lruvec); =20 VM_WARN_ON_ONCE(!seq_is_valid(lruvec)); =20 - /* find the oldest populated generation */ - for (type =3D !can_swap; type < ANON_AND_FILE; type++) { - while (min_seq[type] + MIN_NR_GENS <=3D lrugen->max_seq) { - gen =3D lru_gen_from_seq(min_seq[type]); + for_each_evictable_type(type, swappiness) { + unsigned long seq; + + for (seq =3D lrugen->min_seq[type]; seq + MIN_NR_GENS <=3D lrugen->max_s= eq; seq++) { + gen =3D lru_gen_from_seq(seq); =20 for (zone =3D 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] =3D min(min_seq[LRU_GEN_ANON], min_seq[LRU_GEN_FIL= E]); - min_seq[LRU_GEN_FILE] =3D max(min_seq[LRU_GEN_ANON], lrugen->min_seq[LRU= _GEN_FILE]); - } - - for (type =3D !can_swap; type < ANON_AND_FILE; type++) { - if (min_seq[type] =3D=3D lrugen->min_seq[type]) - continue; - - reset_ctrl_pos(lruvec, type, true); - WRITE_ONCE(lrugen->min_seq[type], min_seq[type]); - success =3D true; + if (seq !=3D lrugen->min_seq[type]) { + reset_ctrl_pos(lruvec, type, true); + WRITE_ONCE(lrugen->min_seq[type], seq); + success =3D true; + } } =20 return success; } =20 -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 swap= piness) { bool success; int prev, next; @@ -3820,13 +3821,11 @@ static bool inc_max_seq(struct lruvec *lruvec, unsi= gned long seq, if (!success) goto unlock; =20 - for (type =3D ANON_AND_FILE - 1; type >=3D 0; type--) { + for (type =3D 0; type < ANON_AND_FILE; type++) { if (get_nr_gens(lruvec, type) !=3D MAX_NR_GENS) continue; =20 - VM_WARN_ON_ONCE(!force_scan && (type =3D=3D LRU_GEN_FILE || can_swap)); - - if (inc_min_seq(lruvec, type, can_swap)) + if (inc_min_seq(lruvec, type, swappiness)) continue; =20 spin_unlock_irq(&lruvec->lru_lock); @@ -3870,7 +3869,7 @@ static bool inc_max_seq(struct lruvec *lruvec, unsign= ed long seq, } =20 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)); =20 if (!mm_state) - return inc_max_seq(lruvec, seq, can_swap, force_scan); + return inc_max_seq(lruvec, seq, swappiness); =20 /* see the comment in iterate_mm_list() */ if (seq <=3D READ_ONCE(mm_state->seq)) @@ -3906,7 +3905,7 @@ static bool try_to_inc_max_seq(struct lruvec *lruvec,= unsigned long seq, =20 walk->lruvec =3D lruvec; walk->seq =3D seq; - walk->can_swap =3D can_swap; + walk->swappiness =3D swappiness; walk->force_scan =3D force_scan; =20 do { @@ -3916,7 +3915,7 @@ static bool try_to_inc_max_seq(struct lruvec *lruvec,= unsigned long seq, } while (mm); done: if (success) { - success =3D inc_max_seq(lruvec, seq, can_swap, force_scan); + success =3D inc_max_seq(lruvec, seq, swappiness); WARN_ON_ONCE(!success); } =20 @@ -3957,13 +3956,13 @@ static bool lruvec_is_sizable(struct lruvec *lruvec= , struct scan_control *sc) { int gen, type, zone; unsigned long total =3D 0; - bool can_swap =3D get_swappiness(lruvec, sc); + int swappiness =3D get_swappiness(lruvec, sc); struct lru_gen_folio *lrugen =3D &lruvec->lrugen; struct mem_cgroup *memcg =3D lruvec_memcg(lruvec); DEFINE_MAX_SEQ(lruvec); DEFINE_MIN_SEQ(lruvec); =20 - for (type =3D !can_swap; type < ANON_AND_FILE; type++) { + for_each_evictable_type(type, swappiness) { unsigned long seq; =20 for (seq =3D min_seq[type]; seq <=3D max_seq; seq++) { @@ -3983,6 +3982,7 @@ static bool lruvec_is_reclaimable(struct lruvec *lruv= ec, struct scan_control *sc { int gen; unsigned long birth; + int swappiness =3D get_swappiness(lruvec, sc); struct mem_cgroup *memcg =3D lruvec_memcg(lruvec); DEFINE_MIN_SEQ(lruvec); =20 @@ -3992,8 +3992,7 @@ static bool lruvec_is_reclaimable(struct lruvec *lruv= ec, struct scan_control *sc if (!lruvec_is_sizable(lruvec, sc)) return false; =20 - /* see the comment on lru_gen_folio */ - gen =3D lru_gen_from_seq(min_seq[LRU_GEN_FILE]); + gen =3D lru_gen_from_seq(evictable_min_seq(min_seq, swappiness)); birth =3D READ_ONCE(lruvec->lrugen.timestamps[gen]); =20 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 =3D pvmw->address; struct vm_area_struct *vma =3D pvmw->vma; struct folio *folio =3D pfn_folio(pvmw->pfn); - bool can_swap =3D !folio_is_file_lru(folio); struct mem_cgroup *memcg =3D folio_memcg(folio); struct pglist_data *pgdat =3D folio_pgdat(folio); struct lruvec *lruvec =3D mem_cgroup_lruvec(memcg, pgdat); @@ -4113,7 +4111,7 @@ bool lru_gen_look_around(struct page_vma_mapped_walk = *pvmw) if (pfn =3D=3D -1) continue; =20 - folio =3D get_pfn_folio(pfn, memcg, pgdat, can_swap); + folio =3D get_pfn_folio(pfn, memcg, pgdat); if (!folio) continue; =20 @@ -4329,8 +4327,8 @@ static bool sort_folio(struct lruvec *lruvec, struct = folio *folio, struct scan_c gen =3D folio_inc_gen(lruvec, folio, false); list_move_tail(&folio->lru, &lrugen->folios[gen][type][zone]); =20 - 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; } =20 @@ -4529,7 +4527,6 @@ static int isolate_folios(struct lruvec *lruvec, stru= ct scan_control *sc, int sw { int i; int type; - int scanned; int tier =3D -1; DEFINE_MIN_SEQ(lruvec); =20 @@ -4554,21 +4551,23 @@ static int isolate_folios(struct lruvec *lruvec, st= ruct scan_control *sc, int sw else type =3D get_type_to_scan(lruvec, swappiness, &tier); =20 - for (i =3D !swappiness; i < ANON_AND_FILE; i++) { + for_each_evictable_type(i, swappiness) { + int scanned; + if (tier < 0) tier =3D get_tier_idx(lruvec, type); =20 + *type_scanned =3D type; + scanned =3D scan_folios(lruvec, sc, type, tier, list); if (scanned) - break; + return scanned; =20 type =3D !type; tier =3D -1; } =20 - *type_scanned =3D type; - - return scanned; + return 0; } =20 static int evict_folios(struct lruvec *lruvec, struct scan_control *sc, in= t 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 =3D false; + struct lru_gen_folio *lrugen =3D &lruvec->lrugen; struct mem_cgroup *memcg =3D lruvec_memcg(lruvec); struct pglist_data *pgdat =3D lruvec_pgdat(lruvec); =20 @@ -4593,7 +4593,7 @@ static int evict_folios(struct lruvec *lruvec, struct= scan_control *sc, int swap =20 scanned +=3D try_to_inc_min_seq(lruvec, swappiness); =20 - if (get_nr_gens(lruvec, !swappiness) =3D=3D MIN_NR_GENS) + if (evictable_min_seq(lrugen->min_seq, swappiness) + MIN_NR_GENS > lrugen= ->max_seq) scanned =3D 0; =20 spin_unlock_irq(&lruvec->lru_lock); @@ -4665,63 +4665,32 @@ static int evict_folios(struct lruvec *lruvec, stru= ct scan_control *sc, int swap } =20 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 =3D 0; - unsigned long young =3D 0; - unsigned long total =3D 0; + unsigned long size =3D 0; struct lru_gen_folio *lrugen =3D &lruvec->lrugen; DEFINE_MIN_SEQ(lruvec); =20 - /* whether this lruvec is completely out of cold folios */ - if (min_seq[!can_swap] + MIN_NR_GENS > max_seq) { - *nr_to_scan =3D 0; + *nr_to_scan =3D 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; - } =20 - for (type =3D !can_swap; type < ANON_AND_FILE; type++) { + for_each_evictable_type(type, swappiness) { unsigned long seq; =20 for (seq =3D min_seq[type]; seq <=3D max_seq; seq++) { - unsigned long size =3D 0; - gen =3D lru_gen_from_seq(seq); =20 for (zone =3D 0; zone < MAX_NR_ZONES; zone++) size +=3D max(READ_ONCE(lrugen->nr_pages[gen][type][zone]), 0L); - - total +=3D size; - if (seq =3D=3D max_seq) - young +=3D size; - else if (seq + MIN_NR_GENS =3D=3D max_seq) - old +=3D size; } } =20 - *nr_to_scan =3D 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 =3D size; + /* better to run aging even though eviction is still possible */ + return evictable_min_seq(min_seq, swappiness) + MIN_NR_GENS =3D=3D max_se= q; } =20 /* @@ -4729,7 +4698,7 @@ static bool should_run_aging(struct lruvec *lruvec, u= nsigned 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, str= uct scan_control *sc, bool if (mem_cgroup_below_min(sc->target_mem_cgroup, memcg)) return -1; =20 - success =3D should_run_aging(lruvec, max_seq, can_swap, &nr_to_scan); + success =3D should_run_aging(lruvec, max_seq, swappiness, &nr_to_scan); =20 /* 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, str= uct scan_control *sc, bool return nr_to_scan >> sc->priority; =20 /* 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; } =20 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 =3D "rep"; n[0] =3D atomic_long_read(&lrugen->refaulted[hist][type][tier]); n[1] =3D atomic_long_read(&lrugen->evicted[hist][type][tier]); - if (tier) - n[2] =3D READ_ONCE(lrugen->protected[hist][type][tier - 1]); + n[2] =3D READ_ONCE(lrugen->protected[hist][type][tier]); } =20 for (i =3D 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); =20 if (!full) - seq =3D min_seq[LRU_GEN_ANON]; + seq =3D evictable_min_seq(min_seq, MAX_SWAPPINESS / 2); else if (max_seq >=3D MAX_NR_GENS) seq =3D max_seq - MAX_NR_GENS + 1; else @@ -5390,23 +5358,14 @@ static const struct seq_operations lru_gen_seq_ops = =3D { }; =20 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; =20 if (seq > max_seq) return -EINVAL; =20 - if (!force_scan && min_seq[!can_swap] + MAX_NR_GENS - 1 <=3D 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; } =20 static int run_eviction(struct lruvec *lruvec, unsigned long seq, struct s= can_control *sc, @@ -5422,7 +5381,7 @@ static int run_eviction(struct lruvec *lruvec, unsign= ed long seq, struct scan_co while (!signal_pending(current)) { DEFINE_MIN_SEQ(lruvec); =20 - if (seq < min_seq[!swappiness]) + if (seq < evictable_min_seq(min_seq, swappiness)) return 0; =20 if (sc->nr_reclaimed >=3D nr_to_reclaim) --=20 2.47.0.338.g60cca15819-goog From nobody Thu Dec 18 00:10:46 2025 Received: from mail-pf1-f201.google.com (mail-pf1-f201.google.com [209.85.210.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3C992558A5 for ; Fri, 6 Dec 2024 00:31:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733445104; cv=none; b=lcFkAUtEks9Nc/cDRhgCgja1XxEkmclNyvT/fAlzHJSr+ZdJHkeDHhEoyxBNWcDSwj8MEP3vawGVHEFkQpqkRPoyN2Wb0SIwSanvfjqgsn7WItMENcQBtUc8cZoEw4H8M9Phhu/k1LegDEnMBPNPq4AP314vnTeEyyZHOh3B5Wk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733445104; c=relaxed/simple; bh=KClDlWCi6SSa0R6rJOBLi/JB8ZGv/AnKAuzivugP4Fg=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=CJvXidDLni6hp8oM6YRMg80SaTCeW/FGjCq/xmPont/HNUzLmmFVUBgaIlc62ZQemquRscC1iii/QIHYTQSNzZQwiKcS5CP4EsrGbUUBmG7A+5GeuIyLPfPvIyXrIrvUzoKALX+PheI9qpkNQdUeqImUWQm+ESfcbs01t+7vfcY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--yuzhao.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=XZmDDcAh; arc=none smtp.client-ip=209.85.210.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--yuzhao.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="XZmDDcAh" Received: by mail-pf1-f201.google.com with SMTP id d2e1a72fcca58-725b7e75f15so571565b3a.3 for ; Thu, 05 Dec 2024 16:31:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1733445102; x=1734049902; darn=vger.kernel.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=h1mvjlX5nT1rLjjtVWZn8iR4hG3sSfAtSE80GuqS3ww=; b=XZmDDcAhR7B2s9NLqaNNu9Ar/e8zo3r2+PmHQ0rXaF6KUyhLBozxJd7a4u8RnfGJud GjWuhiC22BKgAX9zz5areNrl08bfKyNaWKWRHyaBueQD89rnLgbk/c7PFw9FlSMNQ9i0 vSxy1aqETUZAgjG37GWbrC6+dy2UgCemg5WTEz18ZkUp8uR/MUyiQ/8Z/DZDsdiLK2Mk kL1llIv87Zony6ID2V5Y5s9FlF0pMlOPg0y4M9Lm/bTc2aLQb5y06yctLaFZ9qYL8MmI mJhtS2/8Q5/2aVGo06UUvcnpkLWCOL9BECKosck0xEE8cBJ8cH415a8EW7SvFA61WYA0 esdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733445102; x=1734049902; 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=h1mvjlX5nT1rLjjtVWZn8iR4hG3sSfAtSE80GuqS3ww=; b=Z1HYrlUEjST+Qhv1Qu4NHp9Pdf02vIh9ZxBg587ayosgc1/S0KMGo2bnbo5ET/ujw4 AVKsuM0iaPHkT0VCarYoJ1XevgQ6FLpS+e0EhGBXModqp0+SHkhaRmvMW50DWMtuDppj GfHyKcQuE9o7Ns5RRRwrdP2Ce0fle/JBSprbbH2ehJzvZ85gQihWaYo8pGatma/qZlY6 PUATWfViNwouVWPXyftWWLlc62df8w/6LxnsAir1utejg2zuakPEhQj/pAzpLpNycOuS UmgLKYKOH8x05z9jaLp4f4Nh8rJxxCV2Qy6Fu1XjrG3eUzwOrDxOKaNjlpqSBw2JPbCd YbLg== X-Forwarded-Encrypted: i=1; AJvYcCX1Egy34xN0NKeRyGI7RRiB0wVWh8QihcnacxilZktpt+gNgG1fWiRGJwE/uQHVHv1U8D384ixN2ZumxfI=@vger.kernel.org X-Gm-Message-State: AOJu0YzEuNkAlXllaBnJzs1OlEg1jtZo+r0u5Bkq5EBZs7xTbb4Tnpc+ UIsBDB1onpIB3HGFZpwGfhi42aRj9tffyhx0hSRKu97tQOF3hqp4DJO8rszZxYoVdSdcw10sajx QuQ== X-Google-Smtp-Source: AGHT+IHDpfbWWJjycwRdIOATm4/TSA+FDknfDh4D0XImpwFKpP+OCJtRJF+zzzhrB+mJ306ByBPns1yu/E8= X-Received: from pfbim19.prod.google.com ([2002:a05:6a00:8d93:b0:725:3321:1f0c]) (user=yuzhao job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:4fc7:b0:725:9d1d:3462 with SMTP id d2e1a72fcca58-725b81c1481mr1987282b3a.25.1733445102450; Thu, 05 Dec 2024 16:31:42 -0800 (PST) Date: Thu, 5 Dec 2024 17:31:24 -0700 In-Reply-To: <20241206003126.1338283-1-yuzhao@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20241206003126.1338283-1-yuzhao@google.com> X-Mailer: git-send-email 2.47.0.338.g60cca15819-goog Message-ID: <20241206003126.1338283-5-yuzhao@google.com> Subject: [PATCH mm-unstable v2 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 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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..02b01ae2bdbb 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 g= ain, struct ctrl_pos *pos) { + int i; struct lru_gen_folio *lrugen =3D &lruvec->lrugen; int hist =3D lru_hist_from_seq(lrugen->min_seq[type]); =20 - pos->refaulted =3D lrugen->avg_refaulted[type][tier] + - atomic_long_read(&lrugen->refaulted[hist][type][tier]); - pos->total =3D lrugen->avg_total[type][tier] + - lrugen->protected[hist][type][tier] + - atomic_long_read(&lrugen->evicted[hist][type][tier]); pos->gain =3D gain; + pos->refaulted =3D pos->total =3D 0; + + for (i =3D tier % MAX_NR_TIERS; i <=3D min(tier, MAX_NR_TIERS - 1); i++) { + pos->refaulted +=3D lrugen->avg_refaulted[type][i] + + atomic_long_read(&lrugen->refaulted[hist][type][i]); + pos->total +=3D lrugen->avg_total[type][i] + + lrugen->protected[hist][type][i] + + atomic_long_read(&lrugen->evicted[hist][type][i]); + } } =20 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; =20 /* - * 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 =3D 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; } =20 -static int get_type_to_scan(struct lruvec *lruvec, int swappiness, int *ti= er_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] =3D { swappiness, MAX_SWAPPINESS - swappiness }; =20 + if (!swappiness) + return LRU_GEN_FILE; + + if (swappiness =3D=3D 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 =3D 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 - swappi= ness, &pv); =20 - read_ctrl_pos(lruvec, !type, 0, gain[!type], &sp); - for (tier =3D 1; tier < MAX_NR_TIERS; tier++) { - read_ctrl_pos(lruvec, type, tier, gain[type], &pv); - if (!positive_ctrl_err(&sp, &pv)) - break; - } - - *tier_idx =3D tier - 1; - - return type; + return positive_ctrl_err(&sp, &pv); } =20 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 =3D -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 =3D LRU_GEN_FILE; - else if (min_seq[LRU_GEN_ANON] < min_seq[LRU_GEN_FILE]) - type =3D LRU_GEN_ANON; - else if (swappiness =3D=3D 1) - type =3D LRU_GEN_FILE; - else if (swappiness =3D=3D MAX_SWAPPINESS) - type =3D LRU_GEN_ANON; - else if (!(sc->gfp_mask & __GFP_IO)) - type =3D LRU_GEN_FILE; - else - type =3D get_type_to_scan(lruvec, swappiness, &tier); + int type =3D get_type_to_scan(lruvec, swappiness); =20 for_each_evictable_type(i, swappiness) { int scanned; - - if (tier < 0) - tier =3D get_tier_idx(lruvec, type); + int tier =3D get_tier_idx(lruvec, type); =20 *type_scanned =3D type; =20 @@ -4564,7 +4535,6 @@ static int isolate_folios(struct lruvec *lruvec, stru= ct scan_control *sc, int sw return scanned; =20 type =3D !type; - tier =3D -1; } =20 return 0; --=20 2.47.0.338.g60cca15819-goog From nobody Thu Dec 18 00:10:46 2025 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E843D5EE97 for ; Fri, 6 Dec 2024 00:31:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733445107; cv=none; b=nO3Qag89YaHN86FZGbKxtvczrOw62fsVBqY6TPQcVm3S1pU6iGFLrkCIx7ehkV6mX7DuKGIDfFHYvLu+83Q7vGd8+ijd47MF9KeINV0p5fsk+dnkv1UF1TgyePZJsaeZjHynucev7epqk1uS1cFnSrfRJIPxR3jqNtCovtdnFHs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733445107; c=relaxed/simple; bh=7eooM8lictiogeSqDWNnopPiMIbG0zFPlbWX1bsoFTE=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=pAp/A4kryZ3X+xNILLErJ2np4NaXNwHdfkX32mSYv1aI0NqAZA8zz9BUtbDeVvseSfqkpm1NFLQo8Gv+6C9baHC+YEh+Q/ZDOYmp+4TYlBNOuYTS+su9K4mQfdLx31ybq9f5XIHwfrUPos2MSC/KGis2mhMA7k04sTUuM04P5gc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--yuzhao.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=3xJWIrak; arc=none smtp.client-ip=209.85.214.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--yuzhao.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="3xJWIrak" Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-215b45a6e2aso15871965ad.2 for ; Thu, 05 Dec 2024 16:31:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1733445105; x=1734049905; darn=vger.kernel.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=3xJWIrak1tSliUpXcCyShFM9HW3y+w1/uTZ/SeJDCrCyKOACGgj3FDBufNx8e9okx8 NPBmPdlQClLjUqaFtt6jS/gRwA0HCMc5ztfwuGxBzQPApV/93FSHvURXzqUdYu/4W7Hp meKarKNwxyQAUduvkbFxGBsmc9k7DHvqmFfhcOsV9+yDsxrYuZULdYuwoq0808rRvPo5 rPDA3TpG1N46IQiRt+W/99YMjwobvSnlW5bLlPYrdx6QNzdoZjsBlMoxnfy+OAFGAiFN +1zLcM8Hl9s9S23hHoLIHtDirc6lsrkWnfKQrZYnVYwcQ037GQheVZg6mL48cUuhV9H2 ZWmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733445105; x=1734049905; 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=vtg0ul0IkoXwKgK07lZqHAUUb0ae5a5Mb75Fw3kZBHXKFD9yn2z1EuYdJl4ImkfkvD wPtGz9Y52Rj6RUw/ynr+bzytnmyuYr2WcPzg4LQTeEndhqnlPfMx9901WdKHEbCGy8Ik rimpPNngqPPTSG/aVeL+bzfgjPoRrc6pybYB1GPXKG0wUJX1J2urRov3inKCkQMrcjfV hx29qZl2JAPxcAAHyCT2Ct1ELQol/qI7Q9O2a1H7pyhXMV9c48SrJs73d9h0NMzWAb5b sv5dIOenRmdnaMZ5W+j3tV7g5R22TQ0Wx8MPZY22hQx1np3tov6YUNcAuI+oPqb9ns5w B73A== X-Forwarded-Encrypted: i=1; AJvYcCVmb3BNVHONxCOxtWS4Z7q7Ic0j+UT6iQ1VD2Efi4Ntj5LypRBRIFdSJTs40JmrJOm8jWXhYiXMjBQmjyE=@vger.kernel.org X-Gm-Message-State: AOJu0YzPanPuVlSshrmw8TPF2geHK7TxgHBJYmgIO+MDFYW3ekcjYfX9 //fDJZkPJ07ijdCfXVVHTy9WoiEeEsSrFyTJfEwxYQKL6hgolUPQwdMZwwTEyFcm97P/VJstr7M eRw== X-Google-Smtp-Source: AGHT+IGcBw64P6PC43lwi6CEzaODCf5NQzsvKmv+pkev0Vd7uHGWUIM2qXHUyE9c6qDAYcuhyiX00sGOta8= X-Received: from pllb6.prod.google.com ([2002:a17:902:e946:b0:215:83cc:b135]) (user=yuzhao job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:24d:b0:216:1367:7e3d with SMTP id d9443c01a7336-21614d67fc3mr14295335ad.31.1733445105156; Thu, 05 Dec 2024 16:31:45 -0800 (PST) Date: Thu, 5 Dec 2024 17:31:25 -0700 In-Reply-To: <20241206003126.1338283-1-yuzhao@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20241206003126.1338283-1-yuzhao@google.com> X-Mailer: git-send-email 2.47.0.338.g60cca15819-goog Message-ID: <20241206003126.1338283-6-yuzhao@google.com> Subject: [PATCH mm-unstable v2 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 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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=3D2TQo7T4Gr= -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 sha= dow. */ -static bool lru_gen_test_recent(void *shadow, bool file, struct lruvec **l= ruvec, +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; =20 @@ -273,8 +273,10 @@ static bool lru_gen_test_recent(void *shadow, bool fil= e, struct lruvec **lruvec, memcg =3D mem_cgroup_from_id(memcg_id); *lruvec =3D mem_cgroup_lruvec(memcg, pgdat); =20 - min_seq =3D READ_ONCE((*lruvec)->lrugen.min_seq[file]); - return (*token >> LRU_REFS_WIDTH) =3D=3D (min_seq & (EVICTION_MASK >> LRU= _REFS_WIDTH)); + max_seq =3D READ_ONCE((*lruvec)->lrugen.max_seq); + max_seq &=3D EVICTION_MASK >> LRU_REFS_WIDTH; + + return abs_diff(max_seq, *token >> LRU_REFS_WIDTH) < MAX_NR_GENS; } =20 static void lru_gen_refault(struct folio *folio, void *shadow) @@ -290,7 +292,7 @@ static void lru_gen_refault(struct folio *folio, void *= shadow) =20 rcu_read_lock(); =20 - recent =3D lru_gen_test_recent(shadow, type, &lruvec, &token, &workingset= ); + recent =3D lru_gen_test_recent(shadow, &lruvec, &token, &workingset); if (lruvec !=3D folio_lruvec(folio)) goto unlock; =20 @@ -331,7 +333,7 @@ static void *lru_gen_eviction(struct folio *folio) return NULL; } =20 -static bool lru_gen_test_recent(void *shadow, bool file, struct lruvec **l= ruvec, +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, bo= ol *workingset, bool recent; =20 rcu_read_lock(); - recent =3D lru_gen_test_recent(shadow, file, &eviction_lruvec, - &eviction, workingset); + recent =3D lru_gen_test_recent(shadow, &eviction_lruvec, &eviction, work= ingset); rcu_read_unlock(); return recent; } --=20 2.47.0.338.g60cca15819-goog From nobody Thu Dec 18 00:10:46 2025 Received: from mail-pf1-f202.google.com (mail-pf1-f202.google.com [209.85.210.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 688C72D627 for ; Fri, 6 Dec 2024 00:31:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733445110; cv=none; b=vFTXJgXXWzR8ikGNmChgqQlDmDP3injA/07wtLCQxN30jQAqbw4nEJxQPN/O0RdyiRHsSkkhAQJRpFkQhfeJ7VIn79EKCRp0wlt5JvPRhjfQ6S9b1LMYZ4bFP+SAipaOVRFScFgrjArNlqRbJJUfc74noGRrggLI815PueNxNss= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733445110; c=relaxed/simple; bh=VZCMrQWDI6dod9jQGbMKkpRTxcC2ZECYT7EYD4ZOi2U=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=I5OLa3w0t5atUTBoFo0px9HiMCb4UdaffGq3In+b5A36cPSuGCA8PIw/FLNA1wZ/cLE3EcDdfTUiEXaxUpOU5T3WxxqCL2ZzOJZRQMTRFRFmkN5OJt3mOvMt3rAdeE95cDMtGHtW3+uKRw/tg2ukH3BzYOp6RYxDySW3WrvsMi4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--yuzhao.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=2vBBymRG; arc=none smtp.client-ip=209.85.210.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--yuzhao.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="2vBBymRG" Received: by mail-pf1-f202.google.com with SMTP id d2e1a72fcca58-72590d79ef4so1642111b3a.0 for ; Thu, 05 Dec 2024 16:31:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1733445107; x=1734049907; darn=vger.kernel.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=jxh/CyTiTo80t1btGtiyWK44N5wckY+h9Q8TEZ4a9hc=; b=2vBBymRGg6l+TvjdyBJmFImWg6XwJouZgSaKsjbFFeUP1i/b+9aUh9sf5O2ZuKVtBg nQqP73MirOCjLLAeP6vKL8QGPVi+wagAeMLGrE4eK1UKlRhWPaT8fowNY5FhL8MOp2io lTf8YfugQILpona8kn/nF4VIFVssQYQ6U83VmDFkuc7leiIR0j1XIvRKs93gsZL6KbFx z90WqG9Ei8lZTb4Bc3ShzbHZY6ysAtUvcqXcWe4OokNo4TRdgN+kTnw1dYzXyZ5/6CwF GKfm7U26ngcbHHdWRBao+CKHebiSHbU8AOERHlZrUisR1she4eGZjfHqG0hPB8dikkdA Jm3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733445107; x=1734049907; 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=jxh/CyTiTo80t1btGtiyWK44N5wckY+h9Q8TEZ4a9hc=; b=MgLTae6Q/9oWs2X20KD2zOv9fIgGkYynlQqNuWhrKORVWPoXwHdJ0YGlsLc8rzJuxO B/RqemWlgeFj8hqJ/RLgBVRkgAgInbiDZPdV7/K4cMMtU4VyF9QAvk4VqH5xx4E0n0t8 kt1dBR3Dz1LcWAWGSXCJ5Z7KfWZ0zs0nBpapE2ekU/mPAQDrQ7Dsb0qc2ukAosAHs96h qU/azMH1vq8BeugyUTNT1MvsHkVvqRuJbPXn72/H26AvxERE33+BCi3mPFqQMTU8oMSR 9BGXaGmbJ4Gvsk8UPbERZHx1zDfjllzodMnv5APp3vpF2r3Wexg5NQuP/SamYG8tzwhP 08dQ== X-Forwarded-Encrypted: i=1; AJvYcCVEqiC3CrVb9wxaecmYQBsijBpJqhD7apcukJmsVbqZRWO0jigWJoJWC0BEyIlGVGIIJyWZKk28b7fQ+Xw=@vger.kernel.org X-Gm-Message-State: AOJu0YxqIfQbgsJ9M+PRd9umF4NlV+8qKzlzn3N+YzGIOQuvfTHEX1gK 0ovFr9rpHYeJ4eRlza8Ur2tM9qv5dmFRyWJ2xahi/FcUaH2sGPKByPIL3+s1d29UdD8tO67FoJD Vcw== X-Google-Smtp-Source: AGHT+IHJZ27MMa+QM4bFIoZmXc7e0cPr2Wfn3+ytQioqkCZG+HaMt6KJnbAzL7i3cXCeUdXXjK50wIdQ7DI= X-Received: from plbma14.prod.google.com ([2002:a17:903:94e:b0:20d:1e2b:3284]) (user=yuzhao job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:1c4:b0:215:b307:5bb2 with SMTP id d9443c01a7336-21614d68a58mr11549455ad.14.1733445107659; Thu, 05 Dec 2024 16:31:47 -0800 (PST) Date: Thu, 5 Dec 2024 17:31:26 -0700 In-Reply-To: <20241206003126.1338283-1-yuzhao@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20241206003126.1338283-1-yuzhao@google.com> X-Mailer: git-send-email 2.47.0.338.g60cca15819-goog Message-ID: <20241206003126.1338283-7-yuzhao@google.com> Subject: [PATCH mm-unstable v2 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 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 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(), when folio_update_gen() does that, it also clears PG_referenced. For this case, LRU_REFS_MASK is not used. For both of the cases, 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=3D2TQo7T4Gr= -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 | 29 ++++---- 5 files changed, 209 insertions(+), 161 deletions(-) diff --git a/include/linux/mm_inline.h b/include/linux/mm_inline.h index 34e5097182a0..3fcf5fa797fe 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; } =20 -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)); =20 - /* 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); } =20 static inline int folio_lru_refs(struct folio *folio) { unsigned long flags =3D READ_ONCE(folio->flags); - bool workingset =3D flags & BIT(PG_workingset); =20 + 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=3D0,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; } =20 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)); } =20 +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 descript= ors | + * | 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_F= LAGS | + * +-------------------------------------+-------------------------------= ------+ + * | 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_w= riteback(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 =3D folio_lru_gen(folio); int type =3D folio_is_file_lru(folio); int zone =3D folio_zonenum(folio); @@ -237,40 +266,17 @@ static inline bool lru_gen_add_folio(struct lruvec *l= ruvec, struct folio *folio, =20 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 =3D lrugen->max_seq; - else if ((type =3D=3D LRU_GEN_ANON && !folio_test_swapcache(folio)) || - (folio_test_reclaim(folio) && - (folio_test_dirty(folio) || folio_test_writeback(folio)))) - seq =3D lrugen->max_seq - 1; - else if (reclaiming || lrugen->min_seq[type] + MIN_NR_GENS >=3D lrugen->m= ax_seq) - seq =3D lrugen->min_seq[type]; + + dist =3D lru_gen_distance(folio, reclaiming); + if (dist < MIN_NR_GENS) + seq =3D lrugen->min_seq[type] + dist; else - seq =3D lrugen->min_seq[type] + 1; + seq =3D lrugen->max_seq + dist - MIN_NR_GENS - 1; =20 gen =3D lru_gen_from_seq(seq); flags =3D (gen + 1UL) << LRU_GEN_PGOFF; /* see the comment on MIN_NR_GENS about PG_active */ - mask =3D 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 |=3D 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); =20 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..c7ad4d6e1618 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -332,66 +332,88 @@ enum lruvec_flags { #endif /* !__GENERATING_BOUNDS_H */ =20 /* - * Evictable pages are divided into multiple generations. The youngest and= the + * Evictable folios are divided into multiple generations. The youngest an= d the * oldest generation numbers, max_seq and min_seq, are monotonically incre= asing. * 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 ini= tial - * fault; the second check makes sure this page hasn't been used since the= n. - * This process, AKA second chance, requires a minimum of two generations, - * hence MIN_NR_GENS. And to maintain ABI compatibility with the active/in= active - * LRU, e.g., /proc/vmstat, these two generations are considered active; t= he - * 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 c= heck + * 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 mainta= in ABI + * compatibility with the active/inactive LRU, e.g., /proc/vmstat, these t= wo + * generations are considered active; the rest of generations, if they exi= st, + * 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 p= age - * considered active is isolated for non-reclaiming purposes, e.g., migrat= ion. - * 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 =20 /* - * 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 firs= t tier - * (N=3D0,1) is marked by PG_referenced unless it was faulted in through p= age - * 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 fir= st + * tier (N=3D0,1) is marked by PG_referenced unless it was faulted in thro= ugh page + * tables or read ahead. A folio in the last tier (MAX_NR_TIERS-1) is mark= ed by + * PG_workingset. A folio in any other tier (1flags. * * In contrast to moving across generations which requires the LRU lock, m= oving * across tiers only involves atomic operations on folio->flags and theref= ore * 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 descripto= rs - * are statistically hot and thus worth protecting. + * comparisons of refaulted/(evicted+protected) from the first tier and th= e rest + * infer whether folios accessed multiple times through file descriptors a= re + * 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 =20 #ifndef __GENERATING_BOUNDS_H =20 -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) =20 +/* + * For folios accessed multiple times through file descriptors, + * lru_gen_inc_refs() sets additional bits of LRU_REFS_WIDTH in folio->fla= gs + * 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 in the eviction path. And wh= en + * 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_MA= SK is + * only valid when PG_referenced is set. + * + * For folios accessed multiple times through page tables, folio_update_ge= n() + * 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 clea= rs + * 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 =20 enum { @@ -406,8 +428,6 @@ enum { NR_LRU_GEN_CAPS }; =20 -#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) =20 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; =20 + /* 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; } =20 - if (!folio_test_workingset(folio)) { - folio_set_workingset(folio); - return; - } - - /* see the comment on MAX_NR_TIERS */ do { - new_flags =3D old_flags & LRU_REFS_MASK; - if (new_flags =3D=3D LRU_REFS_MASK) - break; + if ((old_flags & LRU_REFS_MASK) =3D=3D LRU_REFS_MASK) { + folio_set_workingset(folio); + return; + } =20 - new_flags +=3D BIT(LRU_REFS_PGOFF); - new_flags |=3D old_flags & ~LRU_REFS_MASK; + new_flags =3D old_flags + BIT(LRU_REFS_PGOFF); } while (!try_cmpxchg(&folio->flags, &old_flags, new_flags)); } =20 @@ -414,7 +409,7 @@ static bool lru_gen_clear_refs(struct folio *folio) int type =3D folio_is_file_lru(folio); struct lru_gen_folio *lrugen =3D &folio_lruvec(folio)->lrugen; =20 - set_mask_bits(&folio->flags, LRU_REFS_MASK | LRU_REFS_FLAGS, 0); + set_mask_bits(&folio->flags, LRU_REFS_FLAGS | BIT(PG_workingset), 0); =20 /* whether can do without shuffling under the LRU lock */ return gen =3D=3D 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); =20 - /* 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 02b01ae2bdbb..90bbc2b3be8b 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -862,6 +862,31 @@ enum folio_references { FOLIOREF_ACTIVATE, }; =20 +#ifdef CONFIG_LRU_GEN +/* + * Only used on a mapped folio in the eviction (rmap walk) path, where pro= motion + * needs to be done by taking the folio off the LRU list and then adding i= t 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(str= uct folio *folio, =20 referenced_ptes =3D folio_referenced(folio, 1, sc->target_mem_cgroup, &vm_flags); - referenced_folio =3D folio_test_clear_referenced(folio); =20 /* * The supposedly reclaimable folio was found to be in a VM_LOCKED vma. @@ -888,6 +912,16 @@ static enum folio_references folio_check_references(st= ruct folio *folio, if (referenced_ptes =3D=3D -1) return FOLIOREF_KEEP; =20 + if (lru_gen_enabled()) { + if (!referenced_ptes) + return FOLIOREF_RECLAIM; + + lru_gen_set_refs(folio); + return FOLIOREF_ACTIVATE; + } + + referenced_folio =3D 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_he= ad *folio_list, if (!sc->may_unmap && folio_mapped(folio)) goto keep_locked; =20 - /* 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, in= t gen) =20 VM_WARN_ON_ONCE(gen >=3D MAX_NR_GENS); =20 + /* 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 =3D old_flags | BIT(PG_referenced); - continue; - } + if (!(old_flags & LRU_GEN_MASK)) + return -1; =20 - new_flags =3D old_flags & ~(LRU_GEN_MASK | LRU_REFS_MASK | LRU_REFS_FLAG= S); - new_flags |=3D (gen + 1UL) << LRU_GEN_PGOFF; + new_flags =3D old_flags & ~(LRU_GEN_MASK | LRU_REFS_FLAGS); + new_flags |=3D ((gen + 1UL) << LRU_GEN_PGOFF) | BIT(PG_workingset); } while (!try_cmpxchg(&folio->flags, &old_flags, new_flags)); =20 return ((old_flags & LRU_GEN_MASK) >> LRU_GEN_PGOFF) - 1; @@ -3196,7 +3228,7 @@ static int folio_inc_gen(struct lruvec *lruvec, struc= t folio *folio, bool reclai =20 new_gen =3D (old_gen + 1) % MAX_NR_GENS; =20 - new_flags =3D old_flags & ~(LRU_GEN_MASK | LRU_REFS_MASK | LRU_REFS_FLAG= S); + new_flags =3D old_flags & ~(LRU_GEN_MASK | LRU_REFS_FLAGS); new_flags |=3D (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 v= m_area_struct *vma, unsigned static struct folio *get_pfn_folio(unsigned long pfn, struct mem_cgroup *m= emcg, struct pglist_data *pgdat) { - struct folio *folio; + struct folio *folio =3D pfn_folio(pfn); + + if (folio_lru_gen(folio) < 0) + return NULL; =20 - folio =3D pfn_folio(pfn); if (folio_nid(folio) !=3D pgdat->node_id) return NULL; =20 @@ -3753,8 +3787,7 @@ static bool inc_min_seq(struct lruvec *lruvec, int ty= pe, int swappiness) while (!list_empty(head)) { struct folio *folio =3D lru_to_folio(head); int refs =3D folio_lru_refs(folio); - int tier =3D lru_tier_from_refs(refs); - int delta =3D folio_nr_pages(folio); + bool workingset =3D folio_test_workingset(folio); =20 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 t= ype, int swappiness) new_gen =3D folio_inc_gen(lruvec, folio, false); list_move_tail(&folio->lru, &lrugen->folios[new_gen][type][zone]); =20 - WRITE_ONCE(lrugen->protected[hist][type][tier], - lrugen->protected[hist][type][tier] + delta); + /* don't count the workingset being lazily promoted */ + if (refs + workingset !=3D BIT(LRU_REFS_WIDTH) + 1) { + int tier =3D lru_tier_from_refs(refs, workingset); + int delta =3D folio_nr_pages(folio); + + WRITE_ONCE(lrugen->protected[hist][type][tier], + lrugen->protected[hist][type][tier] + delta); + } =20 if (!--remaining) return false; @@ -4138,12 +4177,10 @@ bool lru_gen_look_around(struct page_vma_mapped_wal= k *pvmw) continue; } =20 - old_gen =3D folio_lru_gen(folio); - if (old_gen < 0) - folio_set_referenced(folio); - else if (old_gen !=3D new_gen) { - folio_clear_lru_refs(folio); - folio_activate(folio); + if (lru_gen_set_refs(folio)) { + old_gen =3D folio_lru_gen(folio); + if (old_gen >=3D 0 && old_gen !=3D new_gen) + folio_activate(folio); } } =20 @@ -4304,7 +4341,8 @@ static bool sort_folio(struct lruvec *lruvec, struct = folio *folio, struct scan_c int zone =3D folio_zonenum(folio); int delta =3D folio_nr_pages(folio); int refs =3D folio_lru_refs(folio); - int tier =3D lru_tier_from_refs(refs); + bool workingset =3D folio_test_workingset(folio); + int tier =3D lru_tier_from_refs(refs, workingset); struct lru_gen_folio *lrugen =3D &lruvec->lrugen; =20 VM_WARN_ON_ONCE_FOLIO(gen >=3D MAX_NR_GENS, folio); @@ -4326,14 +4364,17 @@ static bool sort_folio(struct lruvec *lruvec, struc= t folio *folio, struct scan_c } =20 /* protected */ - if (tier > tier_idx || refs =3D=3D BIT(LRU_REFS_WIDTH)) { - int hist =3D lru_hist_from_seq(lrugen->min_seq[type]); - + if (tier > tier_idx || refs + workingset =3D=3D BIT(LRU_REFS_WIDTH) + 1) { gen =3D 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]); =20 - WRITE_ONCE(lrugen->protected[hist][type][tier], - lrugen->protected[hist][type][tier] + delta); + /* don't count the workingset being lazily promoted */ + if (refs + workingset !=3D BIT(LRU_REFS_WIDTH) + 1) { + int hist =3D lru_hist_from_seq(lrugen->min_seq[type]); + + WRITE_ONCE(lrugen->protected[hist][type][tier], + lrugen->protected[hist][type][tier] + delta); + } return true; } =20 @@ -4353,8 +4394,7 @@ static bool sort_folio(struct lruvec *lruvec, struct = folio *folio, struct scan_c } =20 /* waiting for writeback */ - if (folio_test_locked(folio) || writeback || - (type =3D=3D LRU_GEN_FILE && dirty)) { + if (writeback || (type =3D=3D LRU_GEN_FILE && dirty)) { gen =3D 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, st= ruct folio *folio, struct sca return false; } =20 - /* 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); =20 /* for shrink_folio_list() */ folio_clear_reclaim(folio); - folio_clear_referenced(folio); =20 success =3D 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, stru= ct scan_control *sc, int swap continue; } =20 - 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(foli= o) || - 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)); } =20 spin_lock_irq(&lruvec->lru_lock); diff --git a/mm/workingset.c b/mm/workingset.c index 2c310c29f51e..3662c0def77a 100644 --- a/mm/workingset.c +++ b/mm/workingset.c @@ -239,7 +239,8 @@ static void *lru_gen_eviction(struct folio *folio) int type =3D folio_is_file_lru(folio); int delta =3D folio_nr_pages(folio); int refs =3D folio_lru_refs(folio); - int tier =3D lru_tier_from_refs(refs); + bool workingset =3D folio_test_workingset(folio); + int tier =3D lru_tier_from_refs(refs, workingset); struct mem_cgroup *memcg =3D folio_memcg(folio); struct pglist_data *pgdat =3D folio_pgdat(folio); =20 @@ -253,7 +254,7 @@ static void *lru_gen_eviction(struct folio *folio) hist =3D lru_hist_from_seq(min_seq); atomic_long_add(delta, &lrugen->evicted[hist][type][tier]); =20 - return pack_shadow(mem_cgroup_id(memcg), pgdat, token, refs); + return pack_shadow(mem_cgroup_id(memcg), pgdat, token, workingset); } =20 /* @@ -304,24 +305,20 @@ static void lru_gen_refault(struct folio *folio, void= *shadow) lrugen =3D &lruvec->lrugen; =20 hist =3D lru_hist_from_seq(READ_ONCE(lrugen->min_seq[type])); - /* see the comment in folio_lru_refs() */ - refs =3D (token & (BIT(LRU_REFS_WIDTH) - 1)) + workingset; - tier =3D lru_tier_from_refs(refs); + refs =3D (token & (BIT(LRU_REFS_WIDTH) - 1)) + 1; + tier =3D lru_tier_from_refs(refs, workingset); =20 atomic_long_add(delta, &lrugen->refaulted[hist][type][tier]); - mod_lruvec_state(lruvec, WORKINGSET_ACTIVATE_BASE + type, delta); =20 - /* - * 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 >=3D 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 + set_mask_bits(&folio->flags, LRU_REFS_MASK, (refs - 1UL) << LRU_REFS_PGO= FF); unlock: rcu_read_unlock(); } --=20 2.47.0.338.g60cca15819-goog