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 A3A6EC46CA2 for ; Tue, 19 Dec 2023 17:36:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3E3E78D0005; Tue, 19 Dec 2023 12:36:40 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 393BF8D0001; Tue, 19 Dec 2023 12:36:40 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 234ED8D0005; Tue, 19 Dec 2023 12:36:40 -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 0AB8A8D0001 for ; Tue, 19 Dec 2023 12:36:40 -0500 (EST) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id C698F120AEA for ; Tue, 19 Dec 2023 17:36:39 +0000 (UTC) X-FDA: 81584272518.08.E9F9E29 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by imf13.hostedemail.com (Postfix) with ESMTP id 5817520016 for ; Tue, 19 Dec 2023 17:36:37 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=GjngV4fn; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b="8uaGklS/"; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=GjngV4fn; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b="8uaGklS/"; spf=pass (imf13.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=1703007397; 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=yrWjN6dEMiPl9OOQNdVUh8/ByQtuMHmNLWEAh2asvp4=; b=49DqLkTzqoHcQOWov4iGaihibprSLhTsgtpDKrE62JvgIMtOMA8A6ZNnJ2teptb/R42RAt /IqtM+kZY6M0QzfyrrHTUi4oo9IIa1Etjv6PsnO/jkqkfe5VmP7xAVjbJ4iwTwCghy9G1z 3F2RXQOCz1QgGuUV+ag4MTOHOISuNfk= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1703007397; a=rsa-sha256; cv=none; b=w4y2GYDMDDB9swJ1ei69HW1COzNiBo3/ggiBZxHvjBULb3fsdbVXBQ0g82TpuW1GYCmnRX gvj5m979g0qaokTutYxtK1q+MxX4ci3klY6g4Kp/T2qKe+YHGYzzFhmXTYhmMvCKjizC2r CsfToMeSjn7LMd4arBm5oGgYTPZJAxc= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=GjngV4fn; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b="8uaGklS/"; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=GjngV4fn; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b="8uaGklS/"; spf=pass (imf13.hostedemail.com: domain of jack@suse.cz designates 195.135.223.131 as permitted sender) smtp.mailfrom=jack@suse.cz; dmarc=none Received: from imap2.dmz-prg2.suse.org (imap2.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:98]) (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 AFB2C1F7C1; Tue, 19 Dec 2023 17:36:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1703007395; 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=yrWjN6dEMiPl9OOQNdVUh8/ByQtuMHmNLWEAh2asvp4=; b=GjngV4fnDPG/ewmB0T/IdRWjXZYoGKT37UFtzdvXcaI4d1X6JZt36xar18VMRFOmIzjMyh uF1QmV4zbtqgAdSKgjKuKWGR0Cm1msbtlvv9cIwius/HUVb6jeN1CGMS7nwjdlOUdiBS6L 2KD2gaFZyK3HUyiu20FTKD5KpdkiaJ0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1703007395; 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=yrWjN6dEMiPl9OOQNdVUh8/ByQtuMHmNLWEAh2asvp4=; b=8uaGklS/ME0u/96f8x6eqUh+RX34jTq2gaiWGy4GHi56gtVHSfXZHB7ie3zxlnK+G+EKB8 DSotUdqwpphw8QDg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1703007395; 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=yrWjN6dEMiPl9OOQNdVUh8/ByQtuMHmNLWEAh2asvp4=; b=GjngV4fnDPG/ewmB0T/IdRWjXZYoGKT37UFtzdvXcaI4d1X6JZt36xar18VMRFOmIzjMyh uF1QmV4zbtqgAdSKgjKuKWGR0Cm1msbtlvv9cIwius/HUVb6jeN1CGMS7nwjdlOUdiBS6L 2KD2gaFZyK3HUyiu20FTKD5KpdkiaJ0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1703007395; 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=yrWjN6dEMiPl9OOQNdVUh8/ByQtuMHmNLWEAh2asvp4=; b=8uaGklS/ME0u/96f8x6eqUh+RX34jTq2gaiWGy4GHi56gtVHSfXZHB7ie3zxlnK+G+EKB8 DSotUdqwpphw8QDg== Received: from imap2.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 imap2.dmz-prg2.suse.org (Postfix) with ESMTPS id 96D6913B9B; Tue, 19 Dec 2023 17:36:35 +0000 (UTC) Received: from dovecot-director2.suse.de ([10.150.64.162]) by imap2.dmz-prg2.suse.org with ESMTPSA id x4TNJKPUgWXYIQAAn2gu4w (envelope-from ); Tue, 19 Dec 2023 17:36:35 +0000 Received: by quack3.suse.cz (Postfix, from userid 1000) id 2F3DDA07E0; Tue, 19 Dec 2023 18:36:35 +0100 (CET) Date: Tue, 19 Dec 2023 18:36:35 +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 02/17] writeback: also update wbc->nr_to_write on writeback failure Message-ID: <20231219173635.hrfs7snikfhcldre@quack3> References: <20231218153553.807799-1-hch@lst.de> <20231218153553.807799-3-hch@lst.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20231218153553.807799-3-hch@lst.de> X-Stat-Signature: ihuz69yi4gff56hfte1krzcd1cxu6uai X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 5817520016 X-Rspam-User: X-HE-Tag: 1703007397-26678 X-HE-Meta: U2FsdGVkX1/TLftYZaFvwouebSSL81674eqtOv0lSEkpc3vKiBkUM+8sFYjcvHlE3M0txv4fCBYnR2qgAQ+y4PQlu+QgoHORWmJvv68BlMJKvFCytwWpvlkijMu1ad7BoNzwaWj959qglksjxduNde/dTqDIk5vQsAfvf+pCmA7AVhN6DzU3Sf7sH8J2mQ9ynu5Cnv174joqFjF6nj/pG1qoiiSjeoL1/+1m5g263P4jq0mD6Rw3Wmi5BTg+psMhFKkXw6psV4wrF3zOVc2YEWLqaD3mVcmHxjzeI6dW1ILwVKHIdyHtXiFYJNkziWkN5ct4s/GYWqftEO0DdcvJQijk6tchacgmIJIHwVfBN8jJGxToYFiRxOXf7Lsg6VNIURwvAo7zN4AgX2m48W+xkr2+upul9UPYl9fdu785n5nbF4fIvNPBcoc8DYTkQ7TB1o5KIb+XMaokIgy6yuwFQGtG/aURzMxZmPmUa0nvWgrlALu7yIA61GtluwGqYDtRhitQEwbnyjmDnJIFIPEL+HWFVlraXsAEw3wyQ0uLHxDD72A1GNBDaM5t0OPMovrbDE/+N9yD1jLldASFDG75EezY52/4Dn6DzMclHmz7iXSCXoUDraRn4+ofgi0+3K74lQP0lI3gWxMTxLgaSjC/9nkBVmn4iXAH1vLLf62qFzt6QMUpK18GUQPFWQhr8HYB6U+whaSO+5F0xq64M1Le7hlpWtCqhB51sWI99s+THmOjPXfpEfF0SF7uBEOE3MCqWHCSniF3LN9rPy7Lh0L6/tMR4Iw/skJs87bKHZtNvJB5t6tR73m1Hks27kWlskkekoDEOP7u/9TZG8EhCNH6TNzpHp9jMq81HQ8rAik/1woJf8H6SbbLL/Hw3bWQfeYDKo0MDC98zP2FNYHYfYQfOHE4Pt5x2wuKFwKyxsQAmlsGGCryCqHviiE2TDHmMTOy/BapNuYddAkHdjb/q1s esGSW8ax ZAd5B/L3JEYO+rdPmF3BSpPNw1RfPHum1pjXdfsApUFOCMFoMt2PH3i5IhzeEQ51LQrxxKLJ/57C/uGJNkjQatQQGyaGvvH597Et9HvV06sFGDHxxNChuzkAPUb8K8Jpf9q6YREWFuiNzlaCakLu81VGJNiRgs6FMUhSa0bIpUOYsN0RVzpQ/QxvGeBqILIxESKJR8qLYFE2lsTVYrWTFZIFR3gtzlhc7TbM7pbKJaTlUYv5v2G2DLCro4IONFZvYvvOpIY1RMUO5Loa+lX19/HaGrde4JbYeVxOuLPZxKuOz9Hg0K+V78ju06RYDpC2mO/Rx 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:38, Christoph Hellwig wrote: > When exiting write_cache_pages early due to a non-integrity write > failure, wbc->nr_to_write currently doesn't account for the folio > we just failed to write. This doesn't matter because the callers > always ingore the value on a failure, but moving the update to > common code will allow to simply the code, so do it. ^^^ simplify > Signed-off-by: Christoph Hellwig Otherwise the patch looks good. Feel free to add: Reviewed-by: Jan Kara Honza > --- > mm/page-writeback.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/mm/page-writeback.c b/mm/page-writeback.c > index b13ea243edb6b2..8e312d73475646 100644 > --- a/mm/page-writeback.c > +++ b/mm/page-writeback.c > @@ -2473,6 +2473,7 @@ int write_cache_pages(struct address_space *mapping, > trace_wbc_writepage(wbc, inode_to_bdi(mapping->host)); > error = writepage(folio, wbc, data); > nr = folio_nr_pages(folio); > + wbc->nr_to_write -= nr; > if (unlikely(error)) { > /* > * Handle errors according to the type of > @@ -2506,7 +2507,6 @@ int write_cache_pages(struct address_space *mapping, > * we tagged for writeback prior to entering this loop. > */ > done_index = folio->index + nr; > - wbc->nr_to_write -= nr; > if (wbc->nr_to_write <= 0 && > wbc->sync_mode == WB_SYNC_NONE) { > done = 1; > -- > 2.39.2 > -- Jan Kara SUSE Labs, CR