From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 850E1C5B543 for ; Tue, 10 Jun 2025 05:50:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 02B3D6B007B; Tue, 10 Jun 2025 01:50:11 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id EF6F46B0089; Tue, 10 Jun 2025 01:50:10 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E0D526B008A; Tue, 10 Jun 2025 01:50:10 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id BDC496B007B for ; Tue, 10 Jun 2025 01:50:10 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 28B5A161088 for ; Tue, 10 Jun 2025 05:50:10 +0000 (UTC) X-FDA: 83538415380.29.09D8747 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf30.hostedemail.com (Postfix) with ESMTP id 3778D80005 for ; Tue, 10 Jun 2025 05:50:08 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b="ySmxq0n/"; spf=none (imf30.hostedemail.com: domain of BATV+631296521f62fa6b3e9f+7961+infradead.org+hch@bombadil.srs.infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=BATV+631296521f62fa6b3e9f+7961+infradead.org+hch@bombadil.srs.infradead.org; dmarc=fail reason="No valid SPF, DKIM not aligned (relaxed)" header.from=lst.de (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1749534608; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=5YzttA8VZgNNq6tkoF3mi5mDiVc+cpxKpy7SHVzN0P8=; b=ElNAjFWYibZcUy5upjdeIfzeag3g0cNMtTWzsZoBGYWXOVr1tpM1AXln/UhrUgPMM9uIjy tICWQu1R0aZi6KBS+cR3oBV+6fuU3IIs5dflvtRYpfpHiOoDIY+5VU2dp6IKgUDtl6q2Db mSO2oh4X+bg8jDoDqMkrCemQQePEqyA= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b="ySmxq0n/"; spf=none (imf30.hostedemail.com: domain of BATV+631296521f62fa6b3e9f+7961+infradead.org+hch@bombadil.srs.infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=BATV+631296521f62fa6b3e9f+7961+infradead.org+hch@bombadil.srs.infradead.org; dmarc=fail reason="No valid SPF, DKIM not aligned (relaxed)" header.from=lst.de (policy=none) ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1749534608; a=rsa-sha256; cv=none; b=NqpTZRocpNjGiCeedBfDLOcZiAx5p6EhcKrIb+NXRo7Q6Ye3Fet8WHOODvAPgmY9/dYlcb ztOru7VPG+wDFxsjmF73lgexhLvPHJIfKNRTUocnrkA3Nj5c+S/m7+VQzE8YhHHKykxgFL pjJtgwSQhAraILkJGogaahY2QW8e0J0= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=5YzttA8VZgNNq6tkoF3mi5mDiVc+cpxKpy7SHVzN0P8=; b=ySmxq0n/ruaAMIOeLRmMtOAXAc 1SpTv40sx/u65Ciav3Tdl4AKShFESiw+h21ZVjdxfnTEdxxBrNOMPlqQGrP3zNYIiMdI0MpIWWach Qk5dpwGJxTMcvjDkB4it4+7KVaazdlHM9YvTVm0gJjC5dGQCpEmQuqgkUdgqnS67/ZanLt2YI0yuO OYEUu2q8n9+YGPOnmhJGwWewJOSKtewbOOwUU2mBtlGg5II2ANedxceNQ5HcS9eb1WIDAtuW/kcxF 0E8dlxZUIO3m/rbGn2iv8ept7oKARMTh7KlVVhptUrDs04AxAep19GdoWZhXiuEvUqb0R+eZY6B9I KSjZ6fJA==; Received: from 2a02-8389-2341-5b80-d601-7564-c2e0-491c.cable.dynamic.v6.surfer.at ([2a02:8389:2341:5b80:d601:7564:c2e0:491c] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.98.2 #2 (Red Hat Linux)) id 1uOrs4-00000005s07-3BTM; Tue, 10 Jun 2025 05:50:05 +0000 From: Christoph Hellwig To: Andrew Morton , Hugh Dickins , Johannes Weiner , Yosry Ahmed , Nhat Pham Cc: Matthew Wilcox , Chengming Zhou , Baolin Wang , linux-mm@kvack.org Subject: [PATCH 1/6] mm: split out a writeout helper from pageout Date: Tue, 10 Jun 2025 07:49:37 +0200 Message-ID: <20250610054959.2057526-2-hch@lst.de> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250610054959.2057526-1-hch@lst.de> References: <20250610054959.2057526-1-hch@lst.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 3778D80005 X-Stat-Signature: 8xnnztz1h4b47s76pkfyyf36wc9uon7x X-Rspam-User: X-HE-Tag: 1749534608-317435 X-HE-Meta: U2FsdGVkX1+dwYaBHqWPCOlpci2xUgBnGlrR20t+n2rRHmqjPNpf7Wroqhm43e47cbbBv1NCOjywH7y9muLBfEoXm0TNzjbomVt3Kftmn4QVkCiQ/ck84anZ7419cw2KgZ5P5TozbGGYT3bRkt0fNXFz1jG9rFpUTKrnXtYIMZf9WBki5u0JRUrq1F15i/jcqVX8gG4F3b52oVhNRDj1ZPf9D2tbMAYPXoiGW/y4aW+qLcaj6DCeGRThO9xGXM+pHPI9Izln/P+AXR8o9s2bGA3E2opb7pfSJSzWYEjrj1t8ZL5k2tibtz7voOz0uQX5Yk/kY68PGH6o/mj33rgw332JXjoOTTxRktL2NyVGqcDgVyjfNKv0SOAyP2shyPRpjReW+RCxTsqVNP0DdYAx64nIrNvEhXvu6TCcOP2daDEJIkeRqd1D+lqQL9rg9UO8iv71FkwkMawe3yhdGCWaX2lUIqArFG5sxAzt9kFB1teWkJvndjgu6rPEThQUrrIGaYwlLLuEG4BKf3dKfZhRSs62iTILHoebpHiwljQ8CthzZGwXPjSKA7i5zBe4C6nxbrkaZvOxM6B+c+U4wR+sywC+uPwr6YAJDuZIhgsnriMqcirebNUaZcn55+fRmYA4M6tEvBGuxwoiqDu5HFi+YCkXXFPM+NY5turV7bG/djFNQClMFRTEg63BN6Ho72RIb72ikcsnk9TzK8t45OfICMCPXCm40z93Yir7NsReUVvpuTxSbeIw4Ab9XrQCwVOX7Z8IyQAI4CJ5IuxlCOwG2OX2PN68xtzFCkhJcJFBnAvglRUqdk8uIntDg91M+V7/snbwsGIi21TwFKSAHtRxI8b+lmNY4cKRx2ojYBputBTJPlQCaLNr9iUqPxFtusMRcASJtVe2N54RRgCr68XKDTo1TJGZ21ydzw+4En+rELxDhOJsKsqXIfnCfB4RhUeilOYayMsdqx4GHjfqz3x d6tZznt8 D69o5HqBueHlkE2FA24mc2Leu88Ziq6BlLFizOoxb/E1f6sZ/Kh7rksh/hxqCoajmaOh0poMOEmxQUA4nnryW/KESXhliViFsvQyG88rnHoNxZkqpL+p5yXIbSOPRQ3Ej1KnsGYAsCDWjLGYIMMPsrla1At2iXqbG0jIMSRbIJMwFBev5vXbu7cSRA2D1rSta/CPm/adpBmPlJaFoV9I+GZyfYioMTE9BaKQwV9mu/P3oMc9HVSBFSp8gN6RtxQoGzEwhvep9jnkgPBWd8URmTTCvCukP7wg7IGTWvG/iCrvPMR6vn4MzbVBMB1Zj/Bb2IJ2tL8WYNSmX89JBAmr1aXIEaQCZ6SzjTeOQzXdgrP88hwOJj6Sr7okSdgQgSiNm4m5DUV/Z3vlARiyXf1ZcHetFbdAWdznefYDZQ/dmzE2nvgKHFAWZ7oJwGqllhX8tPAHqLd4drUkX9BuIS8ySHIGkcej56fICofdTJLeQOsIkaNHDkunfER57Nc1hwIGpDFViObAbayi9zdwi8g8dyzi1/fwqtJn6ng6lSTBO2kiN9xQ= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Move the code to write back swap / shmem folios into a self-contained helper to keep prepare for refactoring it. Signed-off-by: Christoph Hellwig --- mm/vmscan.c | 94 +++++++++++++++++++++++++++-------------------------- 1 file changed, 48 insertions(+), 46 deletions(-) diff --git a/mm/vmscan.c b/mm/vmscan.c index f8dfd2864bbf..3af99b0978b5 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -652,14 +652,55 @@ typedef enum { PAGE_CLEAN, } pageout_t; +static pageout_t writeout(struct folio *folio, struct address_space *mapping, + struct swap_iocb **plug, struct list_head *folio_list) +{ + struct writeback_control wbc = { + .sync_mode = WB_SYNC_NONE, + .nr_to_write = SWAP_CLUSTER_MAX, + .range_start = 0, + .range_end = LLONG_MAX, + .for_reclaim = 1, + .swap_plug = plug, + }; + int res; + + folio_set_reclaim(folio); + + /* + * The large shmem folio can be split if CONFIG_THP_SWAP is not enabled + * or we failed to allocate contiguous swap entries. + */ + if (shmem_mapping(mapping)) { + if (folio_test_large(folio)) + wbc.list = folio_list; + res = shmem_writeout(folio, &wbc); + } else { + res = swap_writeout(folio, &wbc); + } + + if (res < 0) + handle_write_error(mapping, folio, res); + if (res == AOP_WRITEPAGE_ACTIVATE) { + folio_clear_reclaim(folio); + return PAGE_ACTIVATE; + } + + /* synchronous write? */ + if (!folio_test_writeback(folio)) + folio_clear_reclaim(folio); + + trace_mm_vmscan_write_folio(folio); + node_stat_add_folio(folio, NR_VMSCAN_WRITE); + return PAGE_SUCCESS; +} + /* * pageout is called by shrink_folio_list() for each dirty folio. */ static pageout_t pageout(struct folio *folio, struct address_space *mapping, struct swap_iocb **plug, struct list_head *folio_list) { - int (*writeout)(struct folio *, struct writeback_control *); - /* * We no longer attempt to writeback filesystem folios here, other * than tmpfs/shmem. That's taken care of in page-writeback. @@ -690,51 +731,12 @@ static pageout_t pageout(struct folio *folio, struct address_space *mapping, } return PAGE_KEEP; } - if (shmem_mapping(mapping)) - writeout = shmem_writeout; - else if (folio_test_anon(folio)) - writeout = swap_writeout; - else - return PAGE_ACTIVATE; - - if (folio_clear_dirty_for_io(folio)) { - int res; - struct writeback_control wbc = { - .sync_mode = WB_SYNC_NONE, - .nr_to_write = SWAP_CLUSTER_MAX, - .range_start = 0, - .range_end = LLONG_MAX, - .for_reclaim = 1, - .swap_plug = plug, - }; - /* - * The large shmem folio can be split if CONFIG_THP_SWAP is - * not enabled or contiguous swap entries are failed to - * allocate. - */ - if (shmem_mapping(mapping) && folio_test_large(folio)) - wbc.list = folio_list; - - folio_set_reclaim(folio); - res = writeout(folio, &wbc); - if (res < 0) - handle_write_error(mapping, folio, res); - if (res == AOP_WRITEPAGE_ACTIVATE) { - folio_clear_reclaim(folio); - return PAGE_ACTIVATE; - } - - if (!folio_test_writeback(folio)) { - /* synchronous write? */ - folio_clear_reclaim(folio); - } - trace_mm_vmscan_write_folio(folio); - node_stat_add_folio(folio, NR_VMSCAN_WRITE); - return PAGE_SUCCESS; - } - - return PAGE_CLEAN; + if (!shmem_mapping(mapping) && !folio_test_anon(folio)) + return PAGE_ACTIVATE; + if (!folio_clear_dirty_for_io(folio)) + return PAGE_CLEAN; + return writeout(folio, mapping, plug, folio_list); } /* -- 2.47.2