From patchwork Sat Feb 3 07:11:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 13543897 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 047ABC4828D for ; Sat, 3 Feb 2024 07:12:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8986B6B0072; Sat, 3 Feb 2024 02:12:12 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 848CF6B0074; Sat, 3 Feb 2024 02:12:12 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6C17E6B0075; Sat, 3 Feb 2024 02:12:12 -0500 (EST) 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 550ED6B0072 for ; Sat, 3 Feb 2024 02:12:12 -0500 (EST) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 33968A0530 for ; Sat, 3 Feb 2024 07:12:12 +0000 (UTC) X-FDA: 81749623704.14.73BBABE Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf13.hostedemail.com (Postfix) with ESMTP id 8F44520003 for ; Sat, 3 Feb 2024 07:12:10 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=iE2Qy9x6; dmarc=none; spf=none (imf13.hostedemail.com: domain of BATV+a0ed29cff9639d748e7e+7468+infradead.org+hch@bombadil.srs.infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=BATV+a0ed29cff9639d748e7e+7468+infradead.org+hch@bombadil.srs.infradead.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1706944330; 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=Ir6qdgwpiudHSGvIqZf3UZHrrrbsMgA9iIwYL6Ldf0U=; b=IZhR9dXzySNVgxQ+MlKHfvzaabBsGVvO8POogEH2jACPgC8+ZMbX7eW5mudWFI1WJJfo+c NpH6QlPr/xY1+OBIuWgDGTlajfseq8yLK/f9Tbt50F2n4Oye0vHfoBEdVUsgTJohqM6fMp Oh8YTHb/pGASVp6KhG+dmsQPzSvRaqA= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=iE2Qy9x6; dmarc=none; spf=none (imf13.hostedemail.com: domain of BATV+a0ed29cff9639d748e7e+7468+infradead.org+hch@bombadil.srs.infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=BATV+a0ed29cff9639d748e7e+7468+infradead.org+hch@bombadil.srs.infradead.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1706944330; a=rsa-sha256; cv=none; b=RhbJAt4z1RpVM9IQhO6tq3O+jH0PPsxsFZLbVSH6wtrg+AmOk+HQyxX2emYFFdvFGTHWZO 7IvzfpYIycB2fR5QHn5MtCu63Llcrs1F9a1fLKimJqNrdXWd7Hi9kfJGlQIn3QIl5BcJdn mtXpt/SJ0ob3ZWgNIQT89bV5MX8XCVY= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=Ir6qdgwpiudHSGvIqZf3UZHrrrbsMgA9iIwYL6Ldf0U=; b=iE2Qy9x6Sg4y+wDEl3bj4dxn64 gCZM+M5CKCFy/pvjW1p2OkT8q39b+HPLnqpeQFtfQGA7LIQT455VsNCXAFevt/ZFQdlwY6+lV/T08 hi9wUOIqd5dzHOSzIBC2F2C1en3bkkET7N+8OxgSq2ZP6UymsXcY5AHMrDYarIBXr43S1FjEAqJwL tnWLV4DaRWtSn8qD6VOyT5NExzUXn7LolYKSrpLFNKsSD9ZMMwOWlGrlASjgnLrSgjA6/9i6nUia2 SO3m5CYQbkwfuUV+eCZiDRKzYLJuG2c9DuxAxC2a3HR2vl2ucCFG25/X7aUlQeXm0S5RF82fcXR7Y 9YjRd9ow==; Received: from [89.144.222.32] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.97.1 #2 (Red Hat Linux)) id 1rWAC8-0000000Fjz1-3cgJ; Sat, 03 Feb 2024 07:12:09 +0000 From: Christoph Hellwig To: linux-mm@kvack.org Cc: Matthew Wilcox , Jan Kara , David Howells , Brian Foster , Christian Brauner , "Darrick J. Wong" , linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Jan Kara , Dave Chinner Subject: [PATCH 02/13] writeback: fix done_index when hitting the wbc->nr_to_write Date: Sat, 3 Feb 2024 08:11:36 +0100 Message-Id: <20240203071147.862076-3-hch@lst.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240203071147.862076-1-hch@lst.de> References: <20240203071147.862076-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html X-Rspamd-Queue-Id: 8F44520003 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: 4brt6f6chomrmrx98w46dmpuu5s5bgs3 X-HE-Tag: 1706944330-993721 X-HE-Meta: U2FsdGVkX1+l3fkg5xcwoxxPLGFmD1/v330iZIhZJn++s9o1zsMHVVvIob6dDg9RSeB7/Vb/x7aWiI47PQmn//InPdPE47jUbAuWlNWTMpvzE21Uk0qR4T1bA7cewvxq5WoXRJhc9naz9tRr8r5jimLqXAMBT2TRS2zodWKB6d3kp6DICtF5vGog3hZhTVecR1sCwe5LETHiz6eA8Hc0ns0s8MXFc9aqrh9ylpzdNuH7tFy9MeE3nyaZZNIKJ9VnvJ/YnNIauPGCr6owKVyD/UXf+MzwbA/awh4VGIaWHU+atA/OT2qcaEbNO+ECZQzL/VwHCJXA92pJQSBMQxuQU3o16rlqrSKLzho0zjAsyRNSV0b9Mdma5nenHoB5jC37QsLJuITMO4aepsMMcN/RVuXiZpoCo+/7UzTec+eFUusONhhGGBKJ0IiAQ6JQcfBu5Jsxp9LNHN4P5chOIZlkpr5rCaXkwQd/ExWInI4SKZV6P1IjTzYUBRE87vkwW8vALCpabFh3L6jPv4KXou+Uxa9TGYDlxw3ckzMLQ/N6qFDvaWJe8giZ4gcTjRD7FByZZSisxnZ+CGYRBKwTXpK139K44iQar0kSrqIiTVBrHjvgi1uQlZA2NxfeHPhL2KfQlDEUJgAabFmr67YGRJF8XyOlLDnqHP5Z3NT6myYXfYyfgjH+icR8M13sMZ0RW5+TEphINJQZmb/cQwjkOC8hU6ESKFpY+QhCULFj61WfjMMTQEc70/Kjdk8A9RjL7v4HQTdZBR8TTfQDQwRTMArHDfdpcZkW8KOA+4WRwlXBYfqVgyayIV23bfkW1SigQSZfp6a4FDHzPnM7YEfXA3+WiQYd0YUqtDaubhGnJSNOBIA22ktlEcQj1SyVIrK9vFx8eODHY0z2pckwB4Yxjsv0oiUDa6leHs7YyLjeJI+Ah3bo+k63XvsgNW7InWR0KC29ljDBA5nIq7bFi7VdegV AZn/btnU ivBUT0oI05ohy3/dAIJgJTlH1GwV0qUF4QGek68I6yjg1keRfSD8iZDzAW+UbFDKfgIWLwvGAmdUJ5IkNIrygvizPFA0w+vYbu4YCAQ9yOrGMIZG1YvZX1G80Wuiz5IdyuPFa527e5+SMF6lrGRVkoSSjSO20JGYaHD0dztHvmkD2+Gvr833nFLyuQ+aM38hdzXHcTe7ytMW1buYlhC1/M3kSRyn7tVU8rme2Zssn7QvEF5Dmimi5fGwYByJ6WMmc039ze6lBYcdEQp9bYLeq2dbS+zaPp+3xHwZ+tNTivkf2jvZ7GQcEXAG6xgZNY0m8K9vHoB5uzWc9PNs2RUBveeiX5zQpxPhSYUaj/lZwdcZy2CvwtmxxxRIZ+2RQx/zOt7UH8gB1O9+9cuvdaCT5csRGPbt2EVcT8/481kEYytpZibIRSMP9PnWSMFE7gVqJ0qjaWdehxOpoDC8= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: When write_cache_pages finishes writing out a folio, it fails to update done_index to account for the number of pages in the folio just written. That means when range_cyclic writeback is restarted, it will be restarted at this folio instead of after it as it should. Fix that by updating done_index before breaking out of the loop. Signed-off-by: Christoph Hellwig Reviewed-by: Brian Foster Reviewed-by: Jan Kara Acked-by: Dave Chinner --- mm/page-writeback.c | 1 + 1 file changed, 1 insertion(+) diff --git a/mm/page-writeback.c b/mm/page-writeback.c index 02147b61712bc9..b4d978f77b0b69 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c @@ -2505,6 +2505,7 @@ 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. */ + done_index = folio->index + nr; wbc->nr_to_write -= nr; if (wbc->nr_to_write <= 0 && wbc->sync_mode == WB_SYNC_NONE) {