From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) (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 7A9ED1B043A for ; Mon, 30 Dec 2024 17:46:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.174 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735580804; cv=none; b=jmo4nlEgqejcomjbrvdCb7+H0XoCEiQVP7bUuozYpB2tba8vETR+ELZubnltNpTfxpB3SzIIT61sl/oouid1+ZYOlxe1mn//nNYLW/4uWK3fGd8uvzZ26qK64AaCDHCno8rKbfyLfBZsxx/afhzKReSDdZ6b6nLLOZFel9XgZtQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735580804; c=relaxed/simple; bh=d2i28bIgwgBE/CLwLqgga3NoAc+ItA80i0MhwxzUBek=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=meo6FnjRr0q5jltvbWsEKdKWsKS2zdUEz56tlS+xqE0CyeFyE3E9pgQ8RMVOGnBJugGhFfLD/2PzFRI+mY1TZXRij00lMy3TpyJybcUVWHpbdr0iHQgZA83+/+7HI1ME357HVX+d9rSkY9ognRYBEOgWVrptlSJRAQIlJnLd1Zw= 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=XyJOuJmh; arc=none smtp.client-ip=209.85.214.174 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="XyJOuJmh" Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-21670dce0a7so26420655ad.1 for ; Mon, 30 Dec 2024 09:46:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735580802; x=1736185602; 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=rZtcJl9C6ncR1PQN3HhaQn7BWhIvEYupFW/4U59A+e4=; b=XyJOuJmh5pIgHk8WSkF7jcX1IUraKbv60hdkSaHT5aS/257Tuv2YbqOqPQD7Kcx0qf u7+U32vlPz7KfjiNvGn92rAMaBSrUkp8CyhtII0HZwmgxOkm4r16WfaOhOaqhAOzXv3H qbnIF+XOLsX8S51dnwmdGjbihNPkNXDDXgfC8vPU9eRnANX2jVCY0i+sG/2Y6IOrCxDo FMUaQW+WpzX4YpaEzLS9QZ569Im9DOMuZQ5NBrnYNkMFjS4xc+V0XriluS4EWQfdx85n 76o+XO2H9LKiPCOXr9fZ9W9JyIdL2sy67TiZYQXjsfBkI4JSKS5hHzQS8d0mjdkLacvW Ha6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735580802; x=1736185602; 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=rZtcJl9C6ncR1PQN3HhaQn7BWhIvEYupFW/4U59A+e4=; b=etEA+vHXk2RqIfbd/b0tEYnY111BFE3Q0WMBUi1EGjNcPV7/2VpccyuAyur3F9MYoa vdsx34fut8pIbrXZTi8EJu5iFM/x+PiB/uA2yXAnMtaEcWDKjTxl3maTCjqyyf6UuVEn 42QFBtpvDMNuKIJ9dWcrErhsS0gONHpDw3NN63RgV8PKxDOFoXC2+fcXowuSKUzciehr MJc0jQ7nmrJNzrXlmMuw8aNM1ViEDtF02RaQJ1q+M4rZnW/EPsvjNIPrsYdDZv52REwu dnvIr9GrQHSL+y2bMnpIguUwaF77WOVJKvGFeXIyupeplV7Pj4KqPDmNGcUrB4X5sw3H sxkA== X-Forwarded-Encrypted: i=1; AJvYcCUpWb6LqAT5Nu+VdqhakPjDIyJ+TrLO3j27edqoRN45Gn4qB59wGICAEv2hb1BF4sOQboNEoBNc9nrCgeY=@vger.kernel.org X-Gm-Message-State: AOJu0YxLpSO/naAYv9sgxT4YTiKsP7Lb+0wwuWqfJtcBfRwh+UPrCHEf soILkoJx9drXHv92IQ2v8MWhBxAMzahk8oznbCSGOEvJKZFz40x8 X-Gm-Gg: ASbGnctUye4g8bR43UaVUGFoVB4dvBp2zaDyk0U7MH2I/5PoberbRUHG1JJRnh6QacU UPiJ8RMwShRN6GjP8YvdX/8eXG3lHk0ulS3xcC4hbRbARE4YywLkOxbNN2d2h015+trEdix4o50 n9ViDO2YiYqkNNJKzNg6aEqZOhFFD0WV9pvmSp+qT+JMDwHyFKZRy/Q7iKcrCVvplKIukotEjHu YojBjeEcL8b4pHzspDdw+Meu5zoi8CjQBIlXfVHEEMNmxx12k75HDlg0wS0eHWeH/MiIbj0PI9e X-Google-Smtp-Source: AGHT+IGH7NBcYgvpsSru6Cqjs4ALQbwGu05N3l2ACnPnzFiwqgWBlvKXNj5Nr+qZiwuAszQVoGrkOw== X-Received: by 2002:a17:903:22c3:b0:216:6769:9eea with SMTP id d9443c01a7336-219e6f133ccmr516396175ad.37.1735580802454; Mon, 30 Dec 2024 09:46:42 -0800 (PST) Received: from KASONG-MC4.tencent.com ([1.203.117.231]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-219dc9cdf25sm180687695ad.118.2024.12.30.09.46.39 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 30 Dec 2024 09:46:42 -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" , Nhat Pham , Johannes Weiner , Kalesh Singh , linux-kernel@vger.kernel.org, Kairui Song Subject: [PATCH v3 02/13] mm, swap: fold swap_info_get_cont in the only caller Date: Tue, 31 Dec 2024 01:46:10 +0800 Message-ID: <20241230174621.61185-3-ryncsn@gmail.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241230174621.61185-1-ryncsn@gmail.com> References: <20241230174621.61185-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: 8bit 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 --- 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_entry_t entry) return NULL; } -static struct swap_info_struct *swap_info_get_cont(swp_entry_t entry, - struct swap_info_struct *q) -{ - struct swap_info_struct *p; - - p = _swap_info_get(entry); - - if (p != q) { - if (q != NULL) - spin_unlock(&q->lock); - if (p != 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 void *ent2) void swapcache_free_entries(swp_entry_t *entries, int n) { - struct swap_info_struct *p, *prev; + struct swap_info_struct *si, *prev; int i; if (n <= 0) return; prev = NULL; - p = NULL; + si = NULL; /* * 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, int n) if (nr_swapfiles > 1) sort(entries, n, sizeof(entries[0]), swp_entry_cmp, NULL); for (i = 0; i < n; ++i) { - p = swap_info_get_cont(entries[i], prev); - if (p) - swap_entry_range_free(p, entries[i], 1); - prev = p; + si = _swap_info_get(entries[i]); + + if (si != prev) { + if (prev != NULL) + spin_unlock(&prev->lock); + if (si != NULL) + spin_lock(&si->lock); + } + if (si) + swap_entry_range_free(si, entries[i], 1); + prev = si; } - if (p) - spin_unlock(&p->lock); + if (si) + spin_unlock(&si->lock); } int __swap_count(swp_entry_t entry) -- 2.47.1