Received: by 2002:a05:7412:1e0b:b0:fc:a2b0:25d7 with SMTP id kr11csp487893rdb; Thu, 15 Feb 2024 06:25:55 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCUTheucY+GnL9BNVqWosj1CJGlj/dyRpWyQd9voX83tNKwpJ8x7JrqhvgHxcIqUgB5tmqaZNyO+O9dqAFb1RsiEF6z/o8mGo7gDcMW6ZA== X-Google-Smtp-Source: AGHT+IFp7jYAusylFueCMxpSpFgoIZ168Ye+28Mw2PZ+PJLIdRfg+NK1V2CJXfBzE0W+kyGfjfDU X-Received: by 2002:a17:90a:34c8:b0:298:c818:5dc9 with SMTP id m8-20020a17090a34c800b00298c8185dc9mr1718165pjf.10.1708007155000; Thu, 15 Feb 2024 06:25:55 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708007154; cv=pass; d=google.com; s=arc-20160816; b=tHFoFMgN88QIY3Nv4w7T1Ax/mRakS5ruVQe1ykuvV/CXzJAEYNFXI2TKN6vzdinx6k Xr4GSmq/XU+fGPk0xuPPDoY0aMRjUgiV/NQStpxRNXneUTo2LT+1UJicLEgvOGja33vn 8ri8lQAO5yUdP0XwOa2B0bDgQRb6RBO88ogDYMrZfTEuHa0AGzQIRIEa1Oy8uh9Pb404 tWJf3tl6akDtax0xlnzmFRcKd6KvhRqA7W55+5MEZ7VRRVu7rH0j5Vzp/E8nU+YXI4UQ MJJsldgM/CYohqUY9zBC9GtiiXrmaHjPeZAG/RvaYY4wSyj1FpNgQQm295fqk+CFcY53 ogjQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=cxMaD8CgzKPWpzzBQiYSiO7ZuZ6eZs5SBgKJwTWN/r4=; fh=fHt1epEEG4CBzP1AZFY/UQTnQHCnTLYuOY60rKPEgb0=; b=aaE1Y9ceD4M2FtKy2xAEbQjGWnY7gTGDCTeXbsh3lsbmGjjc5EOZmvSVvtxOJvwJzH nu0CG54m4eoGSkWuckmDyRoJOAO3ezuSY4/rEACFPotMkAJ8FAQP9L7noosV61XnFlSH 0WwPNSNa3r4nos9f7pbMOXYcqf6i+xTqq7ym2TFLDiT9kP0aWXSceGvO6J3MuhAyEylc 7vVkZ+K3gtXLxLzC7NXJKdfcIptbg0aOrizK4O0/2sCjGu9w/6yf9OR9jXVGTZwGjjOp 34p5RPuO/f6h8A0EsU7vWGr/UmbO47nTV3odD+xkD7ymZ7jKdmueOhars25sznIiQbMW Apdg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b="sA9hTm/g"; arc=pass (i=1 dkim=pass dkdomain=infradead.org); spf=pass (google.com: domain of linux-kernel+bounces-66334-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-66334-linux.lists.archive=gmail.com@vger.kernel.org" Return-Path: Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id mq13-20020a17090b380d00b0029589234aa5si1304115pjb.150.2024.02.15.06.25.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Feb 2024 06:25:54 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-66334-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b="sA9hTm/g"; arc=pass (i=1 dkim=pass dkdomain=infradead.org); spf=pass (google.com: domain of linux-kernel+bounces-66334-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-66334-linux.lists.archive=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 89EECB25111 for ; Thu, 15 Feb 2024 06:40:12 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8C5FB1B815; Thu, 15 Feb 2024 06:37:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="sA9hTm/g" Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6A1921BC43; Thu, 15 Feb 2024 06:37:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.137.202.133 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707979049; cv=none; b=CG0ORHruFJKvcmJ+n1gdm4UG4qIRp/0sxrrNOCsF3+ZmhobDSJIJL/q/RxlZ0Es7VOsGbANkQpAUI5Qk6rhCUDbhPaPyV2kuy4cunR8KMbfZjy2d4Hzdz/o7rSquEPSU9hfyq0UBuGiLLpM7k9TsQKZGycIDN+ugvAG2JpG3RWk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707979049; c=relaxed/simple; bh=w+Pgu1tzRXvirKXTbFtere9dyO9fQq//XemDJY4dhxo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=BDx/CqpxdJcaxPkSfiyVOMpDhIQNHqDV2yoZqXSoOURnjiuiuzhrQ23xa3Ty7ZdLORBGRIrF+XC5tDEiaW0OajsG0pNXCTyTHPttuq25WyKW0P+xhfK40j6EJWhTQkw47cDQJ8QqDFTBdRYzloYMC0j4Ao7oKBprAKzYNgmLhZk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de; spf=none smtp.mailfrom=bombadil.srs.infradead.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b=sA9hTm/g; arc=none smtp.client-ip=198.137.202.133 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=bombadil.srs.infradead.org 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=cxMaD8CgzKPWpzzBQiYSiO7ZuZ6eZs5SBgKJwTWN/r4=; b=sA9hTm/gXewYmu74Y6HKN+nure pK/w8ImihQ8or1SXbOQU1BH8PnFwBJmpIvkG7mc1M4U5tyoniQYrq05Bf/igP3fq+tdtzlcAvRwF5 aKhKqLpa4MTE7ek+bRUa/cWrAwbNaTWZVcuZ4SrcXEE4OeerQG44/4LyCbkIZBfyv83FA41XFpg4w +WlAzXEYKo/bdm3jraGgGMznibtKSzdPgNUAv4zXOdzla+VVoJ7lA7cWDe+tQxf+1kpi1nfeS38o3 mXM2Pa2LbWZG+mZD7u5jlmUOv5hzQPlc3rwSUF+MQxOPauTPE/I5kLQSIeqa8lIjeOCEJ/PUHi/HJ cOHPVvIg==; Received: from 2a02-8389-2341-5b80-39d3-4735-9a3c-88d8.cable.dynamic.v6.surfer.at ([2a02:8389:2341:5b80:39d3:4735:9a3c:88d8] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.97.1 #2 (Red Hat Linux)) id 1raVN7-0000000F6zU-00HA; Thu, 15 Feb 2024 06:37:25 +0000 From: Christoph Hellwig To: linux-mm@kvack.org Cc: Matthew Wilcox , Jan Kara , David Howells , Brian Foster , Christian Brauner , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Jan Kara , Dave Chinner Subject: [PATCH 11/14] writeback: Use the folio_batch queue iterator Date: Thu, 15 Feb 2024 07:36:46 +0100 Message-Id: <20240215063649.2164017-12-hch@lst.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240215063649.2164017-1-hch@lst.de> References: <20240215063649.2164017-1-hch@lst.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html From: "Matthew Wilcox (Oracle)" Instead of keeping our own local iterator variable, use the one just added to folio_batch. Signed-off-by: Matthew Wilcox (Oracle) Signed-off-by: Christoph Hellwig Reviewed-by: Brian Foster Reviewed-by: Jan Kara Acked-by: Dave Chinner --- mm/page-writeback.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/mm/page-writeback.c b/mm/page-writeback.c index 358ce3ade9ad1e..3cbe4a7daa357c 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c @@ -2406,13 +2406,21 @@ static pgoff_t wbc_end(struct writeback_control *wbc) return wbc->range_end >> PAGE_SHIFT; } -static void writeback_get_batch(struct address_space *mapping, +static struct folio *writeback_get_folio(struct address_space *mapping, struct writeback_control *wbc) { - folio_batch_release(&wbc->fbatch); - cond_resched(); - filemap_get_folios_tag(mapping, &wbc->index, wbc_end(wbc), - wbc_to_tag(wbc), &wbc->fbatch); + struct folio *folio; + + folio = folio_batch_next(&wbc->fbatch); + if (!folio) { + folio_batch_release(&wbc->fbatch); + cond_resched(); + filemap_get_folios_tag(mapping, &wbc->index, wbc_end(wbc), + wbc_to_tag(wbc), &wbc->fbatch); + folio = folio_batch_next(&wbc->fbatch); + } + + return folio; } /** @@ -2454,7 +2462,6 @@ int write_cache_pages(struct address_space *mapping, int error; struct folio *folio; pgoff_t end; /* Inclusive */ - int i = 0; if (wbc->range_cyclic) { wbc->index = mapping->writeback_index; /* prev offset */ @@ -2469,15 +2476,10 @@ int write_cache_pages(struct address_space *mapping, folio_batch_init(&wbc->fbatch); for (;;) { - if (i == wbc->fbatch.nr) { - writeback_get_batch(mapping, wbc); - i = 0; - } - if (wbc->fbatch.nr == 0) + folio = writeback_get_folio(mapping, wbc); + if (!folio) break; - folio = wbc->fbatch.folios[i++]; - folio_lock(folio); if (!folio_prepare_writeback(mapping, wbc, folio)) { folio_unlock(folio); -- 2.39.2