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 2009BEB64D9 for ; Mon, 26 Jun 2023 17:35:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 78C7A8D0011; Mon, 26 Jun 2023 13:35:52 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7189B8D000C; Mon, 26 Jun 2023 13:35:52 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 569168D0011; Mon, 26 Jun 2023 13:35:52 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 3C4A48D000C for ; Mon, 26 Jun 2023 13:35:52 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 16E751A07B6 for ; Mon, 26 Jun 2023 17:35:52 +0000 (UTC) X-FDA: 80945601744.25.190BFEF Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf02.hostedemail.com (Postfix) with ESMTP id 269638000D for ; Mon, 26 Jun 2023 17:35:49 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=nbsu3asm; dmarc=none; spf=none (imf02.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1687800950; 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=Rl4mK631QVfMYqrn657sw5cU2nYiKao9j/G8hhMJYQc=; b=yQSdWLTApOH2hHMlSn3sM3U1meMLQp8SpGhxCsIKIMBTF2USi2+dwlhqAWUkcxAcRYiLmk z4Z3R9dJH7pSOnt77lNAVeBVHc8yktsmpVicxLdO5E6CBSsO2Ok1J6pHQsprh1hV4hWK1n w68RI3mjta4Fjpivg5Qk98VhoBmqQQU= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=nbsu3asm; dmarc=none; spf=none (imf02.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687800950; a=rsa-sha256; cv=none; b=SUmWcl+1NP3dDNsUz7oLMr9hRomUPomuHuTSYKe9+F5Us2UHJbBJdLlbeLmkzsPE0yXKM7 CJ5lJ98kJwg+M9PEJ2pi7RSDsNVmJ36TuJpcj6bPd+dY5fiAlxLhjmLp6DBX8GIBw6Jfr1 U2+qTeniGm4Af6lRjmlkDtMIyu8V9Io= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; 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=Rl4mK631QVfMYqrn657sw5cU2nYiKao9j/G8hhMJYQc=; b=nbsu3asmGLUEUJkp+PGufwS657 4CnYI/PCw6l8Xww27U0CYRwuyhdw3qbIis63qGdeGzCtVLsJOFwYt3NxR09Tdc5xZeJfOY8HBxSpD ML123J3s2go0dLVKtO7JpczdsBdChbc2qdUxfvc7R/nlZz9ke8A7G0kVR8Pe3BeM8cYwULIOBI4va QsVz+e8awbc3irLZPqIwC6yclmfeLbv2Eyi3WV9YAYsgEKeC1gNGPKT8+flhqRnRCmJZMdmeKgqPH POUXY9Q1cVqApg0noTgC9DVH6ZMLKwAsYN6jYt4BOAsygoP/Us8PMzM8KNlDC/dCF+nMklunLylR/ u0gT4KlA==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1qDq7X-001vVB-PR; Mon, 26 Jun 2023 17:35:23 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Jan Kara , David Howells Subject: [PATCH 07/12] writeback: Factor writeback_iter_init() out of write_cache_pages() Date: Mon, 26 Jun 2023 18:35:16 +0100 Message-Id: <20230626173521.459345-8-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230626173521.459345-1-willy@infradead.org> References: <20230626173521.459345-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 269638000D X-Stat-Signature: iy7zrwhoboszjd8jcqzcadam8nzmn1rp X-Rspam-User: X-HE-Tag: 1687800949-32071 X-HE-Meta: U2FsdGVkX1+nqMSCX1v0Xk6kLWX4+cYBX4czHtC5JN0wjpqnOZSCrE1KnbPcVQVcigha4eG0t+75BkBj0m9Umjo1XPmPMikSslYbE1sx59wo4hvVu25qQp22qAUfoC95WJtBwIJ6/KnHEZctY/10AC2kU0eAavitvcYeVrzf77Jun9ARhKjrZnjbs3XfH9XI6F3HK4XNBJKg1ZI0bIEG7CbG88NbB8H8WRVwzf90pEZ9mU2MylOg6UWvF7HiX6/uFmk7ruM3MsxZ6qQlUsBQ7pSkOvLC4JAy6P72QZIxC48AOnEt/gstYjGTY+GGB7q1gx+9wbEXfWcBR1W5fC1g/Sg1LpcbAIlHHtKK+ArZihS84YWb2dLcew+7sAwTrcdQCCmapqfUM9rbi4KRAkJi7Qg6ShyJE8tCrG1iNEfFDRjlibMxQI/dZIzR4e38PXzTDBEIpgue6laflcyKUZUGdf37rM8Cc/43KlIJqF/ik3foMYCaY/hSD36hzzm4uu7seAilOjQccZiWlmUmRNzYfLKeJrybV4j06pUeW8sv6qnJjOpgRKhj8kfP2oYox532VKBdfOwspoSI6wGqeUSPE53Oy9hxwZiEJwO1bJT+oznPoaXRtxi+qgnNOB3aoI0xGD4OZM6F0LQTi2UavZIn71XK9QJ98jn6k7KGly6L8jip/OYPfQJ0SxNjurWxmovLoAq8FXzl470E6oiydp9hmFWFBGaqjQVTpyyC4xEXD2ftckk6gUFF9POz0vGPKnRuAffJ4aPjsfwLEmMZ/K1Dhm20jMiPpJAZF9sXnAervsOuRjCDVkduSTkwOaUEYFBWNHKz0QbjViZ68jJniIB7qXU5U3slfCHHCMVwO0ERvkz3zS3Hj7G/E7obAyPrPaE8I4LOqAQwLN+6Lt6PuTbFgrTKxUOPjC0hxFqch5M0ss21hCOkPSPQ3Y4j/aZGxkV1Dw9ET13Iy00ZMdy0ZNE 4eKV+LCF PT4cL/+ZToUKef79GH26Jg9va8+MnUUw0VC6iP8F5UknVLs4nFZ0+RQkHoKAxoiJfbcqSlJ0TmZBBj/5JUwmoAfWbrhMMsD0FfmkUA9YI3Lo+g0NJnRdAxfF1f5qgzK2QTHJKm1Zj+wFNKmyKKVAx5b+rH40O2FxP4PuZDijbtuIfiX3Ecf0yQji84bnx6yxnwpmIguqp7a9WoYCzxqgxCjG0QVKRUj/+qk9o 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: Make it return the first folio in the batch so that we can use it in a typical for() pattern. Signed-off-by: Matthew Wilcox (Oracle) --- mm/page-writeback.c | 48 ++++++++++++++++++++++++--------------------- 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/mm/page-writeback.c b/mm/page-writeback.c index f782b48c5b0c..18f332611a52 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c @@ -2430,6 +2430,28 @@ static bool should_writeback_folio(struct address_space *mapping, return true; } +static struct folio *writeback_iter_init(struct address_space *mapping, + struct writeback_control *wbc) +{ + if (wbc->range_cyclic) { + wbc->index = mapping->writeback_index; /* prev offset */ + wbc->end = -1; + } else { + wbc->index = wbc->range_start >> PAGE_SHIFT; + wbc->end = wbc->range_end >> PAGE_SHIFT; + if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX) + wbc->range_whole = 1; + } + if (wbc->sync_mode == WB_SYNC_ALL || wbc->tagged_writepages) + tag_pages_for_writeback(mapping, wbc->index, wbc->end); + + wbc->done_index = wbc->index; + folio_batch_init(&wbc->fbatch); + wbc->err = 0; + + return writeback_get_next(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 @@ -2465,30 +2487,12 @@ int write_cache_pages(struct address_space *mapping, struct writeback_control *wbc, writepage_t writepage, void *data) { + struct folio *folio; int error; - if (wbc->range_cyclic) { - wbc->index = mapping->writeback_index; /* prev offset */ - wbc->end = -1; - } else { - wbc->index = wbc->range_start >> PAGE_SHIFT; - wbc->end = wbc->range_end >> PAGE_SHIFT; - if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX) - wbc->range_whole = 1; - } - if (wbc->sync_mode == WB_SYNC_ALL || wbc->tagged_writepages) - tag_pages_for_writeback(mapping, wbc->index, wbc->end); - - wbc->done_index = wbc->index; - folio_batch_init(&wbc->fbatch); - wbc->err = 0; - - for (;;) { - struct folio *folio = writeback_get_next(mapping, wbc); - - if (!folio) - break; - + for (folio = writeback_iter_init(mapping, wbc); + folio; + folio = writeback_get_next(mapping, wbc)) { wbc->done_index = folio->index; folio_lock(folio); -- 2.39.2