From patchwork Mon Jun 26 17:35:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 13293259 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 3E94DEB64D7 for ; Mon, 26 Jun 2023 17:35:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4EE198D0002; Mon, 26 Jun 2023 13:35:32 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2A9418D0007; Mon, 26 Jun 2023 13:35:32 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 061198D0002; Mon, 26 Jun 2023 13:35:31 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id D4CFB8D0006 for ; Mon, 26 Jun 2023 13:35:31 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 5D458160809 for ; Mon, 26 Jun 2023 17:35:31 +0000 (UTC) X-FDA: 80945600862.14.59BD8C8 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf28.hostedemail.com (Postfix) with ESMTP id A1331C0012 for ; Mon, 26 Jun 2023 17:35:29 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=dHEryiCM; spf=none (imf28.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1687800929; 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=X5nRO0yDxZXWnd7LdLo4tOM7JIHXSxr3v1Ba4laEERQ=; b=PYY4jClbJRxweJm6tQegrB6VVqREHKzJSeTHS5elIMGnO+swy3DSNDd5Idy5E0s1f7dNgQ dkxDNm0nRpIOnUBgkhqaVg8Pf+KGtSRdyzip8pJB8hsdbmCJKri23ulIAn/f6ALLf42IC9 /ZhCfshWBCFilBPEnVNLnq6Z2OKDPHQ= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687800929; a=rsa-sha256; cv=none; b=F7vbAbGla7QJtmAQ2fSEPZTD9cURLu/sUBzDkPVSFM7p+EXVAlgjPz4Q+b7sVY0QxyMt68 d35O/13M6QuISwlE1ZzzPSkb1JAT2AxJNU8jxBNvE8+a/V1CSC1M5KiZT42OrJ6gXdT7M4 hyaoyWFpJKf5QFhF0UllFHctQVkpI9g= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=dHEryiCM; spf=none (imf28.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none 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=X5nRO0yDxZXWnd7LdLo4tOM7JIHXSxr3v1Ba4laEERQ=; b=dHEryiCMCiT4PhowBmljTazeb4 RfsGun/8AwiFhnxjHPY2gvtCCziQPaTgjIcWGU73SOzA0fIcWSc+KbOLrgdYC4Zw96YeQhBZRALK/ NSBPdxwMWaRAijWdgrt+j34hxyho6y0P1lr64rSX2UkSY1tDGNfQdbrrGFebrtmHVEhAv0KlkYeFU ujdjqmyJB88r6R4mfBfQoxY25rsKXKRMoVEo5+adJIWvQ62By9WrCtZs+R2PDfdlY39s3mGEwpvNk KHhl2zlWg2zGwPsq6yaIwOvK4o9yUved9e1DKnPqix1EiRAggAwzHGMIQkutgfy3RkGGM5orcLDHJ 6asH01mQ==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1qDq7X-001vUz-9V; 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 01/12] writeback: Factor out writeback_finish() Date: Mon, 26 Jun 2023 18:35:10 +0100 Message-Id: <20230626173521.459345-2-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 X-Rspamd-Queue-Id: A1331C0012 X-Rspam-User: X-Stat-Signature: 7o4apgjnzuupwytxd5fr7r48cwn775we X-Rspamd-Server: rspam03 X-HE-Tag: 1687800929-336128 X-HE-Meta: U2FsdGVkX18vsAlXVQqzx1DcsfLwSw4uXP4YQA5w2IVgPIMSg7H2AKn4E13qLGHVf6qowcB+Pq+JNCNzpuwO0NYmOa9Yi7Eql1dSCHbKI2uBIxAxGhINYXRKX9z3EVjAk205HweLVG+EIPE/yEHSE1Q+v1HuWafWdT2LamvJ6gjEEQ2FGgxZ+6qqnDpT17B45Nke3MjOCVthKshCp0EC0ZToHF4UBK1k69+ym/+RaC30h3R+tcPDV9HDYEWsAmsXGiDMJgRkN5c2pApeaNox45/iUFJf34pqbagKhrnCAunoGPcGRwTxAlf/DavWkXf6rIhori0h5lVzyWd/+i9E27S0j+g8x7BJ/X29zjot89Kpgh4b82imZzqd+EVA+aSpt6aa3zRArKqvZNxTw0D1A1LmJ/gvq4xlXIQKETWPbues0lIDtj9osMuvexuG1JR8V834dRnCoJqOurE4AEohvagDfLf+iMKz9kH9ehoDu7ZBcN4eJvO0RILHbPWlxxn1PC1+I96io7wkT5MbrdJLqqKwRRrREZPYcA4ZINAV9sGJV3P6sQWpqYOAHzrL09O+517Kj3HUfWSR3lrpBG0mFXINh5qA53N/P6LdCQucAn0/z9ewpgHMj6T/7SylRYzUl8q2XNpk9YDk62Bf9ADq06Md9qQhsZjReWDCEMZIkixic4BDZExET4k7rtizmcB39oFZYqLrR+P1YEALhhaKdGWLdwRpNhHJkW/CJT55SC7R0yNnv8pLe4wjVELZ3B8bGwtbtFPuUIvY7sBdF9l3qrCNkxcQuPajZ9g7wWwRYQch/c3oYK1nxmJpqwTvGVMUBV6yTK0kG7WfUhU+0d/oIhf9rRHWzkFL4rEeOZxnal7P1ni/bQ6NX1Zhhg/tSb498OZ1NvZDmkY/J8r0zmmMWczsre69I/4TeNkTCnMEZVlvQB/DHHi7ROpzsxuMqzScH7AmKPxfQThPJVxRYSo JwjLUgUJ qGzpWlxhwlP5p9YWuliJjfKEfFCwqxBkX9O/H4ZKeTtQ8v3lXI8qugxczZ+3K1pIF5hr3vPiYrUf3OvtvGprVGZAWm7KEymQq2Gi+dKX0NC+xNJQkxDy56TYJaFKJ7t5YYlKzACSZmC9dBbjB3Gx/tf0WZIB4p+R6esSE6ZnfnykJPVG+Ic6N7f2yiaqS9lTB9VdsZBLMFyLxSDgm+UNOcgslOtVG3AZsc1/c 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: Instead of having a 'done' variable that controls the nested loops, have a writeback_finish() that can be returned directly. This involves keeping more things in writeback_control, but it's just moving stuff allocated on the stack to being allocated slightly earlier on the stack. Signed-off-by: Matthew Wilcox (Oracle) --- include/linux/writeback.h | 6 ++++ mm/page-writeback.c | 74 +++++++++++++++++++++------------------ 2 files changed, 45 insertions(+), 35 deletions(-) diff --git a/include/linux/writeback.h b/include/linux/writeback.h index fba937999fbf..5b7d11f54013 100644 --- a/include/linux/writeback.h +++ b/include/linux/writeback.h @@ -11,6 +11,7 @@ #include #include #include +#include struct bio; @@ -52,6 +53,10 @@ struct writeback_control { loff_t range_start; loff_t range_end; + struct folio_batch fbatch; + pgoff_t done_index; + int err; + enum writeback_sync_modes sync_mode; unsigned for_kupdate:1; /* A kupdate writeback */ @@ -59,6 +64,7 @@ struct writeback_control { unsigned tagged_writepages:1; /* tag-and-write to avoid livelock */ unsigned for_reclaim:1; /* Invoked from the page allocator */ unsigned range_cyclic:1; /* range_start is cyclic */ + unsigned range_whole:1; /* entire file */ unsigned for_sync:1; /* sync(2) WB_SYNC_ALL writeback */ unsigned unpinned_fscache_wb:1; /* Cleared I_PINNING_FSCACHE_WB */ diff --git a/mm/page-writeback.c b/mm/page-writeback.c index 1d17fb1ec863..abd7c0eebc72 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c @@ -2360,6 +2360,24 @@ void tag_pages_for_writeback(struct address_space *mapping, } EXPORT_SYMBOL(tag_pages_for_writeback); +static int writeback_finish(struct address_space *mapping, + struct writeback_control *wbc, bool done) +{ + folio_batch_release(&wbc->fbatch); + + /* + * If we hit the last page and there is more work to be done: + * wrap the index back to the start of the file for the next + * time we are called. + */ + if (wbc->range_cyclic && !done) + wbc->done_index = 0; + if (wbc->range_cyclic || (wbc->range_whole && wbc->nr_to_write > 0)) + mapping->writeback_index = wbc->done_index; + + return wbc->err; +} + /** * 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 @@ -2395,18 +2413,12 @@ int write_cache_pages(struct address_space *mapping, struct writeback_control *wbc, writepage_t writepage, void *data) { - int ret = 0; - int done = 0; int error; - struct folio_batch fbatch; int nr_folios; pgoff_t index; pgoff_t end; /* Inclusive */ - pgoff_t done_index; - int range_whole = 0; xa_mark_t tag; - folio_batch_init(&fbatch); if (wbc->range_cyclic) { index = mapping->writeback_index; /* prev offset */ end = -1; @@ -2414,7 +2426,7 @@ int write_cache_pages(struct address_space *mapping, index = wbc->range_start >> PAGE_SHIFT; end = wbc->range_end >> PAGE_SHIFT; if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX) - range_whole = 1; + wbc->range_whole = 1; } if (wbc->sync_mode == WB_SYNC_ALL || wbc->tagged_writepages) { tag_pages_for_writeback(mapping, index, end); @@ -2422,20 +2434,24 @@ int write_cache_pages(struct address_space *mapping, } else { tag = PAGECACHE_TAG_DIRTY; } - done_index = index; - while (!done && (index <= end)) { + + wbc->done_index = index; + folio_batch_init(&wbc->fbatch); + wbc->err = 0; + + while (index <= end) { int i; nr_folios = filemap_get_folios_tag(mapping, &index, end, - tag, &fbatch); + tag, &wbc->fbatch); if (nr_folios == 0) break; for (i = 0; i < nr_folios; i++) { - struct folio *folio = fbatch.folios[i]; + struct folio *folio = wbc->fbatch.folios[i]; - done_index = folio->index; + wbc->done_index = folio->index; folio_lock(folio); @@ -2488,14 +2504,14 @@ int write_cache_pages(struct address_space *mapping, folio_unlock(folio); error = 0; } else if (wbc->sync_mode != WB_SYNC_ALL) { - ret = error; - done_index = folio->index + - folio_nr_pages(folio); - done = 1; - break; + wbc->err = error; + wbc->done_index = folio->index + + folio_nr_pages(folio); + return writeback_finish(mapping, + wbc, true); } - if (!ret) - ret = error; + if (!wbc->err) + wbc->err = error; } /* @@ -2505,26 +2521,14 @@ int write_cache_pages(struct address_space *mapping, * we tagged for writeback prior to entering this loop. */ if (--wbc->nr_to_write <= 0 && - wbc->sync_mode == WB_SYNC_NONE) { - done = 1; - break; - } + wbc->sync_mode == WB_SYNC_NONE) + return writeback_finish(mapping, wbc, true); } - folio_batch_release(&fbatch); + folio_batch_release(&wbc->fbatch); cond_resched(); } - /* - * If we hit the last page and there is more work to be done: wrap - * back the index back to the start of the file for the next - * time we are called. - */ - if (wbc->range_cyclic && !done) - done_index = 0; - if (wbc->range_cyclic || (range_whole && wbc->nr_to_write > 0)) - mapping->writeback_index = done_index; - - return ret; + return writeback_finish(mapping, wbc, false); } EXPORT_SYMBOL(write_cache_pages); From patchwork Mon Jun 26 17:35:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 13293266 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 2A863EB64DC for ; Mon, 26 Jun 2023 17:35:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2F9CD8D000F; Mon, 26 Jun 2023 13:35:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 281CF8D000C; Mon, 26 Jun 2023 13:35:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0ADCB8D000F; Mon, 26 Jun 2023 13:35:46 -0400 (EDT) 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 E74508D000C for ; Mon, 26 Jun 2023 13:35:45 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id AF1BCAFF60 for ; Mon, 26 Jun 2023 17:35:45 +0000 (UTC) X-FDA: 80945601450.11.4869B43 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf05.hostedemail.com (Postfix) with ESMTP id 12C59100002 for ; Mon, 26 Jun 2023 17:35:43 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=I8BvqJCH; dmarc=none; spf=none (imf05.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=1687800944; 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=Eb8+i22W56HZAod8nWQSK472UiI/gYMP48K8do/ME/8=; b=y26Qak9ru5bY3sINCl0kftKnY53NPaDok79iNUeqATKroSvKkwutNDRuUdELVVdLh9MMKE So+ASb6OlrJFjfyoHw0bIvi5kB3lUZLgvzFHujwaZC/cniZ6vMJQNsbr76a+0sZ7K+MQ9Y /+AHEa0Koy/R+xJ6qoWLaVwzSEe9PUM= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=I8BvqJCH; dmarc=none; spf=none (imf05.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=1687800944; a=rsa-sha256; cv=none; b=VNXG9pQO/mwK5yYosGuP0XUNxhvOa3J1fv0gNtFlABc2wk6/0QZCTVChqz2wg9QU7bmCF5 1i9p5klZGbIlmoPcQhwp/G5/FiQCVF2dDb/mdnlz7YB2yHI9KuN/yygXoc4sYvjcngvYuO sqXAR+m4w1jG5MRo3e0PRegsNskjZnc= 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=Eb8+i22W56HZAod8nWQSK472UiI/gYMP48K8do/ME/8=; b=I8BvqJCHhBej30amkNnVaHN6rH u9uO/sVt2f+jz7JcGOSx+zl/f70NIeziA/OlCB4o62GnbbwwGLVv/hBjABtamZ47YbH1j4ZOO4hoc QRtJcd7ZjBN83uepkFoGD0dLghMKRhe+wpJC6dFdWan3E0U1OHu3sqtiCt8ZD7+zxqDSwb0Vbi5uq nOyJHt2ANqAHJbdn5QtHLs8S1Ecyurt3g/m+y5pugk3uH39x/eU2jWFeYf7aR2cgIn9Y2zwwl/ozy mNgR7J1eV9HCBuDFaS061IwieX96E0vWyEzjHBhaHEzX9wLQ2iAiERfPCLB4uIn1bhmMDv7lULBmZ j2uURkZQ==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1qDq7X-001vV1-CW; 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 02/12] writeback: Factor writeback_get_batch() out of write_cache_pages() Date: Mon, 26 Jun 2023 18:35:11 +0100 Message-Id: <20230626173521.459345-3-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 X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 12C59100002 X-Stat-Signature: i3kfu4qyhasiaf579isbwskzeqqxo1a4 X-Rspam-User: X-HE-Tag: 1687800943-72610 X-HE-Meta: U2FsdGVkX198YIVeSaN5B6sgEVBSGvkZr/gSRsEOAjtzKwoHF5KCBYSCtYOBLxWNdqc+MAiOXkgrP1diwHew7gUipbsSkdm1bQyg8DriMv2w/2xRewA5hwfJ/LQdDBg1S1xfP6kOw+93Qsw8xzXaodRIoOMeqtds5NKM7xBfHgfKUv/ij2IY8HSMhrYrJKYwXhz+19b7y2OZQdpM07klgU7JE35Uzj+UDfHJ0EGuM1qbwTvYNNRHCc6ktcpuyFGNrSHRS5Ogi7Hjle6nK4CilA7hQ2qucs52Oawdr8iGvKPBm9sU72B54lpJBl5ZIfiw9V1jL+nblv6w+OBz+Ihi5KNv+ZO9UhuuejGZWfEfK56X/Y6e1I6/STgSpb58Ebwk/ZsANNG2zAXTrgDSl6y2B9/HL4q8em1DIXW8sZw2G80bD45cV3PyX+s2bX/fAlAWmu4gFLxcuE3oslRWqq+2eB3LsB4/Bz5YeqSIJp8lEL9/9dlbrQ0jMvkt1wwJKreeih5RRdjd0NXOrX91+m3sHSHSugX0jo7bN0TXf9gz6SHg7/d07ZmL/8cmtXcI1Fl59AAJIa6QyAJFKcpzbA4XhvbZSVinp15lpp0iBzc0Xq0hDH7PGcoyTpxLCEGYd+bB8D51Qf/xagI/hbAV6H2EZ7JhkbnihfsHcXVp6pqwPjX2uGtt9vG2xKWQHEJs9ZjaCCHPTMd8ZLGG6oFJrj6cKO9n6sZNkZSSTCjfLx1443RERJKL3gjQ7EJBw1u4EJD7j2mrJ7WM70nR6vo5fwz099+Ixc/46jEDiRyBo49+cTUvI/PSHfWWOj3ofxybUq+baIgVB8yxGfPOLa3g0pmI0CrHrOndci/WjxyP76XCGTQ0R33XGg9eyQRWO1850jV26XQBDETfiitDS3nZKFSMHnry4EAKLvsapVqNpYqKoFahDzj/VU2tO65eSfkAzoE/lo+e9GBkRSHPcdDGJmi XMUvDr99 yWtGAgpazRxHjzxR9UM/oT8kF/sSb03ciEbWwlh0fm/KhUadrf4G0moDVSqzDn0wFJ/qpiGZ+V4Gyil9c6TV3Ohvhjv+XSGwKB6BS2hcMkgyF6EVDRhVw5E8Y42Tlnv0bzpGdO3UdF7vPEyrctt2ix44iSslJveSYcbqBfkqrUzfRcAwJsq10Ll4eje4U7PGQ8/YcwjAtnvchwYEnmI2aBcj/zjnH09tRLmpc 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: 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) --- include/linux/writeback.h | 2 ++ mm/page-writeback.c | 49 +++++++++++++++++++++------------------ 2 files changed, 29 insertions(+), 22 deletions(-) diff --git a/include/linux/writeback.h b/include/linux/writeback.h index 5b7d11f54013..7dd050b40e4b 100644 --- a/include/linux/writeback.h +++ b/include/linux/writeback.h @@ -54,6 +54,8 @@ struct writeback_control { loff_t range_end; struct folio_batch fbatch; + pgoff_t index; + pgoff_t end; /* Inclusive */ pgoff_t done_index; int err; diff --git a/mm/page-writeback.c b/mm/page-writeback.c index abd7c0eebc72..67c7f1564727 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c @@ -2378,6 +2378,22 @@ static int writeback_finish(struct address_space *mapping, return wbc->err; } +static void writeback_get_batch(struct address_space *mapping, + struct writeback_control *wbc) +{ + xa_mark_t tag; + + if (wbc->sync_mode == WB_SYNC_ALL || wbc->tagged_writepages) + tag = PAGECACHE_TAG_TOWRITE; + else + tag = PAGECACHE_TAG_DIRTY; + + folio_batch_release(&wbc->fbatch); + cond_resched(); + filemap_get_folios_tag(mapping, &wbc->index, wbc->end, tag, + &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 @@ -2414,41 +2430,32 @@ int write_cache_pages(struct address_space *mapping, void *data) { int error; - int nr_folios; - pgoff_t index; - pgoff_t end; /* Inclusive */ - xa_mark_t tag; if (wbc->range_cyclic) { - index = mapping->writeback_index; /* prev offset */ - end = -1; + wbc->index = mapping->writeback_index; /* prev offset */ + wbc->end = -1; } else { - index = wbc->range_start >> PAGE_SHIFT; - end = wbc->range_end >> PAGE_SHIFT; + 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, index, end); - tag = PAGECACHE_TAG_TOWRITE; - } else { - tag = PAGECACHE_TAG_DIRTY; - } + if (wbc->sync_mode == WB_SYNC_ALL || wbc->tagged_writepages) + tag_pages_for_writeback(mapping, wbc->index, wbc->end); - wbc->done_index = index; + wbc->done_index = wbc->index; folio_batch_init(&wbc->fbatch); wbc->err = 0; - while (index <= end) { + while (wbc->index <= wbc->end) { int i; - nr_folios = filemap_get_folios_tag(mapping, &index, end, - tag, &wbc->fbatch); + writeback_get_batch(mapping, wbc); - if (nr_folios == 0) + if (wbc->fbatch.nr == 0) break; - for (i = 0; i < nr_folios; i++) { + for (i = 0; i < wbc->fbatch.nr; i++) { struct folio *folio = wbc->fbatch.folios[i]; wbc->done_index = folio->index; @@ -2524,8 +2531,6 @@ int write_cache_pages(struct address_space *mapping, wbc->sync_mode == WB_SYNC_NONE) return writeback_finish(mapping, wbc, true); } - folio_batch_release(&wbc->fbatch); - cond_resched(); } return writeback_finish(mapping, wbc, false); From patchwork Mon Jun 26 17:35:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 13293267 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 AC4AEEB64D9 for ; Mon, 26 Jun 2023 17:35:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 93C2C8D0010; Mon, 26 Jun 2023 13:35:49 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 89BC28D000C; Mon, 26 Jun 2023 13:35:49 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6EF2C8D0010; Mon, 26 Jun 2023 13:35:49 -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 5386C8D000C for ; Mon, 26 Jun 2023 13:35:49 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 1B2831A0358 for ; Mon, 26 Jun 2023 17:35:49 +0000 (UTC) X-FDA: 80945601618.26.5DAFB5B Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf14.hostedemail.com (Postfix) with ESMTP id 20BB7100003 for ; Mon, 26 Jun 2023 17:35:46 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=GH5JrXCe; dmarc=none; spf=none (imf14.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=1687800947; 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=v6PqW+r7ocyNrYaEadNjC9yXbOPBKSknhOaHoHVmJpk=; b=w0LKBtd1SFIxFWNBwdAovKwqb8kVR6cZQVjd3UEbEAnTAwXby/97JJoRTiHV2hHhOXV5fG Ibr2j5Cerm2w3Ws4FqAqU6NNJ2nFjObEwIO0PnG6aLp7bZe6HIO+/V+RyhvnekXuU+qTa+ jJVin2y8bq07IDz63DnMHxhs3ysb4ms= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=GH5JrXCe; dmarc=none; spf=none (imf14.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=1687800947; a=rsa-sha256; cv=none; b=G/tzRQkix9dqtnNHIBrE7dOQoBEWWJCeLaj7KJLQ++HgZQ4ATVrEEQvUJ9iQc3TS2jPUw5 r2cMhkylE2cW7tYuRUMpijCm7/mZf9EhZZxAvn0rhCW4q7R0SkMi3pkz4+a68aCaRV4DNQ xlLtzkKoGR3AGxQF2BfYD6ZO82a0KMM= 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=v6PqW+r7ocyNrYaEadNjC9yXbOPBKSknhOaHoHVmJpk=; b=GH5JrXCeoj/GgOPu3iWjttA4pE R9WD1MiCBTid7jEiZMHLeGsbpndBGL7pWST3FhxBWC5vruJtb8/vXrvH0+f62gbXnsXZRlsky8pJq 9+M9D8g1czSuBHKCI6CMEd9w5TLyOR/pLQ95L/J/rI+M7DmyKqKs1a6+MLyLQd2/ds8H1fO846FuZ n8cEC0dArDnoP6JGY1ECb59L60b5jQv8FpFk5u65nzfMXMt5F7+6Z/YkjT4frnabjEqYJXLozDGS7 3U7dQlvwCi5sQU/ji6nNPG8IbAEl5U5k7LHM+ju+XzD5CgDWD6fjTcbsn7X1Y6zVcs+D6Xlzu9mZ+ XAvaJBew==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1qDq7X-001vV3-FD; 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 03/12] writeback: Factor should_writeback_folio() out of write_cache_pages() Date: Mon, 26 Jun 2023 18:35:12 +0100 Message-Id: <20230626173521.459345-4-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 X-Rspamd-Queue-Id: 20BB7100003 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: y38g4mymcaeh65cs7ku98yn1f4484d1o X-HE-Tag: 1687800946-942413 X-HE-Meta: U2FsdGVkX18L9jSFdd+fg+waoeCYGlLAmWYoihoLWCsBwcdjm4oMZK9uzynleLpFNMeeFjhEgqhvOgaBbAfvLLUmH8sJLMnRzgUYy1YX5HN2fO8W7sHgZ1sZwnjxf47QZ6CMXw2FHmnlAK5x1fHy1XR7sjVwE5Femol4VNNbczIRCMMUY5FFlnwhdTP7/n9c7JOEEGHnSISxqOkvVlFdWsiiHOLCjBSmuO8g2ipE9UR3nSHjTM/EBWUd6PIoj4iVNhrV1onJFzl/NZWGkig4qPLh4wticyIUG0qh0HwtBXTjZC5UCCqGMR34gjk/zeBG9MVjvJxPcdCjgSM4GAZ0qonlVFD1tyei8XHMMUtOken75SwrWfXgSrhBpKhWvjGP1B/xK0m3YdbpZvRY08Iy76I9kyXnOeuQBjA/8/n4tqV5RZqDIDLfonHKfS4Y4pDue9JTcuWL1TVn1R/hiiLsnzwcKhVBVo8Pp1neKc/ecuaUVP3HkfKY4INy0uFu+KTPKxGRyVA55vk8KJb4NLkM4JDp0FAuYQTlJFwRWJgThUcLbxVxYqOMhC9Pd8MQwAj8gBbMP+sDkXBzV4JVxn7XgmbWENZksegTeaM6HMZB6S4c2Y6d4KkAgL5arwACSkcdmLyl2ZL8PWD8/a3djmmVA6ymTgTyvUchyFkyUUjWBgpywqKxfQ3VovpX7L+mL6O5pKudfT6p710vsge8swiUhaPGo/ljCwM8hSf3xREI/KgUk6ES4bbMgp6EODlKWg6t90fhOypLeis1BQtdh3c8KADAilfcODCNL1qlC+K2HgHFKbi20+TRTdxR1j3cuQ0OP/Ua6tMwaMgte7OlXgPlSx7zr6RvKnc6iGjrIK6bs0cr1XzTFZSxqwlvVtk5eVVHbCN99j6sBtBDH2IUzM9EvJPJHSUJDrlE3iwyZgHU1GOersRteoxV7nzjNuzSXHl0hyiuOrWV52c67bNpzTP Tb/jV58M sA7Mz4q5VCc2SUMZ81VvWHPqDuKt8DcoUIeo8AzMAbricNL1JrsD9HIyAfH71o8+GNOL0JncHmXt38jCr6tcwTvxxHa39MW8RKZwLLZLNywW0mbCpx9I2sguCZpLegSmzMzdy/FXU0XqEwOCUlC3Sfe6Hqz7jzEGjfoDuEpWuySELnnsSWXNMARpq2hafVQHy+M0yTxqAFcSfKtGa959xdWqoO38MDAVyQsPU 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: Reduce write_cache_pages() by about 30 lines; much of it is commentary, but it all bundles nicely into an obvious function. Signed-off-by: Matthew Wilcox (Oracle) --- mm/page-writeback.c | 60 +++++++++++++++++++++++++-------------------- 1 file changed, 33 insertions(+), 27 deletions(-) diff --git a/mm/page-writeback.c b/mm/page-writeback.c index 67c7f1564727..54f2972dab45 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c @@ -2394,6 +2394,37 @@ static void writeback_get_batch(struct address_space *mapping, &wbc->fbatch); } +static bool should_writeback_folio(struct address_space *mapping, + struct writeback_control *wbc, struct folio *folio) +{ + /* + * Folio truncated or invalidated. We can freely skip it then, + * even for data integrity operations: the folio has disappeared + * concurrently, so there could be no real expectation of this + * data integrity operation even if there is now a new, dirty + * folio at the same pagecache index. + */ + if (unlikely(folio->mapping != mapping)) + return false; + + /* Did somebody write it for us? */ + if (!folio_test_dirty(folio)) + return false; + + if (folio_test_writeback(folio)) { + if (wbc->sync_mode != WB_SYNC_NONE) + folio_wait_writeback(folio); + else + return false; + } + + BUG_ON(folio_test_writeback(folio)); + if (!folio_clear_dirty_for_io(folio)) + return false; + + return true; +} + /** * 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 @@ -2461,38 +2492,13 @@ int write_cache_pages(struct address_space *mapping, wbc->done_index = folio->index; folio_lock(folio); - - /* - * Page truncated or invalidated. We can freely skip it - * then, even for data integrity operations: the page - * has disappeared concurrently, so there could be no - * real expectation of this data integrity operation - * even if there is now a new, dirty page at the same - * pagecache address. - */ - if (unlikely(folio->mapping != mapping)) { -continue_unlock: + if (!should_writeback_folio(mapping, wbc, folio)) { folio_unlock(folio); continue; } - if (!folio_test_dirty(folio)) { - /* someone wrote it for us */ - goto continue_unlock; - } - - if (folio_test_writeback(folio)) { - if (wbc->sync_mode != WB_SYNC_NONE) - folio_wait_writeback(folio); - else - goto continue_unlock; - } - - BUG_ON(folio_test_writeback(folio)); - if (!folio_clear_dirty_for_io(folio)) - goto continue_unlock; - trace_wbc_writepage(wbc, inode_to_bdi(mapping->host)); + error = writepage(folio, wbc, data); if (unlikely(error)) { /* From patchwork Mon Jun 26 17:35:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 13293265 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 ED87EEB64D7 for ; Mon, 26 Jun 2023 17:35:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9FE4C8D000E; Mon, 26 Jun 2023 13:35:43 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 988948D000C; Mon, 26 Jun 2023 13:35:43 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 765198D000E; Mon, 26 Jun 2023 13:35:43 -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 63EDB8D000C for ; Mon, 26 Jun 2023 13:35:43 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 3364B1A0526 for ; Mon, 26 Jun 2023 17:35:43 +0000 (UTC) X-FDA: 80945601366.06.D88BD1F Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf02.hostedemail.com (Postfix) with ESMTP id 0F6F680020 for ; Mon, 26 Jun 2023 17:35:40 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=jW+KKslS; 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=1687800941; 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=Hry/pakf3XrjxtX3FxEBHlEHaVaCFV/OlgXU52VAJV8=; b=qGISzn0gzWbrFLRjfZPPF6Lnl/RnoeWLmZ8YJYKnhXVsuqzxJCeHbxf+hGom8qFZc9gPJ3 zowTMSt/fEqsYxIu+eJS/PTSqLD4PHOKWGeocHY0atGzAAN9cZ3cVbyJbozk2gt/o+AEYC /e8QbiZNMfrOIARbh2KAUaat72bcqPg= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=jW+KKslS; 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=1687800941; a=rsa-sha256; cv=none; b=b35X5egmdIP/eG7P2sc9bCRaWiKjAbkIppuVesiUWb+ad5W1MlGtPRXWUKcPLDR96g+6Vz PJtcjBaxevDcPQVrskYsxCuVxcFWh8K0UdtoxwxcjWXYa71V4FA4A1y+va1rtPiU+wdTHo CB+JctxCyCDGXCttYem+iNXmbJXVnLA= 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=Hry/pakf3XrjxtX3FxEBHlEHaVaCFV/OlgXU52VAJV8=; b=jW+KKslSaTipXxmpNDSSeOnylL hzbQCyN3wKzjlszSqjc4HEgvviOgGGjspRJs0Vjv5zO3/R9XMbjtxpTsmS+9Gcwuw/ZcmCCyUnNeN H4tbBHnB66YtrhxCVg35T1Z99VBOHuc93t96BguJpmXgSVovFmRpL3E4/mslcgF20oYguKO1t+f7E aUfCqCMqXZB9pkY6yvUPK4VnHdbnXMwfDHnVDWMQUOAefkCf44Iu/CmD4lgC7Vnrxqd1w5+fQwu8z //QbapaLS3fMPaq6e7Ev6OQIihxf6gBxNalmqp3q/qnWQWabKWAZg/iTq63WdoLJnsWBSSCUnMJEx OM6BZUcg==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1qDq7X-001vV5-HI; 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 04/12] writeback: Simplify the loops in write_cache_pages() Date: Mon, 26 Jun 2023 18:35:13 +0100 Message-Id: <20230626173521.459345-5-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 X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 0F6F680020 X-Stat-Signature: 9xyy4crrfrsb1diuj1du4cu93eexnf4a X-HE-Tag: 1687800940-362994 X-HE-Meta: U2FsdGVkX18uFgpRyEn6YJimkO9bmac71oo6+ngOpMWIxMpTxncSme+tueyr+qNeUYjKfDHwbTOmDFx0+Lou+/B+VBSEzAlbcDoSfJIZkCGGMmWedPv4OuXD4ODDVqHY9pGd+PWe15g6LwHKkXuMHrydjRzBFI5n1l+9k2gkq9eB6EMFsGF+Zgm4cmtoThXz/MeQIaR2vUnk24n4XKuwj0wRwVbLXH+V9zTrZaulWk+wP+kSgFo62wWU5j8b0G3rgqVTAThDRLs9f/cukHxGpQzfhRxeAMuoQVY3B5WgYAFx/1Mk5sy9iiy3jQXmyPDkS59Ai3hjOQiCF4ZQ9Yubm+ilH3Tlmybt/t367uNZYPk3Urc7RAjAm5wsMT77/NFK5k8Ddhu2+UBA3F5r0Jt10udD1FDKYRzLxqi9eMWMx32Ki+lWOv2nX4zmzeofCl2a5FkqxPl4aowNVS+H1e9/carS121GRRX8ZeJZ1gplbFDrg6iFyrphDZLXASYtCeq93xmB+H/qZr1uJ67hvJ6YYxlxIP7N3Cxwh+6wKZWkfQLRV/VmEJtL7lUSvuxbBJL/OGoWizIKT2+UbJiw1p14Ja3pdu0Setl9MVrjuPMU6q7Qe5cNbbXP3eXKCPB24DuD8UrnvxmGpXnlVe8nSWo7NO8cADpBos9Ue5I/b7MWSsp1b2q6JczD1jc69NF40gCfzMYzeka+XOIGm2hyILG3PVb12H6x9huW3/CzVUbEX6HZvTgUPZct2DQXdZqjIMuHpmqwNx54B8h4FKp/gqRDpl/NWJZxX/+vO51OmOp3WGMW9ABPve39aQmAUXIZhC6J7otJcmIou2tM4ZWZ3Rqr7SUrnzb/G/WKKtK3IGFTX2Htx1VWYHY0gR0pWS3WXBfdefeX35k5tiA1BwPEug5QstRd3eM4qA2emr83LbxXsZneR5SGli9VC8I3lxg/wMoHExOUY6x3SfWbzDSTYHF AC95j3+8 HxGSJ2TOYwEdv0mTcqdpN0eVaiVsGzPfPOry4Ipd7wylIgE2TYXdp3rt44w7EWiCNNEhiNucymlivX1WC5nJ/bchFAns+ta6Wr24ShDUxlRpNTYxYj18O8Pw4AuTOPRSNh2GAau6s4o0K85RfLDlrk/8BDB1JbMM1HLIp 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: Collapse the two nested loops into one. This is needed as a step towards turning this into an iterator. --- mm/page-writeback.c | 94 ++++++++++++++++++++++----------------------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/mm/page-writeback.c b/mm/page-writeback.c index 54f2972dab45..68f28eeb15ed 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c @@ -2461,6 +2461,7 @@ int write_cache_pages(struct address_space *mapping, void *data) { int error; + int i = 0; if (wbc->range_cyclic) { wbc->index = mapping->writeback_index; /* prev offset */ @@ -2478,65 +2479,64 @@ int write_cache_pages(struct address_space *mapping, folio_batch_init(&wbc->fbatch); wbc->err = 0; - while (wbc->index <= wbc->end) { - int i; - - writeback_get_batch(mapping, wbc); + for (;;) { + struct folio *folio; + if (i == wbc->fbatch.nr) { + writeback_get_batch(mapping, wbc); + i = 0; + } if (wbc->fbatch.nr == 0) break; - for (i = 0; i < wbc->fbatch.nr; i++) { - struct folio *folio = wbc->fbatch.folios[i]; + folio = wbc->fbatch.folios[i++]; - wbc->done_index = folio->index; + wbc->done_index = folio->index; - folio_lock(folio); - if (!should_writeback_folio(mapping, wbc, folio)) { - folio_unlock(folio); - continue; - } + folio_lock(folio); + if (!should_writeback_folio(mapping, wbc, folio)) { + folio_unlock(folio); + continue; + } - trace_wbc_writepage(wbc, inode_to_bdi(mapping->host)); - - error = writepage(folio, wbc, data); - if (unlikely(error)) { - /* - * Handle errors according to the type of - * writeback. There's no need to continue for - * background writeback. Just push done_index - * past this page so media errors won't choke - * writeout for the entire file. For integrity - * writeback, we must process the entire dirty - * set regardless of errors because the fs may - * still have state to clear for each page. In - * that case we continue processing and return - * the first error. - */ - if (error == AOP_WRITEPAGE_ACTIVATE) { - folio_unlock(folio); - error = 0; - } else if (wbc->sync_mode != WB_SYNC_ALL) { - wbc->err = error; - wbc->done_index = folio->index + - folio_nr_pages(folio); - return writeback_finish(mapping, - wbc, true); - } - if (!wbc->err) - wbc->err = error; - } + trace_wbc_writepage(wbc, inode_to_bdi(mapping->host)); + error = writepage(folio, wbc, data); + if (unlikely(error)) { /* - * We stop writing back only if we are not doing - * integrity sync. In case of integrity sync we have to - * keep going until we have written all the pages - * we tagged for writeback prior to entering this loop. + * Handle errors according to the type of + * writeback. There's no need to continue for + * background writeback. Just push done_index + * past this page so media errors won't choke + * writeout for the entire file. For integrity + * writeback, we must process the entire dirty + * set regardless of errors because the fs may + * still have state to clear for each page. In + * that case we continue processing and return + * the first error. */ - if (--wbc->nr_to_write <= 0 && - wbc->sync_mode == WB_SYNC_NONE) + if (error == AOP_WRITEPAGE_ACTIVATE) { + folio_unlock(folio); + error = 0; + } else if (wbc->sync_mode != WB_SYNC_ALL) { + wbc->err = error; + wbc->done_index = folio->index + + folio_nr_pages(folio); return writeback_finish(mapping, wbc, true); + } + if (!wbc->err) + wbc->err = error; } + + /* + * We stop writing back only if we are not doing + * integrity sync. In case of integrity sync we have to + * keep going until we have written all the pages + * we tagged for writeback prior to entering this loop. + */ + if (--wbc->nr_to_write <= 0 && + wbc->sync_mode == WB_SYNC_NONE) + return writeback_finish(mapping, wbc, true); } return writeback_finish(mapping, wbc, false); From patchwork Mon Jun 26 17:35:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 13293260 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 9D613EB64DC for ; Mon, 26 Jun 2023 17:35:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 62F518D0007; Mon, 26 Jun 2023 13:35:34 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 58F758D0006; Mon, 26 Jun 2023 13:35:34 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 430008D0007; Mon, 26 Jun 2023 13:35:34 -0400 (EDT) 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 1E2028D0006 for ; Mon, 26 Jun 2023 13:35:34 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id D7C9FC0807 for ; Mon, 26 Jun 2023 17:35:33 +0000 (UTC) X-FDA: 80945600946.19.C2A0466 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf05.hostedemail.com (Postfix) with ESMTP id 0BBAE100017 for ; Mon, 26 Jun 2023 17:35:31 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=UixsKVyP; spf=none (imf05.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1687800932; 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+4oLVAPfstR5U6aMi6Troa+YNi9gddz/xau+Gpg+rc=; b=7EGvbbOlqf6ATkbFp1efyOld6GOLkEUe/MxR90ZLKjeI53GT9xk3SctFnMw98SXtyDoaQL nSrR02vhSXqUqnyqHnfQ97Qu8m/oxDgxI+1YPlzSNt7mqymsyDf+gnL7XHF/HmWza8iw28 bJUdeIlSbEiv4Vy7IeYJnhWhn+EUdO8= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687800932; a=rsa-sha256; cv=none; b=ubFrAJqcmRPrwfBMWM2aQrSxx0FDYk1aGyZVa3We/78U+L6vyrmqtyF6kRvVjLoHoOkuJD zRVgSuHZ+cqjauB0mPsSmP2AUUlz9/+nKCYYQSOVBcMGT5oI7FG9wpjBmR7r9s51icl/wk tsE1HkY7+aEc7nkMGR7ycJ9pWeiYsf8= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=UixsKVyP; spf=none (imf05.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none 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=E+4oLVAPfstR5U6aMi6Troa+YNi9gddz/xau+Gpg+rc=; b=UixsKVyP80nb0Gf7F4Lg+jN462 veiCIiZ5m1gznewobjOw1LIlCVl+NQ9bzKtGc1cy/FIFA2ZFOyC31yskGu3ZRnQRQ486TqTOhj/gr MYy4BGRtCU3MWPXCVKFnpYRI0SO+7rxcxT4MHuv18Sude5qsPpa5V0wVCVDJPMg+CxWSEWOj5iYYW AJDD8UCC+LOhQrktHVtCdUQ+V85q2O0pIp+RIDy4myAwlxwJ/KnWBqgsQgybdKyrahLZIt/KPAliX Z7BL5LWIbRipCNRi/kU84/66Ojv2G0K94IDEtnbMk2QxnYFxyp6hwCZ51e4XG35VOJT7z4XE1c+22 +qrDsMow==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1qDq7X-001vV7-Jz; 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 05/12] pagevec: Add ability to iterate a queue Date: Mon, 26 Jun 2023 18:35:14 +0100 Message-Id: <20230626173521.459345-6-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 X-Stat-Signature: pr76cpzognna866cdhxrr79yzyq9xrmy X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 0BBAE100017 X-Rspam-User: X-HE-Tag: 1687800931-256974 X-HE-Meta: U2FsdGVkX18DiDWR3n6mEHbXgXO9E1/gilp+OOddxKsro3toUz0kDjPUE99zu9Bp8E7vuzM4P/v+uGFqMNZcqSEZadP5MJTCvV0XtiLKkd/Sa+zTwYBPWW7R62gyRf/zV8vYEswdKiPHTG+OdI5j13sMs6evHxcjoFgSa0NOCI7B3Oh0iPUCUa5o36/gb+4IP8dG6sdfPRiPbE6c982ziAIJuKsTBB95wX66HbJ6JsCG5nzXrkX5xKGYbjPSzjd7Y3HNcyAQ5KNPZCaIy7TmIOUyDnxjk7H6/upPxiqaAvM8vvoM3r6WFmIhG5+bUy0PyLP/aQE1AJ6Htv1nXfdXy23EWVKQrBrZ53Zkw+offe0cVcFrr9mzVtM4cu8xk/DBnSMaE0bf6pddMbd3lsVGK++R6jjzQKqRWBd6Di30cYohoe4Y07aLU3CWwWCf3xAzKE93+w8Uh+yXK5HcxKrCcRJQHgcvsNV4EuH0m6oxPyl5e4msIF3reX4A7wg+bb4PiWW2xzX4mlxU60RdPYXaC9SgqqXeueO1j4Q5U1fktAFFyfNVnCKqCsqfsn3xvgG+EPR2WT+fdFIwk7MkoJLFML+CyW6XOX2CX6mjKJnx++G6yBeWQIqThDVuzLBR5JsLI3Mat7APlBwPS1AgwJbjZg1Ffi9gWVLXvW17DL5bnmjzS6LcCcEw6zBEmfHJS/0wFFGqrhBE7QZ2GngamoTd+f5nHmj87c3q8qWwtL53vRQLXjprXDCxfOF1eqWNfm7mHydQHnYpYOW0wwlEg4cFl6bATks+BHccPC8nygRiUwLO+T1VsF4k/6+5yQaO7utBYFpFZbCbwzLQIEIqr2/oIKtQOpQNz4AZkqSEAg06I1gJcaTpABqO2G7qxBpdULEGmqHeVOo64OoiCwjuRii2M1UHgwNG9SV1sWCdv5Soa426zfmRzkjAsaa11gaGPdZOyKDrgdsApJVYFezL47D GfA+UZxS n+S+cI4cPr2LfvJIPI7oYVy0Kjrm8lEeOIRiZYXj0e+NWj3rsPSw1TvkqD40ileFfyrk/+C2faN4jTARtemSat9NrtCqkLeoEmiLf+PA4CHnoRWVTdyHCc66FqIpk+fvD2zHtbzP1Z6Tl8KZIBwc/CSa5s/9gDgwg4aPrIbQcbBpHhgCmUlwPryxCYw== 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: Add a loop counter inside the folio_batch to let us iterate from 0-nr instead of decrementing nr and treating the batch as a stack. It would generate some very weird and suboptimal I/O patterns for page writeback to iterate over the batch as a stack. Signed-off-by: Matthew Wilcox (Oracle) --- include/linux/pagevec.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/include/linux/pagevec.h b/include/linux/pagevec.h index 87cc678adc85..fcc06c300a72 100644 --- a/include/linux/pagevec.h +++ b/include/linux/pagevec.h @@ -27,6 +27,7 @@ struct folio; */ struct folio_batch { unsigned char nr; + unsigned char i; bool percpu_pvec_drained; struct folio *folios[PAGEVEC_SIZE]; }; @@ -40,12 +41,14 @@ struct folio_batch { static inline void folio_batch_init(struct folio_batch *fbatch) { fbatch->nr = 0; + fbatch->i = 0; fbatch->percpu_pvec_drained = false; } static inline void folio_batch_reinit(struct folio_batch *fbatch) { fbatch->nr = 0; + fbatch->i = 0; } static inline unsigned int folio_batch_count(struct folio_batch *fbatch) @@ -75,6 +78,21 @@ static inline unsigned folio_batch_add(struct folio_batch *fbatch, return folio_batch_space(fbatch); } +/** + * folio_batch_next - Return the next folio to process. + * @fbatch: The folio batch being processed. + * + * Use this function to implement a queue of folios. + * + * Return: The next folio in the queue, or NULL if the queue is empty. + */ +static inline struct folio *folio_batch_next(struct folio_batch *fbatch) +{ + if (fbatch->i == fbatch->nr) + return NULL; + return fbatch->folios[fbatch->i++]; +} + void __folio_batch_release(struct folio_batch *pvec); static inline void folio_batch_release(struct folio_batch *fbatch) From patchwork Mon Jun 26 17:35:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 13293263 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 54A85EB64D9 for ; Mon, 26 Jun 2023 17:35:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A4CC88D0006; Mon, 26 Jun 2023 13:35:37 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9384F8D000D; Mon, 26 Jun 2023 13:35:37 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 652D18D000C; Mon, 26 Jun 2023 13:35:37 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 45E168D0006 for ; Mon, 26 Jun 2023 13:35:37 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 1AFEA1C856D for ; Mon, 26 Jun 2023 17:35:37 +0000 (UTC) X-FDA: 80945601114.11.0A7D4EA Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf07.hostedemail.com (Postfix) with ESMTP id 57B3440026 for ; Mon, 26 Jun 2023 17:35:34 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=H2DjqGYq; spf=none (imf07.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1687800935; 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=9GHSvlYBgCYCqD7sma1ZZnKYfGDXP4peUgN6BejXrU0=; b=MwDLfRQxTa1S0bOdt2LdFJM1QCUP897fmB0au07/swqq4HhwGsoUs/66h7Hd2+VbzyejKm 20pQgBRpr46+7VacZwe5YL8R7IFwCAVUtFLgM1wwPmIjl+NunY/uX9cB7ueLa0/hw6aKiJ AVhUzuN2YbS5f/sTi3AKmhOrzpZ76+Y= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687800935; a=rsa-sha256; cv=none; b=LF+mT6ffqIzH3iJp73hut9wWXIGfb9n5P1sl4m2rz5jfwtX9XFa43NA8lSZJHAlfsjPl0J 2yNTPjTPfxKE064pMhT/kz+o+dg/Fo1uuOxlYoJPxx7gnyTGYmlSPAVuqkQZclOgQg6QSr bAiOZAvn6/rXCBABnV2wKjgo8ohbGa4= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=H2DjqGYq; spf=none (imf07.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none 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=9GHSvlYBgCYCqD7sma1ZZnKYfGDXP4peUgN6BejXrU0=; b=H2DjqGYqS0ifPU6GyJXK8/BxHu vFVfQGhUx+x0NN019oG/9u6ta/c935isFdskogz6Zi5wk9YpfV1rQeHd3yOr16sdWHX3Sm1wYo4Tl q8Fc6gm3j5a09vRX3D7oa0aXQ+iDxgDnkfjvdQIGdTEVvqcbxfdqAXQOe5yO1SaLR+j0jt7+c+sW9 Pf8KrI7ur+AjXLjxw7Oxzr9qKsXddBrG4X2eYIqgC9KINNGsUfczjLXew+6IH5c7gUiUOekAEY/4T S1ZXhpeY87W/eVlS6lP9H5r3hIaN6in+5mIpOPY/vuuee0LlE5XFsUlbax1JnG8mOLDe9HZw6BXwb 4sjyyKCg==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1qDq7X-001vV9-Mf; 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 06/12] writeback: Use the folio_batch queue iterator Date: Mon, 26 Jun 2023 18:35:15 +0100 Message-Id: <20230626173521.459345-7-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 X-Rspamd-Queue-Id: 57B3440026 X-Rspam-User: X-Stat-Signature: ezr4hkbq4i4efusxosq75cwme18zrj7p X-Rspamd-Server: rspam03 X-HE-Tag: 1687800934-655125 X-HE-Meta: U2FsdGVkX1+iRwb98xDD3EatN/s12ngn68jqiqdvbOqVeFf4/a+MuIOT3hU70CyNvvr1LAYynJyHC8JzZaXWeWHCblWAFNkLijhKvusTq236yz4FaZmS5tzZJcg0bltgzPGSsutGFNGf/IMCQS1QKzRfiME885z0ZgV37UkbLlHAjKvAeSjEQ7NvJkmyApdXxV0eu9k3AmL/t13CrHYJX2IM9DANPHkLtFXFUXTr83p1arw5HPjaGBddoWZNcKAVPcttcZQWNKrKsBqj8V7wfphNz1m4vKmPnE1u9/NR6sF/Yex8EsoPDk9JQpqKPRnQbWCQ8F+l6wznWVv8IjzoGGrDq1XsBEXYeGbyT0VbikcEFjV3qcRXvrWA65h+mcEK0czO/HtZ2LjbeFWGU+BUcjqefXZ5hy+z5eX50BupJ73wGOBaMj8M7xQbIxp/Dm9EsTTby5bMLXxaysYGu9riQTiMFkAKgFmCukp7j3XF4gF3HyeS0A6wrvee3fgWg5nRE8U6J0YsyVzBy2B859DgEdeyFgj+d4UgIx2+MP4j12z+Eym99givYaDba3dKRwaKgFVJEfiNaT/OrDg+Nrf4NPYxRcfiSam8nGMz8GDRAEqTe9MhcwHGKcZBhwNEua6qyGqpFO/lBJuNuRne347a26ZhxAetIO4mBNwMU30sKsk+Oi8EWv+zGEZ7jqdRRdNyVKuW64lAagQM1MYse1UXwhJxI2ZlM5GAGiLezS2szXWkzXygyFh7Gx4CNeDvmrta2xwzlSbvk67XESE4v0rR67rNhpgOAJbWKile1oCYPvuwLxAyYtLg4ExWuB1LwPYhTiFn4GouCHdBvxRq399OqvvTxApBbCus75NZPZFobqTdyF7q+kRn/2xTmOqu0PCO58s3anuzQIkqyaJQHVY+n+zjlKfNQ5IwvAji2QtXEMZF1u1lNPYoE4ewVqAv/Qj2vB4mt4v8YFjtDegz9UL y+xrlcpU tUAeyxuFAHZ1qcmxKlY1XGt/7QCH4D9YiMDr93+etIfVHWLQss2bNRpMSchchWMvjGClskIOs4Ambughgr+0id7B7J6zAa5Iikw6/nypXZi6gfELnBrsW8/yi8cjx/6BYQSMI/BC6K/hrxt+yo4/ufIAsWUV8a2+NLYj3seFuxYFkT0OCENvVJLZBxpoxy/XP4xFlKxZDEI/6d6vL1amTc/FxMEYJJftWkfb3 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: Instead of keeping our own local iterator variable, use the one just added to folio_batch. Signed-off-by: Matthew Wilcox (Oracle) --- mm/page-writeback.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/mm/page-writeback.c b/mm/page-writeback.c index 68f28eeb15ed..f782b48c5b0c 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c @@ -2378,11 +2378,15 @@ static int writeback_finish(struct address_space *mapping, return wbc->err; } -static void writeback_get_batch(struct address_space *mapping, +static struct folio *writeback_get_next(struct address_space *mapping, struct writeback_control *wbc) { + struct folio *folio = folio_batch_next(&wbc->fbatch); xa_mark_t tag; + if (folio) + return folio; + if (wbc->sync_mode == WB_SYNC_ALL || wbc->tagged_writepages) tag = PAGECACHE_TAG_TOWRITE; else @@ -2392,6 +2396,7 @@ static void writeback_get_batch(struct address_space *mapping, cond_resched(); filemap_get_folios_tag(mapping, &wbc->index, wbc->end, tag, &wbc->fbatch); + return folio_batch_next(&wbc->fbatch); } static bool should_writeback_folio(struct address_space *mapping, @@ -2461,7 +2466,6 @@ int write_cache_pages(struct address_space *mapping, void *data) { int error; - int i = 0; if (wbc->range_cyclic) { wbc->index = mapping->writeback_index; /* prev offset */ @@ -2480,17 +2484,11 @@ int write_cache_pages(struct address_space *mapping, wbc->err = 0; for (;;) { - struct folio *folio; + struct folio *folio = writeback_get_next(mapping, wbc); - if (i == wbc->fbatch.nr) { - writeback_get_batch(mapping, wbc); - i = 0; - } - if (wbc->fbatch.nr == 0) + if (!folio) break; - folio = wbc->fbatch.folios[i++]; - wbc->done_index = folio->index; folio_lock(folio); From patchwork Mon Jun 26 17:35:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 13293268 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 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); From patchwork Mon Jun 26 17:35:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 13293257 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 BBEC5EB64D7 for ; Mon, 26 Jun 2023 17:35:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DF5588D0005; Mon, 26 Jun 2023 13:35:30 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D7E038D0002; Mon, 26 Jun 2023 13:35:30 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C1E968D0005; Mon, 26 Jun 2023 13:35:30 -0400 (EDT) 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 B42FB8D0002 for ; Mon, 26 Jun 2023 13:35:30 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 53D091A07C9 for ; Mon, 26 Jun 2023 17:35:30 +0000 (UTC) X-FDA: 80945600820.26.0F5586C Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf07.hostedemail.com (Postfix) with ESMTP id 775BD40009 for ; Mon, 26 Jun 2023 17:35:28 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=jO+IuqRO; spf=none (imf07.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1687800928; 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=4j8qD1VIDkeu8FuhbX23YTq3SVJUsBomytwghqZoPiA=; b=RiiXfhtsRI6mK5tOBZrxMdfpo46ZZiluBi2tkZKgeSjE0nG3VXpV9PQhiYz1EIqCvdn9TC RA5dUVqMmTKIFcgsmJQ2biQrf5vQnTP64liRdid215UaFavsBE9Jf67fgOW/e5bIwNZua3 lX9jIk26+U9yrx+LqOI+61KZrs4lUSs= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687800928; a=rsa-sha256; cv=none; b=8g0Si8HN2o/+C9soJAPklJinGju6owxiLbUTyrBYkPHRnWDOEjTK1HEIUgDAig+neJu5nh kEAncgr4sNRI+S2r2/KZsl5GH+CnB9HfWslPYn5vfjsu7crkuMTO6wlUGq7UTIrUY+4bLW SMrYef6OOFJ4SouKDiqghshTI3b1XPg= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=jO+IuqRO; spf=none (imf07.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none 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=4j8qD1VIDkeu8FuhbX23YTq3SVJUsBomytwghqZoPiA=; b=jO+IuqRONCDpfM0ToVlDzBovD9 NnIpFqCSVbzcdzA354Ai8J4uwvQXN3vjxzaPqsdl/xu+9TkLDzcRKCal7PcOkbcF4dV4DToUbguua DhQc5GIdojQ+898Vu6UjYABB/NZtHhCqnv6dR6n3B4zANWT8SgicSzfUO8KQHTKbqL3iiVruTyBBi TgOxqzuFcqc3rCbML9MBL2LZcXwzT5+YcSAaJsyE93G9W7FkKk1k0a6BL0e2AQngll3EYEidWhOx1 MbKdipsmpf8sBpR98d+bhM2uO0wX76Fuou4HTdMTNuQoYS1f6L3Oed9cA/g5bqwApTqNnCdDFN0wS UGzEVQmg==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1qDq7X-001vVD-S2; 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 08/12] writeback: Factor writeback_get_folio() out of write_cache_pages() Date: Mon, 26 Jun 2023 18:35:17 +0100 Message-Id: <20230626173521.459345-9-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 X-Stat-Signature: prky68qwdgum1idef3iq5tafinqgwk3n X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 775BD40009 X-Rspam-User: X-HE-Tag: 1687800928-590687 X-HE-Meta: U2FsdGVkX18y4GP9uqhb9DO4xRVHhMalZE7zVSfpnGTtHBacNWnC46vNeUb/9PfBHFT2QxJr54E1sDZwsaoIB5kBv5rJtU93fOlYgls+JOY/j97aY6TBf1dh6l06jjeQjsMCvFm69RsqJ0/MXunB6vX8bedZpxGYFV8YIz3RmX10Hskik7B/4D8gmPV/+m/iPVLe5/ObEpFh0ZLNd9TT7W+atKHFhkRFJcttWdJtHFaR2uwhFe8U11qbiUEt2swZFtBbDi9QZp9Kn0xIgZNpfmVTRTkEhnbw3ILMvfciOpFopP8ntj92ra3AM4LiFIwGqQwcciPix2VOE7XSCVWpJ7Qnmw8TyiEi6c9GdNYGXvvKqtDUKK6/26XtWJm64P026G/cSpVu/8Lrt38U2xio7FsJ0NtpRmOcy3Eo4KFkkqkk8RsglDXC9ZGQLmt+BT2E0n7Bft7+vShgN58B+zRjGSXrclvaFILDxF9Mfy3l8i1gHMg8F6WKkqFBL/6mVvphk0VQ2oin0rUowut5bdMU7BrWWLHRpGnrNFmUTLccL18wptp5K/qIpRseMHfBgr20qc27EP0j37lyjBbuYEIQHtNW7J9QQYGvqPgS/HhOr5dyWp1b1xMXirqLK7Qqe8XfrUKwktDwWc0xU3/D7IrHyduYXH6LvaJ2tJAK7acaI4vVux0uW0GLlt/Toy+Ab3ewHOkMhQPliKgHJRPSQSGISwFvKfw/H0OlX6auuvMr3fhwLxsKQkw6ZLOrJEiMDjhuDAKRSZUpZjaxNTOOstUVN0ts6QfURUK8Uj9xfkE+x7aRnpoYbL4ew2QYB4M2AEZ2SomvvRXy7emUROFvxsgR3e/Zee1o/HtQvox2m368lDwaCZWevgkcuZWBaWwiAzZOb2Cy4zWaWU1qsxRwEEfwoshE2dB+Jiei04Ie8nVKi0VZGlqmrTZEbg+39MJZGX0PL3Zo1Ck3Zj5W7A5DpTO mwNVyK51 s56+CkcyO37tGyft1R02CctaXv0yds3FblPwkH+qDC2m8wKupUMlyMpIxOQAzPBna8UrVUXYKgpr/YaoEAXaQ5PxlW1647ejGN3Xy0mS+qeO21tZSPmPMotnooIeO5AOW7ITv5zs6nVevG3kowoGX7Qtj9UhQazgw7dR9gkgp1L7eMTtlfZaF03CH753BLWJBpfuA58VceH20IHqVqoO4aRqPUrI4HW5nmcgC 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: Move the loop for should-we-write-this-folio to its own function. Signed-off-by: Matthew Wilcox (Oracle) --- mm/page-writeback.c | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/mm/page-writeback.c b/mm/page-writeback.c index 18f332611a52..659df2b5c7c0 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c @@ -2430,6 +2430,27 @@ static bool should_writeback_folio(struct address_space *mapping, return true; } +static struct folio *writeback_get_folio(struct address_space *mapping, + struct writeback_control *wbc) +{ + struct folio *folio; + + for (;;) { + folio = writeback_get_next(mapping, wbc); + if (!folio) + return NULL; + wbc->done_index = folio->index; + + folio_lock(folio); + if (likely(should_writeback_folio(mapping, wbc, folio))) + break; + folio_unlock(folio); + } + + trace_wbc_writepage(wbc, inode_to_bdi(mapping->host)); + return folio; +} + static struct folio *writeback_iter_init(struct address_space *mapping, struct writeback_control *wbc) { @@ -2449,7 +2470,7 @@ static struct folio *writeback_iter_init(struct address_space *mapping, folio_batch_init(&wbc->fbatch); wbc->err = 0; - return writeback_get_next(mapping, wbc); + return writeback_get_folio(mapping, wbc); } /** @@ -2492,17 +2513,7 @@ int write_cache_pages(struct address_space *mapping, for (folio = writeback_iter_init(mapping, wbc); folio; - folio = writeback_get_next(mapping, wbc)) { - wbc->done_index = folio->index; - - folio_lock(folio); - if (!should_writeback_folio(mapping, wbc, folio)) { - folio_unlock(folio); - continue; - } - - trace_wbc_writepage(wbc, inode_to_bdi(mapping->host)); - + folio = writeback_get_folio(mapping, wbc)) { error = writepage(folio, wbc, data); if (unlikely(error)) { /* From patchwork Mon Jun 26 17:35:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 13293258 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 D3F9EEB64D9 for ; Mon, 26 Jun 2023 17:35:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2ADCF8D0008; Mon, 26 Jun 2023 13:35:32 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1BC7E8D0006; Mon, 26 Jun 2023 13:35:31 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DF5AF8D0007; Mon, 26 Jun 2023 13:35:31 -0400 (EDT) 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 C30528D0002 for ; Mon, 26 Jun 2023 13:35:31 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 753B9C07EE for ; Mon, 26 Jun 2023 17:35:31 +0000 (UTC) X-FDA: 80945600862.14.0B460B7 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf01.hostedemail.com (Postfix) with ESMTP id B5EA540009 for ; Mon, 26 Jun 2023 17:35:29 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=rbgGQajz; spf=none (imf01.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1687800929; 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=E3aum7WU0bI7IZ184SOLo7ZVUjIFr4d1vA4qDi5sBMk=; b=gy3/39lbQ6Px3Rz/+8/ScRnW+YGaXVzTB/517JL+ICVQBkWqjvpaHYGxRLX1u6dJVjn25L U/0Ox6CHqH5QLBD3aXnTDxmq/LbjBBphcOrWUO2FiswHjo3hDz97KUI4ePs2hrq7FLUTYh c4IkgvR71v8xVyKGpnEnynn1G8dAngI= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687800929; a=rsa-sha256; cv=none; b=SbKaYjk3F4mrSC4Mf2w0LmfPxLH9N4a/hyvyCLb65SJcM0qASoDhQgcy4MREU3NU98L425 6aFu9PXt9r5S/UahwJPdqqQhir0/LRoA8WZzG7boc9ttF2bW4wgr4Mui8FVhLdSklLJPrI 21XH4Xaw0xPfcjL7WSBxhQ/6UB3kY1k= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=rbgGQajz; spf=none (imf01.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none 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=E3aum7WU0bI7IZ184SOLo7ZVUjIFr4d1vA4qDi5sBMk=; b=rbgGQajzMWS1Zvm8l8B087MlBY fs44oUGNMU1wvCmN1CEVg8sLCwUHuiJlE08WOgKcUUJtDr9vSnXdpzQu4hlEVqGAcXaOveiLHWRJ1 1u6GHkry9xBdQ+r/N6cioIMqR/K0lH0Jf8YA7KNQuh3yKOHri1HNfo7aRakN0NWaL9VTHfI+TFQux TOzoFNpy0Ud+oGkcZUrTaqQ9Vujxhrvbn5RT2aQviJhsaKZjlRED4Zewl45kh+nmk/MNYILFiyZO1 5iKDAXUGwGzrxMmiWKexkmO63AcO7cu39YjbMncfmuaVnM7mc9wjySOtqZrDnAo8xwQ4xeVmtsNpf ddtVl8Nw==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1qDq7X-001vVG-VE; Mon, 26 Jun 2023 17:35:24 +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 09/12] writeback: Factor writeback_iter_next() out of write_cache_pages() Date: Mon, 26 Jun 2023 18:35:18 +0100 Message-Id: <20230626173521.459345-10-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 X-Stat-Signature: ao4gftmuofz5yqebcw37fhoieq6r3z9q X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: B5EA540009 X-Rspam-User: X-HE-Tag: 1687800929-691446 X-HE-Meta: U2FsdGVkX1/ewxi6Pk5SAMP78l8rMYa4lczUObmzTA2B/tAhDdG2L/jBnUe2L+DhXR3Ddg6G4+0bd8QaMFHBJrzb8T1ea1kUNzrCLP3eva9RencTZLPlgJbk0m3HANunPMOWB6Nrh/uBwwGB2B5aLtCh6lsUuAguhBfhPB0QBYWbfiVqgYk8sNr44vseMvd2wmCgPi1u3W+pMV8VjuBUmZciluFyDDLG2+tXtY4xXsTQYUGMUAm9IhN/pyjAZ1ASEkWKWOQ0HsgF58Jwg4v44GoDMQrjKiblNTvgwzSZgtl0a3h/ZG3MrxGkWSOFk+X3cYO3yaFWduODG6EBTAAwSwNIO2l3k2IQ1TWk1xplEri/y84fWfG5znn9tIX351cNfvJuC7JFFcAONX53J5xpT75Hpr7FYpEGl7iy5EX4SMyMpShW2eZgOVJz+dt4JcD1ns0GAejW2TXu71jgcGa5KkzYFivsDbD2zCveVNztMSNDHr7Pv1QsAyN0eOmeOSUwLAS7KHhmNshpsevCR+X151tuHUelFxO0MUriYp8+kGP0ScMfaj525ne4n3paVWlke0KEMGhCfEdaFgtsXv4cRSxwo5A1D6Oyo3XETx/aq8bhJUX4fkS01FFr5V+Xib4hKPkas3uz5u2IOVOroOoA9faqszCjgy8E1FenmCxrEWi8D612q3MDk2iixUBU+F97y9JkNl1tw+Ry/evLcg8jILUPnZVSYRv73ih6dExZOvb6NKbD0p3h7Jr7BNoLD/0Xs0hXGVZIz84fXqKW9zpaFwGO9YqYRkbf+aqUfKmuBuYXBRv5lnvrVBy98Yge5nnT9MUyzIB/aLVhFiw3k+kHLWwcnYIrRMTA+M9Wv2geX9WNgQXM9hkB+Lc+5Yg42a9dy/diS+pJWrJGdLtORWFV/kJeKEeY1htkOZGMA4MHOCfMuteVyepXgGNKHDF2/yircopNNkF148EQbzFv1bz wTpOwcA0 ROHWHS3yM5RWPwI1rRJ1Ic32nyydekxX4BlJ6VUB/tgVsMTwDdMLhC5l0vnQM4OywCCYlMsI8V73MQ0avRuFSYNRAf5qyLxU+TMDUCJIQH5ixIpzLjjazWmFjDSCWkUB/kQ70IosngdI9zg+HRV7xdg3macVUKm5Rz2BSy01AxZRUunS7UqjC9fqpzECnF2aKyuE499SubkBiyb1RpjjPM3Uf37RuF3KBX0jh 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: Pull the post-processing of the writepage_t callback into a separate function. That means changing writeback_finish() to return NULL, and writeback_get_next() to call writeback_finish() when we naturally run out of folios. Signed-off-by: Matthew Wilcox (Oracle) --- mm/page-writeback.c | 84 ++++++++++++++++++++++++--------------------- 1 file changed, 44 insertions(+), 40 deletions(-) diff --git a/mm/page-writeback.c b/mm/page-writeback.c index 659df2b5c7c0..ef61d7006c5e 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c @@ -2360,7 +2360,7 @@ void tag_pages_for_writeback(struct address_space *mapping, } EXPORT_SYMBOL(tag_pages_for_writeback); -static int writeback_finish(struct address_space *mapping, +static struct folio *writeback_finish(struct address_space *mapping, struct writeback_control *wbc, bool done) { folio_batch_release(&wbc->fbatch); @@ -2375,7 +2375,7 @@ static int writeback_finish(struct address_space *mapping, if (wbc->range_cyclic || (wbc->range_whole && wbc->nr_to_write > 0)) mapping->writeback_index = wbc->done_index; - return wbc->err; + return NULL; } static struct folio *writeback_get_next(struct address_space *mapping, @@ -2438,7 +2438,7 @@ static struct folio *writeback_get_folio(struct address_space *mapping, for (;;) { folio = writeback_get_next(mapping, wbc); if (!folio) - return NULL; + return writeback_finish(mapping, wbc, false); wbc->done_index = folio->index; folio_lock(folio); @@ -2473,6 +2473,45 @@ 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) +{ + if (unlikely(error)) { + /* + * Handle errors according to the type of writeback. + * There's no need to continue for background writeback. + * Just push done_index past this folio so media + * errors won't choke writeout for the entire file. + * For integrity writeback, we must process the entire + * dirty set regardless of errors because the fs may + * still have state to clear for each folio. In that + * case we continue processing and return the first error. + */ + if (error == AOP_WRITEPAGE_ACTIVATE) { + folio_unlock(folio); + error = 0; + } else if (wbc->sync_mode != WB_SYNC_ALL) { + wbc->err = error; + wbc->done_index = folio->index + + folio_nr_pages(folio); + return writeback_finish(mapping, wbc, true); + } + if (!wbc->err) + wbc->err = error; + } + + /* + * We stop writing back only if we are not doing integrity + * sync. In case of integrity sync we have to keep going until + * we have written all the folios we tagged for writeback prior + * to entering this loop. + */ + if (--wbc->nr_to_write <= 0 && wbc->sync_mode == WB_SYNC_NONE) + return writeback_finish(mapping, wbc, true); + + 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 @@ -2513,46 +2552,11 @@ int write_cache_pages(struct address_space *mapping, for (folio = writeback_iter_init(mapping, wbc); folio; - folio = writeback_get_folio(mapping, wbc)) { + folio = writeback_iter_next(mapping, wbc, folio, error)) { error = writepage(folio, wbc, data); - if (unlikely(error)) { - /* - * Handle errors according to the type of - * writeback. There's no need to continue for - * background writeback. Just push done_index - * past this page so media errors won't choke - * writeout for the entire file. For integrity - * writeback, we must process the entire dirty - * set regardless of errors because the fs may - * still have state to clear for each page. In - * that case we continue processing and return - * the first error. - */ - if (error == AOP_WRITEPAGE_ACTIVATE) { - folio_unlock(folio); - error = 0; - } else if (wbc->sync_mode != WB_SYNC_ALL) { - wbc->err = error; - wbc->done_index = folio->index + - folio_nr_pages(folio); - return writeback_finish(mapping, wbc, true); - } - if (!wbc->err) - wbc->err = error; - } - - /* - * We stop writing back only if we are not doing - * integrity sync. In case of integrity sync we have to - * keep going until we have written all the pages - * we tagged for writeback prior to entering this loop. - */ - if (--wbc->nr_to_write <= 0 && - wbc->sync_mode == WB_SYNC_NONE) - return writeback_finish(mapping, wbc, true); } - return writeback_finish(mapping, wbc, false); + return wbc->err; } EXPORT_SYMBOL(write_cache_pages); From patchwork Mon Jun 26 17:35:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 13293261 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 26434EB64D7 for ; Mon, 26 Jun 2023 17:35:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3219A8D000A; Mon, 26 Jun 2023 13:35:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 233EB8D0006; Mon, 26 Jun 2023 13:35:35 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 05F598D000A; Mon, 26 Jun 2023 13:35:35 -0400 (EDT) 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 E226A8D0006 for ; Mon, 26 Jun 2023 13:35:34 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id A95C814081D for ; Mon, 26 Jun 2023 17:35:34 +0000 (UTC) X-FDA: 80945600988.07.A66B8D8 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf23.hostedemail.com (Postfix) with ESMTP id 9CE1B140024 for ; Mon, 26 Jun 2023 17:35:32 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b="W1PA+/Bi"; dmarc=none; spf=none (imf23.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=1687800932; 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=DbRDOwy4aGYzGm5HeqIsIhOnoGhV3uqwtbzHnV71lmw=; b=mKFI+QyRvphM75qAl9Jvzv5ISSk3l2W1z5bYkbPldtAe7uG0yZAbpnecPGoivNtP2V7D5k YaSMJN+Mn2PoJ8QQNrcE4noXUGyKatOfdN/KVcaFC302xdxYqANJFLwVv+Uvh8Zafkm/8Y R4cKvNX7VDlzbrfydiV0ouFrXX4zofw= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b="W1PA+/Bi"; dmarc=none; spf=none (imf23.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=1687800932; a=rsa-sha256; cv=none; b=fmotOqE4JlymWUUuUa+4napSJ8hZWIJu1u9GdmrLHhguqtumIY+aO5PeeNabvy4YEvmK6v xAWGWBFGhinVyc/IyOacgWV5JzzWNZTe8pwtFm6sstT5OezNFbNSjBCjFZvN19tMAWxVrX OYIsbUmwkj73zU0eA5FGDR+n7lw53Pw= 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=DbRDOwy4aGYzGm5HeqIsIhOnoGhV3uqwtbzHnV71lmw=; b=W1PA+/Bi8v1fqLdsB7yl772V0f RgwlNsF3bvGRmX6GeWkooNi1wYpT1f3iUIzX4l7MUM38mQ9Zw5s7SQOuMEMB53KdS5tSL+OHJSisS K87JMB2fNoyImDp7TG+shhEPLoq4/BISTARhOn43kcMebEMFO3G44dQ5TWC3FZLmULKJjwLPoTUNq WUIpgwde5+sWTO8N2dyN3HIV4wxNNuQ+5Pvpm5cCn3mV9Sxw1bvQhXNl0ETOjQa+6UJarTN7j2N2A ahz+Xz2UCRm0wunSNn5GNma/A151vXBBaymuvJ4fLZ0+HcnPGNDiVY6mFsk/ZzC0yxz2xPztK9RUp bM2BXbXg==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1qDq7Y-001vVI-28; Mon, 26 Jun 2023 17:35:24 +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 10/12] writeback: Add for_each_writeback_folio() Date: Mon, 26 Jun 2023 18:35:19 +0100 Message-Id: <20230626173521.459345-11-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 X-Rspamd-Queue-Id: 9CE1B140024 X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: fa3oq4ed9fp8d1mruxd89os1uzbsya3b X-HE-Tag: 1687800932-723722 X-HE-Meta: U2FsdGVkX1/ldFjVMdFFDFiEohPMnAcUPIw70lVr08J035B4T4tey3BDx0/PRJSVwA7kBUHn/JV1ijGFfYeXSfd6jVCeeiyj5R5cp91/hNNeXcp0ag59N4kSxph5b75kpKWBBynEYe4diA88rZjCo4gxYynugpsUiAfSyGFcWmyZC4lWxggcOGEuoBr07UtyuggyDQwWDbwr8JJ9AKXBMPEZeysl66WU1o3yq/TMfalPGfwicRIKRcxc9IwEvcpoidGZyWYC/JPxrBRX3oSIxcOiSsyG25Likzd2LUDRk/VhXGf6001JuDGOaGakR0H8utw1K6vsZci8kjuABVlVWzN8ikXc5ZmxEfgBrFmCsNZXw4a+guPfflPChjmiSMKxGcqSn4ce0tJyITp0vl+AGXtiCjmZzdypnvKVz4lejOVoI6VGi66O3/rQWEULBMDPyAs9CJtHJTzBliT/BjzoQMOXq6ZvU0drje8aavLY2lc3fQlBs4ri3hVIWBaB10zfBVC2KHx4EJ/23mBYu4u+6boC0MLcgNTOTo7Hs3oi3VtNiZtRLFWe/pyXVqLPxolfHn3gDSd8ifI6bASDcs3jbjxKcZ+k5ECVGJIDmqqTshJ0YrMAaVyCBMxkH6qpJCge/RbBNmkgeEXoLC6qRvwx+/UUtPH2NXQKO883uQWnFf95+qJMRjrl7ahZFjqhf7FwrQCjNoz5nkUzHOcwTCTUomWfEsmISMAKtspRHZEUKsOonlvbXzp2el4/RmHjN5B5TD15ceeVsu2A4qlsacQc4HimHZ8wmrvacRZk8eZ9IfQ/2poS33YsP4Lj/aGx1cy36Zyxzq3cgIfZ5QDNuObPQd1gKFjeFGufOngtuFMixb5KfRLy9TBjPmCIgNmBnYNXBOzuK/MoE1q5qEgzEF6a8EeuhO6xxemztU/8n+ZkqUwtGNVf3rrVuE4+xNGvDyQ2Q/BzZs0e15LyVzrKfKi qBvObGC3 ZVK7zy5+bjXDb52Y9UNTL3N563IWiqkidm0FDvEodl3yUtGSHVJjccYw7U/vlI85j82dhkIJ4VNC6iWzNUXOaJHS67VwYFhzwSXN1HVDVLlXSps0Odyf91yDtnUeWovQPitQhwtaxqVEPd0VpdhpDC2kaQPIugMBYwdICBHxsV3GjamH5oUL4MjHFx9GzvFXxSvTOMGl+6cqER0MzBl+oVieOSyeAl4EFrgA7 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: Wrap up the iterator with a nice bit of syntactic sugar. Now the caller doesn't need to know about wbc->err and can just return error, not knowing that the iterator took care of storing errors correctly. Signed-off-by: Matthew Wilcox (Oracle) --- include/linux/writeback.h | 14 +++++++++++--- mm/page-writeback.c | 11 ++++------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/include/linux/writeback.h b/include/linux/writeback.h index 7dd050b40e4b..84d5306ef045 100644 --- a/include/linux/writeback.h +++ b/include/linux/writeback.h @@ -369,14 +369,22 @@ int balance_dirty_pages_ratelimited_flags(struct address_space *mapping, bool wb_over_bg_thresh(struct bdi_writeback *wb); +struct folio *writeback_iter_init(struct address_space *mapping, + struct writeback_control *wbc); +struct folio *writeback_iter_next(struct address_space *mapping, + struct writeback_control *wbc, struct folio *folio, int error); + +#define for_each_writeback_folio(mapping, wbc, folio, error) \ + for (folio = writeback_iter_init(mapping, wbc); \ + folio || ((error = wbc->err), false); \ + folio = writeback_iter_next(mapping, wbc, folio, error)) + typedef int (*writepage_t)(struct folio *folio, struct writeback_control *wbc, void *data); - -void tag_pages_for_writeback(struct address_space *mapping, - pgoff_t start, pgoff_t end); int write_cache_pages(struct address_space *mapping, struct writeback_control *wbc, writepage_t writepage, void *data); + int do_writepages(struct address_space *mapping, struct writeback_control *wbc); void writeback_set_ratelimit(void); void tag_pages_for_writeback(struct address_space *mapping, diff --git a/mm/page-writeback.c b/mm/page-writeback.c index ef61d7006c5e..245d6318dfb2 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c @@ -2451,7 +2451,7 @@ static struct folio *writeback_get_folio(struct address_space *mapping, return folio; } -static struct folio *writeback_iter_init(struct address_space *mapping, +struct folio *writeback_iter_init(struct address_space *mapping, struct writeback_control *wbc) { if (wbc->range_cyclic) { @@ -2473,7 +2473,7 @@ 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 folio *writeback_iter_next(struct address_space *mapping, struct writeback_control *wbc, struct folio *folio, int error) { if (unlikely(error)) { @@ -2550,13 +2550,10 @@ int write_cache_pages(struct address_space *mapping, struct folio *folio; int error; - for (folio = writeback_iter_init(mapping, wbc); - folio; - folio = writeback_iter_next(mapping, wbc, folio, error)) { + for_each_writeback_folio(mapping, wbc, folio, error) error = writepage(folio, wbc, data); - } - return wbc->err; + return error; } EXPORT_SYMBOL(write_cache_pages); From patchwork Mon Jun 26 17:35:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 13293256 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 CC81EC001DD for ; Mon, 26 Jun 2023 17:35:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0FCD78D0003; Mon, 26 Jun 2023 13:35:30 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 085FC8D0002; Mon, 26 Jun 2023 13:35:30 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E68748D0003; Mon, 26 Jun 2023 13:35:29 -0400 (EDT) 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 D2AA38D0002 for ; Mon, 26 Jun 2023 13:35:29 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 7CBDF140783 for ; Mon, 26 Jun 2023 17:35:29 +0000 (UTC) X-FDA: 80945600778.09.7DB101D Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf27.hostedemail.com (Postfix) with ESMTP id 1E1B240012 for ; Mon, 26 Jun 2023 17:35:26 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=qIKh3LKN; dmarc=none; spf=none (imf27.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=1687800927; 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=sd4UR031RbDntAg7Q2TtCsIA81STdESVBYZOrBi6xDM=; b=s3PpR34Wv4kf6DH7V9+WEt5/SY0BnKYMBUD/96h+bgukLL8wlb1dP3a06eNxJqX9AbstCN 3SP8lAAfLkA3XBxGfFHrYjQx/294Lk8vBkasxQZXDmLq6bRpJXyWJa3bNY6W6qOqx4tgaC CzZQTeW4Q7nYzc8b63/c+TgpNDNBtH0= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=qIKh3LKN; dmarc=none; spf=none (imf27.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=1687800927; a=rsa-sha256; cv=none; b=yxzCT/UXO3pZLeOtjGxYzHmoFv9c5AoHUUodoaMxkveAZ9KUtzOB2jEtx/+Fcd0BH60yx5 pdybnoLVNFkGJUZY9quNx4ujtWjZ1y3r3TjvMQ+qyIdKF7Hy+EmE3aJHYYkBoBwvcHVFN5 iJ0MYonFsTj5TrFLpB8YOOEBMiv0Da4= 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=sd4UR031RbDntAg7Q2TtCsIA81STdESVBYZOrBi6xDM=; b=qIKh3LKNsyIKL6wn9vPVDEzZ+D eEqSPJa/7CQUC5xinii35WBEGVSuPYk98nQd3Rk665j4winBw8s0gcTwod5j//SI78kDfO8LiKpb2 QxPbWsAW0AuHq/5s0VxBqJ9MT/wDfN/+rlOdpY2Fk2YtsFFIPIG9BsONHh4138hmsct/3ELFT9roh e0+vNhPUTa71jfAWtaK5OPKL2MmIEixL3WqzjOmsa18TETHpzf2dOygWdHq4KBAPddiWMAqpgRmR3 ydq70lu0ywMlmKyHpMvrSv53DWf8nfN6Ya3A+O2Bn3zHyOeojHJDOD+gOEsd739ZMiyDu/U2u0Yl8 Ak2tJitA==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1qDq7Y-001vVK-58; Mon, 26 Jun 2023 17:35:24 +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 11/12] iomap: Convert iomap_writepages() to use for_each_writeback_folio() Date: Mon, 26 Jun 2023 18:35:20 +0100 Message-Id: <20230626173521.459345-12-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 X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 1E1B240012 X-Stat-Signature: zcd5hnb81sd3178zsioffdo4n7h9djhy X-Rspam-User: X-HE-Tag: 1687800926-452710 X-HE-Meta: U2FsdGVkX19Ilc+SZJDYNyD9scZ5oio2vfg1gstaqrAPROseT7bfVyV9qeqJb5rYjsLNlSCLxMYBoaqrGW35Yi1JbTZjJnW4qHldxGXPoD7uDzRBw3QanNSEKv8DVs8lFHuMmzXfUFY2pxPNyRdDBg7sy1DjnC8UC+W9l3QSEvGbNpjhkNN6uL7P5fMWDYuaIJ8ATtscRrvyHL1rvQIMamVCSoZPTVvnDR39OX4nujkQ8nx5+u9tjVovzwlalMBo6ncX0KMwcW2v1PCiIX5M2hJ7J11jyQGtw+7Fj/LPDeG/lGqLUky5cemR7qR5J1QBy0mj3C2zM3XJ1AvyIHKN+lvnTw3hXfpHu/qwJYgcdmoeDTg92y6vWtqLtSRYICaA/tLuADLxk0aM1D148Kc90hRc+TzYIw55izfU0gI3zlqo6yOI+y+w4mcQRbnxu0PZ9OjlPGAdcibX3NWQ/i7t1Sn+24Qcr5PI+Of07HQhKhelgbd7GRMDhr6oU5nrTcNFvj1VHPC7Yis8Q2UxIX14Wky6yYNzz/PL/rgt4FQaNP30X7J/meCVND/i620svpYU2xQ9tApZhPY3QhRt30n6cr1K+ILtoZDLIgZCXoyAqE4dNMj0jxzcOvXElYuIUUWu1bCb4auTMTm1255fvBULeNv+9kXHP6Qb8Dx83OQiagvQcGFYB48p0OTQ7qwdu+eHdt49NOnaUw4mEB7GESpoRsSXn/uiC2o8oKLGDV7Wh9daDhISiBX/IFMJH+MwqzteYX9azhfGan4XdMrREqFwWWE96ZURUxm5S5L0kQ0hlv1J7umOlVUnPX45EEdaQqGB5Dn01wEPU0hNRaiu6lrnWNHnzTHPZBw0zzoHSQW6gvjHp00Roik+wP5yPr+NJ95BC9+efHdznau3lawgJF2T5ZjsL/IGBrHg+7l9v86DG36VhmW88Jq+r3LEDPM80bfrzEqN9HJEQPkjfCPrWCT uMoMd1AM 2IyHav4ocdLuE95+jgwIaUNmulsr2Owauhrdiwd9e1gPxBR66MYJA9X2piEb+eeKv6GunlDtbG5wMMNUlFLgt+Fc/Vx+S3vT1xUXRvbDEdxQLmbgfpTWzL+KVx3cPjq1sdqWTjbrULonxbTAA0ajzMZ8992t69Iio8/OCZMb7zmH4r+iFOr/g2R4ZoU1xvVK7XumMqUHJE/grpn0HVmwIozXHKaB9/CV4ly0h 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: This removes one indirect function call per folio, and adds typesafety by not casting through a void pointer. Signed-off-by: Matthew Wilcox (Oracle) --- fs/iomap/buffered-io.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c index a4fa81af60d9..a4dd17abe244 100644 --- a/fs/iomap/buffered-io.c +++ b/fs/iomap/buffered-io.c @@ -1711,9 +1711,8 @@ iomap_writepage_map(struct iomap_writepage_ctx *wpc, * regular allocated space. */ static int iomap_do_writepage(struct folio *folio, - struct writeback_control *wbc, void *data) + struct writeback_control *wbc, struct iomap_writepage_ctx *wpc) { - struct iomap_writepage_ctx *wpc = data; struct inode *inode = folio->mapping->host; u64 end_pos, isize; @@ -1810,13 +1809,16 @@ iomap_writepages(struct address_space *mapping, struct writeback_control *wbc, struct iomap_writepage_ctx *wpc, const struct iomap_writeback_ops *ops) { - int ret; + struct folio *folio; + int err; wpc->ops = ops; - ret = write_cache_pages(mapping, wbc, iomap_do_writepage, wpc); + for_each_writeback_folio(mapping, wbc, folio, err) + err = iomap_do_writepage(folio, wbc, wpc); + if (!wpc->ioend) - return ret; - return iomap_submit_ioend(wpc, wpc->ioend, ret); + return err; + return iomap_submit_ioend(wpc, wpc->ioend, err); } EXPORT_SYMBOL_GPL(iomap_writepages); From patchwork Mon Jun 26 17:35:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 13293262 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 4B165EB64DC for ; Mon, 26 Jun 2023 17:35:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 740A18D000B; Mon, 26 Jun 2023 13:35:37 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6F0668D0006; Mon, 26 Jun 2023 13:35:37 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 42FC08D000B; Mon, 26 Jun 2023 13:35:37 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 290CA8D0006 for ; Mon, 26 Jun 2023 13:35:37 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id EC212140805 for ; Mon, 26 Jun 2023 17:35:36 +0000 (UTC) X-FDA: 80945601072.10.3C42ADA Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf14.hostedemail.com (Postfix) with ESMTP id 5669810000C for ; Mon, 26 Jun 2023 17:35:35 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=EnXvWYXx; spf=none (imf14.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1687800935; 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=ImqynQi+azeOKkPbJPWnsB36hvgJ5MojMLeTL2XpTIs=; b=B6iHX37fgfvxNIepaTeNG6F5If8G8a2XM4Yd1248wFKA8EwpbV4cscv/Nvyqb4Q5gNwQG9 ATzAO3PNoVSY9yOf1nVagmLtDULz4Sjq1ekeotg8iV4K0fHetW/PlQVtGHPWfkFdDX4x8v m9EK9xs7SPKmrDIhmWjm4lc0gMppwkU= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=EnXvWYXx; spf=none (imf14.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687800935; a=rsa-sha256; cv=none; b=cJMzE+PGBADY47AV8SUbkWjbhv4CA1Kqzo5EKhmruKV7BMV03LvbsbMnzfCUAmISYbHN41 8aPeBBUsns4Qq2YaiATo7cmFOkIA9t0RQOcsl791AyVx+ZN7cl/dG03ThbTuJUjzIjAsYT gruWnMYtQZtOG3Rk3EzyJJkk2kRAU/g= 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=ImqynQi+azeOKkPbJPWnsB36hvgJ5MojMLeTL2XpTIs=; b=EnXvWYXx+3E+jBbF7Z3B+1Gi/T yYgl8ytz+fZoD1bsHwC8cXajllUXh279ulAn62xGFuLds1WNXkGTXCQQEyIO2oWdLPtMZma2d/AMg 5Su9uB7fPivq5SeGFfjxhRCguvBEtuQ+YT74zwhANJ5gvelakTfU9l8U8T0yUP1L00nf5upXTXCP+ Tl1v60WsSro8t+8iDng1kThDvglAI8CetB6z50p5gO6KiKgThZkNJZBBkCDUuV1iH9gr8bU4TyNAL wyAv9pc62eib4kBG2gca6eQc6JVqDCIx0YaYqXUQ3JQrqmBSOGcIkls/+Yr7M2SL3Upaqt+O1iEA3 6Vw5OxJw==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1qDq7Y-001vVM-AH; Mon, 26 Jun 2023 17:35:24 +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 12/12] writeback: Remove a use of write_cache_pages() from do_writepages() Date: Mon, 26 Jun 2023 18:35:21 +0100 Message-Id: <20230626173521.459345-13-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 X-Rspamd-Queue-Id: 5669810000C X-Rspam-User: X-Stat-Signature: 6fx3qrfgzd5s1ur7wne94b4dpbaqdhyn X-Rspamd-Server: rspam01 X-HE-Tag: 1687800935-101824 X-HE-Meta: U2FsdGVkX18raMkBKSHCg81Jfkoy7/ZbfzFguMrIYWRJbC44zGbsbMsk/8N7phhj/lKB+RL+F0k1UixV4j/J+PmQCDT/4Z1v91tWBIqrXzCI/oNtRDshMX7YnEZR69O0J5hTeM8UfTpC0L7DxqP2fxy+mOYWI93Oyc3peWX91SPn71JUrWu6W5+w/H+/k5gGld4UICbZGilnnM8OZy6pwiPl++iQ1pPmOABYIwtZkDTe/UInuSTGVVQOEoRXCcphMqQIKlvX2JmGiFnyHQwOt0EcU6ZHj2Nl3v56lgB6coiBZn1TsYLDEhQT5nLoHEDg8LJfNj4apThysZYctzM4fMEijHHLmUsG635I2MEfQ/bn8iJpu7DjSnQ/XciqorZPUQi11C+yzWdKUYg4FmL/e6mcXusVR8ECeTXEvN67qrwwhcEXosq4zGlmn+8fIvA4L992X5lImitMHBnh1fcHPvdHvFWkkpeRjAyTplEu4/jkdxEXoGXhvBNyXlQg7TJTlod8yAqlIhyd7t0Eg3hOwiPLLGlO0l039kMAKKCz1BqqiwDbX+4mFUPIPvkkTQ5XkLrpyj9x0CZG9qNk+20Y7AtC8LBRQ3k0FYs5IWWre6fNFbwS6wnMzpcbK7zOY73vjvVOoxohns+uw6rKueZlBy30vGYUN1Sul3F9RweiXe3x3vzdNKs/mqrm4P5tWdV69DhSf+cows7nLzg5dhYv/sU1RAv0EwCDJVNu9Y4Rz5aFoqMqnXTR+0LS9qd9hUFZ1SLSKuO/qXwEt0FbsCX6Oym2d1agAy468/okan6OOXqvQ/bzTcCZgTssk9c5TbTyzOZ4+OTvw+3Ti+p+DtJWROTt9BLRttpVEN6Hm0bqEU6QTZFDUwCuQE21gTnWEYUV+PUivzDewcG7F2utxZAAQ8NTEz25c9T+jyitP0kPW+wnDxz8FpY49iA8TxrnMVtbGhszRxxD6znQbisFdDY sWMqLgYJ C7Zhf/v8ndGsvb5BqGiqJw0HuADGR0u3NWc+NQKPJw8V9FUMWsW7rqip0YDu2XRAfHXnB/bJ8xyLV3PF+Xu9LemTLqNtHfYzia2b3ZuMOwm6qq/9EzASlNdYdtWNr6M3NqCdgrQcR50otpxEMirBMQS3+pZLVfEJkcdA0vDfSAA1pefgfPN8wcWszxb4I4om59NFtSieGIPI69PvTlQeDlHhKR54MueG66jsL 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: Use the new for_each_writeback_folio() directly instead of indirecting through a callback. Signed-off-by: Matthew Wilcox (Oracle) --- mm/page-writeback.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/mm/page-writeback.c b/mm/page-writeback.c index 245d6318dfb2..55832679af21 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c @@ -2557,13 +2557,21 @@ int write_cache_pages(struct address_space *mapping, } EXPORT_SYMBOL(write_cache_pages); -static int writepage_cb(struct folio *folio, struct writeback_control *wbc, - void *data) +static int writeback_use_writepage(struct address_space *mapping, + struct writeback_control *wbc) { - struct address_space *mapping = data; - int ret = mapping->a_ops->writepage(&folio->page, wbc); - mapping_set_error(mapping, ret); - return ret; + struct blk_plug plug; + struct folio *folio; + int err; + + blk_start_plug(&plug); + for_each_writeback_folio(mapping, wbc, folio, err) { + err = mapping->a_ops->writepage(&folio->page, wbc); + mapping_set_error(mapping, err); + } + blk_finish_plug(&plug); + + return err; } int do_writepages(struct address_space *mapping, struct writeback_control *wbc) @@ -2579,12 +2587,7 @@ int do_writepages(struct address_space *mapping, struct writeback_control *wbc) if (mapping->a_ops->writepages) { ret = mapping->a_ops->writepages(mapping, wbc); } else if (mapping->a_ops->writepage) { - struct blk_plug plug; - - blk_start_plug(&plug); - ret = write_cache_pages(mapping, wbc, writepage_cb, - mapping); - blk_finish_plug(&plug); + ret = writeback_use_writepage(mapping, wbc); } else { /* deal with chardevs and other special files */ ret = 0;