From nobody Mon Feb 9 17:58:01 2026 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) (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 69B002F069E for ; Fri, 19 Dec 2025 19:45:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766173513; cv=none; b=CueEwhHMcG6+NwGECOcz25CfE01SEodLSnYVZv5/Tat6frqhoRbZ8oQ0XCwHyHbZHlVMtRmRC6/J7EBB6ag9GBHuYHkA3k41GBusUJaAdcy++YTVa40Hq5o09mhHlBk78tOe2aQh7Q5njl/YBnjYRhONXI8lMP/Ku8GBxUies0E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766173513; c=relaxed/simple; bh=OXZx3hJUpvyflnbIhrx/hsZoyt5j+zIUJnXxW1934Nw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=WtOL0/bxa9YTeHsRvgznyOWuNPpoMy7snN/Bz7olm64glSgQrSa9UbSLRlfiNdgaBHI2ZFhiLSBoQnzjaAaPc1V1jNfT625400QET9rmwN8H2LcJGjNn8vlmyxhjsQzzNhjlV9Y5ZxFO0QauHct3YOAFeyiclpx+/iNxbWDW564= 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=AFnqYPAx; arc=none smtp.client-ip=209.85.214.182 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="AFnqYPAx" Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-2a0d52768ccso26816485ad.1 for ; Fri, 19 Dec 2025 11:45:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1766173509; x=1766778309; 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=xBKZWOds8khsJf/1rWCdSiGA4KHr0oVaNprz6OLz6qw=; b=AFnqYPAx3iSHgyMM4AoskRT1pQeaYumZadln/g3bm0/jkWa1NpaEK7psdG8x35zYkS o7btf0Dp9wcVsXbAImjMq1soEZUPFQztt0JjA56VR6DxXRjWi+cgHFE9DhSBSqJQbKxU VjkAvmiQrX/3+jRmK+tfpgJ1Wfwm33FE9rPx9hM9WVv1PdDFOYWLArKawXvUrZoHR3zS s1pHjXjvRf61UGSXZaFGnRoCaZk3j+IE/+CV0IDDEfZ0gaaG8znqscjFGeWkWHxVhgJ9 I+hVqmU+dIboTB7FAq049mJIoosbhdQ74RtJtsRxp2ykhhw3dnq4K1/sgx2sEDr1/YOo Delg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766173509; x=1766778309; 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=xBKZWOds8khsJf/1rWCdSiGA4KHr0oVaNprz6OLz6qw=; b=fS0UaJObo3/tualoanGvapMZ8h2mcJrOicsc1X66P3w+RhfGlvgpObjBztrhqRRyQJ rBoSiOvP6rVOommifaacSMSfODrIz3qdpq8sR4FPiv/sw2ee1fDCpxtt/Psq4iu3qkTh YXmnKPPIJ4yzy6SWDdEXHR8lkR7Wdqa6Om0AR54WmpYy1m7NdJpHKbKJU98kaVuDztti 3Kc1V8Xq+Xz1HuGLsINYUrbVM6N0kzgte5JpwjwYh8vp/0/9pUohzEQ9vpaPBfQmN292 /oGhdp18Vlhk/7H8oVqhT8JJwjTl0pgQSouAjbnz/ihUdZrnV4cAqt+gr5eheEF2rQZx MvLw== X-Forwarded-Encrypted: i=1; AJvYcCUeZ4oOtlHIVNR/fpGb4gGV1NqPnhJl7hgbjBfPX3ChBV4OUGSXVXdJc8Zet8N4+ycRIRTbPgM74Ge26o4=@vger.kernel.org X-Gm-Message-State: AOJu0YwG9SDcyiJX3YYbsMySV+wXLGc38SL/oGJAJ6MWl6udhy+sq3Cx R5vP0ZMmElsjhgnQgg+ZJ9rZ8Wd82cSVdtwnDTn9sMBIP7kQMSyzK0Q9 X-Gm-Gg: AY/fxX44ay1z5oQ+WItBj88pGY0qLAdcQZvY1qfxYX05VUieycbt6LTmtqDEOBlNNsY XOdp5hI3fsCKmgHUDws/3XfKzFIsSn3Nzfav0gxL1P91+bln9ck2wSQXkRYn134V2GRkQIaF8jK t6PjtBtm/TvjH5v+gnJLRoSK23Njtn0fPDNa8EP8TGS0XiOvHmLY/vewEQSgQuEkyjvBUwGO+/j bV69vD1Czm2f6T+avQyE7ZBbxiLOPULB/RTOAQ3xg0xn0if4wuTkS+oCvwMjHA96fyaVwzxi4+g 20hUk18k1EjYmJW82SIl0nvlyWANd4s/g+YnSS644/ae/A4y0Ye1Ris7HZ9KgI7tjwkNuTnKpcz gmw2AtbJuQf8uPI7f6hRCopzFicpRirzjLysenKRWY6tXvGeqACnxcoFIRGCoqkR5Ok5Q9saT9N O8MU6ItlFXFIRRPSuVbsEQNGDwF0PSwiiyWWuu6nGLRQtGaps0C7ZJ X-Google-Smtp-Source: AGHT+IHue++AcgUKNm6UdMDh1zNcM0NXOdchpWQN9jVvmWptaNwbmQipzIOUzW0NdJKVXkmlvjqurA== X-Received: by 2002:a17:903:3508:b0:2a0:ea4c:51ed with SMTP id d9443c01a7336-2a2f2737055mr36006985ad.28.1766173509044; Fri, 19 Dec 2025 11:45:09 -0800 (PST) Received: from [127.0.0.1] ([101.32.222.185]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a2f3d76ceesm30170985ad.91.2025.12.19.11.45.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Dec 2025 11:45:08 -0800 (PST) From: Kairui Song Date: Sat, 20 Dec 2025 03:43:40 +0800 Subject: [PATCH v5 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: <20251220-swap-table-p2-v5-11-8862a265a033@tencent.com> References: <20251220-swap-table-p2-v5-0-8862a265a033@tencent.com> In-Reply-To: <20251220-swap-table-p2-v5-0-8862a265a033@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=1766173451; l=3237; i=kasong@tencent.com; s=kasong-sign-tencent; h=from:subject:message-id; bh=MDvljxn/+eOgDP2I6U2bGDv2Q1tUhJNmxWn5F/I5OZM=; b=N1iJmzhWEqsEhTA8SJSJWKN/UgFnp4NM2qNl8VIkZC1as0rpeYYh9nM1MrAu58kx8XtQRHPA4 2pljakNoMLvCwIWc78Kq0oebSA97vZgBAlqipn9ojXj9h245ptzY30r 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 f3516e3c9e40..c878c4115d00 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -3667,26 +3667,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 @@ -3694,25 +3682,20 @@ static int __swap_duplicate(swp_entry_t entry, unsi= gned char usage, int nr) * For swapin out, allocator never allocates bad slots. for * swapin, 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++) { @@ -3731,14 +3714,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