From nobody Mon Feb 9 19:05:55 2026 Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) (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 B432634FF69 for ; Wed, 29 Oct 2025 15:59:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761753592; cv=none; b=HH77Iq2AgIHQB3y5PdJJo8e5guF0RW6Z70CsxYcFMk1CO3AINLCwTO7bD3/NtTMiqMqPNvyDZi7g3cm1sWdwTXNHsUn+FjVhD0AOYiIflm7yY8EucqKFhGjB432QqNDeAHp+Dc6nGWL1PC852bAJ/YBYpw18qyMbcEJKusmtNTY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761753592; c=relaxed/simple; bh=3ptaXN+GAGoCho1TfU0eVUutT5FBhLQ1N3F5bH4ARsY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=YSGRrUG49B+wGKUmPy+IJOsv23zn4/8HPEy2xvDaavNBiqySF3fSAw/O0zP0At5VW7esGMd9sngcH3mEDJ/zJ/8MVlHjNj3CYr4lImTJTgv0L6OcjwcU5/fo/9PwJcpIkxkE2jey2vKIb0BvsbcfnjaSqxjRkbMoQLHn5HayUEo= 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=fGWOPl/f; arc=none smtp.client-ip=209.85.216.53 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="fGWOPl/f" Received: by mail-pj1-f53.google.com with SMTP id 98e67ed59e1d1-34029cd0cbdso84293a91.3 for ; Wed, 29 Oct 2025 08:59:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761753590; x=1762358390; 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=hEBe93+AqDqbmzUn4tECC01fE40N0PwOlnrL0O+c5gY=; b=fGWOPl/fFTEnj35SGpei98lgx5vkrhaylfXEqvKBflfbgchru3ENfNXjwwrC68qyDW Q7+I8JZ/NO3aaCq4BKuvKypgP9NDrzDp5PuwKlpEoJaqPMXQ5YaETe8KB0m32hgH55c2 dYSOn68GnK2w2+Fk1Q1skVn5qkfmo8fGWCmTIzQ29RwMgwzpR51t/n9Ij30NrgfFUZm1 KZH9wkrfLRtGwwMnB7aqzxKjNr4O7dwd1lqHF9Id9kkdkNZqHkXKP7/HG6ONiYRuG0MD 72l2q3hYtGqqOu2o0mGlVuTPuZUwz1oefFGwc9Rsi12Z507wHNM0ZnBNuHqisIPp8Sr8 ayEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761753590; x=1762358390; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hEBe93+AqDqbmzUn4tECC01fE40N0PwOlnrL0O+c5gY=; b=UDwtTfg8w3dTMLDMNaiHWg4Z2kTUxG8QPKye4wj9xP8qGDOYw2ZBaLiw4GpE8upWur qANoQSklS3kvyRB6P+yf3IM3A+i73ZxnMvFTuvN00n1ohMmOBmFSKxQce8s8aZNeRDym DxeE258l2/l+rG5Yq1jLp+gpuNDK+NnHmm1tqpez61FAVr5RNHmshQc+cEDiQpQ17Vwj vR3ZeJmbjk4l0ePgtQ/IRk+aVhgw6W7rkpj0urxNdCyM8UFw+FGyd8IXssZIx8uuh3fh sfohCJVySnrCMZ9Hsrle9KBlS21xPcaur/dP8XyWg+kDa26I/juokTWBY8Q2HHpbHdNi NYBg== X-Forwarded-Encrypted: i=1; AJvYcCXWZk7csop4A4YqfnkfJ0r6bVm9wPgiKFCIkPtxfZbde7jUZUVptiS7Y7kYQaQ/m0rmkMx5DBjH+oSEUTQ=@vger.kernel.org X-Gm-Message-State: AOJu0Ywa3ByE/XdJ6xY/MibZ/7eOCgx14TwlvG4iVRZWjWmQU3tpjsn+ l6+SQRaOqVip9oCwcXmNyshcYQ8ATQFqkTC3E2X9//gopTJqnm+e4hQL X-Gm-Gg: ASbGncuOB1kBabzye7+oW40sMp501Xm63F4JLWnllDVcz5xYxa1Mxczd/SUfavF68ZT rwzbEr+0DTwmAQs1BjcFvzyRnd5rfrbtvbF5DMkiOWK5Qe/d+jaNYlKzQmj721BjGovurcfumfF SgFKPKO1Rn1HcA/0NLzBEsNP63RRMYGMs/WaVLZi4mGCZWiUf+U4y4oVduh/Dqnp+nv3xO/zRsL 97Q33IsYRWb0rbklj7/oarIzyt+Tsgeq1aGdsNX6c1c8LLo6B/yCYEU8n/27q7yQ6fWIg9qIruY vIyjjv3Cfu1B9zZ6ncoIjLs2xpaIOeSNwwFAnEdvtWFZDAOfnZCAnhF+JEZR3cUbF98CCf7kkNI TpE0z3CPHWRDTIXKqvMABLzizyziXygoqVTKGFOiZVPPHhIstEoMzvuJsux0ZNbBOZpLXoo5jZu COL01SSUyRZw== X-Google-Smtp-Source: AGHT+IE3wJlrEK8Y4HOI8VQFwkEg3x3geQZauMd9eO5Geg4rfGwAJlYNO9WbP0RB4Wfto3M74+vZpg== X-Received: by 2002:a17:90b:254b:b0:32b:9bec:158f with SMTP id 98e67ed59e1d1-3403a2f1625mr3442455a91.29.1761753589772; Wed, 29 Oct 2025 08:59:49 -0700 (PDT) Received: from [127.0.0.1] ([101.32.222.185]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-33fed7e95aasm16087366a91.8.2025.10.29.08.59.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Oct 2025 08:59:49 -0700 (PDT) From: Kairui Song Date: Wed, 29 Oct 2025 23:58:37 +0800 Subject: [PATCH 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: <20251029-swap-table-p2-v1-11-3d43f3b6ec32@tencent.com> References: <20251029-swap-table-p2-v1-0-3d43f3b6ec32@tencent.com> In-Reply-To: <20251029-swap-table-p2-v1-0-3d43f3b6ec32@tencent.com> To: linux-mm@kvack.org Cc: Andrew Morton , Baoquan He , Barry Song , Chris Li , Nhat Pham , Johannes Weiner , Yosry Ahmed , David Hildenbrand , Youngjun Park , Hugh Dickins , Baolin Wang , "Huang, Ying" , Kemeng Shi , Lorenzo Stoakes , "Matthew Wilcox (Oracle)" , linux-kernel@vger.kernel.org, Kairui Song X-Mailer: b4 0.14.3 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 e4c521528817..56054af12afd 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -3646,26 +3646,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 @@ -3673,25 +3661,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++) { @@ -3710,14 +3693,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.51.1