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);