From patchwork Mon Feb 12 07:13:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 13552749 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 9ED17C48297 for ; Mon, 12 Feb 2024 07:14:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2CF216B0082; Mon, 12 Feb 2024 02:14:24 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 2804F6B0083; Mon, 12 Feb 2024 02:14:24 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 11F7D6B0085; Mon, 12 Feb 2024 02:14:24 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id F34ED6B0082 for ; Mon, 12 Feb 2024 02:14:23 -0500 (EST) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id D4A361C118E for ; Mon, 12 Feb 2024 07:14:23 +0000 (UTC) X-FDA: 81782288406.12.314E54D Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf09.hostedemail.com (Postfix) with ESMTP id 35F9714002E for ; Mon, 12 Feb 2024 07:14:21 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=3Wgal8GD; spf=none (imf09.hostedemail.com: domain of BATV+56c964bc8172c8a9ee6e+7477+infradead.org+hch@bombadil.srs.infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=BATV+56c964bc8172c8a9ee6e+7477+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=1707722062; 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=H733Z/OisKZKsSfT6EaxuE1uZOfzplnZ1VkoSGD6LBY=; b=71p7RR/2FItCYJDNQiIrUZhoaPielQJJ49+jNYgaCGsg/SlyUuztc9l8xH2e0KEvRH20Ru Gq1y8nuiJCAnQDif3UFNh7kkVW1miCtUU0BKoDZqhzYOYB0u2ofWRw0m8dpQrvdPa/3nah sX8S2WL4ubqYbKaK0pi5V8lqBD3skaQ= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1707722062; a=rsa-sha256; cv=none; b=C/l3WthevM5IugEBoIL+MG9Zrsb2n0eDUKrCWf0WXWEPkzJy4jxxA1nKEwVHCN10MzETJA NLb3aNfw0AtadbJTXi8Xi1nhrPHt6Zw1WxAJflyTRK4R4p2xUPOyngiKnEitcjdEirBJzt oDlKwltLGgihPp++70JF+V77ul1U2cM= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=3Wgal8GD; spf=none (imf09.hostedemail.com: domain of BATV+56c964bc8172c8a9ee6e+7477+infradead.org+hch@bombadil.srs.infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=BATV+56c964bc8172c8a9ee6e+7477+infradead.org+hch@bombadil.srs.infradead.org; dmarc=none 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=H733Z/OisKZKsSfT6EaxuE1uZOfzplnZ1VkoSGD6LBY=; b=3Wgal8GDp/OO9yjFp2rFlOqj97 HkjNBFs0/l40rFgt1jrEGxE8wnNu03bxBKTl3NTcTQuZO2IQ9whXrFw4ywFkPBVeGdRxlwT952/aY HUJZx5cwg5j+WUQy6PpgVM9QoYQxm7VM7J7CezwBeQ7OSkRI6Tl1alD4403gJfiTKV/OBTMfHnAG5 cHHon1/aXcJNCBKrycB3riZqjjN1xA33iCRxNaVsiib1eeCpk1GWuKFMDJuz1BxJjjk4ZWkSQ2QXS sCihHV3jAxBSfvV4E7dY3u4REiqg6qbcf74I1PFnXLQBFgrRStfMEtIZ3muezb+y0n/tRO0brIXPb Hv2IvJJg==; Received: from [2001:4bb8:190:6eab:75e9:7295:a6e3:c35d] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.97.1 #2 (Red Hat Linux)) id 1rZQWC-00000004SyE-3a0i; Mon, 12 Feb 2024 07:14:21 +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: Mon, 12 Feb 2024 08:13:42 +0100 Message-Id: <20240212071348.1369918-9-hch@lst.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240212071348.1369918-1-hch@lst.de> References: <20240212071348.1369918-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-Stat-Signature: hwotck11jgk86zops86k4s3xi7d5588m X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 35F9714002E X-Rspam-User: X-HE-Tag: 1707722061-931106 X-HE-Meta: U2FsdGVkX19WDHxWDwxMsMXXGFCNCEHwHcTwCv5u43zy9Do0kQMgrna4DfaQFP2olpyZZ1sjU83gAEwVpU66D5YnseqqfKETDBJPHpiFqEHR2Ri9jDdoJLvqLELynY4YkG8ngyufrMLUiz2r/I/qn0yP7S5ZGWisPKyENjUdTtibKcVVYM1LRpmqsf7ItaDE8AsH/GIG2p88q8B0ONjpeAoAbH1j5I1x38mo3LJ+o3odVOAWNy4fw8Cs8PNAOL6F06sEHNDwu/nnd+9PHBvcCSvflK1WsaUX529V4JWDzpax0ZKVBLBuypdbuVT2kzAH//dXD9R04MfB7N+kkYlIIYAFzrXUgQKXPLkhKzEs/fmGXnnUTxAOezbtYswP7ib1r4cyX9u97XOf1SfCiGdmxwnSqmhBHq3zeJl+YTZF1HhwMpaDXmFXs+NkAn4b4j4UEiBigbPWXPB4eYa/p/mQsZmnN4BntjSZEDOSMywvVcLqK4s20AR5lBYyGJBPW5nhCcZ0Z+fx0AXPyXpYAhZyNKxWymp4ATGTHJ5xTlaKso7su680hEviskAwDJgq+n9X/unFT89mQLdUkCxn70mWk35p5iASIrCJkzmc20VjCYqIW/c3L6ZX1Fe1SiYZ4uV8D4NdJPNTlovLiYlXZqwxylfyLCLiDa7tuiZaaDNMG/R1YZzNMqgnUWnbSJk8xkdHKHDzi2/HsnaN/qD10Ank7jATQWvax8QBxVg5c8VpddaKehRMg3B3agJlI6FF/b9dHYLTzMUbrc2C2yfqOQiM83ZH6RyaSy89rWVWbl3cqO18GDINlPsVgSWXnE9x99iPc6h+Z4iWpk67nQXFgcS2dnULZwzGs+BOJS1BJ9Iqw1B22JDU7EZISyYzDVCkci1Wt9b6BzMCGRI/qdv+OAQhJG0gXDi9LRxBluyz4gviYZ0I4vENypJAyPLLyPg/6aviOpMuXfih80tfkSbc1vz 9tHLjzFw c/9HyUQTAgfNmqo7eTijx/Erl3GqoHbuGgREh+qXW1utljUPiK7UjxUwF/go1kNWt3Io2p3QFDUNZ6iHFno/jVI8Yhzs4uN5BVYKSHw6oNmJCU+3RqljUbKEHTc0OFPOF5TO4T5YaAmqLEvmBnF+BZ+TVC9IsSAyxX//wZOIKD0IuUYgSg7XuCfjHq6Bz+xKTU2aJQDfRIpay0HCMl4/pDI7zVHZMae6VOdPF9YEmCDM+RVGg7wCkbFTIabBuJyqNhD2Fs6bQDuEK7LO7ACE3JBPmnXPZF/bU0YXblRGX9ftgv66cm38wmOOW7l4+V1aKN1V9BufO3qidKpjsqdvWnGeQ8RD10CMRWMzip/c5fy8+t6/iTVjudds7q3v9U0z1jv/fX8CF8ZA7baCCj+lD35OEtJC+UBI08aVXXOzsk1vO4a89KTYTV0w9HhoT1KyE5sdhmemE/lqcSScuoRpMPzoVROsTTwMboNUpR6+i2t70iGXHN0RekL5DVgeJhlT6BwnkZgL2rxhVyp97vBxYTUTYMee70snkKv1HXZIk8rklYOtWjLMSRppqS0ckK21PBteX 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 20ff00c8be9d90..045ca252c0423d 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);