From nobody Thu Dec 18 20:35:30 2025 Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) (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 50CBE1C3C14 for ; Mon, 13 Jan 2025 17:59:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736791199; cv=none; b=a6q2hM1xhJEIm0JygbiMe3E8hrYmveSDPKyQydId0Tc35KJYAGIdptIJ7DRpkFUphj48Ak4K2HKZyhQNtz85wQVyJLZH+YqAu7370yQqER574i55oRzCDrWSlbfxPe5xLU+bANNByXfmM8G1omF06kG7AhPtzFV+hh0NGCTEvNE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736791199; c=relaxed/simple; bh=ebizjYrxgUBaQcvlifIHoxylJxpYOAd30sM1cB2O0jE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CBGUxoUfVp8L+3/2Oma4sg9NNZwYiT6AJWOsqwUawILkrVZoSQHjt0tl9UUGa71QvQ8ah5jcwF0c8WAkPvokelqlUdFcFYdqwGvXBNpLow6gh4poDhYueowm/Z1kKQBPv051xPooxZAKlOo2MeJJ8h9uhV+Zd0hcmPLcqM6rwvA= 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=cw6qx4cW; arc=none smtp.client-ip=209.85.214.172 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="cw6qx4cW" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-216401de828so76033855ad.3 for ; Mon, 13 Jan 2025 09:59:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1736791197; x=1737395997; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=KIPMfjkfQ89B1WDwc6Z1AsnxOVIeae7YspqiuRkp0ic=; b=cw6qx4cW3W/WjhrsOlvV3csHKbum3jQ26XiOwCAXJAq6mNAHkzhblQcNUIHrU7Zdir IHjEQoEqrBSEOa2KTWTlK6N0/InYvvppLwzx3oneHe5rGvhZWoKQK8Sd7j4Ipra6jgb3 4huPyUBvmBIJmwnV2ZCmBGUbOUqYR9QaUpQQgLmbQrsQ6hiNQo/Lry49F+b1uagyKS4d 2+2RFfrPiMJJUm/LVcQvSFMO72SHdPS9HHjMHwPKKU55pO2u273bFcNZBCpGhs3xt9S2 L2ecUQUUCEfPOso5oXB+51UblanNSNBGWTBdJcrx/oJjTK9Z2smSaPrfJtcqz9m8ZcAN F8Zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736791197; x=1737395997; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=KIPMfjkfQ89B1WDwc6Z1AsnxOVIeae7YspqiuRkp0ic=; b=YknB/PT8TcJbsg7rW5gefCB4tZpragbmvCotGZtuMxxTdc4yyCtHy/t6u0ulKD4xkm B6IF3nf2RvU7P8O1ogAG2QOCtb6NC5iIN/TDICfw+2kljuD0p2ppruDxBeTgPoGywDCq vMWFGg02my2KGkZCT4pMwoyTNR/32fLpqcvCS29YowBaQrCeDHr3ZAIsMWLB6G2e2luq 7Sw84NNNuZ0C8PfmLpeR7GmYgqCW0b/XPG/RIYJHgaQu3Mw7zS7eB9ZUWcee+Cj5tf0K 8z+31zmENMlEUZhbsCTQ5kosbOtknQFAA4TZmTDAiJH/xuRT2x8+hKYN7tzdUVWA7LvZ y7+A== X-Forwarded-Encrypted: i=1; AJvYcCWRzXRylgHiRAjNfFVYEJ5qgXW9EJaRMd8zPm6Xwi3wPYhrpXkcfbA6c4PdhhhuLnSeDjq548c5jUJct14=@vger.kernel.org X-Gm-Message-State: AOJu0Yx2Z0AxSlynH8oG+Aeu75MQdmJlRJnpKiTkosvBWIx2WMXy8zqu God/tGfh8l0hhkip1GRI39n+NP+wJU2Eo/j6jXBdsUrcyntx0qMU X-Gm-Gg: ASbGncteD+FJHP5SmYXRl/CZo4b/mbn9cW+CikWPOXzajm/VgJgs1DFZSdLYgLyCrEe rvD5BIT9xOyHnUcpZjqJk87Gtv8Us31VYDkgWYwAwhuqnO7oHyx56rF1XwatYa13Pg5MkP+PnaI u5eTnD9+//7WXY1reUL2tAUzksAVhbfAMDDuRiapkoszgdlwmhVFHiB9aMQx1pLvsw2yPaYei/U v9SzfCE70tp/ziKDJUP8CdVfTNJeg9uVYh8UwUeFeZzbP9B3hsMuhT7W5oKkgsulzv5l0m6Tl2+ 1g== X-Google-Smtp-Source: AGHT+IEnHU1K7n4HvnC+iaw48qp8W3x2ZslOxNgGfCpcaDHl0MYIhads/GivBX4OKMlfg5wSZ5/7JQ== X-Received: by 2002:a17:902:e808:b0:215:b75f:a18d with SMTP id d9443c01a7336-21a83f36d9emr335932635ad.11.1736791197432; Mon, 13 Jan 2025 09:59:57 -0800 (PST) Received: from KASONG-MC4.tencent.com ([115.171.41.132]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21a9f21aba7sm57023635ad.113.2025.01.13.09.59.54 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 13 Jan 2025 09:59:57 -0800 (PST) From: Kairui Song To: linux-mm@kvack.org Cc: Andrew Morton , Chris Li , Barry Song , Ryan Roberts , Hugh Dickins , Yosry Ahmed , "Huang, Ying" , Baoquan He , Nhat Pham , Johannes Weiner , Kalesh Singh , linux-kernel@vger.kernel.org, Kairui Song Subject: [PATCH v4 02/13] mm, swap: fold swap_info_get_cont in the only caller Date: Tue, 14 Jan 2025 01:57:21 +0800 Message-ID: <20250113175732.48099-3-ryncsn@gmail.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250113175732.48099-1-ryncsn@gmail.com> References: <20250113175732.48099-1-ryncsn@gmail.com> Reply-To: Kairui Song Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Kairui Song The name of the function is confusing, and the code is much easier to follow after folding, also rename the confusing naming "p" to more meaningful "si". Signed-off-by: Kairui Song Reviewed-by: Baoquan He --- mm/swapfile.c | 39 +++++++++++++++------------------------ 1 file changed, 15 insertions(+), 24 deletions(-) diff --git a/mm/swapfile.c b/mm/swapfile.c index f8002f110104..574059158627 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -1375,22 +1375,6 @@ static struct swap_info_struct *_swap_info_get(swp_e= ntry_t entry) return NULL; } =20 -static struct swap_info_struct *swap_info_get_cont(swp_entry_t entry, - struct swap_info_struct *q) -{ - struct swap_info_struct *p; - - p =3D _swap_info_get(entry); - - if (p !=3D q) { - if (q !=3D NULL) - spin_unlock(&q->lock); - if (p !=3D NULL) - spin_lock(&p->lock); - } - return p; -} - static unsigned char __swap_entry_free_locked(struct swap_info_struct *si, unsigned long offset, unsigned char usage) @@ -1687,14 +1671,14 @@ static int swp_entry_cmp(const void *ent1, const vo= id *ent2) =20 void swapcache_free_entries(swp_entry_t *entries, int n) { - struct swap_info_struct *p, *prev; + struct swap_info_struct *si, *prev; int i; =20 if (n <=3D 0) return; =20 prev =3D NULL; - p =3D NULL; + si =3D NULL; =20 /* * Sort swap entries by swap device, so each lock is only taken once. @@ -1704,13 +1688,20 @@ void swapcache_free_entries(swp_entry_t *entries, i= nt n) if (nr_swapfiles > 1) sort(entries, n, sizeof(entries[0]), swp_entry_cmp, NULL); for (i =3D 0; i < n; ++i) { - p =3D swap_info_get_cont(entries[i], prev); - if (p) - swap_entry_range_free(p, entries[i], 1); - prev =3D p; + si =3D _swap_info_get(entries[i]); + + if (si !=3D prev) { + if (prev !=3D NULL) + spin_unlock(&prev->lock); + if (si !=3D NULL) + spin_lock(&si->lock); + } + if (si) + swap_entry_range_free(si, entries[i], 1); + prev =3D si; } - if (p) - spin_unlock(&p->lock); + if (si) + spin_unlock(&si->lock); } =20 int __swap_count(swp_entry_t entry) --=20 2.47.1