From nobody Fri Dec 19 16:45:01 2025 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 54DBB2690C7 for ; Fri, 14 Feb 2025 17:58:28 +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=1739555909; cv=none; b=m39+AdACfopWfIv7aik/6bRETqB351q8CsgzXSnLjAm5EL5lEiLFHa/vQNU3hOG6qPPE999pMkLNLAflZf+atveiKP/1EYglj405vG792MsjfWGDxmNW2qKxesNEEVEvv6TXnZvgXvSP/7+4cQIoXGny+ONfjyLRAds0Tdu6034= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739555909; c=relaxed/simple; bh=5wWmsfWZOJQ4wTvtj1C8ZBtsAx3MzJiXlQSsmX0f7N8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=W44WhdAJEnklfGlOU909mIVavLYbVnjSoh8+SOZuDmCaa99P4+rnz1yn0G83pVibuAyAIk5kh/QDHwXlgQ211o+q60xc5neVQP126e6mmtKVKHCSPKcwSCqbSWrJwyw56qpZeJzJZ6JoM/yDV4U0Vn6NmmtTQz3l5OXmaE6zHkE= 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=QJ4MrWKh; 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="QJ4MrWKh" Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-220c665ef4cso35650335ad.3 for ; Fri, 14 Feb 2025 09:58:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739555907; x=1740160707; 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=wbraR41/doRi2Xpub6gCucxiI0zUxRVmW0Za0OUBAfw=; b=QJ4MrWKhGbw84caCli1dfix49RbwtFFTyztA1o0MODKIv3nYHHcdmYSI0UBGA9D5/2 MlGIFhgp0OL8R2EcolNNDxSHIqiSZKqXepuI2FZnOeppz5aKARKPatqvrMg9FMCWuUnS dBAc5kU65Vj3W9v533OGF1iHQIcPt1EOQ8xSaiiqWLudb1s/GHCKDLnrmduuNUgmtLoO R2g4Z/BqFIbb13Xo8stO08oSJtdtljS+NVyrcx6ASwc/tuYc3MKCHmTscFnCbFZdAktM T8kxpRA4OPs8/TValZMDjdJNth2TAiC35iWfAFJSjMRedcFDSh7eJRpPCSvf1l+egZiO tTOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739555907; x=1740160707; 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=wbraR41/doRi2Xpub6gCucxiI0zUxRVmW0Za0OUBAfw=; b=KkHVeaxvZ/BHvbzHapXCcFbuWg/EGdycPtPitdW31Ej+FDkIaLsVA7q9hkMZW7pC09 Qn0PAqP9+AmPEh/X2Dvb8U6vAWMpMFar8BgHloRByKMyXvJJ5dqGi/5d5dDoKd/MWvXw 776OjvnVRfppd5D1z/r6B8DYLTYthTFUW2D3QzlWTCSkme1imJClE/Bb2UAg9jsf9yoR guij6Ame8hwqgNVzhZAwn02bmBigafSXT0x89rkDuXQlaqhs1qc9dPG7vSfsYH0F9KIg aFn6HLvEJtJRimHo3G6oP11TJUxvErkrD55tmQX5Q4Kub437N5u/URR9y+xt8RRxpSvt Tjyg== X-Forwarded-Encrypted: i=1; AJvYcCUFrcs2LT9Zlrk1Yfd2UTGj5mEFf7Xgert1YwAVn3Rro/zoYa8fIMGP/QJRRxQ66CTwWeuackOw0aFRRrA=@vger.kernel.org X-Gm-Message-State: AOJu0YwCppHtRqd3kyzhPpc6/JV9aoS51Uvvx5mOwkIBZK5VGD+CI6kP 5VuYixbHGCuJqbspbpEX4ziQ1+Jgekr66CtwAn2Zx0IE8x+3ad1E X-Gm-Gg: ASbGncuHnrfqjGWBkut0e1GYMSsDu756IGezENI/6YLsU6nh7sDL1nMYeyWvExt1KEX +BBJ6HtCl/1xRnwDJxmoGFaqnLcjZ0Y4+s+CTgkk6+ffMPU0sx3CwNbh4rRfJVOUI8/BlS4UbYu 3zqZSgxJQOIL5hqy9RkuRiMtgme5ZsvLRtqHlDm6W9xHVtLMO+lm8EsxR4EuJYdHJI6BwFOpx1R HSKTNeH7jONH1mk/8RvazhxtINn/eqjRgV8qXllF2fuaVnYSbtQucJJnutDwT5lO3Y6I4y9gqDg wMMkwjrwpiHpmokEJDCbLvqBRtkSDRU/ZDQu X-Google-Smtp-Source: AGHT+IEcy2yWQYwogQ6KcjhIKWsRSf0nE2f/TYKhfF4cn7HOpM1wAXZnP8din7GApc5tHvB2ixsFGg== X-Received: by 2002:a17:903:18a:b0:220:c8e2:5e30 with SMTP id d9443c01a7336-221040bd29dmr1683615ad.46.1739555907510; Fri, 14 Feb 2025 09:58:27 -0800 (PST) Received: from KASONG-MC4.tencent.com ([106.37.120.226]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-220d55943b5sm31216605ad.246.2025.02.14.09.58.22 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 14 Feb 2025 09:58:27 -0800 (PST) From: Kairui Song To: linux-mm@kvack.org Cc: Andrew Morton , Chris Li , Barry Song , Hugh Dickins , Yosry Ahmed , "Huang, Ying" , Baoquan He , Nhat Pham , Johannes Weiner , Kalesh Singh , linux-kernel@vger.kernel.org, Kairui Song Subject: [PATCH 1/7] mm, swap: avoid reclaiming irrelevant swap cache Date: Sat, 15 Feb 2025 01:57:03 +0800 Message-ID: <20250214175709.76029-2-ryncsn@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250214175709.76029-1-ryncsn@gmail.com> References: <20250214175709.76029-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 Swap allocator will do swap cache reclaim to recycle HAS_CACHE slots for allocation. It initiates the reclaim from the offset to be reclaimed and looks up the corresponding folio. The lookup process is lockless, so it's possible the folio will be removed from the swap cache and given a different swap entry before the reclaim locks the folio. If it happens, the reclaim will end up reclaiming an irrelevant folio, and return wrong return value. This shouldn't cause any problem with correctness or stability, but it is indeed confusing and unexpected, and will increase fragmentation, decrease performance. Fix this by checking whether the folio is still pointing to the offset the allocator want to reclaim before reclaiming it. Signed-off-by: Kairui Song Reviewed-by: Baoquan He --- mm/swapfile.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/mm/swapfile.c b/mm/swapfile.c index 34baefb000b5..c77ffee4af86 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -210,6 +210,7 @@ static int __try_to_reclaim_swap(struct swap_info_struc= t *si, int ret, nr_pages; bool need_reclaim; =20 +again: folio =3D filemap_get_folio(address_space, swap_cache_index(entry)); if (IS_ERR(folio)) return 0; @@ -227,8 +228,16 @@ static int __try_to_reclaim_swap(struct swap_info_stru= ct *si, if (!folio_trylock(folio)) goto out; =20 - /* offset could point to the middle of a large folio */ + /* + * Offset could point to the middle of a large folio, or folio + * may no longer point to the expected offset before it's locked. + */ entry =3D folio->swap; + if (offset < swp_offset(entry) || offset >=3D swp_offset(entry) + nr_page= s) { + folio_unlock(folio); + folio_put(folio); + goto again; + } offset =3D swp_offset(entry); =20 need_reclaim =3D ((flags & TTRS_ANYWAY) || --=20 2.48.1 From nobody Fri Dec 19 16:45:01 2025 Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) (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 4E6B0268C74 for ; Fri, 14 Feb 2025 17:58:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739555914; cv=none; b=DHAi9Ll/IuHzNeV0O2zzXQsswH/xAaQuJEZGT+elVa+6uNAWXjsU/D9jQ7nslhUsvquWUMLNfduaHH/p9b218+VpWCgiQPftUSViFFym0c7dFlRI28jzZS6E4kQljiPxDeYOOJuPFQp+TmsYegeosZSxqIuAFPVyXAfeONDLyBg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739555914; c=relaxed/simple; bh=65uh01PCJ1pLc0j2C8CpxLDOIn18OEFNsiMWcc6F3VI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Dly6+QE4qD+5rSAhfAUo1+AErP2XbAf8TjHwET0gqrs9P67ZbIlKsvAkSf9SXxyxke/2YyDFpVfhkGOb30T3cPU1z1Ea0HClY2VCMzg0GfnuVx5q4SAVaXJja+OEe0V+vzgXtSOZEeQFrCezRpLITtx1PsNFgWaDkHWkTYIjOWg= 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=GDfmuN/n; arc=none smtp.client-ip=209.85.216.52 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="GDfmuN/n" Received: by mail-pj1-f52.google.com with SMTP id 98e67ed59e1d1-2fc291f7ddbso2029950a91.1 for ; Fri, 14 Feb 2025 09:58:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739555912; x=1740160712; 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=gKbcT7HZi918XHMs4NWM+gGN3vz3fffmbZA+qEY+PV4=; b=GDfmuN/nEDaHiCPvPRWDH25Tk0IJVKJXXWfGwF7ZCdjRjR16Je2ijdw07XJgEzQN/v b81OZF/2XW0SguBWcY6GcRME9Gyuf+Ca/AhonLaphXzohtY+PSd05VD2nk69jmgDKxfU XQmhIPUfl2cdUPqzOwiNrYSAaGAWVoTbaOJkSy8SkS2g5KzdcbLDTGp9RlfSutZTPG71 78Ip22Xc836S9kmY78vDiyyQvuE8sRSwmtQNEdCU+cwrYc29Vje0upbLPVlRBr1rKocx vrnQGY1sNrO3PbFjhEi3wKA9twrXPujf+xKyjtfd28lRMdwqlbRp8Ssk1+BltZEEgP4B nD0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739555912; x=1740160712; 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=gKbcT7HZi918XHMs4NWM+gGN3vz3fffmbZA+qEY+PV4=; b=tjlWfy1aO/3evxlHSX2wm1JDlXwxmQL32+5IeLcPMJP0VVeKJ1wp632ZNx6WUKBCjT vrnsax3240rxSJvnXqikBZW7DG8Gz1vXZF6qn0R+xAqDn9j/2QYqLccE+3LTQ4dqa1aQ fiTQidwol1Qjz8n39d1yOz2t5GNJjkTgsu7Q5g2AgvgBpPHh+kk8854k5wuAkQJJd6Wl Jngf+sS5ilPrn1OvVYlnttn/JYGXURsx5hCOm9Mp1rpCWQjP/OWL01Gq/VjGg3+KyU46 /iS/6MJv3ilvIyxupgb0wbGIJTAAwWiBtfgJB0LYNCthe/ZaHC44fAmRGyuNs6cRfh3b yfnw== X-Forwarded-Encrypted: i=1; AJvYcCWIaaQDhD/V6t5Lb32aAGUc4hwuKvtK6uRJRud3t2+2WwvHdfxHzPQqqOTEF8YHsD+qzaaHy0fZa6m7It8=@vger.kernel.org X-Gm-Message-State: AOJu0Yxpo91foydzcqMQHu5F5TiemTYPpXRdYWonhCZQNFZ/MM+BntU6 shE4HwOXonASOeBOaOyI6vvZapqZQUo+2ej3qldujhVfkf9/Qkoe X-Gm-Gg: ASbGncsbhrYBbBLpzIKHPycAQhS3twcmBDLXDL0sAp5HA2C/GU0HS6JATOb+nEt/ZAl i8zxd88dOSztXF60uiesp6o9ZRS95hA82AUmbStZdqKX0xRob1gggis0Xuev31iTr6ePqhq3v4x 3Hu0QXGxzF+mP1rbRuixeyhOFS3Loj88BpaVuaBd1XMQRX+RMMPu7w2z18Wd1kQHv8jIBKIPc+R 5D+G6v2txMXpnVLjlCJrvKi0BsfD0bxjAQraciOhwywTY1qzlkK6H5qZGMpRHyqTps/OLcQxTXZ zR5B2GGEdKgSCbBUEn0+85nmogvMpdydTVfy X-Google-Smtp-Source: AGHT+IFvP7YLzoold6ZoZzlfgGVoTuFDtB0G5EBYz929UfitJI5tbELQqHkPOfuQHwIrnMxFrJEGPA== X-Received: by 2002:a17:90b:384b:b0:2f7:4cce:ae37 with SMTP id 98e67ed59e1d1-2fc0e4c17b5mr14365273a91.18.1739555912471; Fri, 14 Feb 2025 09:58:32 -0800 (PST) Received: from KASONG-MC4.tencent.com ([106.37.120.226]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-220d55943b5sm31216605ad.246.2025.02.14.09.58.27 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 14 Feb 2025 09:58:32 -0800 (PST) From: Kairui Song To: linux-mm@kvack.org Cc: Andrew Morton , Chris Li , Barry Song , Hugh Dickins , Yosry Ahmed , "Huang, Ying" , Baoquan He , Nhat Pham , Johannes Weiner , Kalesh Singh , linux-kernel@vger.kernel.org, Kairui Song Subject: [PATCH 2/7] mm, swap: drop the flag TTRS_DIRECT Date: Sat, 15 Feb 2025 01:57:04 +0800 Message-ID: <20250214175709.76029-3-ryncsn@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250214175709.76029-1-ryncsn@gmail.com> References: <20250214175709.76029-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 This flag exists temporarily to allow the allocator to bypass the slot cache during freeing, so reclaiming one slot will free the slot immediately. But now we have already removed slot cache usage on freeing, so this flag has no effect now. Signed-off-by: Kairui Song Reviewed-by: Baoquan He --- mm/swapfile.c | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/mm/swapfile.c b/mm/swapfile.c index c77ffee4af86..449e388a6fec 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -158,8 +158,6 @@ static long swap_usage_in_pages(struct swap_info_struct= *si) #define TTRS_UNMAPPED 0x2 /* Reclaim the swap entry if swap is getting full */ #define TTRS_FULL 0x4 -/* Reclaim directly, bypass the slot cache and don't touch device lock */ -#define TTRS_DIRECT 0x8 =20 static bool swap_only_has_cache(struct swap_info_struct *si, unsigned long offset, int nr_pages) @@ -257,23 +255,8 @@ static int __try_to_reclaim_swap(struct swap_info_stru= ct *si, if (!need_reclaim) goto out_unlock; =20 - if (!(flags & TTRS_DIRECT)) { - /* Free through slot cache */ - delete_from_swap_cache(folio); - folio_set_dirty(folio); - ret =3D nr_pages; - goto out_unlock; - } - - xa_lock_irq(&address_space->i_pages); - __delete_from_swap_cache(folio, entry, NULL); - xa_unlock_irq(&address_space->i_pages); - folio_ref_sub(folio, nr_pages); + delete_from_swap_cache(folio); folio_set_dirty(folio); - - ci =3D lock_cluster(si, offset); - swap_entry_range_free(si, ci, entry, nr_pages); - unlock_cluster(ci); ret =3D nr_pages; out_unlock: folio_unlock(folio); @@ -707,7 +690,7 @@ static bool cluster_reclaim_range(struct swap_info_stru= ct *si, offset++; break; case SWAP_HAS_CACHE: - nr_reclaim =3D __try_to_reclaim_swap(si, offset, TTRS_ANYWAY | TTRS_DIR= ECT); + nr_reclaim =3D __try_to_reclaim_swap(si, offset, TTRS_ANYWAY); if (nr_reclaim > 0) offset +=3D nr_reclaim; else @@ -860,7 +843,7 @@ static void swap_reclaim_full_clusters(struct swap_info= _struct *si, bool force) if (READ_ONCE(map[offset]) =3D=3D SWAP_HAS_CACHE) { spin_unlock(&ci->lock); nr_reclaim =3D __try_to_reclaim_swap(si, offset, - TTRS_ANYWAY | TTRS_DIRECT); + TTRS_ANYWAY); spin_lock(&ci->lock); if (nr_reclaim) { offset +=3D abs(nr_reclaim); --=20 2.48.1 From nobody Fri Dec 19 16:45:01 2025 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) (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 4731B269829 for ; Fri, 14 Feb 2025 17:58:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739555919; cv=none; b=N+BMIzB480If1KsdjKksia+BhX98xQY7zq8/PG0DXVTzj5FAc403RCsrvELBqzT8HgyEgx4HU8pPN/LqVresVOQYx+JgVUf9kAZYZAVcbgtaYWroeyKDunY6n6niFeCvgnTEMs4EvNH1sJyeH95rcg7pDBo8mnqL3newqC8Et2k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739555919; c=relaxed/simple; bh=AD+oohae5+ejRZ2Rzd5XjPagNVmRG8kydqZMbl7927I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hTwb67+tT7A+Sqe14m5RUovn6XOn95vS/gJUsZc92ryIMkc4ZQWtDS62QYNItINJvoZP0TyKid/XYHOfMhk4Jcho3WzlfdfF8TVMuyvBYj52qp0O5dfZ/8PMVgYXl4Nt4+zBjohA6VIVHGL7+GDtub772cMpmFBvzndVnt78hBg= 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=ciSohYQU; arc=none smtp.client-ip=209.85.214.181 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="ciSohYQU" Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-21f6a47d617so41709375ad.2 for ; Fri, 14 Feb 2025 09:58:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739555917; x=1740160717; 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=vo/Vw3N/1YvU4dFuupnxGUy23lCsf9jYjVH89XpowKk=; b=ciSohYQUSYJNitIDoROKR2nAKehMZwRPURlXe/QzjQXETUEYwfuANR4ZDuAB0KBMtE ggNDz8MoHQm9I6K319rk9aF1QzUss7N57T3naDwW55VPUMnDiAVOpXZ/RqbR/HA3xLQc +jYS3MnLizz8WLIx34ftvPmtlAP2RzSROQ3Ff17V+Ip/W5GY2uvE7coTM/AR/1vx1LMY YmSbDXfLC6fWQoVIx7T/tqLB2mzXniWxyw+kVdxhq7keuIdIGtFbifouncBPBGq0hW07 pUOkmsQhE0TlaTKQsqUw8abvZskgdGuAQzHvIWyUmU/bV9iDawpEClgOK0suYbR8mNab JN3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739555917; x=1740160717; 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=vo/Vw3N/1YvU4dFuupnxGUy23lCsf9jYjVH89XpowKk=; b=fcgKUNx3iB1bu6udMPEnXEt645EnOS/qrANjOrtl5n2tHxrRfKvBmn99VeuRWK6Jh4 vgW1rYULKk9dJWSh7H49F2Glp8Ie1Uo3CzvWuGC68CMlEWojR/wUd3iZUWyI1CcvP3Kx X7nOIx0ycP68hBE33UxRJe1AegG7igqBNpBPpv0axXVys7KAK5B9Scy5xziq9V3+4YsI LBancNArabmFatGcO1ltusdIoVqRZohdF54jCk1D0tvzl0DEvwhaFgMyzDbXC0VVvjpz yPuURKyOqu4jSa6V0xA0nua3vX0T5RPom0Rx4U/Z28n5n80r+LQueUwWJK60TfhjPNlm kMsQ== X-Forwarded-Encrypted: i=1; AJvYcCUmxxvsHyXrSAX5rx39H4XtBa1AaXK3yf4kSjgQNTJbD3iT/Z1/V4yl2WbgOj0xxsxDfX+JPMIkSg3uhwk=@vger.kernel.org X-Gm-Message-State: AOJu0YyBBDvX/t2Bjg9YwwQboVtwBWm6Oky58w970JPCJdCnvfmPic7T jYFNSULu9JCi/Gmq2vchxImZ5ReyYowcJ2JSAEiu0/g3TIeFmLeb X-Gm-Gg: ASbGncu50ZbNFPDuwG7kbQrwA05HxEgrvFrkEPSg8JMZ8n5RhPvkoSXZs/Msg5/agHL 7Di7+ThGsn1axZ8Z2jATLkWv3W/zlQP5DdBUz2aZX9oNPBYlO9e4ln3AunmILDFpIr4tt20w+Tv 4VkVn5u72V5Lleki94sFuBR909q9I06cSKiV7NJ40hJioYdjTQc8b45WJKMk5Ux+svYwNWInSh/ 68fhRQkPkWmjux3oIvul47OEuN43H0HFx3788JYp3hi2Kugv2kBc71FdAGPnB7bfCScVA1Oby/H T9OH7Ue+gB/dyRIAzDQ/sLNVqkvPcAFLsv4X X-Google-Smtp-Source: AGHT+IEqu8/5Sy9EBJ+I/60NzQrDUdehFXtUPvZTfs+82aTm3p2XSzB32UYFzYofOshKbGfGpZWekA== X-Received: by 2002:a17:902:ce09:b0:20d:cb6:11e with SMTP id d9443c01a7336-22104062bcdmr2226915ad.26.1739555917455; Fri, 14 Feb 2025 09:58:37 -0800 (PST) Received: from KASONG-MC4.tencent.com ([106.37.120.226]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-220d55943b5sm31216605ad.246.2025.02.14.09.58.32 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 14 Feb 2025 09:58:37 -0800 (PST) From: Kairui Song To: linux-mm@kvack.org Cc: Andrew Morton , Chris Li , Barry Song , Hugh Dickins , Yosry Ahmed , "Huang, Ying" , Baoquan He , Nhat Pham , Johannes Weiner , Kalesh Singh , linux-kernel@vger.kernel.org, Kairui Song Subject: [PATCH 3/7] mm, swap: avoid redundant swap device pinning Date: Sat, 15 Feb 2025 01:57:05 +0800 Message-ID: <20250214175709.76029-4-ryncsn@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250214175709.76029-1-ryncsn@gmail.com> References: <20250214175709.76029-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 There are only two callers of __read_swap_cache_async not holding a swap device reference, so make them hold a reference instead, and drop the get/put_swap_device calls in __read_swap_cache_async. This should reduce the overhead for swap in during page fault slightly. Signed-off-by: Kairui Song Reviewed-by: Baoquan He --- mm/swap_state.c | 14 ++++++++------ mm/zswap.c | 6 ++++++ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/mm/swap_state.c b/mm/swap_state.c index a54b035d6a6c..50840a2887a5 100644 --- a/mm/swap_state.c +++ b/mm/swap_state.c @@ -426,17 +426,13 @@ struct folio *__read_swap_cache_async(swp_entry_t ent= ry, gfp_t gfp_mask, struct mempolicy *mpol, pgoff_t ilx, bool *new_page_allocated, bool skip_if_exists) { - struct swap_info_struct *si; + struct swap_info_struct *si =3D swp_swap_info(entry); struct folio *folio; struct folio *new_folio =3D NULL; struct folio *result =3D NULL; void *shadow =3D NULL; =20 *new_page_allocated =3D false; - si =3D get_swap_device(entry); - if (!si) - return NULL; - for (;;) { int err; /* @@ -532,7 +528,6 @@ struct folio *__read_swap_cache_async(swp_entry_t entry= , gfp_t gfp_mask, put_swap_folio(new_folio, entry); folio_unlock(new_folio); put_and_return: - put_swap_device(si); if (!(*new_page_allocated) && new_folio) folio_put(new_folio); return result; @@ -552,11 +547,16 @@ struct folio *read_swap_cache_async(swp_entry_t entry= , gfp_t gfp_mask, struct vm_area_struct *vma, unsigned long addr, struct swap_iocb **plug) { + struct swap_info_struct *si; bool page_allocated; struct mempolicy *mpol; pgoff_t ilx; struct folio *folio; =20 + si =3D get_swap_device(entry); + if (!si) + return NULL; + mpol =3D get_vma_policy(vma, addr, 0, &ilx); folio =3D __read_swap_cache_async(entry, gfp_mask, mpol, ilx, &page_allocated, false); @@ -564,6 +564,8 @@ struct folio *read_swap_cache_async(swp_entry_t entry, = gfp_t gfp_mask, =20 if (page_allocated) swap_read_folio(folio, plug); + + put_swap_device(si); return folio; } =20 diff --git a/mm/zswap.c b/mm/zswap.c index ac9d299e7d0c..83dfa1f9e689 100644 --- a/mm/zswap.c +++ b/mm/zswap.c @@ -1051,14 +1051,20 @@ static int zswap_writeback_entry(struct zswap_entry= *entry, struct folio *folio; struct mempolicy *mpol; bool folio_was_allocated; + struct swap_info_struct *si; struct writeback_control wbc =3D { .sync_mode =3D WB_SYNC_NONE, }; =20 /* try to allocate swap cache folio */ + si =3D get_swap_device(swpentry); + if (!si) + return -EEXIST; + mpol =3D get_task_policy(current); folio =3D __read_swap_cache_async(swpentry, GFP_KERNEL, mpol, NO_INTERLEAVE_INDEX, &folio_was_allocated, true); + put_swap_device(si); if (!folio) return -ENOMEM; =20 --=20 2.48.1 From nobody Fri Dec 19 16:45:01 2025 Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) (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 5CC3C2690CA for ; Fri, 14 Feb 2025 17:58:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739555924; cv=none; b=nrgUmaJvtkgHKJITdEVu2Hg37OmA09AhAfYANfzHvYWOP8WTy6QqLhZES81mm4pGqX18LVsiAFzJi+JTSayVfdgGAnsRqhltC+3oE1IcZAI0krRVOVb2EJmlgNkzjsgBw4KszypApf/nPErk9seoHVyH9pOyl5mjXSFwv7VUqrg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739555924; c=relaxed/simple; bh=P1p2DBstkV7u3NrrbXOQ8L3JsE56K0gM7QEH7jio2EU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qAYG7P9KNA0pPCXrpPIPGQLRhoOCZQRJHWP4xgp0svl2Y5lcSjW9MaVwAwDmlDvfwfu/idk0fJqPP1xgMMxyXv1Z6s0r7EPVLcNE9k8QOH0xSDltLC+jktB+SoDHyRpk/YWmVY622c5X8iaj6FaLFl550JrSX8G1hPlMr8AAp1U= 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=Ahq49GGB; arc=none smtp.client-ip=209.85.214.173 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="Ahq49GGB" Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-21f44e7eae4so45771865ad.2 for ; Fri, 14 Feb 2025 09:58:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739555922; x=1740160722; 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=J7iAvbK5JG/d4lmxGQvSkQ18V+/XQNNBtKhwiIbpkLY=; b=Ahq49GGBQknk8vVa8nOsxf9cbFBaKooRucOEDlhT8s8AjfKyrRniSvNMlK5q8kP9lr 18QKDU0QaLu+cKzC3SLDhYofdmZ8ytRlpzEUHjkgKXmd45ZuEmcHYEZx+6JFNrlpoGHF f0dsW2nKHL48RTgD7uPzProxugbMx33flszgoNJe7wghwX0rY96AHiNM839IVgF8C4Im 0NeV5awAaUOSjWtWMg0PvCXzZKPbtgiMf3Z6JVbG41MnZQ5dEqrIUVHSzFqGE5Tqjzgw ZNKYoCWOSgzhx1YxYC973gOXtXG2YoMBRNdbAkcngKl6u3YfQmrw0yyytK+FAZrM6dmt V+oA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739555922; x=1740160722; 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=J7iAvbK5JG/d4lmxGQvSkQ18V+/XQNNBtKhwiIbpkLY=; b=guAwiTRsGVfDZXGZXWQOvL8yyyLx7kBIuk0bbAPp8LhABHB68Fsz2YOT+zAbTDV6el 1vVM5vIbIncrhw1nskjSXsJzAMbUIJscvOc5hhPCZHzIvPiP2TRC8ZKipfSgRmRtq94p S8l3DxCR+W9LfJq7pUKzU8/QlyFsNTfXsu1OLa28xPlphBvZaVuFe4qv8BfDhB70/tMr QJubUvNHv3cKaxfXM403JaqYR2B77BDT+NJGjzyDtdTmtBQtrM72v1tq9eb96b1X/zxL TwpY8H024vy0Q3aJiKXOhI8LJ0ec8s9HGDL0LaS8xa+HOT1Zo1UuEaHDgGm8ylUuAuPp 0zww== X-Forwarded-Encrypted: i=1; AJvYcCU3hTPD8lVJi5RMDeRWuRUDI8vxcEnG4co08ACabvbtfJm4JYHbMWRVATMEraFG/DnQYW+pTBYsQvUaj9Y=@vger.kernel.org X-Gm-Message-State: AOJu0Yx6hABlZT/kgdsS/rqu5jEAtk9JrfP1T76BD49qh5ctmh40yRHN Pje06hHTE/qhlRBNDfDxHHu6Qne/VUAhMBjJMj/G6lNKODc9JJzv X-Gm-Gg: ASbGnctZMnCaHM9BnPZooViRWdApg9YdYW3GXEC/QXG9mImffnmL/BbYK2mlUz0klR5 qlmvXUKl28lRSTR9Crcyq7um8w+FNi3yIPPyr9w2cSYtg4SwVerP4cFi8HzaXTUSMgf9/wwt+pN pUJZhSvrAIT21vbUGjbNrI6uqx5HOM2nmyLAELwBSDCCntOysaQgYh7ypiuJmWRSFgfJIa+qAkv faZCIyJObfSSHam3pyNTXFew/+oaIIzcZoz9Sz4woKwFeDJ+2sn+/CfEXee6FX3qrPHDT4IJrfq PwgIfJ5SOkRvus6Q/N30eFB15fQiiueX7vjJ X-Google-Smtp-Source: AGHT+IH9ha70sbHLOmBa5PHjMDHnw1Ok3lpm5sqNiv2eKZSkk6HsPl/5KsZl/aumE/hwSF+8y4tPBg== X-Received: by 2002:a17:902:ea11:b0:220:f4db:98b4 with SMTP id d9443c01a7336-22104012399mr3146705ad.24.1739555922552; Fri, 14 Feb 2025 09:58:42 -0800 (PST) Received: from KASONG-MC4.tencent.com ([106.37.120.226]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-220d55943b5sm31216605ad.246.2025.02.14.09.58.37 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 14 Feb 2025 09:58:42 -0800 (PST) From: Kairui Song To: linux-mm@kvack.org Cc: Andrew Morton , Chris Li , Barry Song , Hugh Dickins , Yosry Ahmed , "Huang, Ying" , Baoquan He , Nhat Pham , Johannes Weiner , Kalesh Singh , linux-kernel@vger.kernel.org, Kairui Song Subject: [PATCH 4/7] mm, swap: don't update the counter up-front Date: Sat, 15 Feb 2025 01:57:06 +0800 Message-ID: <20250214175709.76029-5-ryncsn@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250214175709.76029-1-ryncsn@gmail.com> References: <20250214175709.76029-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 counter update before allocation was useful to avoid unnecessary scan when device is full, so it will abort early if the counter indicated the device is full. But that is an uncommon case, and now scanning of a full device is very fast, so the up-front update is not helpful any more. Remove it and simplify the slot allocation logic. Signed-off-by: Kairui Song --- mm/swapfile.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/mm/swapfile.c b/mm/swapfile.c index 449e388a6fec..ae3bd0a862fc 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -1208,22 +1208,10 @@ int get_swap_pages(int n_goal, swp_entry_t swp_entr= ies[], int entry_order) int order =3D swap_entry_order(entry_order); unsigned long size =3D 1 << order; struct swap_info_struct *si, *next; - long avail_pgs; int n_ret =3D 0; int node; =20 spin_lock(&swap_avail_lock); - - avail_pgs =3D atomic_long_read(&nr_swap_pages) / size; - if (avail_pgs <=3D 0) { - spin_unlock(&swap_avail_lock); - goto noswap; - } - - n_goal =3D min3((long)n_goal, (long)SWAP_BATCH, avail_pgs); - - atomic_long_sub(n_goal * size, &nr_swap_pages); - start_over: node =3D numa_node_id(); plist_for_each_entry_safe(si, next, &swap_avail_heads[node], avail_lists[= node]) { @@ -1257,10 +1245,8 @@ int get_swap_pages(int n_goal, swp_entry_t swp_entri= es[], int entry_order) spin_unlock(&swap_avail_lock); =20 check_out: - if (n_ret < n_goal) - atomic_long_add((long)(n_goal - n_ret) * size, - &nr_swap_pages); -noswap: + atomic_long_sub(n_ret * size, &nr_swap_pages); + return n_ret; } =20 --=20 2.48.1 From nobody Fri Dec 19 16:45:01 2025 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) (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 9A93E2690CA for ; Fri, 14 Feb 2025 17:58:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739555930; cv=none; b=HOmyfkKyE9MD+7/BTxzaJbk6tLkIxOasdbH4L9Fxt3TDgM5lof92/qV0TIx4eaMwIIdXk0cWBghIQnFpR6YmJSKVo2VbHIHxcFP0E/R0b6nDS2m8O6mbwFW+MLmW+haZpuY7WR2H43ap/sNx/vrzBhf2Se41CAsm/v9t2Ckj97s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739555930; c=relaxed/simple; bh=gm86JVcjyCY787R716UEluROgdOhi2sjssZNxy6jE24=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OSil5CuFCZ/WIPT0Qplt34jFAIW2l5uZmQHFLGPiWdUND7VcvVWMHKyHcWkSZypiSDv7LNTKyG/Y9OXvjywF1FlpgYSKzreQfTh6SoEXfOFt4WJ8uAdRQjHH2/gE5EJX03tgmtUYxaY4SBmthDu3cK7TDXCrkLgLm3h+ZVKXUh4= 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=lKWWNB34; arc=none smtp.client-ip=209.85.214.170 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="lKWWNB34" Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-220d398bea9so33916585ad.3 for ; Fri, 14 Feb 2025 09:58:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739555928; x=1740160728; 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=4dCFAluMOzAQvK61QbUUUqwSef8skzDGJtN8wrwwO2c=; b=lKWWNB34ct0ME56sofgUj8cPtCiS49H5m14lz9wM5W/nVLesxhTB2fLCQfvh5MHH02 7S1jIUnrJk64+zoCJJqoPqsOi8WCVjOBR2VtfxsanUkcQ64tL1uaJUDtEYS3qABU/kvx qQX26aJ57a7PTwf7AgZXBOpUcjMlEAk11cg/ohVxKezCNGp/qTTUhb7xGUgSEIcpxGhc fQzpZpCJN0FRdDJH03csYacpjOB7UeM1OH7c+xLdjyq/uBXXQHHoxKN3oH4pG7C+n4uB XHbi9/TkfD3CiuZeufLb+o5a6Pc8oO/g1Ea5N3lOToYWGUSYCYeRZRsWpK8+Dw8qvUWi cV4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739555928; x=1740160728; 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=4dCFAluMOzAQvK61QbUUUqwSef8skzDGJtN8wrwwO2c=; b=XR9rr6tqBregL6CFsFSVH8gYlcxhYWKvxUAF4FpDVwFDMQpqz/HxGzntyJZ8GDC9Hk 8xaxmbYcVPEoZUMsibvH3GjaTinupuKgO9QZNUYHMpZijYpPkpZ5FLy4KGURmZoFkhMQ AZ13hzMm6QqJAD2Qth0ZutsIIyAMwXeBODN5ZgpJjoddUy06lAaCGjdu9NOwzx8S0lqJ fI3ux59ywQUGZnX1aKxSOww76ZlWGeVPZoFYqYmf8J4qtDTZimx6+Bl7Wv6ccEMW4Vjn PyQjaaRxmH8fgw1cfGUld6RmM3Ve6OefelalU5uVKCnq9mAXwUSICKkPachriTLnWnY/ cUMw== X-Forwarded-Encrypted: i=1; AJvYcCXfu9KTBbSNOMC1Unqjvw9K6IItuWG8irq5ibBbBv5CbLg27PC3ShJza9SKZ56hxixP1nqQR7Y0rtPg5NI=@vger.kernel.org X-Gm-Message-State: AOJu0Yyjj1cEPCPcY60Cn9Pdx26j4lnS3HlNhi0PbOLR82WHRnUFFraL NPa8pFdkxw7NXS/h97ivAm4zd/kdjFn5ghm4hnbi8XNv1Y0JmMGf X-Gm-Gg: ASbGnctZukrRh25bgotSJmr19fDOvV61vy0xVJ05DJGAb4bMBikUqVtPfIwsEjgnw1t SafgxomZ657vm9vkpUm/FBrWqWCWdr+SFsDsmwpPxoNl462zKce1N9ekocLyYIn8zrTlrBoElLf sIkCh7iv0q/WZlbi4kuhLTzX0MYLFvwrThaU8z6WTHbbPSscg70q7sX3dqKORy9D5nkfVqgDZRv m9I8NmitrxUou1E9yBMGkSfa9tsHYsjpYRzS0IxXi8+St4Ff2W72i3aCxnsCfDZQFM+HH5F5kLL N9HtX7Z8CzA6jjNIz6D0Ia+qwTjsEBhTpK+B X-Google-Smtp-Source: AGHT+IEGQxigwy9i4C5LjKLVWwRE3ILrRt8Bj7f0chMUrukyyWwUbg5alAHyT9i/np1CLUlPEgoenQ== X-Received: by 2002:a17:903:2301:b0:21f:6ce1:7410 with SMTP id d9443c01a7336-2210405d629mr2962655ad.24.1739555927679; Fri, 14 Feb 2025 09:58:47 -0800 (PST) Received: from KASONG-MC4.tencent.com ([106.37.120.226]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-220d55943b5sm31216605ad.246.2025.02.14.09.58.42 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 14 Feb 2025 09:58:47 -0800 (PST) From: Kairui Song To: linux-mm@kvack.org Cc: Andrew Morton , Chris Li , Barry Song , Hugh Dickins , Yosry Ahmed , "Huang, Ying" , Baoquan He , Nhat Pham , Johannes Weiner , Kalesh Singh , linux-kernel@vger.kernel.org, Kairui Song Subject: [PATCH 5/7] mm, swap: use percpu cluster as allocation fast path Date: Sat, 15 Feb 2025 01:57:07 +0800 Message-ID: <20250214175709.76029-6-ryncsn@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250214175709.76029-1-ryncsn@gmail.com> References: <20250214175709.76029-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 Current allocation workflow first traverses the plist with a global lock held, after choosing a device, it uses the percpu cluster on that swap device. This commit moves the percpu cluster variable out of being tied to individual swap devices, making it a global percpu variable, and will be used directly for allocation as a fast path. The global percpu cluster variable will never point to a HDD device, and allocation on HDD devices is still globally serialized. This improves the allocator performance and prepares for removal of the slot cache in later commits. There shouldn't be much observable behavior change, except one thing: this changes how swap device allocation rotation works. Currently, each allocation will rotate the plist, and because of the existence of slot cache (64 entries), swap devices of the same priority are rotated for every 64 entries consumed. And, high order allocations are different, they will bypass the slot cache, and so swap device is rotated for every 16K, 32K, or up to 2M allocation. The rotation rule was never clearly defined or documented, it was changed several times without mentioning too. After this commit, once slot cache is gone in later commits, swap device rotation will happen for every consumed cluster. Ideally non-HDD devices will be rotated if 2M space has been consumed for each order, this seems reasonable. HDD devices is rotated for every allocation regardless of the allocation order, which should be OK and trivial. Signed-off-by: Kairui Song --- include/linux/swap.h | 11 ++-- mm/swapfile.c | 120 +++++++++++++++++++++++++++---------------- 2 files changed, 79 insertions(+), 52 deletions(-) diff --git a/include/linux/swap.h b/include/linux/swap.h index 2fe91c293636..a8d84f22357e 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h @@ -284,12 +284,10 @@ enum swap_cluster_flags { #endif =20 /* - * We assign a cluster to each CPU, so each CPU can allocate swap entry fr= om - * its own cluster and swapout sequentially. The purpose is to optimize sw= apout - * throughput. + * We keep using same cluster for rotating device so swapout will be seque= ntial. + * The purpose is to optimize swapout throughput on rotating device. */ -struct percpu_cluster { - local_lock_t lock; /* Protect the percpu_cluster above */ +struct swap_sequential_cluster { unsigned int next[SWAP_NR_ORDERS]; /* Likely next allocation offset */ }; =20 @@ -315,8 +313,7 @@ struct swap_info_struct { atomic_long_t frag_cluster_nr[SWAP_NR_ORDERS]; unsigned int pages; /* total of usable pages of swap */ atomic_long_t inuse_pages; /* number of those currently in use */ - struct percpu_cluster __percpu *percpu_cluster; /* per cpu's swap locatio= n */ - struct percpu_cluster *global_cluster; /* Use one global cluster for rota= ting device */ + struct swap_sequential_cluster *global_cluster; /* Use one global cluster= for rotating device */ spinlock_t global_cluster_lock; /* Serialize usage of global cluster */ struct rb_root swap_extent_root;/* root of the swap extent rbtree */ struct block_device *bdev; /* swap device or bdev of swap file */ diff --git a/mm/swapfile.c b/mm/swapfile.c index ae3bd0a862fc..791cd7ed5bdf 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -116,6 +116,18 @@ static atomic_t proc_poll_event =3D ATOMIC_INIT(0); =20 atomic_t nr_rotate_swap =3D ATOMIC_INIT(0); =20 +struct percpu_swap_cluster { + struct swap_info_struct *si; + unsigned long offset[SWAP_NR_ORDERS]; + local_lock_t lock; +}; + +static DEFINE_PER_CPU(struct percpu_swap_cluster, percpu_swap_cluster) =3D= { + .si =3D NULL, + .offset =3D { SWAP_ENTRY_INVALID }, + .lock =3D INIT_LOCAL_LOCK(), +}; + static struct swap_info_struct *swap_type_to_swap_info(int type) { if (type >=3D MAX_SWAPFILES) @@ -548,7 +560,7 @@ static bool swap_do_scheduled_discard(struct swap_info_= struct *si) ci =3D list_first_entry(&si->discard_clusters, struct swap_cluster_info,= list); /* * Delete the cluster from list to prepare for discard, but keep - * the CLUSTER_FLAG_DISCARD flag, there could be percpu_cluster + * the CLUSTER_FLAG_DISCARD flag, percpu_swap_cluster could be * pointing to it, or ran into by relocate_cluster. */ list_del(&ci->list); @@ -815,10 +827,12 @@ static unsigned int alloc_swap_scan_cluster(struct sw= ap_info_struct *si, out: relocate_cluster(si, ci); unlock_cluster(ci); - if (si->flags & SWP_SOLIDSTATE) - __this_cpu_write(si->percpu_cluster->next[order], next); - else + if (si->flags & SWP_SOLIDSTATE) { + __this_cpu_write(percpu_swap_cluster.si, si); + __this_cpu_write(percpu_swap_cluster.offset[order], next); + } else { si->global_cluster->next[order] =3D next; + } return found; } =20 @@ -869,9 +883,8 @@ static void swap_reclaim_work(struct work_struct *work) } =20 /* - * Try to get swap entries with specified order from current cpu's swap en= try - * pool (a cluster). This might involve allocating a new cluster for curre= nt CPU - * too. + * Try to allocate swap entries with specified order and try set a new + * cluster for current CPU too. */ static unsigned long cluster_alloc_swap_entry(struct swap_info_struct *si,= int order, unsigned char usage) @@ -879,18 +892,12 @@ static unsigned long cluster_alloc_swap_entry(struct = swap_info_struct *si, int o struct swap_cluster_info *ci; unsigned int offset, found =3D 0; =20 - if (si->flags & SWP_SOLIDSTATE) { - /* Fast path using per CPU cluster */ - local_lock(&si->percpu_cluster->lock); - offset =3D __this_cpu_read(si->percpu_cluster->next[order]); - } else { + if (!(si->flags & SWP_SOLIDSTATE)) { /* Serialize HDD SWAP allocation for each device. */ spin_lock(&si->global_cluster_lock); offset =3D si->global_cluster->next[order]; - } - - if (offset) { ci =3D lock_cluster(si, offset); + /* Cluster could have been used by another order */ if (cluster_is_usable(ci, order)) { if (cluster_is_empty(ci)) @@ -980,9 +987,7 @@ static unsigned long cluster_alloc_swap_entry(struct sw= ap_info_struct *si, int o } } done: - if (si->flags & SWP_SOLIDSTATE) - local_unlock(&si->percpu_cluster->lock); - else + if (!(si->flags & SWP_SOLIDSTATE)) spin_unlock(&si->global_cluster_lock); return found; } @@ -1203,6 +1208,41 @@ static bool get_swap_device_info(struct swap_info_st= ruct *si) return true; } =20 +/* + * Fast path try to get swap entries with specified order from current + * CPU's swap entry pool (a cluster). + */ +static int swap_alloc_fast(swp_entry_t entries[], + unsigned char usage, + int order, int n_goal) +{ + struct swap_cluster_info *ci; + struct swap_info_struct *si; + unsigned int offset, found; + int n_ret =3D 0; + + n_goal =3D min(n_goal, SWAP_BATCH); + + si =3D __this_cpu_read(percpu_swap_cluster.si); + offset =3D __this_cpu_read(percpu_swap_cluster.offset[order]); + if (!si || !offset || !get_swap_device_info(si)) + return 0; + + while (offset) { + ci =3D lock_cluster(si, offset); + found =3D alloc_swap_scan_cluster(si, ci, offset, order, usage); + if (!found) + break; + entries[n_ret++] =3D swp_entry(si->type, found); + if (n_ret =3D=3D n_goal) + break; + offset =3D __this_cpu_read(percpu_swap_cluster.offset[order]); + } + + put_swap_device(si); + return n_ret; +} + int get_swap_pages(int n_goal, swp_entry_t swp_entries[], int entry_order) { int order =3D swap_entry_order(entry_order); @@ -1211,19 +1251,28 @@ int get_swap_pages(int n_goal, swp_entry_t swp_entr= ies[], int entry_order) int n_ret =3D 0; int node; =20 + /* Fast path using percpu cluster */ + local_lock(&percpu_swap_cluster.lock); + n_ret =3D swap_alloc_fast(swp_entries, + SWAP_HAS_CACHE, + order, n_goal); + if (n_ret =3D=3D n_goal) + goto out; + + n_goal =3D min_t(int, n_goal - n_ret, SWAP_BATCH); + /* Rotate the device and switch to a new cluster */ spin_lock(&swap_avail_lock); start_over: node =3D numa_node_id(); plist_for_each_entry_safe(si, next, &swap_avail_heads[node], avail_lists[= node]) { - /* requeue si to after same-priority siblings */ plist_requeue(&si->avail_lists[node], &swap_avail_heads[node]); spin_unlock(&swap_avail_lock); if (get_swap_device_info(si)) { - n_ret =3D scan_swap_map_slots(si, SWAP_HAS_CACHE, - n_goal, swp_entries, order); + n_ret +=3D scan_swap_map_slots(si, SWAP_HAS_CACHE, n_goal, + swp_entries + n_ret, order); put_swap_device(si); if (n_ret || size > 1) - goto check_out; + goto out; } =20 spin_lock(&swap_avail_lock); @@ -1241,12 +1290,10 @@ int get_swap_pages(int n_goal, swp_entry_t swp_entr= ies[], int entry_order) if (plist_node_empty(&next->avail_lists[node])) goto start_over; } - spin_unlock(&swap_avail_lock); - -check_out: +out: + local_unlock(&percpu_swap_cluster.lock); atomic_long_sub(n_ret * size, &nr_swap_pages); - return n_ret; } =20 @@ -2733,8 +2780,6 @@ SYSCALL_DEFINE1(swapoff, const char __user *, special= file) arch_swap_invalidate_area(p->type); zswap_swapoff(p->type); mutex_unlock(&swapon_mutex); - free_percpu(p->percpu_cluster); - p->percpu_cluster =3D NULL; kfree(p->global_cluster); p->global_cluster =3D NULL; vfree(swap_map); @@ -3133,7 +3178,7 @@ static struct swap_cluster_info *setup_clusters(struc= t swap_info_struct *si, unsigned long nr_clusters =3D DIV_ROUND_UP(maxpages, SWAPFILE_CLUSTER); struct swap_cluster_info *cluster_info; unsigned long i, j, idx; - int cpu, err =3D -ENOMEM; + int err =3D -ENOMEM; =20 cluster_info =3D kvcalloc(nr_clusters, sizeof(*cluster_info), GFP_KERNEL); if (!cluster_info) @@ -3142,20 +3187,7 @@ static struct swap_cluster_info *setup_clusters(stru= ct swap_info_struct *si, for (i =3D 0; i < nr_clusters; i++) spin_lock_init(&cluster_info[i].lock); =20 - if (si->flags & SWP_SOLIDSTATE) { - si->percpu_cluster =3D alloc_percpu(struct percpu_cluster); - if (!si->percpu_cluster) - goto err_free; - - for_each_possible_cpu(cpu) { - struct percpu_cluster *cluster; - - cluster =3D per_cpu_ptr(si->percpu_cluster, cpu); - for (i =3D 0; i < SWAP_NR_ORDERS; i++) - cluster->next[i] =3D SWAP_ENTRY_INVALID; - local_lock_init(&cluster->lock); - } - } else { + if (!(si->flags & SWP_SOLIDSTATE)) { si->global_cluster =3D kmalloc(sizeof(*si->global_cluster), GFP_KERNEL); if (!si->global_cluster) @@ -3432,8 +3464,6 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialf= ile, int, swap_flags) bad_swap_unlock_inode: inode_unlock(inode); bad_swap: - free_percpu(si->percpu_cluster); - si->percpu_cluster =3D NULL; kfree(si->global_cluster); si->global_cluster =3D NULL; inode =3D NULL; --=20 2.48.1 From nobody Fri Dec 19 16:45:01 2025 Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.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 D70B42686A8 for ; Fri, 14 Feb 2025 17:58:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739555936; cv=none; b=JZD+zNc2Etv0BWyzTHdfd66p2tOGGr4WCCvVSc6L4mtHa0lZyXVtoFptCn3rVHI5UXPRai9J0UczBU/dpJTutQc+o/0E6O+eLYWx54M4T+dCyS4WY2O2NHVptG/jnziDsitSNxT0M36DXNY4CmhhPsgix0nnJfMKZne5QlxXAvU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739555936; c=relaxed/simple; bh=5zF08hI2n5nDivExTXRxFcFb2fHoATW+k0qZ9b0JEn0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VxbWEO3uokXBg62s5GoU+Fh5GA/qkyTUhk6VnfDa8iRKNKlVByR0AJwxzGan+qa1F05hORtewFpnViiXIVB2vSThRQgZLne5MV8Izv1/K/vfPYG1Gxnd1rnEU9GY325B56L+MqtRFgI2MGFCRaZtPdF7oDra00jPkz41ojq5eFw= 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=jhYDuFEV; arc=none smtp.client-ip=209.85.214.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="jhYDuFEV" Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-220e83d65e5so31089525ad.1 for ; Fri, 14 Feb 2025 09:58:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739555933; x=1740160733; 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=IrxkWCsY2BG0TogE7kDNIlucXg1dBLFmlliY7Uuharg=; b=jhYDuFEVkjkmCg4ilJ+EYeimGpSs3uEsZHY0U6KlPqSc1XZTT6GSSnlurnS9K5aLJa l6recFLTgbCaFrEql6riFawQNbfaVZgA91lfakxcZfYWpTulN4WZE92exCsxEFIuPs44 E3DUht/yTXFZg4Bds94rQeqOgoToJAcFur6JS3KHw3rDbSucBUxDsnHDmZDv+30kA/a8 Hyc10SzBtt6BF5xbCIjgJ8MOBtOuo39NpduYaVrp6RKB/o7AWJDYMQRV26uAKiiTaV9p J59tvttxyo4Q45LDACfo0An04AtDV/HHbnBG9fWzkpVrWiWkH+gjVSkfJOqEHKDy953N 2bIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739555933; x=1740160733; 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=IrxkWCsY2BG0TogE7kDNIlucXg1dBLFmlliY7Uuharg=; b=Hok6fCwSAc8LPMiKmuc9p/IT8X4AyJ5YLgziBSE9UCAGcAKCnjXqdRJJzOGUaIEuIv 7SmLBnjmMMx/TV1Mw6OuSHlmkAcHdOIppkrafHkKiqJ0n7S+9dMEVsg5i0dvs655KHDX 1wo9h0Eo1lrVcGsYneVfg+6+/eH31f0H2p2n6RPq9yxgD3nbOrJYLz4LSwP3FZNYrDhN v/sZUmM35796/pj/WkyjqE1Rpbe1qs2wxDPQup1kcd6KZCn7q1HzGZQMwL3RC1AjrNqf 7sGPgPY+DIySO0tGLksrT6zZGV7qh4W7xvp+c01SrzqwL5MVb0yXFMfW6rs7Dw9FKVir RKKg== X-Forwarded-Encrypted: i=1; AJvYcCU2+bPsbW7qfuNb16XG+hNg21OpSOeCoV3YR6vyRIUkz/g9UBZE4b5QOoeAbzxIik3R/rbTyWKDEyBtvwA=@vger.kernel.org X-Gm-Message-State: AOJu0Yyrkn5k4VwOLFTrdFb2vAe5X+y7uWFq5niZRzYmOJKbmS92uk5L Pe+qcg7w8Jp29An+O5SgnDFntiGpiGIq4PcbCjswecaQP4M0AUQX X-Gm-Gg: ASbGnctf3ZBHVMkfyNMM7azBem1zffXyskFwsf4IaEpQ7XxupR0ZRgDmmxa+lMpzZvq c8LIWYajJg5VWhOxNay5YDrkk1xPUU1zrvBwXSBkJhvNc+JLst4nWgTdD+3Jc3bN/MZke2PVozD HTt9xDoTxbhqDULQQZqG531n3bpaKy1enQxEcxmuOOh81SjR69NL4t2QnYs+v81BjANPDfd8s5v lC1uTqpT6paAjNemIkBCj/4anF/FI69byC0LjKBQXxaxl0F08EEwP74wGHynvArBnncySeoHA6g KU688lG0Mf4IxuMtH/+Q2Qyi+fAlfe5U4rk3 X-Google-Smtp-Source: AGHT+IFU/H/3lJEuxMEyY0X4vY4k43jZAun4SfbIvrjpzUIvreDXgYLIc7CySd22D5UQYi76P8WUVQ== X-Received: by 2002:a17:902:cccc:b0:220:be86:a42d with SMTP id d9443c01a7336-22104048ecemr2911695ad.21.1739555932901; Fri, 14 Feb 2025 09:58:52 -0800 (PST) Received: from KASONG-MC4.tencent.com ([106.37.120.226]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-220d55943b5sm31216605ad.246.2025.02.14.09.58.48 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 14 Feb 2025 09:58:52 -0800 (PST) From: Kairui Song To: linux-mm@kvack.org Cc: Andrew Morton , Chris Li , Barry Song , Hugh Dickins , Yosry Ahmed , "Huang, Ying" , Baoquan He , Nhat Pham , Johannes Weiner , Kalesh Singh , linux-kernel@vger.kernel.org, Kairui Song Subject: [PATCH 6/7] mm, swap: remove swap slot cache Date: Sat, 15 Feb 2025 01:57:08 +0800 Message-ID: <20250214175709.76029-7-ryncsn@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250214175709.76029-1-ryncsn@gmail.com> References: <20250214175709.76029-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 Slot cache is no longer needed now, removing it and all related code. - vm-scalability with: `usemem --init-time -O -y -x -R -31 1G`, 12G memory cgroup using simulated pmem as SWAP (32G pmem, 32 CPUs), 16 test runs for each case, measuring the total throughput: Before (KB/s) (stdev) After (KB/s) (stdev) Random (4K): 424907.60 (24410.78) 414745.92 (34554.78) Random (64K): 163308.82 (11635.72) 167314.50 (18434.99) Sequential (4K, !-R): 6150056.79 (103205.90) 6321469.06 (115878.16) The performance changes are below noise level. - Build linux kernel with make -j96, using 4K folio with 1.5G memory cgroup limit and 64K folio with 2G memory cgroup limit, on top of tmpfs, 12 test runs, measuring the system time: Before (s) (stdev) After (s) (stdev) make -j96 (4K): 6445.69 (61.95) 6408.80 (69.46) make -j96 (64K): 6841.71 (409.04) 6437.99 (435.55) Similar to above, 64k mTHP case showed a slight improvement. Signed-off-by: Kairui Song --- include/linux/swap.h | 2 - include/linux/swap_slots.h | 28 ---- mm/Makefile | 2 +- mm/swap_slots.c | 295 ------------------------------------- mm/swap_state.c | 8 +- mm/swapfile.c | 173 ++++++++-------------- 6 files changed, 64 insertions(+), 444 deletions(-) delete mode 100644 include/linux/swap_slots.h delete mode 100644 mm/swap_slots.c diff --git a/include/linux/swap.h b/include/linux/swap.h index a8d84f22357e..456833705ea0 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h @@ -465,7 +465,6 @@ void free_pages_and_swap_cache(struct encoded_page **, = int); extern atomic_long_t nr_swap_pages; extern long total_swap_pages; extern atomic_t nr_rotate_swap; -extern bool has_usable_swap(void); =20 /* Swap 50% full? Release swapcache more aggressively.. */ static inline bool vm_swap_full(void) @@ -489,7 +488,6 @@ extern void swap_shmem_alloc(swp_entry_t, int); extern int swap_duplicate(swp_entry_t); extern int swapcache_prepare(swp_entry_t entry, int nr); extern void swap_free_nr(swp_entry_t entry, int nr_pages); -extern void swapcache_free_entries(swp_entry_t *entries, int n); extern void free_swap_and_cache_nr(swp_entry_t entry, int nr); int swap_type_of(dev_t device, sector_t offset); int find_first_swap(dev_t *device); diff --git a/include/linux/swap_slots.h b/include/linux/swap_slots.h deleted file mode 100644 index 840aec3523b2..000000000000 --- a/include/linux/swap_slots.h +++ /dev/null @@ -1,28 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _LINUX_SWAP_SLOTS_H -#define _LINUX_SWAP_SLOTS_H - -#include -#include -#include - -#define SWAP_SLOTS_CACHE_SIZE SWAP_BATCH -#define THRESHOLD_ACTIVATE_SWAP_SLOTS_CACHE (5*SWAP_SLOTS_CACHE_SIZE) -#define THRESHOLD_DEACTIVATE_SWAP_SLOTS_CACHE (2*SWAP_SLOTS_CACHE_SIZE) - -struct swap_slots_cache { - bool lock_initialized; - struct mutex alloc_lock; /* protects slots, nr, cur */ - swp_entry_t *slots; - int nr; - int cur; - int n_ret; -}; - -void disable_swap_slots_cache_lock(void); -void reenable_swap_slots_cache_unlock(void); -void enable_swap_slots_cache(void); - -extern bool swap_slot_cache_enabled; - -#endif /* _LINUX_SWAP_SLOTS_H */ diff --git a/mm/Makefile b/mm/Makefile index 53392d2af3a5..ea16e472b294 100644 --- a/mm/Makefile +++ b/mm/Makefile @@ -75,7 +75,7 @@ ifdef CONFIG_MMU obj-$(CONFIG_ADVISE_SYSCALLS) +=3D madvise.o endif =20 -obj-$(CONFIG_SWAP) +=3D page_io.o swap_state.o swapfile.o swap_slots.o +obj-$(CONFIG_SWAP) +=3D page_io.o swap_state.o swapfile.o obj-$(CONFIG_ZSWAP) +=3D zswap.o obj-$(CONFIG_HAS_DMA) +=3D dmapool.o obj-$(CONFIG_HUGETLBFS) +=3D hugetlb.o diff --git a/mm/swap_slots.c b/mm/swap_slots.c deleted file mode 100644 index 9c7c171df7ba..000000000000 --- a/mm/swap_slots.c +++ /dev/null @@ -1,295 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Manage cache of swap slots to be used for and returned from - * swap. - * - * Copyright(c) 2016 Intel Corporation. - * - * Author: Tim Chen - * - * We allocate the swap slots from the global pool and put - * it into local per cpu caches. This has the advantage - * of no needing to acquire the swap_info lock every time - * we need a new slot. - * - * There is also opportunity to simply return the slot - * to local caches without needing to acquire swap_info - * lock. We do not reuse the returned slots directly but - * move them back to the global pool in a batch. This - * allows the slots to coalesce and reduce fragmentation. - * - * The swap entry allocated is marked with SWAP_HAS_CACHE - * flag in map_count that prevents it from being allocated - * again from the global pool. - * - * The swap slots cache is protected by a mutex instead of - * a spin lock as when we search for slots with scan_swap_map, - * we can possibly sleep. - */ - -#include -#include -#include -#include -#include -#include -#include - -static DEFINE_PER_CPU(struct swap_slots_cache, swp_slots); -static bool swap_slot_cache_active; -bool swap_slot_cache_enabled; -static bool swap_slot_cache_initialized; -static DEFINE_MUTEX(swap_slots_cache_mutex); -/* Serialize swap slots cache enable/disable operations */ -static DEFINE_MUTEX(swap_slots_cache_enable_mutex); - -static void __drain_swap_slots_cache(void); - -#define use_swap_slot_cache (swap_slot_cache_active && swap_slot_cache_ena= bled) - -static void deactivate_swap_slots_cache(void) -{ - mutex_lock(&swap_slots_cache_mutex); - swap_slot_cache_active =3D false; - __drain_swap_slots_cache(); - mutex_unlock(&swap_slots_cache_mutex); -} - -static void reactivate_swap_slots_cache(void) -{ - mutex_lock(&swap_slots_cache_mutex); - swap_slot_cache_active =3D true; - mutex_unlock(&swap_slots_cache_mutex); -} - -/* Must not be called with cpu hot plug lock */ -void disable_swap_slots_cache_lock(void) -{ - mutex_lock(&swap_slots_cache_enable_mutex); - swap_slot_cache_enabled =3D false; - if (swap_slot_cache_initialized) { - /* serialize with cpu hotplug operations */ - cpus_read_lock(); - __drain_swap_slots_cache(); - cpus_read_unlock(); - } -} - -static void __reenable_swap_slots_cache(void) -{ - swap_slot_cache_enabled =3D has_usable_swap(); -} - -void reenable_swap_slots_cache_unlock(void) -{ - __reenable_swap_slots_cache(); - mutex_unlock(&swap_slots_cache_enable_mutex); -} - -static bool check_cache_active(void) -{ - long pages; - - if (!swap_slot_cache_enabled) - return false; - - pages =3D get_nr_swap_pages(); - if (!swap_slot_cache_active) { - if (pages > num_online_cpus() * - THRESHOLD_ACTIVATE_SWAP_SLOTS_CACHE) - reactivate_swap_slots_cache(); - goto out; - } - - /* if global pool of slot caches too low, deactivate cache */ - if (pages < num_online_cpus() * THRESHOLD_DEACTIVATE_SWAP_SLOTS_CACHE) - deactivate_swap_slots_cache(); -out: - return swap_slot_cache_active; -} - -static int alloc_swap_slot_cache(unsigned int cpu) -{ - struct swap_slots_cache *cache; - swp_entry_t *slots; - - /* - * Do allocation outside swap_slots_cache_mutex - * as kvzalloc could trigger reclaim and folio_alloc_swap, - * which can lock swap_slots_cache_mutex. - */ - slots =3D kvcalloc(SWAP_SLOTS_CACHE_SIZE, sizeof(swp_entry_t), - GFP_KERNEL); - if (!slots) - return -ENOMEM; - - mutex_lock(&swap_slots_cache_mutex); - cache =3D &per_cpu(swp_slots, cpu); - if (cache->slots) { - /* cache already allocated */ - mutex_unlock(&swap_slots_cache_mutex); - - kvfree(slots); - - return 0; - } - - if (!cache->lock_initialized) { - mutex_init(&cache->alloc_lock); - cache->lock_initialized =3D true; - } - cache->nr =3D 0; - cache->cur =3D 0; - cache->n_ret =3D 0; - /* - * We initialized alloc_lock and free_lock earlier. We use - * !cache->slots or !cache->slots_ret to know if it is safe to acquire - * the corresponding lock and use the cache. Memory barrier below - * ensures the assumption. - */ - mb(); - cache->slots =3D slots; - mutex_unlock(&swap_slots_cache_mutex); - return 0; -} - -static void drain_slots_cache_cpu(unsigned int cpu, bool free_slots) -{ - struct swap_slots_cache *cache; - - cache =3D &per_cpu(swp_slots, cpu); - if (cache->slots) { - mutex_lock(&cache->alloc_lock); - swapcache_free_entries(cache->slots + cache->cur, cache->nr); - cache->cur =3D 0; - cache->nr =3D 0; - if (free_slots && cache->slots) { - kvfree(cache->slots); - cache->slots =3D NULL; - } - mutex_unlock(&cache->alloc_lock); - } -} - -static void __drain_swap_slots_cache(void) -{ - unsigned int cpu; - - /* - * This function is called during - * 1) swapoff, when we have to make sure no - * left over slots are in cache when we remove - * a swap device; - * 2) disabling of swap slot cache, when we run low - * on swap slots when allocating memory and need - * to return swap slots to global pool. - * - * We cannot acquire cpu hot plug lock here as - * this function can be invoked in the cpu - * hot plug path: - * cpu_up -> lock cpu_hotplug -> cpu hotplug state callback - * -> memory allocation -> direct reclaim -> folio_alloc_swap - * -> drain_swap_slots_cache - * - * Hence the loop over current online cpu below could miss cpu that - * is being brought online but not yet marked as online. - * That is okay as we do not schedule and run anything on a - * cpu before it has been marked online. Hence, we will not - * fill any swap slots in slots cache of such cpu. - * There are no slots on such cpu that need to be drained. - */ - for_each_online_cpu(cpu) - drain_slots_cache_cpu(cpu, false); -} - -static int free_slot_cache(unsigned int cpu) -{ - mutex_lock(&swap_slots_cache_mutex); - drain_slots_cache_cpu(cpu, true); - mutex_unlock(&swap_slots_cache_mutex); - return 0; -} - -void enable_swap_slots_cache(void) -{ - mutex_lock(&swap_slots_cache_enable_mutex); - if (!swap_slot_cache_initialized) { - int ret; - - ret =3D cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "swap_slots_cache", - alloc_swap_slot_cache, free_slot_cache); - if (WARN_ONCE(ret < 0, "Cache allocation failed (%s), operating " - "without swap slots cache.\n", __func__)) - goto out_unlock; - - swap_slot_cache_initialized =3D true; - } - - __reenable_swap_slots_cache(); -out_unlock: - mutex_unlock(&swap_slots_cache_enable_mutex); -} - -/* called with swap slot cache's alloc lock held */ -static int refill_swap_slots_cache(struct swap_slots_cache *cache) -{ - if (!use_swap_slot_cache) - return 0; - - cache->cur =3D 0; - if (swap_slot_cache_active) - cache->nr =3D get_swap_pages(SWAP_SLOTS_CACHE_SIZE, - cache->slots, 0); - - return cache->nr; -} - -swp_entry_t folio_alloc_swap(struct folio *folio) -{ - swp_entry_t entry; - struct swap_slots_cache *cache; - - entry.val =3D 0; - - if (folio_test_large(folio)) { - if (IS_ENABLED(CONFIG_THP_SWAP)) - get_swap_pages(1, &entry, folio_order(folio)); - goto out; - } - - /* - * Preemption is allowed here, because we may sleep - * in refill_swap_slots_cache(). But it is safe, because - * accesses to the per-CPU data structure are protected by the - * mutex cache->alloc_lock. - * - * The alloc path here does not touch cache->slots_ret - * so cache->free_lock is not taken. - */ - cache =3D raw_cpu_ptr(&swp_slots); - - if (likely(check_cache_active() && cache->slots)) { - mutex_lock(&cache->alloc_lock); - if (cache->slots) { -repeat: - if (cache->nr) { - entry =3D cache->slots[cache->cur]; - cache->slots[cache->cur++].val =3D 0; - cache->nr--; - } else if (refill_swap_slots_cache(cache)) { - goto repeat; - } - } - mutex_unlock(&cache->alloc_lock); - if (entry.val) - goto out; - } - - get_swap_pages(1, &entry, 0); -out: - if (mem_cgroup_try_charge_swap(folio, entry)) { - put_swap_folio(folio, entry); - entry.val =3D 0; - } - return entry; -} diff --git a/mm/swap_state.c b/mm/swap_state.c index 50840a2887a5..2b5744e211cd 100644 --- a/mm/swap_state.c +++ b/mm/swap_state.c @@ -20,7 +20,6 @@ #include #include #include -#include #include #include #include "internal.h" @@ -447,13 +446,8 @@ struct folio *__read_swap_cache_async(swp_entry_t entr= y, gfp_t gfp_mask, =20 /* * Just skip read ahead for unused swap slot. - * During swap_off when swap_slot_cache is disabled, - * we have to handle the race between putting - * swap entry in swap cache and marking swap slot - * as SWAP_HAS_CACHE. That's done in later part of code or - * else swap_off will be aborted if we return NULL. */ - if (!swap_entry_swapped(si, entry) && swap_slot_cache_enabled) + if (!swap_entry_swapped(si, entry)) goto put_and_return; =20 /* diff --git a/mm/swapfile.c b/mm/swapfile.c index 791cd7ed5bdf..66c8869ef346 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -37,7 +37,6 @@ #include #include #include -#include #include #include #include @@ -892,6 +891,13 @@ static unsigned long cluster_alloc_swap_entry(struct s= wap_info_struct *si, int o struct swap_cluster_info *ci; unsigned int offset, found =3D 0; =20 + /* + * Swapfile is not block device so unable + * to allocate large entries. + */ + if (order && !(si->flags & SWP_BLKDEV)) + return 0; + if (!(si->flags & SWP_SOLIDSTATE)) { /* Serialize HDD SWAP allocation for each device. */ spin_lock(&si->global_cluster_lock); @@ -1155,43 +1161,6 @@ static void swap_range_free(struct swap_info_struct = *si, unsigned long offset, swap_usage_sub(si, nr_entries); } =20 -static int scan_swap_map_slots(struct swap_info_struct *si, - unsigned char usage, int nr, - swp_entry_t slots[], int order) -{ - unsigned int nr_pages =3D 1 << order; - int n_ret =3D 0; - - if (order > 0) { - /* - * Should not even be attempting large allocations when huge - * page swap is disabled. Warn and fail the allocation. - */ - if (!IS_ENABLED(CONFIG_THP_SWAP) || - nr_pages > SWAPFILE_CLUSTER) { - VM_WARN_ON_ONCE(1); - return 0; - } - - /* - * Swapfile is not block device so unable - * to allocate large entries. - */ - if (!(si->flags & SWP_BLKDEV)) - return 0; - } - - while (n_ret < nr) { - unsigned long offset =3D cluster_alloc_swap_entry(si, order, usage); - - if (!offset) - break; - slots[n_ret++] =3D swp_entry(si->type, offset); - } - - return n_ret; -} - static bool get_swap_device_info(struct swap_info_struct *si) { if (!percpu_ref_tryget_live(&si->users)) @@ -1212,54 +1181,53 @@ static bool get_swap_device_info(struct swap_info_s= truct *si) * Fast path try to get swap entries with specified order from current * CPU's swap entry pool (a cluster). */ -static int swap_alloc_fast(swp_entry_t entries[], +static int swap_alloc_fast(swp_entry_t *entry, unsigned char usage, - int order, int n_goal) + int order) { struct swap_cluster_info *ci; struct swap_info_struct *si; - unsigned int offset, found; - int n_ret =3D 0; - - n_goal =3D min(n_goal, SWAP_BATCH); + unsigned int offset, found =3D SWAP_ENTRY_INVALID; =20 si =3D __this_cpu_read(percpu_swap_cluster.si); offset =3D __this_cpu_read(percpu_swap_cluster.offset[order]); if (!si || !offset || !get_swap_device_info(si)) - return 0; + return false; =20 - while (offset) { - ci =3D lock_cluster(si, offset); - found =3D alloc_swap_scan_cluster(si, ci, offset, order, usage); - if (!found) - break; - entries[n_ret++] =3D swp_entry(si->type, found); - if (n_ret =3D=3D n_goal) - break; - offset =3D __this_cpu_read(percpu_swap_cluster.offset[order]); - } + ci =3D lock_cluster(si, offset); + found =3D alloc_swap_scan_cluster(si, ci, offset, order, usage); + if (found) + *entry =3D swp_entry(si->type, found); =20 put_swap_device(si); - return n_ret; + return !!found; } =20 -int get_swap_pages(int n_goal, swp_entry_t swp_entries[], int entry_order) +swp_entry_t folio_alloc_swap(struct folio *folio) { - int order =3D swap_entry_order(entry_order); - unsigned long size =3D 1 << order; + unsigned int order =3D folio_order(folio); + unsigned int size =3D 1 << order; struct swap_info_struct *si, *next; - int n_ret =3D 0; + swp_entry_t entry =3D {}; + unsigned long offset; int node; =20 + if (order) { + /* + * Should not even be attempting large allocations when huge + * page swap is disabled. Warn and fail the allocation. + */ + if (!IS_ENABLED(CONFIG_THP_SWAP) || size > SWAPFILE_CLUSTER) { + VM_WARN_ON_ONCE(1); + return entry; + } + } + /* Fast path using percpu cluster */ local_lock(&percpu_swap_cluster.lock); - n_ret =3D swap_alloc_fast(swp_entries, - SWAP_HAS_CACHE, - order, n_goal); - if (n_ret =3D=3D n_goal) - goto out; + if (swap_alloc_fast(&entry, SWAP_HAS_CACHE, order)) + goto out_alloced; =20 - n_goal =3D min_t(int, n_goal - n_ret, SWAP_BATCH); /* Rotate the device and switch to a new cluster */ spin_lock(&swap_avail_lock); start_over: @@ -1268,11 +1236,14 @@ int get_swap_pages(int n_goal, swp_entry_t swp_entr= ies[], int entry_order) plist_requeue(&si->avail_lists[node], &swap_avail_heads[node]); spin_unlock(&swap_avail_lock); if (get_swap_device_info(si)) { - n_ret +=3D scan_swap_map_slots(si, SWAP_HAS_CACHE, n_goal, - swp_entries + n_ret, order); + offset =3D cluster_alloc_swap_entry(si, order, SWAP_HAS_CACHE); put_swap_device(si); - if (n_ret || size > 1) - goto out; + if (offset) { + entry =3D swp_entry(si->type, offset); + goto out_alloced; + } + if (order) + goto out_failed; } =20 spin_lock(&swap_avail_lock); @@ -1291,10 +1262,20 @@ int get_swap_pages(int n_goal, swp_entry_t swp_entr= ies[], int entry_order) goto start_over; } spin_unlock(&swap_avail_lock); -out: +out_failed: + local_unlock(&percpu_swap_cluster.lock); + return entry; + +out_alloced: local_unlock(&percpu_swap_cluster.lock); - atomic_long_sub(n_ret * size, &nr_swap_pages); - return n_ret; + if (mem_cgroup_try_charge_swap(folio, entry)) { + put_swap_folio(folio, entry); + entry.val =3D 0; + } else { + atomic_long_sub(size, &nr_swap_pages); + } + + return entry; } =20 static struct swap_info_struct *_swap_info_get(swp_entry_t entry) @@ -1590,25 +1571,6 @@ void put_swap_folio(struct folio *folio, swp_entry_t= entry) unlock_cluster(ci); } =20 -void swapcache_free_entries(swp_entry_t *entries, int n) -{ - int i; - struct swap_cluster_info *ci; - struct swap_info_struct *si =3D NULL; - - if (n <=3D 0) - return; - - for (i =3D 0; i < n; ++i) { - si =3D _swap_info_get(entries[i]); - if (si) { - ci =3D lock_cluster(si, swp_offset(entries[i])); - swap_entry_range_free(si, ci, entries[i], 1); - unlock_cluster(ci); - } - } -} - int __swap_count(swp_entry_t entry) { struct swap_info_struct *si =3D swp_swap_info(entry); @@ -1849,6 +1811,7 @@ void free_swap_and_cache_nr(swp_entry_t entry, int nr) swp_entry_t get_swap_page_of_type(int type) { struct swap_info_struct *si =3D swap_type_to_swap_info(type); + unsigned long offset; swp_entry_t entry =3D {0}; =20 if (!si) @@ -1856,8 +1819,13 @@ swp_entry_t get_swap_page_of_type(int type) =20 /* This is called for allocating swap entry, not cache */ if (get_swap_device_info(si)) { - if ((si->flags & SWP_WRITEOK) && scan_swap_map_slots(si, 1, 1, &entry, 0= )) - atomic_long_dec(&nr_swap_pages); + if (si->flags & SWP_WRITEOK) { + offset =3D cluster_alloc_swap_entry(si, 0, 1); + if (offset) { + entry =3D swp_entry(si->type, offset); + atomic_long_dec(&nr_swap_pages); + } + } put_swap_device(si); } fail: @@ -2623,16 +2591,6 @@ static bool __has_usable_swap(void) return !plist_head_empty(&swap_active_head); } =20 -bool has_usable_swap(void) -{ - bool ret; - - spin_lock(&swap_lock); - ret =3D __has_usable_swap(); - spin_unlock(&swap_lock); - return ret; -} - /* * Called after clearing SWP_WRITEOK, ensures cluster_alloc_range * see the updated flags, so there will be no more allocations. @@ -2724,8 +2682,6 @@ SYSCALL_DEFINE1(swapoff, const char __user *, special= file) =20 wait_for_allocation(p); =20 - disable_swap_slots_cache_lock(); - set_current_oom_origin(); err =3D try_to_unuse(p->type); clear_current_oom_origin(); @@ -2733,12 +2689,9 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specia= lfile) if (err) { /* re-insert swap space back into swap_list */ reinsert_swap_info(p); - reenable_swap_slots_cache_unlock(); goto out_dput; } =20 - reenable_swap_slots_cache_unlock(); - /* * Wait for swap operations protected by get/put_swap_device() * to complete. Because of synchronize_rcu() here, all swap @@ -3487,8 +3440,6 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialf= ile, int, swap_flags) putname(name); if (inode) inode_unlock(inode); - if (!error) - enable_swap_slots_cache(); return error; } =20 --=20 2.48.1 From nobody Fri Dec 19 16:45:01 2025 Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) (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 E079D269B0B for ; Fri, 14 Feb 2025 17:58:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739555939; cv=none; b=fpbmc2cgNLZiCiMfuzUxagCTCSlGHEYnqKEEQr7rIutMzJV1CtuQG7jwZg4Qvx47iXb0pDj0CfH64BkUFyiELsBvFX4VLVi6DOaoS4DRUw6ZCz+9YjouEv2/cVK1xKqynxp5SE40E1UsdvpZA2xt69psVytUf+eJfp6me6zcS6w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739555939; c=relaxed/simple; bh=Ii4C2B8Q05zbNYVU3US5x/Ud4xWKaB+IajjZ4KoJVgE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NSXtAKfa+DkcDNm9HsKkUubQ64RxdvruePqA3AapQy1iwQuLxovQYHa1yXSGg6OtXcYSaeuNLnF2PIsfCjD8bIcwr08jwd+rOJd3Ov5w1+pvyxgGu9Lvl0YL2XRt6qVOeiTN/4TWq++9+AHRM7kJVm9nEbHGGFkvh4KGNR8SncM= 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=Ed6ki5wb; arc=none smtp.client-ip=209.85.214.177 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="Ed6ki5wb" Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-220c8eb195aso47559605ad.0 for ; Fri, 14 Feb 2025 09:58:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739555937; x=1740160737; 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=g131YEqRMfLTVZhTMtUAtQy5KjWaVYxNxWGQgGzsAzk=; b=Ed6ki5wbfxbRIHKa4Zm/3p9mABAupYnvRmWqboTOacJ40uCkGmWRmAyhIWhmUOeZY5 j/gHyx7b7dRJGFq8LMGrwl9mAjOaj+Nm+/qqDD4jZq9kKQI263o4qwfjXJDEQvfL+bK+ 2R1Y30gvYiy8cb4jvtUDUU14VQ3ph9WyQAtOtjooQJXMq6fozJrcc8chpw7ZRqyTVSaT 7AajcAUxhtDR9eUjpZ8S+ZGiggtWM7xeUchFcu55nYPrOrlsAeP0ASpkVmmuoy7WdgZU OJ4/1ggZse8L6YNLldH8vOeljJ1/T0tixTVVGSeNq99ucbRFEQSSzLXoD772ha/2vw+6 4CZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739555937; x=1740160737; 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=g131YEqRMfLTVZhTMtUAtQy5KjWaVYxNxWGQgGzsAzk=; b=SKj/V+1OjGjFo21FfCMSHTIRiy8MpkwdxYpYggSbc5319Krj7E2B33VL8f1FpbK0iY GX/ZoHN3rCXORvl0VCTU1mLXOIbTOHQPBGi2SC38CoPl3upAFVOCnEHfY01AAF+WuUqn /6JalCDoJPpAjuhGoL7PLh6EasgeFa9n9slz7gBjtCiQ9eT+Npghc+q/TUl7g/rqP2uD k/e0yT3rd2Xzrx6azaI/iYTmxU+G8qBX4bE8lGUrU8OJgqXEzigNX5kftxTWi92poetB tLUIDhzUczrcMDYCutpkDlibNqFmsr3Ujv6Tys2okArIePc7GMrqZ6L3aW29c19tEpYo +cUA== X-Forwarded-Encrypted: i=1; AJvYcCVvXdZxhadiKXQoKb2M9hZ68o3kbCpx4UfuATCGxU61lf4pJ+9rvQSxOU0rHmqp5LH2eOO34Fy1lV3ozQs=@vger.kernel.org X-Gm-Message-State: AOJu0YygjiRQ9ww2Q7eOgE9hYb+PrwxcAxI8L73j49tgmYQXhkv/4mU/ cpRDfTz5rNDn6XDdpNNeH/3gNbIvMZu1O4XjDh1q81RWeeyPCS4y X-Gm-Gg: ASbGncvfyvr+5G1RQJiBcm8MdXUqvpurjtJlGctnHztPPRD9TyVG9afJoCzLQycjEzQ Fq+ns4bXC6VVBb284Fxi1uaO7b1YwKFwLWpZQFsr567MrVko7YaW9doY/fLYzxxzkxnfkBET0o3 56O3hV8Xi6PN6sc2GVKu6FHWnZiERoomdfBmmlVPSU9CtA4DEX8U35MOCQkiC71FtSVfxAlkIAZ joqF6NAijnjtJR47mAaEtt4vaYILxlxjkBn/dNehnXrxYcXYC4LPYfp5v0XXX0f303YabTf5tSB F6aIHuR0SfayM6D6IY02DzWFCUKeXTWni4iM X-Google-Smtp-Source: AGHT+IEBFWRSKG7OwZIbmlb93b7xdfMca6gf2NNi7p6B/FLu0eRP37//Pl09ZSVseFox+/txo2Nx6Q== X-Received: by 2002:a17:902:d483:b0:215:6e01:ad07 with SMTP id d9443c01a7336-22103efb5b1mr2464155ad.6.1739555937010; Fri, 14 Feb 2025 09:58:57 -0800 (PST) Received: from KASONG-MC4.tencent.com ([106.37.120.226]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-220d55943b5sm31216605ad.246.2025.02.14.09.58.53 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 14 Feb 2025 09:58:56 -0800 (PST) From: Kairui Song To: linux-mm@kvack.org Cc: Andrew Morton , Chris Li , Barry Song , Hugh Dickins , Yosry Ahmed , "Huang, Ying" , Baoquan He , Nhat Pham , Johannes Weiner , Kalesh Singh , linux-kernel@vger.kernel.org, Kairui Song Subject: [PATCH 7/7] mm, swap: simplify folio swap allocation Date: Sat, 15 Feb 2025 01:57:09 +0800 Message-ID: <20250214175709.76029-8-ryncsn@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250214175709.76029-1-ryncsn@gmail.com> References: <20250214175709.76029-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 With slot cache gone, clean up the allocation helpers even more. folio_alloc_swap will be the only entry for allocation and adding the folio to swap cache (except suspend), making it opposite of folio_free_swap. Signed-off-by: Kairui Song --- include/linux/swap.h | 8 ++-- mm/shmem.c | 21 +++------ mm/swap.h | 6 --- mm/swap_state.c | 57 ---------------------- mm/swapfile.c | 110 ++++++++++++++++++++++++++++--------------- mm/vmscan.c | 16 ++++++- 6 files changed, 94 insertions(+), 124 deletions(-) diff --git a/include/linux/swap.h b/include/linux/swap.h index 456833705ea0..e799e965dac8 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h @@ -478,7 +478,7 @@ static inline long get_nr_swap_pages(void) } =20 extern void si_swapinfo(struct sysinfo *); -swp_entry_t folio_alloc_swap(struct folio *folio); +bool folio_alloc_swap(struct folio *folio, gfp_t gfp_mask); bool folio_free_swap(struct folio *folio); void put_swap_folio(struct folio *folio, swp_entry_t entry); extern swp_entry_t get_swap_page_of_type(int); @@ -587,11 +587,9 @@ static inline int swp_swapcount(swp_entry_t entry) return 0; } =20 -static inline swp_entry_t folio_alloc_swap(struct folio *folio) +static bool folio_alloc_swap(struct folio *folio, gfp_t gfp_mask); { - swp_entry_t entry; - entry.val =3D 0; - return entry; + return false; } =20 static inline bool folio_free_swap(struct folio *folio) diff --git a/mm/shmem.c b/mm/shmem.c index b35ba250c53d..2aa206b52ff2 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -1546,7 +1546,6 @@ static int shmem_writepage(struct page *page, struct = writeback_control *wbc) struct inode *inode =3D mapping->host; struct shmem_inode_info *info =3D SHMEM_I(inode); struct shmem_sb_info *sbinfo =3D SHMEM_SB(inode->i_sb); - swp_entry_t swap; pgoff_t index; int nr_pages; bool split =3D false; @@ -1628,14 +1627,6 @@ static int shmem_writepage(struct page *page, struct= writeback_control *wbc) folio_mark_uptodate(folio); } =20 - swap =3D folio_alloc_swap(folio); - if (!swap.val) { - if (nr_pages > 1) - goto try_split; - - goto redirty; - } - /* * Add inode to shmem_unuse()'s list of swapped-out inodes, * if it's not already there. Do it now before the folio is @@ -1648,20 +1639,20 @@ static int shmem_writepage(struct page *page, struc= t writeback_control *wbc) if (list_empty(&info->swaplist)) list_add(&info->swaplist, &shmem_swaplist); =20 - if (add_to_swap_cache(folio, swap, - __GFP_HIGH | __GFP_NOMEMALLOC | __GFP_NOWARN, - NULL) =3D=3D 0) { + if (folio_alloc_swap(folio, __GFP_HIGH | __GFP_NOMEMALLOC | __GFP_NOWARN)= ) { shmem_recalc_inode(inode, 0, nr_pages); - swap_shmem_alloc(swap, nr_pages); - shmem_delete_from_page_cache(folio, swp_to_radix_entry(swap)); + swap_shmem_alloc(folio->swap, nr_pages); + shmem_delete_from_page_cache(folio, swp_to_radix_entry(folio->swap)); =20 mutex_unlock(&shmem_swaplist_mutex); BUG_ON(folio_mapped(folio)); return swap_writepage(&folio->page, wbc); } =20 + list_del_init(&info->swaplist); mutex_unlock(&shmem_swaplist_mutex); - put_swap_folio(folio, swap); + if (nr_pages > 1) + goto try_split; redirty: folio_mark_dirty(folio); if (wbc->for_reclaim) diff --git a/mm/swap.h b/mm/swap.h index ad2f121de970..0abb68091b4f 100644 --- a/mm/swap.h +++ b/mm/swap.h @@ -50,7 +50,6 @@ static inline pgoff_t swap_cache_index(swp_entry_t entry) } =20 void show_swap_cache_info(void); -bool add_to_swap(struct folio *folio); void *get_shadow_from_swap_cache(swp_entry_t entry); int add_to_swap_cache(struct folio *folio, swp_entry_t entry, gfp_t gfp, void **shadowp); @@ -163,11 +162,6 @@ struct folio *filemap_get_incore_folio(struct address_= space *mapping, return filemap_get_folio(mapping, index); } =20 -static inline bool add_to_swap(struct folio *folio) -{ - return false; -} - static inline void *get_shadow_from_swap_cache(swp_entry_t entry) { return NULL; diff --git a/mm/swap_state.c b/mm/swap_state.c index 2b5744e211cd..68fd981b514f 100644 --- a/mm/swap_state.c +++ b/mm/swap_state.c @@ -166,63 +166,6 @@ void __delete_from_swap_cache(struct folio *folio, __lruvec_stat_mod_folio(folio, NR_SWAPCACHE, -nr); } =20 -/** - * add_to_swap - allocate swap space for a folio - * @folio: folio we want to move to swap - * - * Allocate swap space for the folio and add the folio to the - * swap cache. - * - * Context: Caller needs to hold the folio lock. - * Return: Whether the folio was added to the swap cache. - */ -bool add_to_swap(struct folio *folio) -{ - swp_entry_t entry; - int err; - - VM_BUG_ON_FOLIO(!folio_test_locked(folio), folio); - VM_BUG_ON_FOLIO(!folio_test_uptodate(folio), folio); - - entry =3D folio_alloc_swap(folio); - if (!entry.val) - return false; - - /* - * XArray node allocations from PF_MEMALLOC contexts could - * completely exhaust the page allocator. __GFP_NOMEMALLOC - * stops emergency reserves from being allocated. - * - * TODO: this could cause a theoretical memory reclaim - * deadlock in the swap out path. - */ - /* - * Add it to the swap cache. - */ - err =3D add_to_swap_cache(folio, entry, - __GFP_HIGH|__GFP_NOMEMALLOC|__GFP_NOWARN, NULL); - if (err) - goto fail; - /* - * Normally the folio will be dirtied in unmap because its - * pte should be dirty. A special case is MADV_FREE page. The - * page's pte could have dirty bit cleared but the folio's - * SwapBacked flag is still set because clearing the dirty bit - * and SwapBacked flag has no lock protected. For such folio, - * unmap will not set dirty bit for it, so folio reclaim will - * not write the folio out. This can cause data corruption when - * the folio is swapped in later. Always setting the dirty flag - * for the folio solves the problem. - */ - folio_mark_dirty(folio); - - return true; - -fail: - put_swap_folio(folio, entry); - return false; -} - /* * This must be called only on folios that have * been verified to be in the swap cache and locked. diff --git a/mm/swapfile.c b/mm/swapfile.c index 66c8869ef346..8449bd703bd8 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -1181,9 +1181,9 @@ static bool get_swap_device_info(struct swap_info_str= uct *si) * Fast path try to get swap entries with specified order from current * CPU's swap entry pool (a cluster). */ -static int swap_alloc_fast(swp_entry_t *entry, - unsigned char usage, - int order) +static bool swap_alloc_fast(swp_entry_t *entry, + unsigned char usage, + int order) { struct swap_cluster_info *ci; struct swap_info_struct *si; @@ -1203,47 +1203,31 @@ static int swap_alloc_fast(swp_entry_t *entry, return !!found; } =20 -swp_entry_t folio_alloc_swap(struct folio *folio) +/* Rotate the device and switch to a new cluster */ +static bool swap_alloc_rotate(swp_entry_t *entry, + unsigned char usage, + int order) { - unsigned int order =3D folio_order(folio); - unsigned int size =3D 1 << order; - struct swap_info_struct *si, *next; - swp_entry_t entry =3D {}; - unsigned long offset; int node; + unsigned long offset; + struct swap_info_struct *si, *next; =20 - if (order) { - /* - * Should not even be attempting large allocations when huge - * page swap is disabled. Warn and fail the allocation. - */ - if (!IS_ENABLED(CONFIG_THP_SWAP) || size > SWAPFILE_CLUSTER) { - VM_WARN_ON_ONCE(1); - return entry; - } - } - - /* Fast path using percpu cluster */ - local_lock(&percpu_swap_cluster.lock); - if (swap_alloc_fast(&entry, SWAP_HAS_CACHE, order)) - goto out_alloced; - - /* Rotate the device and switch to a new cluster */ + node =3D numa_node_id(); spin_lock(&swap_avail_lock); start_over: - node =3D numa_node_id(); plist_for_each_entry_safe(si, next, &swap_avail_heads[node], avail_lists[= node]) { + /* Rotate the device and switch to a new cluster */ plist_requeue(&si->avail_lists[node], &swap_avail_heads[node]); spin_unlock(&swap_avail_lock); if (get_swap_device_info(si)) { offset =3D cluster_alloc_swap_entry(si, order, SWAP_HAS_CACHE); put_swap_device(si); if (offset) { - entry =3D swp_entry(si->type, offset); - goto out_alloced; + *entry =3D swp_entry(si->type, offset); + return true; } if (order) - goto out_failed; + return false; } =20 spin_lock(&swap_avail_lock); @@ -1262,20 +1246,68 @@ swp_entry_t folio_alloc_swap(struct folio *folio) goto start_over; } spin_unlock(&swap_avail_lock); -out_failed: + return false; +} + +/** + * folio_alloc_swap - allocate swap space for a folio + * @folio: folio we want to move to swap + * @gfp: gfp mask for shadow nodes + * + * Allocate swap space for the folio and add the folio to the + * swap cache. + * + * Context: Caller needs to hold the folio lock. + * Return: Whether the folio was added to the swap cache. + */ +bool folio_alloc_swap(struct folio *folio, gfp_t gfp) +{ + unsigned int order =3D folio_order(folio); + unsigned int size =3D 1 << order; + swp_entry_t entry =3D {}; + + VM_BUG_ON_FOLIO(!folio_test_locked(folio), folio); + VM_BUG_ON_FOLIO(!folio_test_uptodate(folio), folio); + + /* + * Should not even be attempting large allocations when huge + * page swap is disabled. Warn and fail the allocation. + */ + if (order && (!IS_ENABLED(CONFIG_THP_SWAP) || size > SWAPFILE_CLUSTER)) { + VM_WARN_ON_ONCE(1); + return false; + } + + local_lock(&percpu_swap_cluster.lock); + if (swap_alloc_fast(&entry, SWAP_HAS_CACHE, order)) + goto out_alloced; + if (swap_alloc_rotate(&entry, SWAP_HAS_CACHE, order)) + goto out_alloced; local_unlock(&percpu_swap_cluster.lock); - return entry; + return false; =20 out_alloced: local_unlock(&percpu_swap_cluster.lock); - if (mem_cgroup_try_charge_swap(folio, entry)) { - put_swap_folio(folio, entry); - entry.val =3D 0; - } else { - atomic_long_sub(size, &nr_swap_pages); - } + if (mem_cgroup_try_charge_swap(folio, entry)) + goto out_free; =20 - return entry; + /* + * XArray node allocations from PF_MEMALLOC contexts could + * completely exhaust the page allocator. __GFP_NOMEMALLOC + * stops emergency reserves from being allocated. + * + * TODO: this could cause a theoretical memory reclaim + * deadlock in the swap out path. + */ + if (add_to_swap_cache(folio, entry, gfp | __GFP_NOMEMALLOC, NULL)) + goto out_free; + + atomic_long_sub(size, &nr_swap_pages); + return true; + +out_free: + put_swap_folio(folio, entry); + return false; } =20 static struct swap_info_struct *_swap_info_get(swp_entry_t entry) diff --git a/mm/vmscan.c b/mm/vmscan.c index fcca38bc640f..71a6b597e469 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -1289,7 +1289,7 @@ static unsigned int shrink_folio_list(struct list_hea= d *folio_list, split_folio_to_list(folio, folio_list)) goto activate_locked; } - if (!add_to_swap(folio)) { + if (!folio_alloc_swap(folio, __GFP_HIGH | __GFP_NOWARN)) { int __maybe_unused order =3D folio_order(folio); =20 if (!folio_test_large(folio)) @@ -1305,9 +1305,21 @@ static unsigned int shrink_folio_list(struct list_he= ad *folio_list, } #endif count_mthp_stat(order, MTHP_STAT_SWPOUT_FALLBACK); - if (!add_to_swap(folio)) + if (!folio_alloc_swap(folio, __GFP_HIGH | __GFP_NOWARN)) goto activate_locked_split; } + /* + * Normally the folio will be dirtied in unmap because its + * pte should be dirty. A special case is MADV_FREE page. The + * page's pte could have dirty bit cleared but the folio's + * SwapBacked flag is still set because clearing the dirty bit + * and SwapBacked flag has no lock protected. For such folio, + * unmap will not set dirty bit for it, so folio reclaim will + * not write the folio out. This can cause data corruption when + * the folio is swapped in later. Always setting the dirty flag + * for the folio solves the problem. + */ + folio_mark_dirty(folio); } } =20 --=20 2.48.1