From nobody Tue Dec 2 00:45:58 2025 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 013412D877F for ; Mon, 24 Nov 2025 19:16:32 +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=1764011796; cv=none; b=gJfIc25oVcKU5T5Xc7hn4Bj0NJqDmwWz7XjaufVsrsAK1vOdNJmWAcbSTA2iVd5VsFm/rlTROaC0OxfD+f6haxLjJKg5FHQiUVG3Y0mdM3bXMV9JuRNAB6c/BDkVvjrT4MRVgcuT8skY1MN+udWKb+9IZBs3zsaKoPVKqMQKYJE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764011796; c=relaxed/simple; bh=ydyG7nRsB3shTBRPDVTg5QINk3fb6Ark0u5sZzeHh/M=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=jCMdNxB1dBtjZxjHjLQ5PRdGmEaArH8uLaLgnZlauEX/3YbBhRXdlQgcwdoN4DbFDJ8y2IvRz7jwDw0Ppt4euNsW4ApE1CjzrwzKB1x3nLeuM/3uxNunfwvWC+KJp7gd3mkI+2aqW6eaSN8E3zn5bCWZQHW8gwIdAGEBEVX+C9s= 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=cyvZdnB3; 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="cyvZdnB3" Received: by mail-pf1-f176.google.com with SMTP id d2e1a72fcca58-7ad1cd0db3bso3973306b3a.1 for ; Mon, 24 Nov 2025 11:16:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764011792; x=1764616592; 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=aApchueQuc9NX7QoG5SpFOXLdsh6omcVGTvQgPwgUXI=; b=cyvZdnB3DVwzs2DfOQ5XUQspXrG8T2yH8vh8cV3h1EvyE8L/sBsybYeCNOP783Qw0z BkzmzSRZNtqbyTBBT2f6szUctb8X36AygG0Jn0v+nU4qJpS7A6G+84CiwfoXvs8G2lyI bOhXUkJz4k/e2Yy6osp3DAObzYvJHpPmF8TCdYNuEYISG46ekiAefkHw3Plc+SIYNivx M6GlOhdbRc2zVZ/WzaePsk4gkeUqgRFW1IYNq+thRnpl8osClCAfHr1TLXlkUACr0dxI sEyPg8Wj0o2WEZDfWyy4Qq/dJG7OT6jEs8bcKOBKrnwmQUORn4sVsrJ4+8JT+IKwQMbe jpCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764011792; x=1764616592; 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=aApchueQuc9NX7QoG5SpFOXLdsh6omcVGTvQgPwgUXI=; b=BBjNFFqamOimXNr1P2IfBnSZHLUhqTthyEmh23S+dbuijin7Uhqb2mHEOhkYMj0B6r lqxLIloyjA0F3gjlPSE67lOYIH0ci8YyUtZfsNwuivwUuKxk/VDBKeQ/GPFYTFCcRorF HrJ8GaBVMVbRGlPur2UNRtqeyWZGp2eMgj2FOOcccz9Bq9wMuoH1SAXhCKYgN6nD7WLV iPXCWNyJnHy89tOTzdyC1+H6pA++FVddlCzGf7elNZxx5k8DLq1WcfdnC23lAF4z7YSy uAshSEkX9ZmN8R8UHnH9Sm5ggyyrybPIPmTZwPwqOtxviKuMeyWzj34ZGxh3B4DYZJ3O ix5g== X-Forwarded-Encrypted: i=1; AJvYcCX6QZ2Qr0Uyb9J2vpWGKJVEQatmOHRwTfTeRxr+Ld9MeP6JBFfY+fn4/5KqMXVcLzpykxepNJwhdplKrME=@vger.kernel.org X-Gm-Message-State: AOJu0Yw5xzzoI0UCGmsEX61oa2WBCKgL2I6EjcWN/bB6gm9fFeOKDH22 czD6F18aaYKjLYJhYszPqGXrbmbc+ZUqc4jjSrKvx2ATSnIxLj1p2H/Z X-Gm-Gg: ASbGncsvb+HqfQuOQvc18nFwNhRGfyc0hCILgHjTDlkzBXbYyiCBF+FD1gx2Idz5eox txVQFm28dtbbT4373JTpb310dG4otqNOkK7fSTVExGpaKVAqiYG3Er3Jq3tEuaakZnBCb1z6DWY 4mcZf+w6++gT/unvVTr0batiYzEgLXN8eb8r0UVcBIrhYRtc5BP2Eyox5sbPeOeGUMTkOwsOD8D JoXIVmRTtD6emoSSLPpzTSafgcPrExdzyC8g5rZitejyj521zbctX08HcHn05SdH6XyfMbyn/BB kDP28z5RzAozlnJ/6wYO7PBLmMkjcaU2nnwTsA0ukTWrG90CXxEpSZcHOnJg3p9/MhT3MyEmOBO SqOrm8tJO98ewv7RyfeoFsOByhdBIOz89I/WpNn46b/kQVHjjKcuYje+w/oH4qIH1ezhhFIwL+M fq3Rgmduj/N19+n6MdNKBTRx18Sb45YIEGbmXR5GgTu7gHdxxw X-Google-Smtp-Source: AGHT+IEQsH3iGKnaf18AIE9fwY37Xal5hjhuN438/kkbKsBXRp1SnnyRRphbQAhP2oB7wIDvxgCBaA== X-Received: by 2002:a05:6300:8b0f:b0:35d:d477:a7e0 with SMTP id adf61e73a8af0-3614ebad215mr14443143637.15.1764011792157; Mon, 24 Nov 2025 11:16:32 -0800 (PST) Received: from [127.0.0.1] ([101.32.222.185]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-bd75def75ffsm14327479a12.3.2025.11.24.11.16.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Nov 2025 11:16:31 -0800 (PST) From: Kairui Song Date: Tue, 25 Nov 2025 03:13:54 +0800 Subject: [PATCH v3 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: <20251125-swap-table-p2-v3-11-33f54f707a5c@tencent.com> References: <20251125-swap-table-p2-v3-0-33f54f707a5c@tencent.com> In-Reply-To: <20251125-swap-table-p2-v3-0-33f54f707a5c@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=1764011730; l=3213; i=kasong@tencent.com; s=kasong-sign-tencent; h=from:subject:message-id; bh=pQmOxy2a4hlTElz+FVuPM6pQWOBbEh87j1+qRKen2wM=; b=dxdfFMK7ckPqm/0zEPcQesdz8rcrvfbMXOndagpSD5xrTTwYVIz97wkW/J0xLiWGxa7LtAP6m LGJNIkCyL6kAtqXcU4+Gvlqi3r+BoeXNgoq51uNZ9JbDPqJHdR56Okm 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 bdbdb4a4c452..5b173ef0bc74 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -3662,26 +3662,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 @@ -3689,25 +3677,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++) { @@ -3726,14 +3709,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