From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from outbound.pv.icloud.com (pv-2006e-snip4-3.eps.apple.com [57.103.67.66]) (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 EF6A634C808 for ; Mon, 25 May 2026 14:57:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=57.103.67.66 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779721065; cv=none; b=a2k0W95oezl+ryuqLvRIxI9GCyH6odzYoZbxoCwIjjCS+JdEZuPp0d4TbwvEEcGDSZ/W73QKpsD9GHrzvRCCbIMdkmQkzedPdZHi7Ja3h1djZSXcn6HKbwgmy9d4y546fHRSXto7Dp7RdYKe146YfzfU2u2D0eCE3pr8TMaEI6c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779721065; c=relaxed/simple; bh=s9EbIFh/LV8iPlyUTN5QDlVlv2e5tCPSHPTZBWN4pmg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=hDkbxc4HgOz+aaF9u1y4PdA+od8wIo9I9ApPJMpxs/taj/tWhX8cU5BmWy1tqKPQ8PpQsEDspnf1gISsxQJzTFR4trYJDxtHnzwiJ+O/+3KxOhMCMDN12SS+Q/T4brcSzJgFI4jZCfBL5m8jfc+6QDtXfG1/ZQAK7kL/ZkYqVPg= 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=Nt58n+BQ; arc=none smtp.client-ip=57.103.67.66 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="Nt58n+BQ" Received: from outbound.pv.icloud.com (unknown [127.0.0.2]) by p00-icloudmta-asmtp-us-west-1a-60-percent-11 (Postfix) with ESMTPS id 2FBD418000B3; Mon, 25 May 2026 14:57:39 +0000 (UTC) X-ICL-Out-Info: HUtFAUMEWwJACUgBTUQeDx5WFlZNRAJCTQhMHV8FRQNBF0kFWBcOVk1DEUMdUhlfH1cTVhR3AlEcVg1XQ1QEX1BfHA4EVAddBV1WUAJaS0ATBEoDTV8OXh8EF0YZVQRHHl1WQxsZAlEcVg1XQ1QEX1BJDEFQbFoARxdIHV0ZWW9QXRwOBFQHXQVdVlACWktfGV1FD18HWQRADEoGQFUKRhNRVUcBVUZUHEwLW0BBXx9BFEAAWg9SVkZYGlBdBytbE1UXRgkZCF0dB1hHFEcODxlaFFwYUw== Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=icloud.com; s=1a1hai; t=1779721063; x=1782313063; bh=vYeCbJz1qvnDRDXrZFPnGvD5lPvltNFcb/fwP8QSlLA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:x-icloud-hme; b=Nt58n+BQ471CG0lbBKFMrOjiRTvJYWpLtMo0f07CvdzLhvgjbyJiLARQ5WCOLwhFgV4kgGae2DbdEqmkoKTjYdr/pDSpWi5fK+WwkaY+1GVqD2kyOKD/36F56VGTflxrZiNJ5Yw6Wrp98LZh0hVwRAuWI0XmLtKvOM47eQLMBEAfZVR1aZknBTuA+96QnVfXhTLJEssbxMNlGomGkJqqRmPrVyJRSNLMO2fTilx3JzS+dg+/PJKZCGexKD9glhavbmi1deGsh0EncUNx9CgYz07lYP7BG6OeOOlYtUa/HKRhJVFtLhiONZY5yvUGe7wBWp3uDYXGNKp2UeewC81lgA== Received: from [21.6.122.162] (unknown [17.56.9.36]) by p00-icloudmta-asmtp-us-west-1a-60-percent-11 (Postfix) with ESMTPSA id 8D31D18000D1; Mon, 25 May 2026 14:57:34 +0000 (UTC) From: Zhang Peng Date: Mon, 25 May 2026 22:57:17 +0800 Subject: [PATCH v4 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: <20260525-batch-tlb-flush-v4-1-83789d6abc00@icloud.com> References: <20260525-batch-tlb-flush-v4-0-83789d6abc00@icloud.com> In-Reply-To: <20260525-batch-tlb-flush-v4-0-83789d6abc00@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 , "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=1779721049; l=2251; i=zippermonkey@icloud.com; s=20260309; h=from:subject:message-id; bh=s9EbIFh/LV8iPlyUTN5QDlVlv2e5tCPSHPTZBWN4pmg=; b=Q9hFLErSWCqkSz9LhQiyJcXUqZ73JcbBE+VSQfJkIPsQIu6C0SsgjkT7qcNrbu/dskgodbytC fbc3JevNMVEC4fG6KrjSyQZrlDQ+IwOe9pX21+h4qbGSTcHLbfr1n4r X-Developer-Key: i=zippermonkey@icloud.com; a=ed25519; pk=tPCLpFnBfIyHsp0k7eaUTUREEa36bQNW/69X+NS8wBU= X-Proofpoint-GUID: 4R-4Yspfm7SXYI4kHMakN0x1YTQYALGO X-Proofpoint-ORIG-GUID: 4R-4Yspfm7SXYI4kHMakN0x1YTQYALGO X-Authority-Info-Out: v=2.4 cv=Rq3I7SmK c=1 sm=1 tr=0 ts=6a146364 cx=c_apl:c_pps:t_out a=azHRBMxVc17uSn+fyuI/eg==:117 a=azHRBMxVc17uSn+fyuI/eg==:17 a=IkcTkHD0fZMA:10 a=NGcC8JguVDcA:10 a=x7bEGLp0ZPQA:10 a=YE32fvk_ji8A:10 a=VkNPw1HP01LnGYTKEx00:22 a=GvQkQWPkAAAA:8 a=67y7PdGttH7DD6AgI8EA:9 a=QEXdDO2ut3YA:10 a=J82S1U87d15UFHHUFZS8:22 a=R6HnoDE5lksTgPyyjrIf:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTI1MDE1MyBTYWx0ZWRfX9oMhjyYCbRfH SVyIBplsGl3G/r6bWvuKFXx8sq+EpQI13Bpvclv7Wet/3GcViasapcyuIAQ+AEVVIhssSietzx4 xUffNfWIIo9UIjU7wwPW7CJOl9ls7Co1Np67i3XVWQsIjedSzJbPhpltkq1YkdG0JSeJ88aqkRR Jcc7hsVq0QBB+KO8DKMHr1+OVkYXaqP+WBE+h0Exw+/CJmNQwzpyOiAw34zTK5pRD330P7HI8M9 hKdMSTHpcRGCWUwQnPylyo8Uhm+/xXlUcNPwRyYLHyq5trvNb0mxgnBoeIgvI+8dR0Z6pNCkU26 qTWmToWJ4Udmecdb2ucelNnjgffDU3L7+7GbDBfzBXDZCB6sZLrnRiFMUyfWMQ= 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 | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/mm/vmscan.c b/mm/vmscan.c index ca4533eba701..886d8b4843aa 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -1050,6 +1050,28 @@ 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) +{ + /* 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); + } +} + /* * shrink_folio_list() returns the number of reclaimed pages */ @@ -1525,17 +1547,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, nr_pages); keep_locked: folio_unlock(folio); keep: -- 2.43.7