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 7CB6CC35274 for ; Thu, 21 Dec 2023 11:30:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 12FAF8D0007; Thu, 21 Dec 2023 06:30:09 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 0E0388D0001; Thu, 21 Dec 2023 06:30:09 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EC2C38D0007; Thu, 21 Dec 2023 06:30:08 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id D9F058D0001 for ; Thu, 21 Dec 2023 06:30:08 -0500 (EST) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id B1A211A0D25 for ; Thu, 21 Dec 2023 11:30:08 +0000 (UTC) X-FDA: 81590606496.09.D39349D Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by imf22.hostedemail.com (Postfix) with ESMTP id 3E878C000A for ; Thu, 21 Dec 2023 11:30:05 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=R5hSwd5l; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=aBv5zKwx; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=bSqK6InS; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=KAYg9i7z; spf=pass (imf22.hostedemail.com: domain of jack@suse.cz designates 195.135.223.131 as permitted sender) smtp.mailfrom=jack@suse.cz; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1703158206; a=rsa-sha256; cv=none; b=eT3xxhiEnVgwmEVJueZJZeqlRPqydRhm55JttQUNaidOTONxa+/vl4gXmV2P5KGsUk6muG tcmBDI0WqSzVjVHq45Gvg/DRhBzB1ITR+eIy3/2YaRUtczD/iBPcBp3pM86zyKMY05w6x/ aWlykCDwHhu963aQU6y7N61FikbaeBU= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=R5hSwd5l; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=aBv5zKwx; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=bSqK6InS; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=KAYg9i7z; spf=pass (imf22.hostedemail.com: domain of jack@suse.cz designates 195.135.223.131 as permitted sender) smtp.mailfrom=jack@suse.cz; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1703158206; 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=collHDGGumjW8qJbYtol2//lRSPeWpd6YSa6qeEokGw=; b=OZvWnLaTwOjf7yVig9W+xQOHC7ODG/aHm7T0Sv5DQoCZfA7HTodrfq/AqiH7pRARae5kbm 705g6dTf4PwSKvJ3U5QoRUfoZInM7SrEfkXI1xL4qlfN/oXMOl3HEyvdpg4IUCu+maT3rZ kfy3UiNBigjUTbkC+JiHzqlK2zCW77w= Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 78E901FDAA; Thu, 21 Dec 2023 11:30:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1703158204; h=from:from:reply-to: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=collHDGGumjW8qJbYtol2//lRSPeWpd6YSa6qeEokGw=; b=R5hSwd5ljiBreUag5bpe26RA2Dib9xWRSV/QlS/3nrZjR3YvcP5lqg0EKSpmh0aXFdPdFC jNQnjf4KAlEnJVvKa+FKM+XVUasXG4un0cpuI3bD7XNao3NCIzDzIazds9JSISDvWluSyY ePYN6JLvZWw1EmfLOEj+fZ14TxWc0kQ= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1703158204; h=from:from:reply-to: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=collHDGGumjW8qJbYtol2//lRSPeWpd6YSa6qeEokGw=; b=aBv5zKwxXGp22hWnr06AJDGuNmzdxlk6VCN5FWEIT8F6L8UdmTiy/pcZN8ezyLfo8GO07Q g1wSq6RJMSKIeBCQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1703158203; h=from:from:reply-to: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=collHDGGumjW8qJbYtol2//lRSPeWpd6YSa6qeEokGw=; b=bSqK6InSzvg37MNHX9AIIVbyuK05c1VwhItUctNBqWE0yoPGIAEAnMDcteL0MLv+bbKc/z e+ODmi4h6YvZtwWPsrAYX03/RKcam2FBLV/i3D36KVY7Cdt1LcEdd8tNEP8L07zjPqp7of KZvAnEgWO/KYXCt/Qankm1sAxyQ6tZI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1703158203; h=from:from:reply-to: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=collHDGGumjW8qJbYtol2//lRSPeWpd6YSa6qeEokGw=; b=KAYg9i7zFcAH75mXRS/00Q5UnZXz80vQjKHM4zwbrMdKc8EPSx5zheHSAbZYlae6RSCeyt dcFNZ9qVnFAOW4AA== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 6D47E13725; Thu, 21 Dec 2023 11:30:03 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id Bu+uGrshhGXdWwAAD6G6ig (envelope-from ); Thu, 21 Dec 2023 11:30:03 +0000 Received: by quack3.suse.cz (Postfix, from userid 1000) id 1FE0EA07E3; Thu, 21 Dec 2023 12:29:59 +0100 (CET) Date: Thu, 21 Dec 2023 12:29:59 +0100 From: Jan Kara To: Christoph Hellwig Cc: linux-mm@kvack.org, "Matthew Wilcox (Oracle)" , Jan Kara , David Howells , Brian Foster , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 12/17] writeback: Factor writeback_iter_init() out of write_cache_pages() Message-ID: <20231221112959.du2lplmxa2uquuf6@quack3> References: <20231218153553.807799-1-hch@lst.de> <20231218153553.807799-13-hch@lst.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20231218153553.807799-13-hch@lst.de> X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 3E878C000A X-Stat-Signature: b9pkaa7eobcpmz5myrm8n1u9kohkoeyb X-Rspam-User: X-HE-Tag: 1703158205-566443 X-HE-Meta: U2FsdGVkX1/TJg4REexglY4KrjCoJUCG6NUu9WVk5TqfFb4Zf9ESkHulvIamvn/2ss2IS1x/hX9UYURsMKCameuPSbuoM9dsi5nVFl15bmGaCyuyImuq/WCeelbnzGLKPpvG8/8k7BCtnP/jgTl/JWJh8gMfJCgtg0YkABSy+Xgl3itfxJTiecL8TagY+KMPAvlBr7A/uHVXmjK0kH39CMwJ6Kme/rWiF5Lpl0oX7bniQZEPIg5ohLuOva1nW2p/M+rY2J6m+Ca25ooWb5jx0HNepWYzgbdaR5Q24v3Z6AsrcCVm4J59fU38XnJhBxEayGLFtWTeuajaMWrt3S0ticzdUAepSpE9/MHBgcTLN81bnQNWTS9Kop3o2CEA+OO7PX1ntwqKQtCb+3TLT1uLDE2NcrTet0CFFPujYCO5EVTDxAl210M0yH+myhgqHyetMxMmj3Beq7vG5D3p6mNi54jMb12o/fmbZUz2A5P+35m817km5NX3iHwnoTPDk4lhkF3Gu1PPwLDDoKqdPdmEDPZCFlVx9is1DG7QL2/cF1UwfvNWMnK4yf9uBJXnPcNgifRjIsgbooj0ESzt8eY1QVktqHs98yZV1WL7jVw7yQy8K9ip7s4j8HHIE5QSzZfpflq3ZXMZYbcwSFlSUEc9BIMY/eJE+DkJwlW+GukCifdB408nRNBCyelIucOLw6WT3Oo6Ubc2hzKQxZKQjacGwPqDj/N+nzQOad/YGnadZUfxnR2+kxAcT3V90+SNbFswdFzR7oOU/QmMycJr6nMhOX1bC3rTlwV7DjXGQsW7Hgm4/BYwXqPU9giDFBMUGcPUDjaDsO6unBTjxiEJmdYEcZjdYGgn+itfdmePpjdo7B79g+vXFB8NU1RRCFO5J/fb7gFtmv5V4TX4kc4G6xpiRBIgG6DYFq6ww7QMIFE3Cb5QIOnrUE9lV+qZG9f5o3kYUjpjqajkTdX9h3efWmt SIBQpsLO VRgd3fLHxTZnwwHHX++Yj3FtvBgFlVhWsqcHv/21me9FtOpZsgY9pzf7Rx9BtwxSOSK8bvQy0S9u9AAWt0E/pvP67cmdb71W55hxUZN5B3gL+EDYeJOf5PUPyBedGD7M99cWmvWtk1lEBNkj1V2+vL10/auaaXtCnCvcnXTApXiEOUOhaQUZ0jzjN1BAReKoP+/IK+mPaO9bw3VFXIAoLpnhJbevf+Wrpcowwv8hlCSQNVSORvp3/Agx1OzgubbMjyUcpe/yc3C3bJFGkUqbcdaiQcDXz386aUwxV8WVrS3pAaD1+JBQwRMdnv+qbUCBP4oJNDX4UTxP9Z59JJ6/o047jkFjRzx6w5mqWqrHKjHrmZML5tmHFwI1MhgOV2joKQptv 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 Mon 18-12-23 16:35:48, Christoph Hellwig wrote: > From: "Matthew Wilcox (Oracle)" > > Make it return the first folio in the batch so that we can use it > in a typical for() pattern. > > Signed-off-by: Matthew Wilcox (Oracle) > Signed-off-by: Christoph Hellwig Looks good. Feel free to add: Reviewed-by: Jan Kara Honza > --- > mm/page-writeback.c | 39 ++++++++++++++++++++------------------- > 1 file changed, 20 insertions(+), 19 deletions(-) > > diff --git a/mm/page-writeback.c b/mm/page-writeback.c > index 70f42fd9a95b5d..efcfffa800884d 100644 > --- a/mm/page-writeback.c > +++ b/mm/page-writeback.c > @@ -2442,6 +2442,22 @@ static bool should_writeback_folio(struct address_space *mapping, > return true; > } > > +static struct folio *writeback_iter_init(struct address_space *mapping, > + struct writeback_control *wbc) > +{ > + if (wbc->range_cyclic) > + wbc->index = mapping->writeback_index; /* prev offset */ > + else > + wbc->index = wbc->range_start >> PAGE_SHIFT; > + > + if (wbc->sync_mode == WB_SYNC_ALL || wbc->tagged_writepages) > + tag_pages_for_writeback(mapping, wbc->index, wbc_end(wbc)); > + > + wbc->err = 0; > + folio_batch_init(&wbc->fbatch); > + return writeback_get_next(mapping, wbc); > +} > + > /** > * write_cache_pages - walk the list of dirty pages of the given address space and write all of them. > * @mapping: address space structure to write > @@ -2477,29 +2493,14 @@ int write_cache_pages(struct address_space *mapping, > struct writeback_control *wbc, writepage_t writepage, > void *data) > { > + struct folio *folio; > int error; > - pgoff_t end; /* Inclusive */ > > - if (wbc->range_cyclic) { > - wbc->index = mapping->writeback_index; /* prev offset */ > - end = -1; > - } else { > - wbc->index = wbc->range_start >> PAGE_SHIFT; > - end = wbc->range_end >> PAGE_SHIFT; > - } > - if (wbc->sync_mode == WB_SYNC_ALL || wbc->tagged_writepages) > - tag_pages_for_writeback(mapping, wbc->index, end); > - > - folio_batch_init(&wbc->fbatch); > - wbc->err = 0; > - > - for (;;) { > - struct folio *folio = writeback_get_next(mapping, wbc); > + for (folio = writeback_iter_init(mapping, wbc); > + folio; > + folio = writeback_get_next(mapping, wbc)) { > unsigned long nr; > > - if (!folio) > - break; > - > folio_lock(folio); > if (!should_writeback_folio(mapping, wbc, folio)) { > folio_unlock(folio); > -- > 2.39.2 > -- Jan Kara SUSE Labs, CR