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 EF12CC46CCD for ; Thu, 21 Dec 2023 11:53:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 86F288D000A; Thu, 21 Dec 2023 06:53:49 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 81E458D0001; Thu, 21 Dec 2023 06:53:49 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6BE608D000A; Thu, 21 Dec 2023 06:53:49 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 5C2C48D0001 for ; Thu, 21 Dec 2023 06:53:49 -0500 (EST) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 24732140707 for ; Thu, 21 Dec 2023 11:53:49 +0000 (UTC) X-FDA: 81590666178.28.840249A Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by imf12.hostedemail.com (Postfix) with ESMTP id F2B7140007 for ; Thu, 21 Dec 2023 11:53:46 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=oLST258I; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=yT7a2fho; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=oLST258I; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=yT7a2fho; dmarc=none; spf=pass (imf12.hostedemail.com: domain of jack@suse.cz designates 195.135.223.130 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=1703159627; 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=L31YACKSQsFcxxfW7VaGnizvEvAwj2sWxxztR/WkIj8=; b=5/VyjtE1ygXexxsGb2tpdm8ZvafU01emwdTPIZPPTNMvysLAbNr6CKefBCkOunRwHk9jNY nhc4ryVQb5geh8Qu13aWtI5pzKwIyogRJnhWd98Q99+r1PrslFFdT8pVKlQpWj8D9Nr63R R8ps52uK2hQ1ywgmshWHHuuQylnGgmg= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=oLST258I; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=yT7a2fho; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=oLST258I; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=yT7a2fho; dmarc=none; spf=pass (imf12.hostedemail.com: domain of jack@suse.cz designates 195.135.223.130 as permitted sender) smtp.mailfrom=jack@suse.cz ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1703159627; a=rsa-sha256; cv=none; b=ZG2bj1OJjZvxgXwa6d0A3BcrIBnVDY4Qljb3Btp5KB4AL+MXBXyb6a2EYTpr5IQGFVl3/6 apy0Q/hm8mAHWMKI98l7gxxdmIhKyAmVPeK7HdSU5RGCMH8Z+eOWCxS5ML43T3i3dAAzt9 cjbL8QP9WyK6AXsDqMS/IDfkHX0AFrY= 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-out1.suse.de (Postfix) with ESMTPS id 67FD121E44; Thu, 21 Dec 2023 11:53:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1703159625; 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=L31YACKSQsFcxxfW7VaGnizvEvAwj2sWxxztR/WkIj8=; b=oLST258IANtlkxNQE9+eUj/nMzwZaADtIVJFFeGRl7JvU++VyCiEKxyyl/kbPS8Qyz2KkE N0xXsBjrFHwTmG4VyIqWO30F+dSFRuVmPWkXt+7TQSY/6i3dMYNmfG0QleHKge+Xd7f4TK qQ2J+8+5di4lO3Rg/wKKvpm403CaCqo= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1703159625; 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=L31YACKSQsFcxxfW7VaGnizvEvAwj2sWxxztR/WkIj8=; b=yT7a2fhoGycH/mU51y5QnFa1RIGX8wiVt4CKtTT910qi9O1PvEtRjgUX0lcnM7Hke2+qO9 FOpVzS8omBa8gpBA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1703159625; 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=L31YACKSQsFcxxfW7VaGnizvEvAwj2sWxxztR/WkIj8=; b=oLST258IANtlkxNQE9+eUj/nMzwZaADtIVJFFeGRl7JvU++VyCiEKxyyl/kbPS8Qyz2KkE N0xXsBjrFHwTmG4VyIqWO30F+dSFRuVmPWkXt+7TQSY/6i3dMYNmfG0QleHKge+Xd7f4TK qQ2J+8+5di4lO3Rg/wKKvpm403CaCqo= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1703159625; 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=L31YACKSQsFcxxfW7VaGnizvEvAwj2sWxxztR/WkIj8=; b=yT7a2fhoGycH/mU51y5QnFa1RIGX8wiVt4CKtTT910qi9O1PvEtRjgUX0lcnM7Hke2+qO9 FOpVzS8omBa8gpBA== 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 5D78313AB5; Thu, 21 Dec 2023 11:53:45 +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 WfrcFkknhGXyYwAAD6G6ig (envelope-from ); Thu, 21 Dec 2023 11:53:45 +0000 Received: by quack3.suse.cz (Postfix, from userid 1000) id 17115A07E3; Thu, 21 Dec 2023 12:53:45 +0100 (CET) Date: Thu, 21 Dec 2023 12:53:45 +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 16/17] writeback: Remove a use of write_cache_pages() from do_writepages() Message-ID: <20231221115345.jaqzljtj2s675vjr@quack3> References: <20231218153553.807799-1-hch@lst.de> <20231218153553.807799-17-hch@lst.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20231218153553.807799-17-hch@lst.de> X-Rspamd-Queue-Id: F2B7140007 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: efct7pzq65hhsp1tj4e1ycyms487sxui X-HE-Tag: 1703159626-191502 X-HE-Meta: U2FsdGVkX18bM7GK+VExiSuwolSaEV/dKpvoTrRaN51/dU4VQ+xfhMj5ZDkTm7oK9AZHHiMnyQj7eMkX3eyA+ZHXMv1HOM92KXZnC0lxIF7IxbIwtcYS98prgD/XEV5A/LDkt4fldDU1UYv+v63qlEmxbmjzXdMAQ8DQnGomjUOcadcf/w5kTJfjiX/0gEEoXp3v08bP8OBZAj2Uc4Y3OFeijkAj9IgdX8iJFo7PpXMoxRhmxd+ueFF+tgpfuTWj6AY6jNHPnbXgchyG+LtAH0RTgptoKZvOWMw/+O/aDznXZMvP/SbERy6LyijB+UstK/ALS6UKU0qdNOD+561Oc53SSEwMKAWa03UMWPTjCcJ7eQOV8MRDNb0IoW08PgcWFTs2lZs8AE8kyMyoUDPmEq192DNeCxeHMnSRElha/7eiq3eIyAwllZm3ZNTyNYFHxhZXS+8vuJpIlyx/a5gBxzGoda5isMT6SU5a3Y/7EiJSDR4JBMUfvl5bjLA+0hIwAiqIbfvJ/r0xGn/MG9kvQ5XKQkDVrMl/JBDjNFlPD2zmjRs/wqskNhNZfcl8AGI8fV0Thd1d//Xvo3KhZ/zOM5uKIGRbT1orpy9EmCa310HIccyIzmcvsvOGQLU/nRiMJEpOcA1N9Hx1GWrUPyyr+RRroY3aIwzHRtR/CvulWhXeIrdvmOl3kHTCkHDB9JjXM/9tLwdorpXTcsZMDWzlW0p8MkkFTwYu9IPROAj+TQ0Mvc5v3UfdBu4Fa50bHmZYSw2VMzhPK0YORQQiNfbFwa5WBw+pi0TqQkFTGJM1w7LdU+KQvB/46wrVmcrBl5sUPd3gpWa2B5J6mgEGomcW4fv+bnlv27h6BdwqLFcxXjYzJBq7q5rGb0GcZk1cjeQvIZhKjWb0nfYWzAGLzEzifBJx9VgPkWWvF4len3a6rd0Q1Q3zeC5uQf+WXkj79FQI 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:52, Christoph Hellwig wrote: > From: "Matthew Wilcox (Oracle)" > > Use the new for_each_writeback_folio() directly instead of indirecting > through a callback. > > 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 | 27 +++++++++++++++------------ > 1 file changed, 15 insertions(+), 12 deletions(-) > > diff --git a/mm/page-writeback.c b/mm/page-writeback.c > index fbffd30a9cc93f..d3c2c78e0c67ce 100644 > --- a/mm/page-writeback.c > +++ b/mm/page-writeback.c > @@ -2564,13 +2564,21 @@ int write_cache_pages(struct address_space *mapping, > } > EXPORT_SYMBOL(write_cache_pages); > > -static int writepage_cb(struct folio *folio, struct writeback_control *wbc, > - void *data) > +static int writeback_use_writepage(struct address_space *mapping, > + struct writeback_control *wbc) > { > - struct address_space *mapping = data; > - int ret = mapping->a_ops->writepage(&folio->page, wbc); > - mapping_set_error(mapping, ret); > - return ret; > + struct blk_plug plug; > + struct folio *folio; > + int err; > + > + blk_start_plug(&plug); > + for_each_writeback_folio(mapping, wbc, folio, err) { > + err = mapping->a_ops->writepage(&folio->page, wbc); > + mapping_set_error(mapping, err); > + } > + blk_finish_plug(&plug); > + > + return err; > } > > int do_writepages(struct address_space *mapping, struct writeback_control *wbc) > @@ -2586,12 +2594,7 @@ int do_writepages(struct address_space *mapping, struct writeback_control *wbc) > if (mapping->a_ops->writepages) { > ret = mapping->a_ops->writepages(mapping, wbc); > } else if (mapping->a_ops->writepage) { > - struct blk_plug plug; > - > - blk_start_plug(&plug); > - ret = write_cache_pages(mapping, wbc, writepage_cb, > - mapping); > - blk_finish_plug(&plug); > + ret = writeback_use_writepage(mapping, wbc); > } else { > /* deal with chardevs and other special files */ > ret = 0; > -- > 2.39.2 > -- Jan Kara SUSE Labs, CR