From patchwork Sat Feb 3 07:11:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 13543902 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 87B03C4828D for ; Sat, 3 Feb 2024 07:12:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 11F626B007E; Sat, 3 Feb 2024 02:12:35 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 0A75C6B0080; Sat, 3 Feb 2024 02:12:35 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E62016B0081; Sat, 3 Feb 2024 02:12:34 -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 D48296B007E for ; Sat, 3 Feb 2024 02:12:34 -0500 (EST) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 96E3A1A013E for ; Sat, 3 Feb 2024 07:12:34 +0000 (UTC) X-FDA: 81749624628.18.89D2160 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf18.hostedemail.com (Postfix) with ESMTP id F3B251C0014 for ; Sat, 3 Feb 2024 07:12:32 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=ZpxFIRF0; spf=none (imf18.hostedemail.com: domain of BATV+a0ed29cff9639d748e7e+7468+infradead.org+hch@bombadil.srs.infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=BATV+a0ed29cff9639d748e7e+7468+infradead.org+hch@bombadil.srs.infradead.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1706944353; a=rsa-sha256; cv=none; b=6vlCkyPgShnK3NUn51vWRaTWoYNqO8qF0Ozs5XV+LJPWte6OarLJXWiga+XvG/yW8jJEUD 02rGYxnSSfYk6Wm5iIFq6AWlJNmolXA7RUqDMf2rzcrT4BdDGLQUGY3UgJqC/QLCQ+645u L+nl26azg6w4i1/8IiGd1/VAc5a/Igo= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=ZpxFIRF0; spf=none (imf18.hostedemail.com: domain of BATV+a0ed29cff9639d748e7e+7468+infradead.org+hch@bombadil.srs.infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=BATV+a0ed29cff9639d748e7e+7468+infradead.org+hch@bombadil.srs.infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1706944353; 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=e37EqS2ZYYTeeuRHGuEE+Jp38DFAOi6vK8cHvx3Jpt4=; b=chdsZQSWdRf/urmTl1C14wHICnxc78R6HEuJwoGk8OeRUlRWt74YF1IxDCJfDGv7oKldvR rJTZMLl9vUEVcMLBgAERuGAvvXgC4gk+pkN3BwYdnRvwpTj8l0oxoncfJqISEsBJGrUC6s Mcf0x+VcfLiKy8roMeXqyb/UYXv3fAg= 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=e37EqS2ZYYTeeuRHGuEE+Jp38DFAOi6vK8cHvx3Jpt4=; b=ZpxFIRF0rwjTTxnnah1dH4r+g/ N+x8kCIzZ77fhJadth50deaJ77t6djMUAPPcuUsG1BbnsxFdWYEzisaWKSgIBC8xV1DytPxrky3Kq 4Bmxmc3DKJhdTBatFBqeQFMkzLwlbU0XxvcSsuXqZqOCepbKrwmBI3VW1YMpzQanXhV/rM5cjAK4n fNlo6Cd3ftcE74+bpOHcLUbnwvNg2EgWBQqWeGCkHKvr+yDL9l9MwidQlkyhRbp2WGHa63Zz95LHJ vaMEze6Ezzq8d+IedDrC8ow1o8kZucRlgXIPTCXgpzDvwGD0AuTEHieil/ddDKnJ6ZHMijpArgbhA gVVCUrpg==; Received: from [89.144.222.32] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.97.1 #2 (Red Hat Linux)) id 1rWACV-0000000Fk90-2Gz9; Sat, 03 Feb 2024 07:12:32 +0000 From: Christoph Hellwig To: linux-mm@kvack.org Cc: Matthew Wilcox , Jan Kara , David Howells , Brian Foster , Christian Brauner , "Darrick J. Wong" , linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Jan Kara , Dave Chinner Subject: [PATCH 07/13] writeback: Factor writeback_get_batch() out of write_cache_pages() Date: Sat, 3 Feb 2024 08:11:41 +0100 Message-Id: <20240203071147.862076-8-hch@lst.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240203071147.862076-1-hch@lst.de> References: <20240203071147.862076-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-Server: rspam08 X-Rspamd-Queue-Id: F3B251C0014 X-Stat-Signature: 4jxe4xw711qg5bxb3mj38pmf8sh1we86 X-Rspam-User: X-HE-Tag: 1706944352-106237 X-HE-Meta: U2FsdGVkX19qNYMnhQaLp3BlTSFImPYwoc7jvHkcdwXJ0ygIkyTr3U2uuObthRu6k5WXf9vVIg/DZDkmkFzFA5pWtb1ex+jJYlRLepCm++0Vl3fefP5WcH39NMWPUoGyRf8YeTuTi9qHquc2GP3UPvCftsOeSC0NWqXCLB+hoZ9UF69hw0HNZLe/hs3CN+YtCCR+BZniybSwjELFLBhSqpBJcHIHKaFd1oL2KfDSoTSQAFMsLFcRIl2vqSXvup/fK3KeGB3DdkKT8lZ68jsbEb2g39yVXrccyKoPzmXdo6uR/1PNc3mbNypuEzBS3PuBPC+pUnqKMEc8vsifnSfANOToqkEAEvH6sh+W9hwl9gHH4YfywOKcx/YBNiTv2C95WqQkF6pdDwZ28acX7YpmeoYjMsicx3r9jijOXvjii9u3oNuYu4uk6XZK0P0gLLwQG7c6axr3dNvXpQ7BJNTw13YV1v0UFgdxsX1B+Mf73LJF868NzIeD6ESudZnSm4NBTATj5HZeQo8rgXrE1zr/ru41kTLOftYo+lfjQGoTV/rGoX+3svud+c6Z6XJp6dUgAc7Y/iRj5p4DfDEqbgpnDD8HRwGo2MBCp20F2y7gbTZ9BOJ852iiPIryhVWQuTLy0EmNUP04A7mecyNvFIBvxaxcL1Iu7WZZ1lylLZ2HUe/KU2iIQuwW52ltmW7KJC+PoaAXs1jfsZsTjlmFj0BEl1gpfmRAxel4Ls43FNHAQILCxPF9kAW+hr7iLB/cHTCFpmKZMJ165wjVXdbDi/uq2mXRzekaXpz6NNwyos99r9rHaXVy55bou1DtWK9XNgOz6TUg017kwwnm007+SShY/LWXF9a/xFjuIVQD24bvReUOCpv5XbYoQazQ8WGSLHFCG0ys2E7p3DwfG3RQbbPPJ6T7crMOYUIK832rX3kWaOVu9jGNPu/k36QwIL01329SLEUvydaZKhZSAjhc08n CNbtEghB kVQDaRGLFXWriB+Ew0VU2B79ngdJc6+FciDM0c5bTlptX6qWGfzyXpFXkA2kwvnWfeY/nYopJTyrplt6gA+LEDMKwYlrNsfoa0O2KaEjg8VuyGsv2rxfHJo54uOYL6hzqaBnnUkAcX9zDM7ZTu5LVfFTciZgliGKcGYxF12ffh0G6K6H86QaLAZfJ3F2CJ351a5HIGT4X+pgWhu/0f3c2Cgs4fI6KzEaYWXWZLXC69fM4AsV5lswJuB1rx6EYs31zBzKtXzSiWQrk3HoN7MT07/gCFbXhwxz9JtvgXaRU+7+OpO8qNdUzxp2zvJglnD9YTQcYvuZp0bItPpl/2QJsjZfqKDYk+h23r6sHe4GhZDzryAuSxkzAafE853eASB8zBamxd/ohKgL+ItVhhxx2cRcOq+jwPQfpDThLXoZ93TC4rqpDbV2j5sNut9JlfccvFCM3EpbbhxisUsP5Mjd47TjgB4j0PXHl+KlTAGxAaAVzQ6AEOJu24RgTCt72/6FqJPVgsA5H02NycMbZYjGkBIchm3bgEzhC79mRROBfEbDgBcs= 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 949193624baa38..23363ed712f646 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,12 +2527,13 @@ 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; done: - folio_batch_release(&fbatch); + folio_batch_release(&wbc->fbatch); if (wbc->range_cyclic) mapping->writeback_index = folio->index + folio_nr_pages(folio); return error;