From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from outbound.qs.icloud.com (qs-2001l-snip4-2.eps.apple.com [57.103.87.115]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6A5142BE7BE for ; Mon, 20 Jul 2026 05:08:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=57.103.87.115 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784524081; cv=none; b=KJO98LhP1/EFYY2gYBytcsz8Gg8EmKq3DKNYVClY7Azqyd0pGTXgvcYdg/qQZ3rwt1nfpRPPA0E6Pz1iShAlhWjGNyQlTXDbbeexI5+dq3ShUqXtgFARKEJtDpdydUKl1pMZGkGvVEq2nFIWmehMMBWZL8Ahl6NswjWybmv/bxw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784524081; c=relaxed/simple; bh=/o7xQp7LYCOHZ22PnOkQZVfltgn9zHZheEocHYd6IiQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=UcjB4ua/oJnD4EgGZqb2U7bR84CPLr0QU9Nvv0jZxUq8ev1UCRHgJ3abAiX1p/a+DovsFVHH7620xVRUVrofYXW6PggYplpMl0V96YE2P/OcT+YNsL1G2XP2OBom0m/fQ2I64d+zC1lC6Q5LMTUtcjukB3cnFpWnKqYe2LENibY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=icloud.com; spf=pass smtp.mailfrom=icloud.com; dkim=pass (2048-bit key) header.d=icloud.com header.i=@icloud.com header.b=nElY1mpx; arc=none smtp.client-ip=57.103.87.115 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=icloud.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=icloud.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=icloud.com header.i=@icloud.com header.b="nElY1mpx" Received: from outbound.qs.icloud.com (unknown [127.0.0.2]) by p00-icloudmta-asmtp-us-east-2d-60-percent-7 (Postfix) with ESMTPS id 8CAC7180014C; Mon, 20 Jul 2026 05:07:57 +0000 (UTC) X-ICL-RepId: 019f7dec-79d8-73c7-91f6-a38505208ad8 X-ICL-Out-Info: HUtFAUMEWwJACUgBTUQeDx5WFlZNRAJCTQhMHVwGXRxCCkEdXgBLVxQEAlodRw5AHVYWWAhOK1sTVRdGCRkIXR0ZHldQXgheH0wcHQ5YBhICWkUBXRcDVxxWRVwYQwldBVccHRxERVsTVRdGCRkIXR0ZCEcfCjADQg5WA0MHRQAtGRxXUF4IXh9MHB0OWAYSHVAcDlEFWwBGCU8BXRoJUwRaEB4ZWwkfFlUNQAUaHQddCFVXDw5fAREJHAMJAQlyGVoUXBhTRVEfVEYTGU4bV01QG18CQg8= Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=icloud.com; s=1a1hai; t=1784524079; x=1787116079; bh=10j7WY6pZYOXAZEZpweX4crZCY4OfUrYCS2F0Vpwmv8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:x-icloud-hme; b=nElY1mpxXvsXBRr9n2BLhYUsrVAAyAUFZDjRYKE4tBuUC86UqF/ub2746q6jG/Gbt3YUkR3OcTQ1MVojpEkXA6X2uOc3U5AUD5LI3QffBj2DnV20Od761mWaBccX3sVzSA+bv6Vj/m+QITqn/o+bQp3uHR8DgIQJp8/meSBprIiVDykwFgv7IwxOj7vScaz1e08J+v/xB4l7LFCqrNgIBCmOCHWXF14V2PQftjiT7MJND/XPaC0DwbCMnrpgG3kqgbO8tENM6qYTFpkXf+IALyisXCPYM773gAYJDhpDZ9oAsTbx0O/T7ub0BdO3Ilo8oVOwJEOzKlRmDQbzB2fqLw== Received: from [21.6.122.162] (unknown [17.57.155.37]) by p00-icloudmta-asmtp-us-east-2d-60-percent-7 (Postfix) with ESMTPSA id 16CE0180010D; Mon, 20 Jul 2026 05:07:50 +0000 (UTC) From: Zhang Peng Date: Mon, 20 Jul 2026 13:07:38 +0800 Subject: [PATCH v5 1/5] mm/vmscan: introduce folio_activate_locked() helper Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260720-batch-tlb-flush-v5-1-db943a0d0d6b@icloud.com> References: <20260720-batch-tlb-flush-v5-0-db943a0d0d6b@icloud.com> In-Reply-To: <20260720-batch-tlb-flush-v5-0-db943a0d0d6b@icloud.com> To: Andrew Morton , David Hildenbrand , Lorenzo Stoakes , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , Johannes Weiner , Shakeel Butt , Axel Rasmussen , Yuanchu Xie , Wei Xu , Michal Hocko , Qi Zheng , "Liam R. Howlett" , Qi Zheng Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Barry Song , Kairui Song , Zhang Peng X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1784524064; l=2344; i=zippermonkey@icloud.com; s=20260309; h=from:subject:message-id; bh=/o7xQp7LYCOHZ22PnOkQZVfltgn9zHZheEocHYd6IiQ=; b=rhn1vXifhzIq4xrjZIPPTD8K48FziRZqJrzYtujzYoZ7k1ac5K55GLoD6NWFWzwaHpknPJXeC wB2/2OcCH3RBJLZ5LdN3ftGi21PhW2czvgmaUeTa/RP8/Z+OSFdFa2e X-Developer-Key: i=zippermonkey@icloud.com; a=ed25519; pk=tPCLpFnBfIyHsp0k7eaUTUREEa36bQNW/69X+NS8wBU= X-Proofpoint-GUID: hV3P6CG3dzB9ygQveRXF6_8kY3ngsOKF X-Proofpoint-ORIG-GUID: hV3P6CG3dzB9ygQveRXF6_8kY3ngsOKF X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzIwMDA1NCBTYWx0ZWRfX9TfIUtfr4Y/6 0W0xMzbYYVkmZ4Z/NcTqTvdfq3seAKfGJDpyXgWJ2EdH8QJnCUn0SJPdvL9jTafxgzAowXNF5+Z JrX5b9buGldQ38R767BQRAAQraU8qmn7Nz9GfsVSOsZQXOxB635t5kYV5IKYxJvM6CX9QbtopML cuuETdFy9BtmPU1OfTaWkbJY/yam8vbDI+hyxe21BHMS0Y/f+EcFe0qFAM9aOLevQqeo0Daea2S tU34N1urIidECC8pGfm4yzaLTJaUWUV6Cm8ETiHQFCQPBz52OqUZb0saZcJpPOXvS4Zgl4r0dRK blNl9y+tPDXd/SSW30S The activate_locked label in shrink_folio_list() reclaims swap cache when needed, marks the folio active, and updates activation statistics. Extract this block into folio_activate_locked() so it can be reused. No functional change. Signed-off-by: Zhang Peng --- mm/vmscan.c | 38 +++++++++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/mm/vmscan.c b/mm/vmscan.c index ca4533eba701..5ba880dce21e 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -1050,6 +1050,32 @@ static bool may_enter_fs(struct folio *folio, gfp_t gfp_mask) return !data_race(folio_swap_flags(folio) & SWP_FS_OPS); } +/* + * Prepare a locked folio to be kept active rather than reclaimed. + * Reclaims its swap slot if it will not be swapped, then marks it + * active and updates activation statistics. + */ +static void folio_activate_locked(struct folio *folio, + struct reclaim_stat *stat) +{ + unsigned int nr_pages = folio_nr_pages(folio); + + VM_WARN_ON_ONCE_FOLIO(!folio_test_locked(folio), folio); + VM_WARN_ON_ONCE_FOLIO(folio_test_active(folio), folio); + + /* Not a candidate for swapping, so reclaim swap space. */ + if (folio_test_swapcache(folio) && + (mem_cgroup_swap_full(folio) || folio_test_mlocked(folio))) + folio_free_swap(folio); + if (!folio_test_mlocked(folio)) { + int type = folio_is_file_lru(folio); + + folio_set_active(folio); + stat->nr_activate[type] += nr_pages; + count_memcg_folio_events(folio, PGACTIVATE, nr_pages); + } +} + /* * shrink_folio_list() returns the number of reclaimed pages */ @@ -1525,17 +1551,7 @@ static unsigned int shrink_folio_list(struct list_head *folio_list, nr_pages = 1; } activate_locked: - /* Not a candidate for swapping, so reclaim swap space. */ - if (folio_test_swapcache(folio) && - (mem_cgroup_swap_full(folio) || folio_test_mlocked(folio))) - folio_free_swap(folio); - VM_BUG_ON_FOLIO(folio_test_active(folio), folio); - if (!folio_test_mlocked(folio)) { - int type = folio_is_file_lru(folio); - folio_set_active(folio); - stat->nr_activate[type] += nr_pages; - count_memcg_folio_events(folio, PGACTIVATE, nr_pages); - } + folio_activate_locked(folio, stat); keep_locked: folio_unlock(folio); keep: -- 2.43.7