From nobody Mon Feb 9 17:35:22 2026 Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) (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 393422EF665 for ; Sun, 25 Jan 2026 17:58:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769363935; cv=none; b=oRbts7CXFZSOTn/MKKoOIK0SzcLb3zQpQ5zOspV0s6V9fmNbuGT0PLKgKLa+XEk01z40O9bM5citt1YsAGWbkW49cRuKX8COJGEtx3TbVYtunFG/TnDj9Ca6NWmAKihGohuhEn38xgANVLokqP0Vm6Z0PpjnRp1KR47W7UnKll8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769363935; c=relaxed/simple; bh=1LwIQgJ5QLFFSEXQuxx2YLbh6ikRLLEdp3AUw4a3lHc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=mXgeQxs7ESMl/YGlwpi6f1ZfwiNr6iYK+LQSuB2zOFiiRQnjMUhxt/d7wFBPrZjZCBWMsHEq80oHhRfdOM/JgXmzdRtQxXZ0fJ3aVWg5CSsbGqyP0KSNFuqk1P5n0E4c8C1ViZaPhWrfUC28DrJCzAS8ohuQ6dkQ1SnAaVVXlDE= 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=Vv0IdCMq; arc=none smtp.client-ip=209.85.210.176 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="Vv0IdCMq" Received: by mail-pf1-f176.google.com with SMTP id d2e1a72fcca58-81f4f4d4822so1936428b3a.3 for ; Sun, 25 Jan 2026 09:58:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1769363933; x=1769968733; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=OKXYNAqC58IBkWvtFGcy+ttT57KuezlLy+MzWN+rz2c=; b=Vv0IdCMqwWpWOLnsUvQIU9B3iJTuHabedyjY2TW/c1ChxQOXNr+XaPONF34tw2Lbi9 fbA0fFZ5BeNIMlJ0eEQBh7mpFJCpVsfJKDslYa5clee5/rUiIb+f6zBlQtUVKofH0bel f2Bkk06v829r3+iqZPju9GCXalH1SW9S+NMOYeVrOqyp5QHaYXkedZoFqtOq+c8p4eBb gY5vkiFkKnC5I9aBkT5uAtWJJUMmZ5MHEggNUn0h0r2vSoQshYHn40sXBtWRNoUYZ82X IUgLyHVe1bjOvkJb3zhAjKqkiTExt/eyibxng4BPlDy1ulj6WjpM9zuzPc3aNF8yG1c7 YHUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769363933; x=1769968733; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=OKXYNAqC58IBkWvtFGcy+ttT57KuezlLy+MzWN+rz2c=; b=sFspdIpAoUpVZD6oCktx5YqGClosQ5hn7MxfaJydCUPxg6kYe+auJclDXz+wJOiX9q a4o23XyTSdOil2/sn65nSZ1J5xpB30boPOKGZS5lbF2TQWkG/ohC3M/1fTxlQ/yTOmc2 loSfSD+pH7VmVtLngYjvRqLCj40JGxXzzejw3cuVolqJESSl02zpsS4NANHRNVttec7/ aJ3tg8ykJ4vdlbygu+1PJO6VxYE9F60+qgKmwINd+okXbxEsE8X1NxAZxEuf9gWaOGYN EwWTgFKha/oLtvBnUJTyoQXi6f0UDF+SjTCLDbK2uNcsNHwyksMfUT8YvZvTuBGvGBTl DDug== X-Forwarded-Encrypted: i=1; AJvYcCXqtEBzUEwle6xOjvKo8m1eqYoOhkpQsAk2RxOxN1fBg49qBT+PQOuKvmNU3VWPJiJ9fEtQIxJ5NSkPpII=@vger.kernel.org X-Gm-Message-State: AOJu0YysdIEDqTWOzgk9D+WzEwwpQxfFcAfLTaXx4sQFr+JlOqos1k74 bX6QvzsUqzwG9dBwhx1vzg4My0n9OzvW4QIKOWw08aezwtlJ2L15Mm4b X-Gm-Gg: AZuq6aI6TuNSxcNI9BdGk9y8jI7XBeCEYbgmfypuDFE1FMw1U/6QqLue/+AXiDkNiKB hCA7jaT9/FsM+sgC/fN+NMXMkOfBX3y5Y/C36umOAybs0NQeJnLjSV9tEvaGZ19c8PwvkclZgcT Lr0XYtO9Md1WsJPu0J3vuDde2Tzf4cCL7N7b0vNGB9pQcQMSUw/ONbKqpSeDoyTjXQTMjd9OCyq +wJe6ewgNeIafkz8c+C7WrVWI3OqRNwdXtJeGQ3HHga1QVchgSyR49Xk7MudfA51DpThCRC/KzV Nm2vNGeYpIkbYxaoHumDWflBhKPxK5GOe29v8ptexsA74OC8QaSMjdwQcXqW2ZYtP90ph+eZXXO 6N+KioJRWdl/ll9XY7vB6OEO0ZF6zfcHt5BizTdCBR692XDYSnjqN16Qn5HzyitnpMFHZaciv+k 1fNKFO57S5AjZf4Ce91cN+FWqOp0WkKtOFKecrRZ2c3hZXEf4IZzO8+q24aQo= X-Received: by 2002:a05:6a00:6c94:b0:81f:3d13:e081 with SMTP id d2e1a72fcca58-82341286034mr1728052b3a.41.1769363933483; Sun, 25 Jan 2026 09:58:53 -0800 (PST) Received: from [127.0.0.1] ([101.32.222.185]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-8231876e718sm7405963b3a.62.2026.01.25.09.58.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jan 2026 09:58:52 -0800 (PST) From: Kairui Song Date: Mon, 26 Jan 2026 01:57:34 +0800 Subject: [PATCH 11/12] mm, swap: simplify checking if a folio is swapped Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260126-swap-table-p3-v1-11-a74155fab9b0@tencent.com> References: <20260126-swap-table-p3-v1-0-a74155fab9b0@tencent.com> In-Reply-To: <20260126-swap-table-p3-v1-0-a74155fab9b0@tencent.com> To: linux-mm@kvack.org Cc: Andrew Morton , Kemeng Shi , Nhat Pham , Baoquan He , Barry Song , Johannes Weiner , David Hildenbrand , Lorenzo Stoakes , linux-kernel@vger.kernel.org, Chris Li , Kairui Song X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1769363877; l=7000; i=kasong@tencent.com; s=kasong-sign-tencent; h=from:subject:message-id; bh=8TW7AOA0FyTSy07GVfKQSiXTCJR3nOx0B++VcBYD3xg=; b=pEzWHdtTTghSM7y2k/qDzilzweYWaIo/0d1n0BBKRJPn3omkQQM1w3UVRSo9dKwvUCoh3+lxv JgCcK0I0lDFDSs1Ho7U8htmHbBq0XbtuhWOrefmRcRNVD88lAd40L2R X-Developer-Key: i=kasong@tencent.com; a=ed25519; pk=kCdoBuwrYph+KrkJnrr7Sm1pwwhGDdZKcKrqiK8Y1mI= From: Kairui Song Clean up and simplify how we check if a folio is swapped. The helper already requires the folio to be in swap cache and locked. That's enough to pin the swap cluster from being freed, so there is no need to lock anything else to avoid UAF. And besides, we have cleaned up and defined the swap operation to be mostly folio based, and now the only place a folio will have any of its swap slots' count increased from 0 to 1 is folio_dup_swap, which also requires the folio lock. So as we are holding the folio lock here, a folio can't change its swap status from not swapped (all swap slots have a count of 0) to swapped (any slot has a swap count larger than 0). So there won't be any false negatives of this helper if we simply depend on the folio lock to stabilize the cluster. We are only using this helper to determine if we can and should release the swap cache. So false positives are completely harmless, and also already exist before. Depending on the timing, previously, it's also possible that a racing thread releases the swap count right after releasing the ci lock and before this helper returns. In any case, the worst that could happen is we leave a clean swap cache. It will still be reclaimed when under pressure just fine. So, in conclusion, we can simplify and make the check much simpler and lockless. Also, rename it to folio_maybe_swapped to reflect the design. Signed-off-by: Kairui Song --- mm/swap.h | 5 ++-- mm/swapfile.c | 82 ++++++++++++++++++++++++++++++++-----------------------= ---- 2 files changed, 48 insertions(+), 39 deletions(-) diff --git a/mm/swap.h b/mm/swap.h index 751430e2d2a5..3395c2aa1956 100644 --- a/mm/swap.h +++ b/mm/swap.h @@ -195,12 +195,13 @@ extern int swap_retry_table_alloc(swp_entry_t entry, = gfp_t gfp); * * folio_alloc_swap(): the entry point for a folio to be swapped * out. It allocates swap slots and pins the slots with swap cache. - * The slots start with a swap count of zero. + * The slots start with a swap count of zero. The slots are pinned + * by swap cache reference which doesn't contribute to swap count. * * folio_dup_swap(): increases the swap count of a folio, usually * during it gets unmapped and a swap entry is installed to replace * it (e.g., swap entry in page table). A swap slot with swap - * count =3D=3D 0 should only be increasd by this helper. + * count =3D=3D 0 can only be increased by this helper. * * folio_put_swap(): does the opposite thing of folio_dup_swap(). */ diff --git a/mm/swapfile.c b/mm/swapfile.c index 1cf18761c0fd..f2b5013c7692 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -1740,7 +1740,11 @@ int folio_alloc_swap(struct folio *folio) * @subpage: if not NULL, only increase the swap count of this subpage. * * Typically called when the folio is unmapped and have its swap entry to - * take its palce. + * take its place: Swap entries allocated to a folio has count =3D=3D 0 an= d pinned + * by swap cache. The swap cache pin doesn't increase the swap count. This + * helper sets the initial count =3D=3D 1 and increases the count as the f= olio is + * unmapped and swap entries referencing the slots are generated to replace + * the folio. * * Context: Caller must ensure the folio is locked and in the swap cache. * NOTE: The caller also has to ensure there is no raced call to @@ -1941,49 +1945,44 @@ int swp_swapcount(swp_entry_t entry) return count < 0 ? 0 : count; } =20 -static bool swap_page_trans_huge_swapped(struct swap_info_struct *si, - swp_entry_t entry, int order) +/* + * folio_maybe_swapped - Test if a folio covers any swap slot with count >= 0. + * + * Check if a folio is swapped. Holding the folio lock ensures the folio w= on't + * go from not-swapped to swapped because the initial swap count increment= can + * only be done by folio_dup_swap, which also locks the folio. But a concu= rrent + * decrease of swap count is possible through swap_put_entries_direct, so = this + * may return a false positive. + * + * Context: Caller must ensure the folio is locked and in the swap cache. + */ +static bool folio_maybe_swapped(struct folio *folio) { + swp_entry_t entry =3D folio->swap; struct swap_cluster_info *ci; - unsigned int nr_pages =3D 1 << order; - unsigned long roffset =3D swp_offset(entry); - unsigned long offset =3D round_down(roffset, nr_pages); - unsigned int ci_off; - int i; + unsigned int ci_off, ci_end; bool ret =3D false; =20 - ci =3D swap_cluster_lock(si, offset); - if (nr_pages =3D=3D 1) { - ci_off =3D roffset % SWAPFILE_CLUSTER; - if (swp_tb_get_count(__swap_table_get(ci, ci_off))) - ret =3D true; - goto unlock_out; - } - for (i =3D 0; i < nr_pages; i++) { - ci_off =3D (offset + i) % SWAPFILE_CLUSTER; - if (swp_tb_get_count(__swap_table_get(ci, ci_off))) { - ret =3D true; - break; - } - } -unlock_out: - swap_cluster_unlock(ci); - return ret; -} - -static bool folio_swapped(struct folio *folio) -{ - swp_entry_t entry =3D folio->swap; - struct swap_info_struct *si; - VM_WARN_ON_ONCE_FOLIO(!folio_test_locked(folio), folio); VM_WARN_ON_ONCE_FOLIO(!folio_test_swapcache(folio), folio); =20 - si =3D __swap_entry_to_info(entry); - if (!IS_ENABLED(CONFIG_THP_SWAP) || likely(!folio_test_large(folio))) - return swap_entry_swapped(si, entry); + ci =3D __swap_entry_to_cluster(entry); + ci_off =3D swp_cluster_offset(entry); + ci_end =3D ci_off + folio_nr_pages(folio); + /* + * Extra locking not needed, folio lock ensures its swap entries + * won't be released, the backing data won't be gone either. + */ + rcu_read_lock(); + do { + if (__swp_tb_get_count(__swap_table_get(ci, ci_off))) { + ret =3D true; + break; + } + } while (++ci_off < ci_end); + rcu_read_unlock(); =20 - return swap_page_trans_huge_swapped(si, entry, folio_order(folio)); + return ret; } =20 static bool folio_swapcache_freeable(struct folio *folio) @@ -2029,7 +2028,7 @@ bool folio_free_swap(struct folio *folio) { if (!folio_swapcache_freeable(folio)) return false; - if (folio_swapped(folio)) + if (folio_maybe_swapped(folio)) return false; =20 swap_cache_del_folio(folio); @@ -3713,6 +3712,8 @@ void si_swapinfo(struct sysinfo *val) * * Context: Caller must ensure there is no race condition on the reference * owner. e.g., locking the PTL of a PTE containing the entry being increa= sed. + * Also the swap entry must have a count >=3D 1. Otherwise folio_dup_swap = should + * be used. */ int swap_dup_entry_direct(swp_entry_t entry) { @@ -3724,6 +3725,13 @@ int swap_dup_entry_direct(swp_entry_t entry) return -EINVAL; } =20 + /* + * The caller must be increasing the swap count from a direct + * reference of the swap slot (e.g. a swap entry in page table). + * So the swap count must be >=3D 1. + */ + VM_WARN_ON_ONCE(!swap_entry_swapped(si, entry)); + return swap_dup_entries_cluster(si, swp_offset(entry), 1); } =20 --=20 2.52.0