From nobody Thu Apr 2 23:54:48 2026 Received: from outbound.ci.icloud.com (ci-2006h-snip4-3.eps.apple.com [57.103.90.204]) (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 896D53BC681 for ; Thu, 26 Mar 2026 08:36:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=57.103.90.204 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774514212; cv=none; b=gUJmlYUkwo3wMPeXrAcwLKn54cNqT3vJYFhIP4MkJzZ+pqrzeAxa31whWWadWL6oRSIpTvEQ7O2tvVMfFMySJmX5BpUtiThYEbhSwHNX4XFiKLzHjVWMHsPfw5i89hlmJKqvOLULCcqY0gBqYbC3zBlMACfgxn22EKOM3QnYcm0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774514212; c=relaxed/simple; bh=o0V0zHRuokKFdrTmqqx9vAI1MOcEwIIWKgzyYz0MNDI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=axYxBAIfIRrOC1tOhg4ylZtguE/NkLpJWVOUTVXALlPOhWOglISjBbG5IMiiJA5nvBpWA18ExTK6I7Tzmw09PwKoKDPnUklN/16Sr6fqQ3GiONKXIM75hd0B3wYNagyjdv1DjiynUr72bSIFkeea+3jgcgkvw1qPPYnt11sx4vg= 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=y5fckf4a; arc=none smtp.client-ip=57.103.90.204 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="y5fckf4a" Received: from outbound.ci.icloud.com (unknown [127.0.0.2]) by p00-icloudmta-asmtp-us-central-1k-100-percent-11 (Postfix) with ESMTPS id 277DB1800216; Thu, 26 Mar 2026 08:36:45 +0000 (UTC) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=icloud.com; s=1a1hai; t=1774514209; x=1777106209; bh=W+PRHeM3s2DI2yQOSrDPnTDvHR27Fnjgpu54ajqjWKM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:x-icloud-hme; b=y5fckf4aHvY/4d/k3tDLEvwtHArMQ3QvflAZqnGyufERLyAoK0PiQTpsvukg5kdqrz0j8okrB+tex28EDyL+udWlPGM/ov3fG4BDF+XiYWwxf+3UKqcz3R+zDe3BeIP4iqrM7V9PYGoS5uZKNtZZ6wkl4yxvY80eRwp2YTRKkjwveYCkv4yDuS3X7Q+z+YTH3pCIEhhKvCWD7XgJow0O2XvJiEloXr5wF4gk93PrvA8jN8k2pjI3cJ+Ook2Nwf9Tqu7Eb5Im+HIUIv/qwJSy9zwiNx0EGmHah4Q0quA6XXa+coBRXYbyVtk5FHwhLsboRJj/qrvqW2xuNiPopli71Q== Received: from [21.6.122.162] (unknown [17.57.156.36]) by p00-icloudmta-asmtp-us-central-1k-100-percent-11 (Postfix) with ESMTPSA id E62D81800103; Thu, 26 Mar 2026 08:36:38 +0000 (UTC) From: Zhang Peng Date: Thu, 26 Mar 2026 16:36:18 +0800 Subject: [PATCH v2 2/5] mm/vmscan: extract folio activation into folio_active_bounce() 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: quoted-printable Message-Id: <20260326-batch-tlb-flush-v2-2-403e523325c4@icloud.com> References: <20260326-batch-tlb-flush-v2-0-403e523325c4@icloud.com> In-Reply-To: <20260326-batch-tlb-flush-v2-0-403e523325c4@icloud.com> To: Andrew Morton , David Hildenbrand , Lorenzo Stoakes , "Liam R. Howlett" , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , Johannes Weiner , Qi Zheng , Shakeel Butt , Axel Rasmussen , Yuanchu Xie , Wei Xu , Michal Hocko Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Kairui Song , Zhang Peng X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1774514187; l=2167; i=zippermonkey@icloud.com; s=20260309; h=from:subject:message-id; bh=MwBPaFWPFTZ2m6kdtZRGEvS5uyMpPolk6vIxczHd7KA=; b=QTpI4KhMzfCr7GoxijlS887QDstZgQYD2aylFzXTg1x16Sz+J6AVX6Kio9gWjhzhmPJWOihxV Be08cy4jIvVAjl7Pq55we5fm/FOdC6J27OAWoVx6NKDbz6HMHN7q+Sm X-Developer-Key: i=zippermonkey@icloud.com; a=ed25519; pk=tPCLpFnBfIyHsp0k7eaUTUREEa36bQNW/69X+NS8wBU= X-Proofpoint-GUID: Bkfp8Xp4cWnVHNChC_PiyCLqKKrQZk6r X-Authority-Info-Out: v=2.4 cv=acpsXBot c=1 sm=1 tr=0 ts=69c4f020 cx=c_apl:c_pps:t_out a=2G65uMN5HjSv0sBfM2Yj2w==:117 a=2G65uMN5HjSv0sBfM2Yj2w==:17 a=IkcTkHD0fZMA:10 a=Yq5XynenixoA:10 a=x7bEGLp0ZPQA:10 a=YE32fvk_ji8A:10 a=VkNPw1HP01LnGYTKEx00:22 a=GvQkQWPkAAAA:8 a=tUYT8qNuPuMAWAmJffYA:9 a=QEXdDO2ut3YA:10 a=J82S1U87d15UFHHUFZS8:22 a=R6HnoDE5lksTgPyyjrIf:22 X-Proofpoint-ORIG-GUID: Bkfp8Xp4cWnVHNChC_PiyCLqKKrQZk6r X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzI2MDA2MiBTYWx0ZWRfX0eQXWbj8yDBm nNm+6008kYFQdsgm+vSpXzEAMOfBLAUxgTxbjuTp3nFrLYrBvfqVPa2usPCCwBFVrEpjKwbI64D Vv8ftur/dqMW4Qw6U4XU5f4D9zgJC2Eveg/EOnR4QlHWHSl4YOq7MPY81i6er7qn3lW8mCfbxDJ vybhu9hKzPEFNI6GjYG34cC9SAlcFAZqfAI514EAQ19LHhkCQpn/2I6Jtj2xpWvoB/hnpEJbwpc mF0mTfIrWmp2CU7O3/j3puvx58XQUjT+SDa4KasECfQmSbf/iipKc1Am1Wh578fgeUv6hMmZifD DEzYkMAux4E0yopD5hCzDMLlE/nLG+WNmqo0pCGPTVLQdDXNskZ2aaU+qgdVn8= X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-03-26_02,2026-03-24_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 mlxlogscore=999 phishscore=0 spamscore=0 clxscore=1015 mlxscore=0 malwarescore=0 suspectscore=0 adultscore=0 lowpriorityscore=0 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.22.0-2601150000 definitions=main-2603260062 From: Zhang Peng The activate_locked label in shrink_folio_list() handles swap cache reclaim, marks the folio active, and updates activation statistics. Extract this block into folio_active_bounce() to make shrink_folio_list() easier to follow. No functional change Suggested-by: Kairui Song Signed-off-by: Zhang Peng --- mm/vmscan.c | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/mm/vmscan.c b/mm/vmscan.c index f3f03a44042e..0860a48d5bf3 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -1052,6 +1052,24 @@ static bool may_enter_fs(struct folio *folio, gfp_t = gfp_mask) return !data_race(folio_swap_flags(folio) & SWP_FS_OPS); } =20 +/* Mark folio as active and prepare to bounce back to head of LRU */ +static void folio_active_bounce(struct folio *folio, struct reclaim_stat *= stat, + unsigned int nr_pages) +{ + /* 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 =3D folio_is_file_lru(folio); + + folio_set_active(folio); + stat->nr_activate[type] +=3D nr_pages; + count_memcg_folio_events(folio, PGACTIVATE, nr_pages); + } +} + /* * Reclaimed folios are counted in stat->nr_reclaimed. */ @@ -1527,17 +1545,7 @@ static void shrink_folio_list(struct list_head *foli= o_list, nr_pages =3D 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 =3D folio_is_file_lru(folio); - folio_set_active(folio); - stat->nr_activate[type] +=3D nr_pages; - count_memcg_folio_events(folio, PGACTIVATE, nr_pages); - } + folio_active_bounce(folio, stat, nr_pages); keep_locked: folio_unlock(folio); keep: --=20 2.43.7