From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qk1-f179.google.com (mail-qk1-f179.google.com [209.85.222.179]) (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 2C46730FF39 for ; Sun, 16 Nov 2025 18:13:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.179 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763316789; cv=none; b=dYF1iZPnQmWHl5WralvNHiXgvRPD7HgYMiwPLaRA66D75GMr28LaPhgzGYukTLBs7ZjFcFFoe2zdKkVUf03uWV56pcSlIFT0yVCGjtjf3gjj86d9uRsxcYvpNQQ8gCX1AFp7QJvyJQq+3/7IzKjtFOXvp2EjdqnHu/Zhwh3rcdg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763316789; c=relaxed/simple; bh=lW1PS8ciSlXv1tjsf7cH/sSIyRnjMnlE3q961sc1LJk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=OYZFE/4+PwxM4WOHvhTh3tblKxrXb7qTFIbbW7soBhpEtXKXBXmjgh9TQzC6f6NQavOag/aNs9zXAGJDN0C7vle9OiSVeHMR0Bd4OEXlvgnZzWE+8i8cSetx39jztx+1tF95d/Qc+5WYWVaX/Hm8e1xo+HhD8yFFiR/xD2ygzFk= 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=QnEs5FLU; arc=none smtp.client-ip=209.85.222.179 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="QnEs5FLU" Received: by mail-qk1-f179.google.com with SMTP id af79cd13be357-8b2ed01b95dso28579485a.0 for ; Sun, 16 Nov 2025 10:13:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1763316787; x=1763921587; 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=lSSgfvXGMUVDrnVHVmW9bapiPTm8k034PTcoJJPn0ow=; b=QnEs5FLUWGr++Fo007qdvxHNSVXuM/n4lAjNadoB7ljMnRDX9Jumoz1N//40RhKXtv zlm7Po6iQ2et7tBKvLZRSwM4UdLIVcNA1Ab8SUApb48ryfLc0L3CPrEbflZkdCEtItC/ SjFLOjsPVl+NRKchuWDv5FgRxLRIki8ZVWcOtGuy9ivcY+CQTuOrMyraNEW3JNuDTcXz nJS1ZHT9Ti82I7aM8QCMwvGUA2sPB8P2UZCUnjnrKcY5W5VRfyGO+L57mcGtatTtSJ8+ RQBKytxeuRSTMhepPWZ/hZC+MllQTpH11I783JV3oKk3R/wh1uBHkE9nLYRWc36G6YjL lVEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763316787; x=1763921587; 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=lSSgfvXGMUVDrnVHVmW9bapiPTm8k034PTcoJJPn0ow=; b=GFrD+hpNiMgEFZYRzpZv+d+ckD2MVy0ml6+HubdgfZvg5m5+kU3TVo02QM4+qsa1wt oe5wvPvOpYHeMrhTD0LsMh6Lu06C3QJoqcg22d3/0ZS1dEa+EGMw4nI476wyYaJqbqaa gTgkxR4VA3Pox+oCGa6pUbJB2N5MZZm87x6taFYEs9ZUhFviVa+JA3XUx6ofmMLU1GwM 8W+3B5/MUeL1mgg770UmXjRA5tJnrqV2iF/CRmqItcD7pePSBQUf2FV2LgxTxGPBJh5D YS24vhYeKWNuZFTK6inteu0pxX0oGNaxsD+vgQVWaM/4MmWoW+2tFz6+Dl/qXB11i3IF If/A== X-Forwarded-Encrypted: i=1; AJvYcCVgJ4h2fkoOdhOp4ZWHIX1RTksnCt3vxF0x4m4TciR6PdzdsfHtYV5blL/Se5xHQ/wGF1HtxW7ocw47KX0=@vger.kernel.org X-Gm-Message-State: AOJu0YwCBPOvQ88eQ4bsrGFpqg1ArNy+JjIEYr2Bxh6IDgSKrerXlWpL kXiMMufPepQp5aIO1wFCOf2f0LOzLPXxgLO1ekT8vC5G1UMMqYtxOqg7 X-Gm-Gg: ASbGncu30WYrQhHkNaOwu9SQftDQdHpKACnirghByWjl4JilMlr+9b6A9zN1MOM4DxY abYWy1oByJTTOZCFwrMIy4C/b/dt6pZlpkfVF3rdOrlsq2kWoGZSpvsmpFHXvCIkPlLapLFSdNr V7tnq7az6UNjol6p35VX6HpU/Kl9/vnrN0JWDE8R0X3fvPLdnL03wvzUrQ6hD9Z4v63amw3eQge EhzHnVG73n56era+S8V5J0/8xQ14V/Q0HV3kQgIdESHdXxGrieLGKF8YzSspRiCpyLFftLiBfPJ rVDxcMD8Ff/J4SD9EMiKXxAVTA4MtWw51mg3OXPNmnRQxNMqdqqDb3WDJKOIMc9X+7jfmgG5YVX YwA6UBLDJdOaoyWbA2sfSI+TwfaKZANbF7lRqsA3WGITKyrgNX6p7slD9n32aH+WEIjDLmxBBRY eNb9lcZ80uNOJpj8yKePGfGor+VrBLLt5pmNJ2WaXamw== X-Google-Smtp-Source: AGHT+IEcCA97r0JyWuFTR0wVrGw1frbCyQjh7ot7ArE1rHrRI0o3COooS2z7cYfHFGZW8YMjjYwzJw== X-Received: by 2002:a05:620a:269a:b0:8b2:200f:ddc9 with SMTP id af79cd13be357-8b2c3145ad8mr1196937085a.9.1763316786891; Sun, 16 Nov 2025 10:13:06 -0800 (PST) Received: from [127.0.0.1] ([101.32.222.185]) by smtp.gmail.com with ESMTPSA id af79cd13be357-8b2e089b436sm305447785a.45.2025.11.16.10.13.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 16 Nov 2025 10:13:06 -0800 (PST) From: Kairui Song Date: Mon, 17 Nov 2025 02:11:52 +0800 Subject: [PATCH v2 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: 7bit Message-Id: <20251117-swap-table-p2-v2-11-37730e6ea6d5@tencent.com> References: <20251117-swap-table-p2-v2-0-37730e6ea6d5@tencent.com> In-Reply-To: <20251117-swap-table-p2-v2-0-37730e6ea6d5@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=1763316712; l=3213; i=kasong@tencent.com; s=kasong-sign-tencent; h=from:subject:message-id; bh=4sqUTb5wDrIOXmOyfh6gWE4Eh7n/OBitK92gcYdHBSY=; b=G1R6O++yLMnm9VaeJ2Qbh0DEMkVpYLddj4B7JafKPOouOQt+XZ0C+P3slAOI65XhYlEWuiF17 F9GgB+N7WzXD8EHdK30/egsIEDaiD55RlKu7BkC1ZqOtcQQQ3RtZITD 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 d57e83a4d0a7..94d21b755c0c 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -3654,26 +3654,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. -> ENOMEM */ -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 = swap_entry_to_info(entry); - if (WARN_ON_ONCE(!si)) { - pr_err("%s%08lx\n", Bad_file, entry.val); - return -EINVAL; - } - - offset = swp_offset(entry); - VM_WARN_ON(nr > SWAPFILE_CLUSTER - offset % SWAPFILE_CLUSTER); - ci = swap_cluster_lock(si, offset); + int i; + unsigned char count, has_cache; - err = 0; for (i = 0; i < nr; i++) { count = si->swap_map[offset + i]; @@ -3681,25 +3669,20 @@ static int __swap_duplicate(swp_entry_t entry, unsigned char usage, int nr) * Allocator never allocates bad slots, and readahead is guarded * by swap_entry_swapped. */ - if (WARN_ON(swap_count(count) == SWAP_MAP_BAD)) { - err = -ENOENT; - goto unlock_out; - } + if (WARN_ON(swap_count(count) == SWAP_MAP_BAD)) + return -ENOENT; has_cache = count & SWAP_HAS_CACHE; count &= ~SWAP_HAS_CACHE; if (!count && !has_cache) { - err = -ENOENT; + return -ENOENT; } else if (usage == SWAP_HAS_CACHE) { if (has_cache) - err = -EEXIST; + return -EEXIST; } else if ((count & ~COUNT_CONTINUED) > SWAP_MAP_MAX) { - err = -EINVAL; + return -EINVAL; } - - if (err) - goto unlock_out; } for (i = 0; i < nr; i++) { @@ -3718,14 +3701,31 @@ static int __swap_duplicate(swp_entry_t entry, unsigned char usage, int nr) * Don't need to rollback changes, because if * usage == 1, there must be nr == 1. */ - err = -ENOMEM; - goto unlock_out; + return -ENOMEM; } WRITE_ONCE(si->swap_map[offset + i], count | has_cache); } -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 = swp_offset(entry); + + si = 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 = swap_cluster_lock(si, offset); + err = swap_dup_entries(si, ci, offset, usage, nr); swap_cluster_unlock(ci); return err; } -- 2.51.2