From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id E486AEB64D7 for ; Wed, 28 Jun 2023 18:55:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 63F4D8D0002; Wed, 28 Jun 2023 14:55:56 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5EF638D0001; Wed, 28 Jun 2023 14:55:56 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4DDF18D0002; Wed, 28 Jun 2023 14:55:56 -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 4110E8D0001 for ; Wed, 28 Jun 2023 14:55:56 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id D5094B00D2 for ; Wed, 28 Jun 2023 18:55:55 +0000 (UTC) X-FDA: 80953061070.07.B44A75A Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf24.hostedemail.com (Postfix) with ESMTP id 4334E180015 for ; Wed, 28 Jun 2023 18:55:52 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=url2F0fZ; dmarc=none; spf=none (imf24.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=1687978553; a=rsa-sha256; cv=none; b=zGIob7g6WZL8BNg7R/qx9y7PvwcaVg3AWViH4klBnJuSuwTpWxljINYg8eOWRClZbyh8s0 fet1yUv3o93km3HTKb49XHcqrnTsdK6xAg7F9/EUOcAemsdNalg3C3ynJXni9J7dmdInOr oXaOddwPKrkOJeITeOTfRYS2DuYmCes= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=url2F0fZ; dmarc=none; spf=none (imf24.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=1687978553; 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:references:dkim-signature; bh=6P08QVXXRrbXoyateQxxQCk4bh+paRKekLCZ82zEgH8=; b=31clJhvi4icdVEIaEFjt9QDQ99l6d38uY/LSgX4jv2bXDghQNIad1z4CZ2iWzEMpLzEjGa VOm5E/qDsv9pipBlAF02NUu6DdNTnl03t5unf4E2yRgQN5pK8NP4+T4X4JUQyiZQOJ6pHH JrBL1l3R8b/ECiYJ6JV52oVF6KeJg1I= 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: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:In-Reply-To:References; bh=6P08QVXXRrbXoyateQxxQCk4bh+paRKekLCZ82zEgH8=; b=url2F0fZ01ji+ds4Rem0FLeG/t 3dBgDzfYIW7OTTtfNLTt4rIH8crndyry4OHdQvZbyIyMr7Ajb+Ot4P1UNdIXGYTPc2hf3qzLWaJFe pspy9msXJ+wykOy3fBGL5CoAAPKY3IE7oB9mUn9o3bCcgNirkUg9veocsCNB8mPWiIf95QyUPcM2U QxocqigmcFUM2BtK2mRWdF665uuL0dFsM3gIdK08lFx8RbxxTfbCJeh3vnoMChqvx3PkZ+mKXLbEM Cg/NaR6/AbFocoTrKu1dv6QzWIfOmOAMf7EZ66V4Xww7T4aQdeNDAnbEs2Fbx5ZHJOwqsGouzITT0 zNLlPUsw==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1qEaKT-0047Ys-Ue; Wed, 28 Jun 2023 18:55:49 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton , linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Jan Kara , Christoph Hellwig Cc: "Matthew Wilcox (Oracle)" Subject: [PATCH] writeback: Account the number of pages written back Date: Wed, 28 Jun 2023 19:55:48 +0100 Message-Id: <20230628185548.981888-1-willy@infradead.org> X-Mailer: git-send-email 2.37.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 4334E180015 X-Stat-Signature: gk3w5thgwy1837ny86ojebjmumgiw3rm X-HE-Tag: 1687978552-743386 X-HE-Meta: U2FsdGVkX18xLDZ90bZm3AwzsqLZOMiA/DU9HYaHhssgvEzFUQO8EvZU9X7bRM68DKu4peu2yVD6kjzRQjQnQum53iG7rYvA4ulm8q00duHVBIdWvb/Sb2Afh+k0fwSJZtFZKUXJo0S6uu+fDasH0qAKwcDafomzQExDJNJHmZEv/ZiAMKolN+A5X1HYhcviDyIebiD7ntneWRCjtt6VcQiaiQnIg0lsx52waRlPrScTtvxMIhmz094InjlgUbS3UZwpQX0AnAN1p75FRqrngh+DguMyo/xkmE7zpFbz0BNS23jGi14KOIctB7CohFFdzbPzVrJuVCfzZJMunhDRu89AilCQmecP+FNNkeddjaLSVIGciO0/ZhZ54feJJbKPzhA3HhbgKdw0nVuCuMaWjABWRJrbguEzz6XGuHNuhaaB2a5g2AhotyqPSbvt1E8cQP6jn2geDkaAh7fdABg03yCCquIN+Z7umJ4Uaap0RCRwg1vdw2BpFRGv0w21vrEY03tq0EnAZK3t4r9zUuIdTjgSf28NfLCzcWJGrl/C/hvJBh0684m3kx5CpYaZdYNsyhNh1noI4YtRZ+xVl/Efo2EJUY0vdkYkc76pHHmRjqSkNwBNTB/+zzaJ4pmS6431dqdeKXIkrsFBlCkcRO009L7QLC37/U4ZCiJW5sWDz049/0HmCwFF+V8nCc9Viin+uWW6M0iq4VYuHbXVv9GLF6iyC4uAhhbfIMA31RNMjmzxjy3IJDQB2a+8pZ+KRd3J7Vf4CX1kIaZwIcMS4gKrWA+i4NNwCGy4I4b94eK38qaaS5KQoOHf25r9A9qmBpixH5i8RjOsYqruwcbEx90UDrt4w3dXunOGjFnb+kIqBTEJ/1d1pUHxbeqiN0kkkrX3m4l+T4Dzpa+doNUcTIIm2dsVnCm0Ccx/L8r8VaWzU8J13FvC3pluAIp5Q200H47Mom1ninCTluxA3BGCDal zylKPQkV wqJr30q5AkErYbRZwcfBPhMubqP7povylLmpnqpnpFeEXd0jErgFL5kYEak9gXiwOaFm38fui8dMbjw3QbsCchWnJj6aeg1TQLhD3jQhCEfNDZGnmH/DICn/Z96LuBuWGbDDndAVU1mxGp7UryaR0+GvfalEaz8+SElz07Bk+E2mJ9WD7vaTm4E6/ZH+EMVbI2559ZTnXmQqcLVR1yba8g1udcg== 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: nr_to_write is a count of pages, so we need to decrease it by the number of pages in the folio we just wrote, not by 1. Most callers specify either LONG_MAX or 1, so are unaffected, but writeback_sb_inodes() might end up writing 512x as many pages as it asked for. Fixes: 793917d997df ("mm/readahead: Add large folio readahead") Signed-off-by: Matthew Wilcox (Oracle) --- mm/page-writeback.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/mm/page-writeback.c b/mm/page-writeback.c index 1d17fb1ec863..d3f42009bb70 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c @@ -2434,6 +2434,7 @@ int write_cache_pages(struct address_space *mapping, for (i = 0; i < nr_folios; i++) { struct folio *folio = fbatch.folios[i]; + unsigned long nr; done_index = folio->index; @@ -2471,6 +2472,7 @@ int write_cache_pages(struct address_space *mapping, trace_wbc_writepage(wbc, inode_to_bdi(mapping->host)); error = writepage(folio, wbc, data); + nr = folio_nr_pages(folio); if (unlikely(error)) { /* * Handle errors according to the type of @@ -2489,8 +2491,7 @@ int write_cache_pages(struct address_space *mapping, error = 0; } else if (wbc->sync_mode != WB_SYNC_ALL) { ret = error; - done_index = folio->index + - folio_nr_pages(folio); + done_index = folio->index + nr; done = 1; break; } @@ -2504,7 +2505,8 @@ int write_cache_pages(struct address_space *mapping, * 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->nr_to_write -= nr; + if (wbc->nr_to_write <= 0 && wbc->sync_mode == WB_SYNC_NONE) { done = 1; break; -- 2.39.2