From nobody Wed Feb 11 08:12:15 2026 Received: from mail-oi1-f169.google.com (mail-oi1-f169.google.com [209.85.167.169]) (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 2CA373783A1 for ; Sun, 8 Feb 2026 21:59:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770587961; cv=none; b=gKzcFgyVVGMVp7kJ5EeYgiwLrmy/cNoMdhlSn/9AY/IqmO2Du3+zndlmgvRsx06joKTU2+smNBAE9W/7f5eRpNaj4xHviOVoEL6cJg0oS2QILAPI33JVYT4aDHww1F31SPsCSIl6sSaSAq9oG/byjJb9/CtVpOYNc4nRu4vxfxo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770587961; c=relaxed/simple; bh=/ca3nyTvcSF3Q5evcfrzx/MRu40Tc4y2RvBcpmh2s4c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=G1mmZg4ygl2483KnSrx/UQCrEUyxKoIXfoCrmUGbT19miM+kXZoYTA8VEGDukorGQSUPaHxtdZX6MkrOMbTeRpweVHpXHkqAKNH+9MsNmXiKdNOvYJXOkxGxQvvyVC95EjdGo15T1S6Kamvg7K8TJVII/Uc5dsko8+2m8KddPNo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=B7j6AO8Y; arc=none smtp.client-ip=209.85.167.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="B7j6AO8Y" Received: by mail-oi1-f169.google.com with SMTP id 5614622812f47-45efe81556fso2601754b6e.2 for ; Sun, 08 Feb 2026 13:59:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1770587960; x=1771192760; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=dEUe6oTCoBFfM+Sx9vNYCw5ijDc8cAJk/jm6jmf+e+o=; b=B7j6AO8YN9leB9k7DzO8rSMj68ziEmpr37BWYkEVC1tSLosY0u3PLsnWkvi9OQ8V4V aAnT3XYpdSaE401l4YtI+t5b/Q+jf4E1Nh7Xjv6ylJaXOPk4hg39eoJZZ5tkpDBC4QUC hoT8UbLfoQhWiKEH9vmbfymqx6PCiLZ5sQaJ7S4psfOCSQunle196qEPfK2GtOUGelpG ko0dH9aRA1m3fXrRwZK0UHYq8De0MNBTTvSK4okSJkI1/vISLb4PBY0LF4UugMoXKdcp 1NZOqB6hhSZk4f6Aw+kK3d0JolNDxsrMHMsRrzXFMQqF2OmKrBreDRdg5hKT2dDDmx0B j9ng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770587960; x=1771192760; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=dEUe6oTCoBFfM+Sx9vNYCw5ijDc8cAJk/jm6jmf+e+o=; b=X7lVFtiTt/gpoLgmsqA9L2UPU/GDHi0fxa6MWcwOS9iqpyyW4GH2kso9uPVAalNAkf xmPu/CCp97A3netR71WUXFj1LcpJXpQn+cM7/bWDJQvcTGWzbyJhLC/mHRzhGApAmggS e5U1BH4YfRbyJqQ1yh83FbQzSoGh4gdNbT7W3dhDQYkXvVi/qGIQde9LHdDAurIuEdna KEwonMP1iYlbGPqYlYO/cSZZ6K9cflIKtfWWaPTy5b9VzXnsifnAlbHckE1JW32a/M9y q2WsKwQ763HAYjM2LT/lblLdrUEvNDuxO205FjtU1r7pmb2eqkkP53qLlL2jyPPlf7ij GZOA== X-Forwarded-Encrypted: i=1; AJvYcCV5QBbeq4GZEekIFDkSns3o6P0AzeAKPAyBH34yskOy2ZqOsOQhfatXy0W9FdbLV1i5vITV0g3aSsXXe6Y=@vger.kernel.org X-Gm-Message-State: AOJu0YzUy6ta9CRvkRIHFk1AEN7EabEI7d1I+fn+/jIzhaGomn489gC4 FFb7jQHteqrGtFOTaq4DX7/DA+iLjruH67gScgW7H8gZYS5ma0NY9e5A X-Gm-Gg: AZuq6aKl9g/dTzr9tjmqQMNTmXvpw29HRiGLpJjQwnpoLUYCPgYm6F7LWUEl+TBj8O+ HWsiVEqdUw+ImP3XMKMXOSmgPTWMFYAfWsLtuwE5XWHkWPleUmRdvznlg98/AArll+4R3kc7zKM zpQ4ZJYosbicMnQ79TX4KJaJz9gMVd4NiuuTfh1B++Qi3HHqfsSc7l0hoPM1ep+pzZbb/BwK2dD cxv9r4ejSomfJNLPss6iTYPta3DU7JNGb8oO3+1OWu+qO0rrJR89hhWjCjIIj5T52jrjKipUz3l AW8SHNue2Kt3CevxvauGmLGkx95YlgcHfhe1QhOxL8wZ3FlWCNXwqtTSwBTid0thj9No3GH9OV6 mNXWNmAQkuLwLSvcv8AAwndJluLtA0jg5DqfEwN0kacaGSWgonFqSbiZVJRGV/2SUsa9rUaT408 2UCYeqbkPoC+2YisfntYKYnOYJ8F1dSOsB X-Received: by 2002:a05:6808:158e:b0:45e:f0ef:cd75 with SMTP id 5614622812f47-462fcb77c7amr4638475b6e.65.1770587960064; Sun, 08 Feb 2026 13:59:20 -0800 (PST) Received: from localhost ([2a03:2880:10ff:2::]) by smtp.gmail.com with ESMTPSA id 5614622812f47-462fe9df04esm5291448b6e.7.2026.02.08.13.59.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Feb 2026 13:59:18 -0800 (PST) From: Nhat Pham To: linux-mm@kvack.org Cc: akpm@linux-foundation.org, hannes@cmpxchg.org, hughd@google.com, yosry.ahmed@linux.dev, mhocko@kernel.org, roman.gushchin@linux.dev, shakeel.butt@linux.dev, muchun.song@linux.dev, len.brown@intel.com, chengming.zhou@linux.dev, kasong@tencent.com, chrisl@kernel.org, huang.ying.caritas@gmail.com, ryan.roberts@arm.com, shikemeng@huaweicloud.com, viro@zeniv.linux.org.uk, baohua@kernel.org, bhe@redhat.com, osalvador@suse.de, lorenzo.stoakes@oracle.com, christophe.leroy@csgroup.eu, pavel@kernel.org, kernel-team@meta.com, linux-kernel@vger.kernel.org, cgroups@vger.kernel.org, linux-pm@vger.kernel.org, peterx@redhat.com, riel@surriel.com, joshua.hahnjy@gmail.com, npache@redhat.com, gourry@gourry.net, axelrasmussen@google.com, yuanchu@google.com, weixugc@google.com, rafael@kernel.org, jannh@google.com, pfalcato@suse.de, zhengqi.arch@bytedance.com Subject: [PATCH v3 18/20] memcg: swap: only charge physical swap slots Date: Sun, 8 Feb 2026 13:58:31 -0800 Message-ID: <20260208215839.87595-19-nphamcs@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260208215839.87595-1-nphamcs@gmail.com> References: <20260208215839.87595-1-nphamcs@gmail.com> 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 Content-Type: text/plain; charset="utf-8" Now that zswap and the zero-filled swap page optimization no longer takes up any physical swap space, we should not charge towards the swap usage and limits of the memcg in these case. We will only record the memcg id on virtual swap slot allocation, and defer physical swap charging (i.e towards memory.swap.current) until the virtual swap slot is backed by an actual physical swap slot (on zswap store failure fallback or zswap writeback). Signed-off-by: Nhat Pham --- include/linux/swap.h | 16 +++++++++ mm/memcontrol-v1.c | 6 ++++ mm/memcontrol.c | 83 ++++++++++++++++++++++++++++++++------------ mm/vswap.c | 39 +++++++++------------ 4 files changed, 98 insertions(+), 46 deletions(-) diff --git a/include/linux/swap.h b/include/linux/swap.h index 9cd45eab313f8..a30d382fb5ee1 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h @@ -613,6 +613,22 @@ static inline void folio_throttle_swaprate(struct foli= o *folio, gfp_t gfp) #endif =20 #if defined(CONFIG_MEMCG) && defined(CONFIG_SWAP) +void __mem_cgroup_record_swap(struct folio *folio, swp_entry_t entry); +static inline void mem_cgroup_record_swap(struct folio *folio, + swp_entry_t entry) +{ + if (!mem_cgroup_disabled()) + __mem_cgroup_record_swap(folio, entry); +} + +void __mem_cgroup_clear_swap(swp_entry_t entry, unsigned int nr_pages); +static inline void mem_cgroup_clear_swap(swp_entry_t entry, + unsigned int nr_pages) +{ + if (!mem_cgroup_disabled()) + __mem_cgroup_clear_swap(entry, nr_pages); +} + int __mem_cgroup_try_charge_swap(struct folio *folio, swp_entry_t entry); static inline int mem_cgroup_try_charge_swap(struct folio *folio, swp_entry_t entry) diff --git a/mm/memcontrol-v1.c b/mm/memcontrol-v1.c index 6eed14bff7426..4580a034dcf72 100644 --- a/mm/memcontrol-v1.c +++ b/mm/memcontrol-v1.c @@ -680,6 +680,12 @@ void memcg1_swapin(swp_entry_t entry, unsigned int nr_= pages) * memory+swap charge, drop the swap entry duplicate. */ mem_cgroup_uncharge_swap(entry, nr_pages); + + /* + * Clear the cgroup association now to prevent double memsw + * uncharging when the backends are released later. + */ + mem_cgroup_clear_swap(entry, nr_pages); } } =20 diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 2ba5811e7edba..50be8066bebec 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -5172,6 +5172,49 @@ int __init mem_cgroup_init(void) } =20 #ifdef CONFIG_SWAP +/** + * __mem_cgroup_record_swap - record the folio's cgroup for the swap entri= es. + * @folio: folio being swapped out. + * @entry: the first swap entry in the range. + */ +void __mem_cgroup_record_swap(struct folio *folio, swp_entry_t entry) +{ + unsigned int nr_pages =3D folio_nr_pages(folio); + struct mem_cgroup *memcg; + + /* Recording will be done by memcg1_swapout(). */ + if (do_memsw_account()) + return; + + memcg =3D folio_memcg(folio); + + VM_WARN_ON_ONCE_FOLIO(!memcg, folio); + if (!memcg) + return; + + memcg =3D mem_cgroup_id_get_online(memcg); + if (nr_pages > 1) + mem_cgroup_id_get_many(memcg, nr_pages - 1); + swap_cgroup_record(folio, mem_cgroup_id(memcg), entry); +} + +/** + * __mem_cgroup_clear_swap - clear cgroup information of the swap entries. + * @folio: folio being swapped out. + * @entry: the first swap entry in the range. + */ +void __mem_cgroup_clear_swap(swp_entry_t entry, unsigned int nr_pages) +{ + unsigned short id =3D swap_cgroup_clear(entry, nr_pages); + struct mem_cgroup *memcg; + + rcu_read_lock(); + memcg =3D mem_cgroup_from_id(id); + if (memcg) + mem_cgroup_id_put_many(memcg, nr_pages); + rcu_read_unlock(); +} + /** * __mem_cgroup_try_charge_swap - try charging swap space for a folio * @folio: folio being added to swap @@ -5190,34 +5233,24 @@ int __mem_cgroup_try_charge_swap(struct folio *foli= o, swp_entry_t entry) if (do_memsw_account()) return 0; =20 - memcg =3D folio_memcg(folio); - - VM_WARN_ON_ONCE_FOLIO(!memcg, folio); - if (!memcg) - return 0; - - if (!entry.val) { - memcg_memory_event(memcg, MEMCG_SWAP_FAIL); - return 0; - } - - memcg =3D mem_cgroup_id_get_online(memcg); + /* + * We already record the cgroup on virtual swap allocation. + * Note that the virtual swap slot holds a reference to memcg, + * so this lookup should be safe. + */ + rcu_read_lock(); + memcg =3D mem_cgroup_from_id(lookup_swap_cgroup_id(entry)); + rcu_read_unlock(); =20 if (!mem_cgroup_is_root(memcg) && !page_counter_try_charge(&memcg->swap, nr_pages, &counter)) { memcg_memory_event(memcg, MEMCG_SWAP_MAX); memcg_memory_event(memcg, MEMCG_SWAP_FAIL); - mem_cgroup_id_put(memcg); return -ENOMEM; } =20 - /* Get references for the tail pages, too */ - if (nr_pages > 1) - mem_cgroup_id_get_many(memcg, nr_pages - 1); mod_memcg_state(memcg, MEMCG_SWAP, nr_pages); =20 - swap_cgroup_record(folio, mem_cgroup_id(memcg), entry); - return 0; } =20 @@ -5231,7 +5264,8 @@ void __mem_cgroup_uncharge_swap(swp_entry_t entry, un= signed int nr_pages) struct mem_cgroup *memcg; unsigned short id; =20 - id =3D swap_cgroup_clear(entry, nr_pages); + id =3D lookup_swap_cgroup_id(entry); + rcu_read_lock(); memcg =3D mem_cgroup_from_id(id); if (memcg) { @@ -5242,7 +5276,6 @@ void __mem_cgroup_uncharge_swap(swp_entry_t entry, un= signed int nr_pages) page_counter_uncharge(&memcg->swap, nr_pages); } mod_memcg_state(memcg, MEMCG_SWAP, -nr_pages); - mem_cgroup_id_put_many(memcg, nr_pages); } rcu_read_unlock(); } @@ -5251,14 +5284,18 @@ static bool mem_cgroup_may_zswap(struct mem_cgroup = *original_memcg); =20 long mem_cgroup_get_nr_swap_pages(struct mem_cgroup *memcg) { - long nr_swap_pages, nr_zswap_pages =3D 0; + long nr_swap_pages; =20 if (zswap_is_enabled() && (mem_cgroup_disabled() || do_memsw_account() || mem_cgroup_may_zswap(memcg))) { - nr_zswap_pages =3D PAGE_COUNTER_MAX; + /* + * No need to check swap cgroup limits, since zswap is not charged + * towards swap consumption. + */ + return PAGE_COUNTER_MAX; } =20 - nr_swap_pages =3D max_t(long, nr_zswap_pages, get_nr_swap_pages()); + nr_swap_pages =3D get_nr_swap_pages(); if (mem_cgroup_disabled() || do_memsw_account()) return nr_swap_pages; for (; !mem_cgroup_is_root(memcg); memcg =3D parent_mem_cgroup(memcg)) diff --git a/mm/vswap.c b/mm/vswap.c index 7563107eb8eee..2a071d5ae173c 100644 --- a/mm/vswap.c +++ b/mm/vswap.c @@ -543,6 +543,7 @@ void vswap_rmap_set(struct swap_cluster_info *ci, swp_s= lot_t slot, struct vswap_cluster *cluster =3D NULL; struct swp_desc *desc; unsigned long flush_nr, phys_swap_start =3D 0, phys_swap_end =3D 0; + unsigned long phys_swap_released =3D 0; unsigned int phys_swap_type =3D 0; bool need_flushing_phys_swap =3D false; swp_slot_t flush_slot; @@ -572,6 +573,7 @@ void vswap_rmap_set(struct swap_cluster_info *ci, swp_s= lot_t slot, if (desc->type =3D=3D VSWAP_ZSWAP && desc->zswap_entry) { zswap_entry_free(desc->zswap_entry); } else if (desc->type =3D=3D VSWAP_SWAPFILE) { + phys_swap_released++; if (!phys_swap_start) { /* start a new contiguous range of phys swap */ phys_swap_start =3D swp_slot_offset(desc->slot); @@ -602,6 +604,9 @@ void vswap_rmap_set(struct swap_cluster_info *ci, swp_s= lot_t slot, flush_nr =3D phys_swap_end - phys_swap_start; swap_slot_free_nr(flush_slot, flush_nr); } + + if (phys_swap_released) + mem_cgroup_uncharge_swap(entry, phys_swap_released); } =20 /* @@ -629,7 +634,7 @@ static void vswap_free(struct vswap_cluster *cluster, s= truct swp_desc *desc, spin_unlock(&cluster->lock); =20 release_backing(entry, 1); - mem_cgroup_uncharge_swap(entry, 1); + mem_cgroup_clear_swap(entry, 1); =20 /* erase forward mapping and release the virtual slot for reallocation */ spin_lock(&cluster->lock); @@ -644,9 +649,6 @@ static void vswap_free(struct vswap_cluster *cluster, s= truct swp_desc *desc, */ int folio_alloc_swap(struct folio *folio) { - struct vswap_cluster *cluster =3D NULL; - int i, nr =3D folio_nr_pages(folio); - struct swp_desc *desc; swp_entry_t entry; =20 VM_BUG_ON_FOLIO(!folio_test_locked(folio), folio); @@ -656,25 +658,7 @@ int folio_alloc_swap(struct folio *folio) if (!entry.val) return -ENOMEM; =20 - /* - * XXX: for now, we charge towards the memory cgroup's swap limit on virt= ual - * swap slots allocation. This will be changed soon - we will only charge= on - * physical swap slots allocation. - */ - if (mem_cgroup_try_charge_swap(folio, entry)) { - rcu_read_lock(); - for (i =3D 0; i < nr; i++) { - desc =3D vswap_iter(&cluster, entry.val + i); - VM_WARN_ON(!desc); - vswap_free(cluster, desc, (swp_entry_t){ entry.val + i }); - } - spin_unlock(&cluster->lock); - rcu_read_unlock(); - atomic_add(nr, &vswap_alloc_reject); - entry.val =3D 0; - return -ENOMEM; - } - + mem_cgroup_record_swap(folio, entry); swap_cache_add_folio(folio, entry, NULL); =20 return 0; @@ -716,6 +700,15 @@ bool vswap_alloc_swap_slot(struct folio *folio) if (!slot.val) return false; =20 + if (mem_cgroup_try_charge_swap(folio, entry)) { + /* + * We have not updated the backing type of the virtual swap slot. + * Simply free up the physical swap slots here! + */ + swap_slot_free_nr(slot, nr); + return false; + } + /* establish the vrtual <-> physical swap slots linkages. */ si =3D __swap_slot_to_info(slot); ci =3D swap_cluster_lock(si, swp_slot_offset(slot)); --=20 2.47.3