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 4ADFFC41535 for ; Fri, 22 Dec 2023 15:09:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3EB4B8D0008; Fri, 22 Dec 2023 10:09:06 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 34FE68D0003; Fri, 22 Dec 2023 10:09:06 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 179518D0008; Fri, 22 Dec 2023 10:09:06 -0500 (EST) 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 014DD8D0003 for ; Fri, 22 Dec 2023 10:09:05 -0500 (EST) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 8F396A0EF8 for ; Fri, 22 Dec 2023 15:09:05 +0000 (UTC) X-FDA: 81594787050.04.91AEDF5 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf22.hostedemail.com (Postfix) with ESMTP id 74E07C000D for ; Fri, 22 Dec 2023 15:09:03 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=AWYiSCNJ; dmarc=none; spf=none (imf22.hostedemail.com: domain of BATV+af923ccb694ecd533eae+7425+infradead.org+hch@bombadil.srs.infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=BATV+af923ccb694ecd533eae+7425+infradead.org+hch@bombadil.srs.infradead.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1703257743; 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=Tv6lrDU8r6rlJypjv3siMvmCkcJEVy83R0f8GQdaFQU=; b=bxd5TJJHCxI2vKZ4MPT20NhhMHUOGezYHNVKIP4LIntS77vPydJoAahf0Xxa+XVhGMjmCz 4q9yr5jkIrPNT/RcWKaDxhJSXopr8avQFYaLYuGbTTtLZ7BG4S+LrImkvtQs8jp+2UT+mX 9cfm3OMtJ61HOBfqs9UvovVRhq5tLjE= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=AWYiSCNJ; dmarc=none; spf=none (imf22.hostedemail.com: domain of BATV+af923ccb694ecd533eae+7425+infradead.org+hch@bombadil.srs.infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=BATV+af923ccb694ecd533eae+7425+infradead.org+hch@bombadil.srs.infradead.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1703257743; a=rsa-sha256; cv=none; b=QbTNWt3PXkQqfFadmbQEOWyu7MSGsMwmvqERF9O8V3/NWTcahZ7j2B1KmgyNPpGaS6sf21 kNKIhcwbpEudKizMKpLAj76/8LSKOjydyWZvG+CVcPXxiiNUP2mrGZl96oBkO9WniX+SUB 3uAwDu5yCJMHd65/6KZA8Agvx9KK9q8= 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=Tv6lrDU8r6rlJypjv3siMvmCkcJEVy83R0f8GQdaFQU=; b=AWYiSCNJg8Yta3tpcjdQxGvw8L EvtMV1WeGwuWEB3TDrAffKN606PP/uIZLFU9/YNjCbAsUCYX8zUs8FeKkHub/niKeumC6GIoUiMHL V5wS03sfVZpFQd3R6vLLzbnYXMdQ5flWog5xsVIBG7V1iQqbWzO6skZlSrvW99SHHaEq1syx4w6Zp pOE4tEWlS0mGLIzJM2aqnc2cQvrATlEUfezMuN3fXjE7sR4E1+AxcuS8zLKxfCDXjzD+2Va6AJVN2 M/Tr2UDGLXa9y5PiBU3MybJUd+9vUnG/JxzdSmwqBzjTnEyr7h1SKZh6iYs8RGLha4KiO2za/uX8E 6DqydyuQ==; Received: from 2a02-8389-2341-5b80-39d3-4735-9a3c-88d8.cable.dynamic.v6.surfer.at ([2a02:8389:2341:5b80:39d3:4735:9a3c:88d8] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.96 #2 (Red Hat Linux)) id 1rGh94-006BZF-0b; Fri, 22 Dec 2023 15:09:02 +0000 From: Christoph Hellwig To: linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" , Jan Kara , David Howells , Brian Foster , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Jan Kara , Dave Chinner Subject: [PATCH 14/17] writeback: Factor writeback_iter_next() out of write_cache_pages() Date: Fri, 22 Dec 2023 16:08:24 +0100 Message-Id: <20231222150827.1329938-15-hch@lst.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231222150827.1329938-1-hch@lst.de> References: <20231222150827.1329938-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-Queue-Id: 74E07C000D X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: tawuniferjt55efgxizxzqnd4wny8iem X-HE-Tag: 1703257743-631877 X-HE-Meta: U2FsdGVkX19B1e10ZWV5KubceV4aU3SN2fqeO73Q/751xzjkoxCSBKQJmlq7XAjIdMgy2Yc84d0WGLtLOdz9Av6b2AnMCsdkiwv/NSnO+tivJIK7T7CWQqoM8CfxyeDogTpRG5SSybpF9aceM6vE9HT/RU0iShFRCSQMyy6O/w004zySjalIu4rOxP3Z1Ci5FQGZVzzCGwNE/ZZh6sI80zGrJ359CXU2y+qF6pJsRjd+d3w9hoew/fUSUPYscgi+rsN7Y/LZSG6Xx2mKuPmWgCfcuLmOpIP1DGNg9Nkba3IVF5cr89HhVhLOlWoVWcEd+0xXzNX4pliDPij+xirUH1O8mS1o4IKOJ1/94ArzZaSAGg9XgvLKaPRUVyHmZr65FTH5JlPMf1fz0TD3Cu4E6BbsSWyAGh0+PKnVtt35bpNSzLBFLkn74w692y2Et7oqX147YVQwXRWncjBpqRRO66iOzv/2BfbCyMDkoAniImtIMRRYWJ0OTc92q3FaRjLo9oteeuvLQIE0vBaMykA/6dLWRAfHClW6OECGx/qucG7I0Y3QTa5w0aNH9wEkW8qfs8POCO1CyAcrK1ZN3w7+vFHGVvrfxW4/mlUn5P0UDx79LmtAcfkFB/sU+0jtMp9zyK5H31PuTWPSt1oDWVqYLtupj5nI8Wx9JasgETPMYxLgZlfONSknUZdf63qJNJMnohdiaepz+Leq9uo8Q5QAL3BhSzOl1P8y/zBug69UcwRb9WjviJRzTEoNxesBN/CsImv2/ZtK3flem0gAUJK/W1Hj0q/oq+It7aZnROaibzqfztwVBoOss6VVzxQU/7E/IPiMCYi346gg0S9mruYiDUKKbK5IVPVvYZl9YnYV73k3b2L+gvJO3oIZHiOYW1aLSbbc1romiTvA8vA7qddly2MC+5qONjykOt5PXAqOIStY6crGCI6fm0nYN9H0mkEftgpFfO4cjj+A2FsyfOT OGawg455 68tACCElZs9WwaTex/bFbSD2H8/OxmrW8l0s1gqAcqKzx02un4cun0Z976QmgS5q1Je7t4GM3R/tzLSicTcup9EL1tUsrux/qbHkGV4IPbLIaQ4NVe8i/ol5/0HY3Gcf5+yYc4hqCn0cNDPVteC3g585fgdzTGcavL6PP+d9VH0uz+DivxB5NksbJanMnYzxkimyeJD0CqmEdhySn3pUnLNB5KaRNnqmimVIZ2oCUDcA35m+kPu+d/bdmYMHI2OL7ZdCb74dbfiNIq8umzE9hgZoqLuKOzQX+3frg0jJuJT7Ayslccb0XxRtzTC9aMOX1Lcxf0yQ/ST2Jf178uRGeb5gLZLOd0gKR7xSnEGkc58XCRMoB70z2iQCxWHY1tpTwgZjOBF6L3jIoKashRjOpdvt1yghkjY8ZUmqdMDpm/0mUtzwRq9i8kSLzhgXPK5mdd25v/04RxIuM3NRiZhQK8O/4Hoyho+Y1o0+N8a76bKuf00Ou/Sge+aQL1vWygsPc0OljGqnhdEfZ/g09wwjPegUHar6RtgnSQm5k 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: From: "Matthew Wilcox (Oracle)" Pull the post-processing of the writepage_t callback into a separate function. That means changing writeback_get_next() to call writeback_finish() when we naturally run out of folios. Signed-off-by: Matthew Wilcox (Oracle) Signed-off-by: Christoph Hellwig Reviewed-by: Jan Kara Acked-by: Dave Chinner --- mm/page-writeback.c | 85 ++++++++++++++++++++++++--------------------- 1 file changed, 45 insertions(+), 40 deletions(-) diff --git a/mm/page-writeback.c b/mm/page-writeback.c index b6048c14748fdb..a041cc563762ae 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c @@ -2442,8 +2442,10 @@ static struct folio *writeback_get_folio(struct address_space *mapping, filemap_get_folios_tag(mapping, &wbc->index, wbc_end(wbc), wbc_to_tag(wbc), &wbc->fbatch); folio = folio_batch_next(&wbc->fbatch); - if (!folio) + if (!folio) { + writeback_finish(mapping, wbc, 0); return NULL; + } } folio_lock(folio); @@ -2472,6 +2474,46 @@ static struct folio *writeback_iter_init(struct address_space *mapping, return writeback_get_folio(mapping, wbc); } +static struct folio *writeback_iter_next(struct address_space *mapping, + struct writeback_control *wbc, struct folio *folio, int error) +{ + unsigned long nr = folio_nr_pages(folio); + + wbc->nr_to_write -= nr; + + /* + * Handle the legacy AOP_WRITEPAGE_ACTIVATE magic return value. + * Eventually all instances should just unlock the folio themselves and + * return 0; + */ + if (error == AOP_WRITEPAGE_ACTIVATE) { + folio_unlock(folio); + error = 0; + } + + if (error && !wbc->err) + wbc->err = error; + + /* + * For integrity sync we have to keep going until we have written all + * the folios we tagged for writeback prior to entering the writeback + * loop, even if we run past wbc->nr_to_write or encounter errors. + * This is because the file system may still have state to clear for + * each folio. We'll eventually return the first error encountered. + * + * For background writeback just push done_index past this folio so that + * we can just restart where we left off and media errors won't choke + * writeout for the entire file. + */ + if (wbc->sync_mode == WB_SYNC_NONE && + (wbc->err || wbc->nr_to_write <= 0)) { + writeback_finish(mapping, wbc, folio->index + nr); + return NULL; + } + + return writeback_get_folio(mapping, wbc); +} + /** * write_cache_pages - walk the list of dirty pages of the given address space and write all of them. * @mapping: address space structure to write @@ -2512,47 +2554,10 @@ int write_cache_pages(struct address_space *mapping, for (folio = writeback_iter_init(mapping, wbc); folio; - folio = writeback_get_folio(mapping, wbc)) { - unsigned long nr; - + folio = writeback_iter_next(mapping, wbc, folio, error)) error = writepage(folio, wbc, data); - nr = folio_nr_pages(folio); - wbc->nr_to_write -= nr; - - /* - * Handle the legacy AOP_WRITEPAGE_ACTIVATE magic return value. - * Eventually all instances should just unlock the folio - * themselves and return 0; - */ - if (error == AOP_WRITEPAGE_ACTIVATE) { - folio_unlock(folio); - error = 0; - } - - if (error && !wbc->err) - wbc->err = error; - /* - * For integrity sync we have to keep going until we have - * written all the folios we tagged for writeback prior to - * entering this loop, even if we run past wbc->nr_to_write or - * encounter errors. This is because the file system may still - * have state to clear for each folio. We'll eventually return - * the first error encountered. - * - * For background writeback just push done_index past this folio - * so that we can just restart where we left off and media - * errors won't choke writeout for the entire file. - */ - if (wbc->sync_mode == WB_SYNC_NONE && - (wbc->err || wbc->nr_to_write <= 0)) { - writeback_finish(mapping, wbc, folio->index + nr); - return error; - } - } - - writeback_finish(mapping, wbc, 0); - return 0; + return wbc->err; } EXPORT_SYMBOL(write_cache_pages); -- 2.39.2