From nobody Tue Feb 10 00:00:41 2026 Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) (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 3F65934DB4A for ; Thu, 4 Dec 2025 19:30:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764876631; cv=none; b=nyWrBCBLZlmMl+U/2QaXWNOAVvAR/gYjvGd+mqTq+pDxqFio4k6aCssKgVtQiNgqK9DaiXDJYCtuIItZwpyaW5TqUN3q+rS+6iU/7OWUlRuzWlmfLfkJiLUIenYsq2R0yZSG6Za+cKGAxpfHv2ldyzxTxyR+km5mKJs+2JTj8QU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764876631; c=relaxed/simple; bh=VlDCm54ah9liVJ/Nk6cWG/1/qPfdYyE/ePJ761vI6Y4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ZGs3jXb19IWzz/pv48Q0knYa/qK5eG8N9R3ULShys8gtr6g3b3Jhj0nr9fst7eHXsxGRMZO4WOfdY4NsrnXYQq6jrszvzaJGkImhDS5ISXT6wKVTEU5wDFzdG2LeqAvavLFf/iZKGvmNCZSRCepDw0dQTh+4CRbBTmKRuwPIcq8= 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=X4J9vOsZ; arc=none smtp.client-ip=209.85.214.175 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="X4J9vOsZ" Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-297e264528aso13355035ad.2 for ; Thu, 04 Dec 2025 11:30:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764876629; x=1765481429; 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=pdpDGFKobTDZcaA+oYO377RhHuNYAnjN7TF4QVNsFf8=; b=X4J9vOsZ3HPWD26zur2NE8renTMW+dz4mV4sWWcI6dB2x6g53mm5LKejUbWLlDvVXL gVr0TReJVswhOGtpzQXB2K2mc3i2gVVoTYGxKldX1zc7tKnHQm82PiUtbY0EzV7lyUv1 +RflHFIFeyO3xLczTHFE2S0P1Fs0wxaI5w/htP63dJ9SETuklAZabm41Z0kGOOfM5V0Q qcg7zrYj4SZLTLW4jF/NYyZ9BU8iIZgIdN/reAHFpnWqIDq4mx2oaLapEKXOTDznExmS IwWBiWaah1/XxAde8B2e/m/gtjp1nSVOXurQ1gxpuJfvSCMA3lo8+GKVsxKVq1/i7Gtw J47w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764876629; x=1765481429; 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=pdpDGFKobTDZcaA+oYO377RhHuNYAnjN7TF4QVNsFf8=; b=A/ajMrHUEW7NMO/hAFLcra/iVJ5UlErsAoc66HInq1WCw0uXxMW37wZ2fyDt87sIrj apoRFlFGEOgf6hhtoBwO51WwIL31z6vaIeEGSzOVrP9cyaKsuE3w+pyFlwY1HFfBhqqI XlQO/BteR4jxYhOoYbMzbea+vBgc1KNHsNo/9Evo5bQqRm8gzqahRLI1sw9CqPUJ/K8S W6Eg1EmGlKrli4M5UBzVwF47RoUAdogfSh7vRoTzmrYdKn8UqoaICq5cBy6CPzY5LpV2 E59EWJwXWzTnWTFKR01ZWjS2WWH2YOW/tEvbBxz5xDIXhRIL8aYRX7oi6I755HfzNONw 2BPA== X-Forwarded-Encrypted: i=1; AJvYcCVWJ7NBXGcZ0g2IzvPmuqQjWCeqq2FljuBfkP4O/o7JefYljNr0UdwigLvaSyzdZwoIWfmiuKvrFVQcHb8=@vger.kernel.org X-Gm-Message-State: AOJu0Yzx3urucbhAK/fgaWxNNgCHj/XPf3Aiu5Yn9fLSzp5h/D4Gvcx0 EU+E8P19yH9jmi5O8iFb6Qac0iqmri7rL+cilxVSL04jhC7yDa1FhOuC X-Gm-Gg: ASbGnctUNMhkFvYOEOAeEkw2VSBVvZP2w7kHsajTk6k5NNTJeGXi9v+k6/gsx+QTN0U wH8QP9KbUhuEz0bKlQSEx0JrSq5WIHqWm4r/DSO0VMz3oGWZpnGIvkBTEXFJFGtMP1Uuf4U0XH6 G4d7eRwpbNPgTQDqtV8P6bJmWb+eHOa9Rhe61P3M+qUMBFPOMVHOgvNePiZBo+/9JNXqXUvfsuJ k+KOfTNpZ1NwVwvHwJMv8pMFpDlxrPoC17h4Gtj9Y9NHp5G1cK7VezjJLq7LTpHNlBxNgBhDTkn GvqRMcufK8XvA9l/shrW7RM+EMOybqyoF0hz2YuuhCi2MselgaaWfhxUEIrYEQ1NPxP/H18Ojhv Fl5Ix5sgOwX1KZZJdp/+H+a9Y7x2A4KKe+cRwXZQ637bey0JSaGK7WkVxe69OO2kz3qeckGHtNQ ivLPK/GCChnDWAHsPCkns0ABgOl7PsniHUV0VSgZYCvDpe123v X-Google-Smtp-Source: AGHT+IFficBiEMz/pYiFH4fMZ1x1Z847vNsC3DafnIyYiLDS2+cnBVh0UanWRv7rLW1Nv8XeJgOXlA== X-Received: by 2002:a17:902:ccd0:b0:297:e231:f410 with SMTP id d9443c01a7336-29d9fb65b25mr43914435ad.13.1764876629308; Thu, 04 Dec 2025 11:30:29 -0800 (PST) Received: from [127.0.0.1] ([101.32.222.185]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-bf686b3b5a9sm2552926a12.9.2025.12.04.11.30.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Dec 2025 11:30:28 -0800 (PST) From: Kairui Song Date: Fri, 05 Dec 2025 03:29:19 +0800 Subject: [PATCH v4 11/19] mm, swap: split locked entry duplicating into a standalone helper 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: <20251205-swap-table-p2-v4-11-cb7e28a26a40@tencent.com> References: <20251205-swap-table-p2-v4-0-cb7e28a26a40@tencent.com> In-Reply-To: <20251205-swap-table-p2-v4-0-cb7e28a26a40@tencent.com> To: linux-mm@kvack.org Cc: Andrew Morton , Baoquan He , Barry Song , Chris Li , Nhat Pham , Yosry Ahmed , David Hildenbrand , Johannes Weiner , Youngjun Park , Hugh Dickins , Baolin Wang , Ying Huang , Kemeng Shi , Lorenzo Stoakes , "Matthew Wilcox (Oracle)" , linux-kernel@vger.kernel.org, Kairui Song X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1764876574; l=3213; i=kasong@tencent.com; s=kasong-sign-tencent; h=from:subject:message-id; bh=UCtbWcSkIiRY+e/EucxLikEc+mfHA8d9Ghbzu0X0yNQ=; b=uBiHRTVs5Yf1quAWq5aqh+UbkP/IGjU3Qt//+q+F8Aj0HHKN7bFns4gRjtpoF5uyfmUMxZk0Y 4C81u+2HDaACCprv7DUtWzXX9t+Ur6JqeLPVF4a0a2SxiNEaldfC5I8 X-Developer-Key: i=kasong@tencent.com; a=ed25519; pk=kCdoBuwrYph+KrkJnrr7Sm1pwwhGDdZKcKrqiK8Y1mI= From: Kairui Song No feature change, split the common logic into a stand alone helper to be reused later. Signed-off-by: Kairui Song --- mm/swapfile.c | 62 +++++++++++++++++++++++++++++--------------------------= ---- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/mm/swapfile.c b/mm/swapfile.c index 2703dfafc632..d9d943fc7b8d 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -3666,26 +3666,14 @@ void si_swapinfo(struct sysinfo *val) * - swap-cache reference is requested but the entry is not used. -> ENOENT * - swap-mapped reference requested but needs continued swap count. -> EN= OMEM */ -static int __swap_duplicate(swp_entry_t entry, unsigned char usage, int nr) +static int swap_dup_entries(struct swap_info_struct *si, + struct swap_cluster_info *ci, + unsigned long offset, + unsigned char usage, int nr) { - struct swap_info_struct *si; - struct swap_cluster_info *ci; - unsigned long offset; - unsigned char count; - unsigned char has_cache; - int err, i; - - si =3D swap_entry_to_info(entry); - if (WARN_ON_ONCE(!si)) { - pr_err("%s%08lx\n", Bad_file, entry.val); - return -EINVAL; - } - - offset =3D swp_offset(entry); - VM_WARN_ON(nr > SWAPFILE_CLUSTER - offset % SWAPFILE_CLUSTER); - ci =3D swap_cluster_lock(si, offset); + int i; + unsigned char count, has_cache; =20 - err =3D 0; for (i =3D 0; i < nr; i++) { count =3D si->swap_map[offset + i]; =20 @@ -3693,25 +3681,20 @@ static int __swap_duplicate(swp_entry_t entry, unsi= gned char usage, int nr) * Allocator never allocates bad slots, and readahead is guarded * by swap_entry_swapped. */ - if (WARN_ON(swap_count(count) =3D=3D SWAP_MAP_BAD)) { - err =3D -ENOENT; - goto unlock_out; - } + if (WARN_ON(swap_count(count) =3D=3D SWAP_MAP_BAD)) + return -ENOENT; =20 has_cache =3D count & SWAP_HAS_CACHE; count &=3D ~SWAP_HAS_CACHE; =20 if (!count && !has_cache) { - err =3D -ENOENT; + return -ENOENT; } else if (usage =3D=3D SWAP_HAS_CACHE) { if (has_cache) - err =3D -EEXIST; + return -EEXIST; } else if ((count & ~COUNT_CONTINUED) > SWAP_MAP_MAX) { - err =3D -EINVAL; + return -EINVAL; } - - if (err) - goto unlock_out; } =20 for (i =3D 0; i < nr; i++) { @@ -3730,14 +3713,31 @@ static int __swap_duplicate(swp_entry_t entry, unsi= gned char usage, int nr) * Don't need to rollback changes, because if * usage =3D=3D 1, there must be nr =3D=3D 1. */ - err =3D -ENOMEM; - goto unlock_out; + return -ENOMEM; } =20 WRITE_ONCE(si->swap_map[offset + i], count | has_cache); } =20 -unlock_out: + return 0; +} + +static int __swap_duplicate(swp_entry_t entry, unsigned char usage, int nr) +{ + int err; + struct swap_info_struct *si; + struct swap_cluster_info *ci; + unsigned long offset =3D swp_offset(entry); + + si =3D swap_entry_to_info(entry); + if (WARN_ON_ONCE(!si)) { + pr_err("%s%08lx\n", Bad_file, entry.val); + return -EINVAL; + } + + VM_WARN_ON(nr > SWAPFILE_CLUSTER - offset % SWAPFILE_CLUSTER); + ci =3D swap_cluster_lock(si, offset); + err =3D swap_dup_entries(si, ci, offset, usage, nr); swap_cluster_unlock(ci); return err; } --=20 2.52.0