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)) { /*