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 9B456C35274 for ; Thu, 21 Dec 2023 11:42:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1ADF48D0008; Thu, 21 Dec 2023 06:42:06 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 15E9A8D0001; Thu, 21 Dec 2023 06:42:06 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F416C8D0008; Thu, 21 Dec 2023 06:42:05 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id E10B48D0001 for ; Thu, 21 Dec 2023 06:42:05 -0500 (EST) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id B1065C08C2 for ; Thu, 21 Dec 2023 11:42:05 +0000 (UTC) X-FDA: 81590636610.03.1873D9F Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by imf09.hostedemail.com (Postfix) with ESMTP id 41F1214000D for ; Thu, 21 Dec 2023 11:42:03 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=D+whZSpu; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=Y2TE2OBd; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=D+whZSpu; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=Y2TE2OBd; dmarc=none; spf=pass (imf09.hostedemail.com: domain of jack@suse.cz designates 195.135.223.131 as permitted sender) smtp.mailfrom=jack@suse.cz ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1703158923; a=rsa-sha256; cv=none; b=St7FfbAbqI+9PQ4WNt3mhCSsTS3zcxzg/EUxhk7209avDNqVu7OIVM4Tk02AF229OgqO0R LhDExwTV9LBSLxoviTM/VZeW91k8Dn7KdCrEUXfkuEQWnBsM6NjdLtDKz6AMI3KTlAncRi 25iYAoy8yw6YVmACk/hWXmbBO0mgdKI= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=D+whZSpu; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=Y2TE2OBd; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=D+whZSpu; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=Y2TE2OBd; dmarc=none; spf=pass (imf09.hostedemail.com: domain of jack@suse.cz designates 195.135.223.131 as permitted sender) smtp.mailfrom=jack@suse.cz ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1703158923; 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=HHGj/QWNdjAWrYVT+sev2QMbn9CEKZZ/Yw7K3T4SC9k=; b=uQPIwukFts+Wqc5LyWkgDj3DaW+Pv3FQcHd1zhf7Ee0q5SRQ0fpsfHmMwGZd5GS7+DRmjP fB9Msl5p0I9R2CtTsjgqYJ+OUZrUPdodIb/ZaVklg4en4tl0m9WOjuE4+fEXB+c1PeNsmN I5NDhPh2zs6h7A+BHbXvNfCV4q0/AOM= Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [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 A07101FB73; Thu, 21 Dec 2023 11:42:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1703158921; 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=HHGj/QWNdjAWrYVT+sev2QMbn9CEKZZ/Yw7K3T4SC9k=; b=D+whZSpuxgib93oNZ0IF1mLee1O3AL+iNCX0uDYMGIOE9ywMBVsgZS2LACAABhhIPgrQdu z9u+ttw+qlAlUV29460x/JHoeIPQtC2ORQlsNZnTQzZhEl09RxcVRzQAUOLS6Km8Q82bVK QkBVtcQx4RjcTII8A1uyjml6J9I/Z70= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1703158921; 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=HHGj/QWNdjAWrYVT+sev2QMbn9CEKZZ/Yw7K3T4SC9k=; b=Y2TE2OBdyc8UnRUTNf5Y3YBYbTw2MHEaQj3rUmP3226n4Chbqpg+sTTDaztz3SJCkJFS/5 A4lIU6vN8/O7VHAA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1703158921; 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=HHGj/QWNdjAWrYVT+sev2QMbn9CEKZZ/Yw7K3T4SC9k=; b=D+whZSpuxgib93oNZ0IF1mLee1O3AL+iNCX0uDYMGIOE9ywMBVsgZS2LACAABhhIPgrQdu z9u+ttw+qlAlUV29460x/JHoeIPQtC2ORQlsNZnTQzZhEl09RxcVRzQAUOLS6Km8Q82bVK QkBVtcQx4RjcTII8A1uyjml6J9I/Z70= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1703158921; 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=HHGj/QWNdjAWrYVT+sev2QMbn9CEKZZ/Yw7K3T4SC9k=; b=Y2TE2OBdyc8UnRUTNf5Y3YBYbTw2MHEaQj3rUmP3226n4Chbqpg+sTTDaztz3SJCkJFS/5 A4lIU6vN8/O7VHAA== 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 952B013725; Thu, 21 Dec 2023 11:42:01 +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 kVZmJIkkhGUAYAAAD6G6ig (envelope-from ); Thu, 21 Dec 2023 11:42:01 +0000 Received: by quack3.suse.cz (Postfix, from userid 1000) id 3ECABA07E3; Thu, 21 Dec 2023 12:41:53 +0100 (CET) Date: Thu, 21 Dec 2023 12:41:53 +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 13/17] writeback: Factor writeback_get_folio() out of write_cache_pages() Message-ID: <20231221114153.2ktiwixqedsk5adw@quack3> References: <20231218153553.807799-1-hch@lst.de> <20231218153553.807799-14-hch@lst.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20231218153553.807799-14-hch@lst.de> X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 41F1214000D X-Stat-Signature: oycd6g41mudbe4en873beaideow1386o X-HE-Tag: 1703158923-33839 X-HE-Meta: U2FsdGVkX1+kwrwa7MKmFonzCYxlJyhQaW21cOWanWzyXjkfkN2x6YYvZk1WepXggo4G4G8CQ/Te80bJX7f7PkAlEq1mlevwqkuQNuwgUv2DJ8p9qgmqdUZtGHfublG5+wWj4voy+bha1VV4wbdKTqoNm1gx5uDpa6ZvKfg/WvNOLR5ONXEacaC+Qya/LFk21QrA8D3N++q4jRtE8eRAEkVLTLCWwekAOjzKf57iFFo4TUrZegN9EXP+ft8QFLXrQ+0VJ33PSEIl2RD9haTWsRAY1fSId7pZOaATW/TCF/ghnkyYGZiyDm0m36AhnFNOmMQpdXMWT82BZo35McWmriNypgOsXQcZjwNxiQoLuNhmE1AWBtPafFADmTESw2Esoe8Um0CTcHRiaQY8PBNDTkgFU7eto1oOZBVXiXkLB/2iC+MLeQ1+0hmh8Y277v7vsrKyHqDJfBsb9M+bAtEVtPaA1NnBLcjoISgYTKndZFgmHOPh+U5bDxZHdVL3DInj0aLvqbU6FV8mYBHYCZgHFMuVQpxXENqxGIB3/Mjg+vpBrWZDkj49ZCEAhnS5yboRbwwcF+InJHjsXs9b5DEoMvwUB9NuSDQ1qb/bZ2qZv1kHGRnUSG6f9NW3TIvBZ8TPBqTOhnf50HxHTR+tmpm5ENeXlimbY1tInp6d2jIXzNpbu6CUj5IJA13ryTExNpikHnv7SgaYtYe+bvNzTDMrv8B6diwHPIfiJHA0wPnpOUgWPhuau1pxZXu7I/lYOqteseRVU0gJkeNu12T/5RlCCn02Vv53msJSSKXF8OI4Ginh5VFgpd6f9a5yLU7geBG9mTnaskTdNM1svFS7kYTzZJJShNseeGma/Bjx4xIPDll4ZZSdY2H0jBoZB1kZv4FOYVXQFc9BVERaS/rHba13gyzFPM4076MrdcCp/0VszsLEfTuGN5jgm/Rk/GVnzfc/dnW6cyCBFQWX5BouDYi 44mqH7wf kaId1B41/kaOWI72HGjGWlfmZaj/OLy5Tkza2tmAauVIVvegX0ylHlQbfk7+LQQbg/NLHsxpILZaP5h0sQs/4HiDUSISa9pm5iP3FKXf1oS+UFxVKUO6j6s7RUCD7o/83Z9m+tfCIedL8FdPljmueQsMvwfUeVkRT1GpatPGHZXU9wqi2YBanVOrq/QY+B+4oNY0OjkFRSgvpNPTvcLKWobQiYXvzEwzDYSWU5Hb3Gqg8s46PH0MbgdKaAahOyujVndApZp4RKU6pmSpMcki5eVgC9Id3DVM4b2vld9reOpBVmD8F8wFNtfdKQMN4IsXeATSL2fd5gUL4YhgsDz59dAuqyx9dN5BwLtk/9r0xt9bqU/YoRvbqXM/jLOgNMMmCeIsR 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:49, Christoph Hellwig wrote: > From: "Matthew Wilcox (Oracle)" > > Move the loop for should-we-write-this-folio to its own function. > > Signed-off-by: Matthew Wilcox (Oracle) > Signed-off-by: Christoph Hellwig Looks good to me. Feel free to add: Reviewed-by: Jan Kara But I'd note that the call stack depth of similarly called helper functions (with more to come later in the series) is getting a bit confusing. Maybe we should inline writeback_get_next() into its single caller writeback_get_folio() to reduce confusion a bit... Honza > +static struct folio *writeback_get_folio(struct address_space *mapping, > + struct writeback_control *wbc) > +{ > + struct folio *folio; > + > + for (;;) { > + folio = writeback_get_next(mapping, wbc); > + if (!folio) > + return NULL; > + folio_lock(folio); > + if (likely(should_writeback_folio(mapping, wbc, folio))) > + break; > + folio_unlock(folio); > + } > + > + trace_wbc_writepage(wbc, inode_to_bdi(mapping->host)); > + return folio; > +} > + > static struct folio *writeback_iter_init(struct address_space *mapping, > struct writeback_control *wbc) > { > @@ -2455,7 +2474,7 @@ static struct folio *writeback_iter_init(struct address_space *mapping, > > wbc->err = 0; > folio_batch_init(&wbc->fbatch); > - return writeback_get_next(mapping, wbc); > + return writeback_get_folio(mapping, wbc); > } > > /** > @@ -2498,17 +2517,9 @@ int write_cache_pages(struct address_space *mapping, > > for (folio = writeback_iter_init(mapping, wbc); > folio; > - folio = writeback_get_next(mapping, wbc)) { > + folio = writeback_get_folio(mapping, wbc)) { > unsigned long nr; > > - folio_lock(folio); > - if (!should_writeback_folio(mapping, wbc, folio)) { > - folio_unlock(folio); > - continue; > - } > - > - trace_wbc_writepage(wbc, inode_to_bdi(mapping->host)); > - > error = writepage(folio, wbc, data); > nr = folio_nr_pages(folio); > wbc->nr_to_write -= nr; > -- > 2.39.2 > -- Jan Kara SUSE Labs, CR