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 AB5F1C47DB3 for ; Mon, 29 Jan 2024 20:12:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 361E66B0096; Mon, 29 Jan 2024 15:12:39 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 3122A6B0098; Mon, 29 Jan 2024 15:12:39 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1DA7A6B0099; Mon, 29 Jan 2024 15:12:39 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 0CC8C6B0096 for ; Mon, 29 Jan 2024 15:12:39 -0500 (EST) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id DC5511A05D7 for ; Mon, 29 Jan 2024 20:12:38 +0000 (UTC) X-FDA: 81733446396.13.DBB37F7 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf19.hostedemail.com (Postfix) with ESMTP id 8F5AD1A0011 for ; Mon, 29 Jan 2024 20:12:35 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Ga8gFpp7; spf=pass (imf19.hostedemail.com: domain of bfoster@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=bfoster@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1706559157; 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-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=qK9tbpAJWU+jCclBGn+oKppMC1R8LcdvjWspqD2gVlo=; b=rqL1Az2ofckTzz0CpmpyvTDgSmp+UA3QroY+Vf1vveJfl8MW8qmHEyka4D5rHkpbTUU6Gg jBbgOFDjdy1yjbazxel2By7Mx1yXrSzHZJE37eCXuRsRW4vcCldL/B4xzYk3Lw/hW+hFYC a7HO4uElwyy1MMyk6n3Qtt4LZMvknC8= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Ga8gFpp7; spf=pass (imf19.hostedemail.com: domain of bfoster@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=bfoster@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1706559157; a=rsa-sha256; cv=none; b=HXLxT6+ugQS8XubkVDVhHoMUkMSwGOJ5c6ozbDGboeX7dwVn7k6BZFz0DTNC/+67X5hEWo dshGTd02sZjoUCk8SOpqkrCHLy2+2tcsE7P6p5SDDccdasuMChubT1fSUyKkBsCqiVi3GF 8ljY/1bQ/VRAyjzzYav/ajQQM9i6iHc= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1706559154; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=qK9tbpAJWU+jCclBGn+oKppMC1R8LcdvjWspqD2gVlo=; b=Ga8gFpp7da5k/FfCqMRhX1cfF31mb6V5VWFZETxzxPwzPxETN2MfELKOFN+AjT9QUcyuGH ebVm7nGBKAKuVQrm89bEJt4iuD/Ou99ag5KEKO/fw2fCCophYrjKM+TIzkL739amCUAIWt CCpRMCH16xvxxonxg8zlZzNwgJBnPCo= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-215-J6DXV2dePT6btmWl161NIw-1; Mon, 29 Jan 2024 15:12:30 -0500 X-MC-Unique: J6DXV2dePT6btmWl161NIw-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 727D4837224; Mon, 29 Jan 2024 20:12:29 +0000 (UTC) Received: from bfoster (unknown [10.22.32.186]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E6433AD4; Mon, 29 Jan 2024 20:12:28 +0000 (UTC) Date: Mon, 29 Jan 2024 15:13:47 -0500 From: Brian Foster To: Christoph Hellwig Cc: linux-mm@kvack.org, Matthew Wilcox , Jan Kara , David Howells , 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: Re: [PATCH 06/19] writeback: Factor out writeback_finish() Message-ID: References: <20240125085758.2393327-1-hch@lst.de> <20240125085758.2393327-7-hch@lst.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240125085758.2393327-7-hch@lst.de> X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.1 X-Rspamd-Queue-Id: 8F5AD1A0011 X-Rspam-User: X-Stat-Signature: xkh1yj4rm8j6ghefnaebjzj7ce96zeus X-Rspamd-Server: rspam01 X-HE-Tag: 1706559155-632980 X-HE-Meta: U2FsdGVkX19nraAmvOCX3Iljo2CWy7l6mHnfl6VKifPHzZTk+ZR5jd3giWlUifFW/1pNC3bYeDhp0Mn6+SNNlU4rhQfEldfqFbSvs85pii4qX+QlzkMgl1He36yw5y4cPxL0tFCT7KBe9f45BQRKkpl0zvVxm2IzGOPZ7upgy+oJ1TCUHj8MUT+6WTPC2+m2jUjfoDF9M63AZRXE2kubJTyfkBK+9VvsqaP2tasLh6w45GQ04uubajnU43gu9yqIrSV/If5bkl24czUWkegFsuWcFo/mesDUaSRiaiuzvgthXzru5d54M6ySrZ0PP8H971wTKH8WpUenKYoDuZb/3qhA/C2NC1ibT1+HLeWvt2iyeVrJw+GgG8bHqP0NOVjyg9RKy1/9uUsjm6rEheJfJcBxXT49TE5ey6vLNRRnTNDsUPwtiDVKdfHdUzkYHJqyOufKwQdnzN8lTeYt0oCwSduIG/fDCCkkSrxmuIDqYnG0OP3+czh8kqU4wusMk5dReWCY1ND7FxKuAYinD8lI2FRq5x0RPh/Ebnxy2uQVgp44l0x54CCPRjKE+cfHBlMxBjjO3q50UUTxHdihZqP61TNCbB7U4y4aP1RZw5CPR1OiJL7sX5/xYcbKt5uYND6Y3oQSTTAC6BY1SvYPwy7gPiVjkE+tPgygqd0/49t0PGEBQr90u9K2Dc/5J6DDDwph+r+or1dkV1TjCVefQsUCbS97u5pkW2nfrBli6p51xoK8/gZyxVdrznidI7lUoWuvyrlDw3hARXuiJC/sECArLZonkraQTD5LXLB9vieL+tVnayI8tecCCEHBMyoE5FgEYvBuGrO4TZw3Vvb0MQQSAj2hDzJc05IJhnKxd/Pl07gpI0OemVy0KZU/V0uCnxPRS3nvDF9O5YKyQ72rOE3dgPV7tFJOuepffCIFuxr8mBI95+Hq0ZnL7uwO2bkiMA8DHPeXt7IIuUZbShC2JyM KP5/yp8y 0LxO/pUx7n/T6bYHVSJU/tGkFwmYVevk7hF8QGg/MG90pNzrElz82avN2e8rC7xuOrSbhmjas8+wD8/x4v0GuP1ff7XepDfO9ob+6TqgCEqKlmuYdiP3q0sOO3IQlbTP6J/Y4plM6F5EO59VVthkrQ3vuBy2tZd39+ZjUXU6dfvaeT+s3Oc8Fuo5qtFYwdaG5GbTFzPHM2t3hSnhicpEPMVNFQQexwweuhFHnHYqp3JzZa1zYIcrgymzSLRy9RcpssswItjobPh084YhWDW2MtD3eaFGawY90VkrUWHY13m/dYbNYCART15WGY+9dHRF9Q4Cj 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: On Thu, Jan 25, 2024 at 09:57:45AM +0100, Christoph Hellwig wrote: > From: "Matthew Wilcox (Oracle)" > > Instead of having a 'done' variable that controls the nested loops, > have a writeback_finish() that can be returned directly. This involves > keeping more things in writeback_control, but it's just moving stuff > allocated on the stack to being allocated slightly earlier on the stack. > > Signed-off-by: Matthew Wilcox (Oracle) > [hch: heavily rebased, reordered and commented struct writeback_control] > Signed-off-by: Christoph Hellwig > Reviewed-by: Jan Kara > Acked-by: Dave Chinner > --- > include/linux/writeback.h | 6 +++ > mm/page-writeback.c | 79 ++++++++++++++++++++------------------- > 2 files changed, 47 insertions(+), 38 deletions(-) > ... > diff --git a/mm/page-writeback.c b/mm/page-writeback.c > index 437745a511c634..fcd90a176d806c 100644 > --- a/mm/page-writeback.c > +++ b/mm/page-writeback.c ... > @@ -2419,22 +2437,23 @@ int write_cache_pages(struct address_space *mapping, > } else { > tag = PAGECACHE_TAG_DIRTY; > } > - done_index = index; > - while (!done && (index <= end)) { > + > + folio_batch_init(&wbc->fbatch); > + wbc->err = 0; > + > + while (index <= end) { > int i; > > nr_folios = filemap_get_folios_tag(mapping, &index, end, > - tag, &fbatch); > + tag, &wbc->fbatch); > > if (nr_folios == 0) > break; > > for (i = 0; i < nr_folios; i++) { > - struct folio *folio = fbatch.folios[i]; > + struct folio *folio = wbc->fbatch.folios[i]; > unsigned long nr; > > - done_index = folio->index; > - > folio_lock(folio); > > /* > @@ -2481,6 +2500,9 @@ int write_cache_pages(struct address_space *mapping, > folio_unlock(folio); > error = 0; > } > + JFYI: whitespace damage on the above line. > + if (error && !wbc->err) > + wbc->err = error; > Also what happened to the return of the above "first error encountered" for the WB_SYNC_ALL case? Is that not needed for some reason (and so the comment just below might require an update)? Brian > /* > * For integrity sync we have to keep going until we > @@ -2496,38 +2518,19 @@ int write_cache_pages(struct address_space *mapping, > * off and media errors won't choke writeout for the > * entire file. > */ > - if (error && !ret) > - ret = error; > - if (wbc->sync_mode == WB_SYNC_NONE) { > - if (ret || wbc->nr_to_write <= 0) { > - done_index = folio->index + nr; > - done = 1; > - break; > - } > + if (wbc->sync_mode == WB_SYNC_NONE && > + (wbc->err || wbc->nr_to_write <= 0)) { > + writeback_finish(mapping, wbc, > + folio->index + nr); > + return error; > } > } > - folio_batch_release(&fbatch); > + folio_batch_release(&wbc->fbatch); > cond_resched(); > } > > - /* > - * For range cyclic writeback we need to remember where we stopped so > - * that we can continue there next time we are called. If we hit the > - * last page and there is more work to be done, wrap back to the start > - * of the file. > - * > - * For non-cyclic writeback we always start looking up at the beginning > - * of the file if we are called again, which can only happen due to > - * -ENOMEM from the file system. > - */ > - if (wbc->range_cyclic) { > - if (done) > - mapping->writeback_index = done_index; > - else > - mapping->writeback_index = 0; > - } > - > - return ret; > + writeback_finish(mapping, wbc, 0); > + return 0; > } > EXPORT_SYMBOL(write_cache_pages); > > -- > 2.39.2 > >