From patchwork Thu Feb 15 06:36:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 13557442 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 96C2CC48BEB for ; Thu, 15 Feb 2024 06:37:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 89D986B00B3; Thu, 15 Feb 2024 01:37:21 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 8243E6B00B4; Thu, 15 Feb 2024 01:37:21 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 69F3A6B00B5; Thu, 15 Feb 2024 01:37:21 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 506FA6B00B3 for ; Thu, 15 Feb 2024 01:37:21 -0500 (EST) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 0350A120482 for ; Thu, 15 Feb 2024 06:37:21 +0000 (UTC) X-FDA: 81793081482.11.6FBA515 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf14.hostedemail.com (Postfix) with ESMTP id 58AF4100016 for ; Thu, 15 Feb 2024 06:37:19 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=ojz1xsKL; dmarc=none; spf=none (imf14.hostedemail.com: domain of BATV+a252b21bd4a653ddb6e6+7480+infradead.org+hch@bombadil.srs.infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=BATV+a252b21bd4a653ddb6e6+7480+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=1707979039; 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=E+OSD9VSpQpoZ28pgBfOHWK/m45gq5ZINg4N5qkBC0Q=; b=tCUDZVpY+hrQbF1O/Jfap2/Ut9kV+EGrMyS+1t50Wb+xMu+6P9Vvgbi6Awz9GlTks/RUFg w7aBsWkeXCSIiB3qyCKk5awELZWmcqE3mzLZwcuBOMAY7vEBzo06kmonKLbpdkUXMpKfYH seGxL1NDA+mYP2W8RNXNo0yL3CIju68= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=ojz1xsKL; dmarc=none; spf=none (imf14.hostedemail.com: domain of BATV+a252b21bd4a653ddb6e6+7480+infradead.org+hch@bombadil.srs.infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=BATV+a252b21bd4a653ddb6e6+7480+infradead.org+hch@bombadil.srs.infradead.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1707979039; a=rsa-sha256; cv=none; b=7wSP/uPRWAOGgLx5u31/EXlnKc9E+iTcT6qB8eSwm6yo8l0TzLcvMAN++YFqa1Ek3yksro T0rh8p5Pi0bOT4q068E2BK/rLQms/bgj7rBpB5jhScYCczUDJO9BMcNkxKl7ZcUcV9DPno mD6fnrLQe3XTcerLWr4P3RpiXcQENdE= 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=E+OSD9VSpQpoZ28pgBfOHWK/m45gq5ZINg4N5qkBC0Q=; b=ojz1xsKL7yLiHr6HXkyeNSFyTs OzRaeuK4Hzu442qbSfBX+k4xEMaeju2pg+s/VA1GbW61KuexcJPAMmRVDz98mv4JU5KrmEfGKx3I6 4+exbkMiG7vHaFI4/i2IEbv2T6JBKtVN8F9jVZcwj1+d7ASZrHA3PF5hCBG+cng0XmWbe47JiLXvt LGhgnrtuaMKcpcOPKInsOMpHOK1lE261LPZK/QKFw2zE+p9c2cn9Nlm+Jnm2bF5843Cg85H6Bfeb4 8UmSpoyIKkBNE0dvO0L3HJH1d/Y67uY/hRugC1oESNSjvMTgRUDsDw8PkBdn1n1OVx1Kv02rCVBJd jEEfLK7g==; 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.97.1 #2 (Red Hat Linux)) id 1raVN0-0000000F6vb-0F0x; Thu, 15 Feb 2024 06:37:18 +0000 From: Christoph Hellwig To: linux-mm@kvack.org Cc: Matthew Wilcox , Jan Kara , David Howells , Brian Foster , Christian Brauner , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Jan Kara , Dave Chinner Subject: [PATCH 08/14] writeback: Factor writeback_get_batch() out of write_cache_pages() Date: Thu, 15 Feb 2024 07:36:43 +0100 Message-Id: <20240215063649.2164017-9-hch@lst.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240215063649.2164017-1-hch@lst.de> References: <20240215063649.2164017-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html X-Rspamd-Queue-Id: 58AF4100016 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: 5d9r347amn7ib7s6xpz4rurzg99xf19s X-HE-Tag: 1707979039-387097 X-HE-Meta: U2FsdGVkX18vfVCC987fy3d4H4EageRnAywk3J/UdgY/TAlQ8awCWVLmsew7wp/xbMD1fIZ/nhZXgVY6SUjddmU22kS+BJmImUJ8E6cZDnLQjdFDtKDPFG90AQzLFcWZpznGB0lYtTAin5RmqoUseTs+36aVNQ/j1FYNqU2Fsit9FU8DGnZaGQTXy944DUyP/jEB84jcpsSG14kqKC11IyVw1n6oY2hm/f8VI4T+XpaTXvbOhBdKwefKu3IUg0KgCLOu1XgzRoCIJtroOU2TR9mSB11TB1SadBVJTGNB1xafmRoDh3vYcaoACMhLxcMyFi1qv/i1adadPXZyL0bTGN6jQccDF6I8YuHTJz6nPQjGhWTFGT6ZRBa8af0zkyLrc2eRMq2Z1yLo8G6yaRVAwEjC+INB89PidmqTkzqvdnqAYU/motNavMsBjqZXZSaOwtIfdrQ1Ja1e+Ii4n3lG30YNDCbki12KsfVehf1B47z74V1yvy2lTNPsBzTSUFmiEqqA2s/iU7+Q3hsflhr5VrJkyT5Qx8b3gBEQ2Adf9c6fekBnPA0evo4sctLbz2BlLdVjbLvVpNDmTjZazOO0vQxUwTEr29xtD2e2qp7rjcZgUfOAPSM/zoBwMVtouLHsZygtg0Utqbxaxl2WE+KOQLE2DdPzkI089L0exUDUJrTgFJwbciLkTfPQblLtFZ5qkX+SMWpHtKIQ5WhUcg8W83Fy8tdVkAerkCEngqiTZ3z4Bi6RZg3mJeumN+YaGbiFeYXxzrxY3dTrs2qC9mrglppirbkCFUFiAzCUne8Kc/HOvUAufiqbx0kRuhiEUPckIAX20/EHje+xILfPuP0aCz354mMmEbyY+Jm8Pboq7pSAuDCtr+pfIy9CNx6OROruGfw5rgXI0pe6xC4psyt1KGVJWvpGk5FYeU6G2snTgznWWFmGq2281CQYBvpabkDrSNHbWeWLDLEyg6NbQ8u jVWwtM6J 1oVqvNGNpOmYx9k/ny0Jl4Y68t8Bc/u3uVxay6KtnTPAMyWKwewwXnJppXQmAR0TP4vIigg9OMgVJsYQRXYEAhWwOglru0Y/a7O+EJ5WE4eex+gm8RJcAVbSc6qrPi2O62XhWOjJM3OzCmg6PjxUAkUzW5Ru3lu350SSva7GPYlMNtchwMLB330h+DHKo0InualDfkVPZJEvbTqPW+ob5Rx2ie+xGjBvIf+RF916ywMqwL03vaKCpAeiCrZd7qhrZSNhYJsxevGdrbdnBAW0z5MEvvWq7LuRgsLIzPLaDlTI3y8Bp/JcaDb/1LR7sXIEtoeqv+7PXlVAPu5OUhlfUm5xHUVcrDrKYHxtcOApFrhg0I+p1JQSPYIozGbKSVprSx0PLB6pnlVnqZojO1Wxdy6NPX9ITBhPKPl5To+F0VwV+iZujzP0Fn4R74wko4WIzOq4TuxKHRI2FkeRHSIjOpt62x1lgYXowjCGShM7+LnnH6h4UM1GF5Vw1BAckvhMht7DA2IHrD1skQwX7zapCVHNMxHrEum2fAKe0fdrv0CZQ3F2g48fCGUqoSDnSTVr0utfD 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)" This simple helper will be the basis of the writeback iterator. To make this work, we need to remember the current index and end positions in writeback_control. Signed-off-by: Matthew Wilcox (Oracle) [hch: heavily rebased, add helpers to get the tag and end index, don't keep the end index in struct writeback_control] Signed-off-by: Christoph Hellwig Reviewed-by: Brian Foster Reviewed-by: Jan Kara Acked-by: Dave Chinner --- include/linux/writeback.h | 6 ++++ mm/page-writeback.c | 60 +++++++++++++++++++++++++-------------- 2 files changed, 44 insertions(+), 22 deletions(-) diff --git a/include/linux/writeback.h b/include/linux/writeback.h index 4b8cf9e4810bad..f67b3ea866a0fb 100644 --- a/include/linux/writeback.h +++ b/include/linux/writeback.h @@ -11,6 +11,7 @@ #include #include #include +#include struct bio; @@ -40,6 +41,7 @@ enum writeback_sync_modes { * in a manner such that unspecified fields are set to zero. */ struct writeback_control { + /* public fields that can be set and/or consumed by the caller: */ long nr_to_write; /* Write this many pages, and decrement this for each page written */ long pages_skipped; /* Pages which were not written */ @@ -77,6 +79,10 @@ struct writeback_control { */ struct swap_iocb **swap_plug; + /* internal fields used by the ->writepages implementation: */ + struct folio_batch fbatch; + pgoff_t index; + #ifdef CONFIG_CGROUP_WRITEBACK struct bdi_writeback *wb; /* wb this writeback is issued under */ struct inode *inode; /* inode being written out */ diff --git a/mm/page-writeback.c b/mm/page-writeback.c index 4bc55ce9597d13..5b8dbbef713722 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c @@ -2392,6 +2392,29 @@ static bool folio_prepare_writeback(struct address_space *mapping, return true; } +static xa_mark_t wbc_to_tag(struct writeback_control *wbc) +{ + if (wbc->sync_mode == WB_SYNC_ALL || wbc->tagged_writepages) + return PAGECACHE_TAG_TOWRITE; + return PAGECACHE_TAG_DIRTY; +} + +static pgoff_t wbc_end(struct writeback_control *wbc) +{ + if (wbc->range_cyclic) + return -1; + return wbc->range_end >> PAGE_SHIFT; +} + +static void writeback_get_batch(struct address_space *mapping, + struct writeback_control *wbc) +{ + folio_batch_release(&wbc->fbatch); + cond_resched(); + filemap_get_folios_tag(mapping, &wbc->index, wbc_end(wbc), + wbc_to_tag(wbc), &wbc->fbatch); +} + /** * 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 @@ -2429,38 +2452,32 @@ int write_cache_pages(struct address_space *mapping, { int ret = 0; int error; - struct folio_batch fbatch; struct folio *folio; - int nr_folios; - pgoff_t index; pgoff_t end; /* Inclusive */ - xa_mark_t tag; - folio_batch_init(&fbatch); if (wbc->range_cyclic) { - index = mapping->writeback_index; /* prev offset */ + wbc->index = mapping->writeback_index; /* prev offset */ end = -1; } else { - index = wbc->range_start >> PAGE_SHIFT; + wbc->index = wbc->range_start >> PAGE_SHIFT; end = wbc->range_end >> PAGE_SHIFT; } - if (wbc->sync_mode == WB_SYNC_ALL || wbc->tagged_writepages) { - tag_pages_for_writeback(mapping, index, end); - tag = PAGECACHE_TAG_TOWRITE; - } else { - tag = PAGECACHE_TAG_DIRTY; - } - while (index <= end) { + if (wbc->sync_mode == WB_SYNC_ALL || wbc->tagged_writepages) + tag_pages_for_writeback(mapping, wbc->index, end); + + folio_batch_init(&wbc->fbatch); + + while (wbc->index <= end) { int i; - nr_folios = filemap_get_folios_tag(mapping, &index, end, - tag, &fbatch); + writeback_get_batch(mapping, wbc); - if (nr_folios == 0) + if (wbc->fbatch.nr == 0) break; - for (i = 0; i < nr_folios; i++) { - folio = fbatch.folios[i]; + for (i = 0; i < wbc->fbatch.nr; i++) { + folio = wbc->fbatch.folios[i]; + folio_lock(folio); if (!folio_prepare_writeback(mapping, wbc, folio)) { folio_unlock(folio); @@ -2498,8 +2515,6 @@ int write_cache_pages(struct address_space *mapping, goto done; } } - folio_batch_release(&fbatch); - cond_resched(); } /* @@ -2512,6 +2527,7 @@ int write_cache_pages(struct address_space *mapping, * of the file if we are called again, which can only happen due to * -ENOMEM from the file system. */ + folio_batch_release(&wbc->fbatch); if (wbc->range_cyclic) mapping->writeback_index = 0; return ret; @@ -2519,7 +2535,7 @@ int write_cache_pages(struct address_space *mapping, done: if (wbc->range_cyclic) mapping->writeback_index = folio->index + folio_nr_pages(folio); - folio_batch_release(&fbatch); + folio_batch_release(&wbc->fbatch); return error; } EXPORT_SYMBOL(write_cache_pages);