Received: by 2002:a05:7412:31a9:b0:e2:908c:2ebd with SMTP id et41csp3662127rdb; Wed, 13 Sep 2023 21:05:49 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGyhwzVa52CX6411Bm3326x0SreHj6YaMPiPOCnu76phsofbnPbXrzDuPMOBGvQQdgV/YMe X-Received: by 2002:a67:db98:0:b0:44e:c2d6:cbce with SMTP id f24-20020a67db98000000b0044ec2d6cbcemr3620020vsk.11.1694664349216; Wed, 13 Sep 2023 21:05:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694664349; cv=none; d=google.com; s=arc-20160816; b=buSH/tQa1huYxKJRbW9iMV/YzerN3iAdXL8eQuB1oxs5GksVnHeGkq8/x8THmhulkF 2S/BH5fJTiJ6MoGKxr8bzxDAtI6hz2Ugg+2c+ARZhdX6KV8+vzvkiXyBEG2tAO6m2B12 niID1EPFbun7HqTmE79le7A+ETRBsptBfMLBm84XAqbwDAIl35QFrRa+XGz1hnypnTYL Q1Ou/BHgbbZ7lSfrjIcsZyJtm0PRhFJCRkfEELGr3JG6YgSPV0nYCdVaN95mUJoPoyCc eiyPFf9kOcFXiPLdkGSkEzDpTg+8sVl674xYnvX/C7ePgrz+NQBwGN/C2bKHzCpCIbOR Nzjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature :dkim-signature; bh=BFK28ZsfwA0eG1jJ0A5JLDN+cBxNTTlKg+5tpbEt3rY=; fh=s50B52cjw3wwmNbTgwVom0d5b/dZEEK9h2bh9aJ95wY=; b=y/Biai3ho2tqrg77DgXCd38X5qLNguDaDy020hj8ggGWClSW2yF/ASrz/Qb7OgJxgO nHWj/Ljh4s2RKotkxvKcO5YV8x8oxRzFmLuPa8yXO4uJRBpwq1+u76AUtonsgiYy2LZO qCxHYMIAOrj0QozK1h354VbTt2iaeRvQJCjkra24T60DpBdV6Eexv8FlCD1PIHHHy8Dh 70lntsNZJaWimFLhHwHxEtjaK2DvHqsC6B87H+WrkvpGvh9/lfw9oi5HAVSQxGMzexek T0ZLkuw94SkbGoL03fTLGrHvytqNa+dt6JuFe/yt4qpg97U1LZzTAgmXm8TyKFYkyG5I O0jA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.cz header.s=susede2_rsa header.b=a1DfTFLd; dkim=neutral (no key) header.i=@suse.cz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from fry.vger.email (fry.vger.email. [2620:137:e000::3:8]) by mx.google.com with ESMTPS id y21-20020a634b15000000b00564997692c5si616531pga.817.2023.09.13.21.05.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 21:05:49 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.cz header.s=susede2_rsa header.b=a1DfTFLd; dkim=neutral (no key) header.i=@suse.cz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id CFE26801DD88; Wed, 13 Sep 2023 08:17:41 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241658AbjIMPR1 (ORCPT + 99 others); Wed, 13 Sep 2023 11:17:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36806 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241683AbjIMPRM (ORCPT ); Wed, 13 Sep 2023 11:17:12 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AAFF6C6; Wed, 13 Sep 2023 08:16:53 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 6D5061F461; Wed, 13 Sep 2023 15:16:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1694618212; 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=BFK28ZsfwA0eG1jJ0A5JLDN+cBxNTTlKg+5tpbEt3rY=; b=a1DfTFLdh8NhAmkegwqPo8ale2psz7WYh+NMBgUtIv9m/Zc3BrfsT8hN0KYIy6O2iuFEjb xoUjVUgd2jNwvz70ZeBuyJCj2stgv70/rnncNJccGCqeK+OAGWdftLdPFoPr9FBLIT8Vx+ beFObFcfca6EWBwPa1+9DUcbxqduQ7Y= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1694618212; 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=BFK28ZsfwA0eG1jJ0A5JLDN+cBxNTTlKg+5tpbEt3rY=; b=XjWQa8kMR7udhZ/0uLHF3Njba+OOboiq3COz0MVR9+BrfsgQr8mbnNu66b7+PC8/QhMziN 9ufKqcB5GGTwovDQ== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 6037813440; Wed, 13 Sep 2023 15:16:52 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id ZMh1F2TSAWVzegAAMHmgww (envelope-from ); Wed, 13 Sep 2023 15:16:52 +0000 Received: by quack3.suse.cz (Postfix, from userid 1000) id DE3E0A07C2; Wed, 13 Sep 2023 17:16:51 +0200 (CEST) Date: Wed, 13 Sep 2023 17:16:51 +0200 From: Jan Kara To: Chunhai Guo Cc: jack@suse.cz, chao@kernel.org, jaegeuk@kernel.org, brauner@kernel.org, viro@zeniv.linux.org.uk, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] fs-writeback: writeback_sb_inodes: Do not increase 'total_wrote' when nothing is written Message-ID: <20230913151651.gzmyjvqwan3euhwi@quack3> References: <20230913131501.478516-1-guochunhai@vivo.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230913131501.478516-1-guochunhai@vivo.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Wed, 13 Sep 2023 08:17:42 -0700 (PDT) X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email On Wed 13-09-23 07:15:01, Chunhai Guo wrote: > > On Wed 13-09-23 10:42:21, Christian Brauner wrote: > > > [+Cc Jan] > > > > Thanks! > > > > > On Tue, Sep 12, 2023 at 08:20:43AM -0600, Chunhai Guo wrote: > > > > I am encountering a deadlock issue as shown below. There is a commit > > > > 344150999b7f ("f2fs: fix to avoid potential deadlock") can fix this > > > > issue. > > > > However, from log analysis, it appears that this is more likely a > > > > fake progress issue similar to commit 68f4c6eba70d ("fs-writeback: > > > > writeback_sb_inodes: Recalculate 'wrote' according skipped pages"). > > > > In each writeback iteration, nothing is written, while > > > > writeback_sb_inodes() increases 'total_wrote' each time, causing an > > > > infinite loop. This patch fixes this issue by not increasing > > > > 'total_wrote' when nothing is written. > > > > > > > > wb_writeback fsync (inode-Y) > > > > blk_start_plug(&plug) > > > > for (;;) { > > > > iter i-1: some reqs with page-X added into plug->mq_list // f2fs node > > > > page-X with PG_writeback > > > > filemap_fdatawrite > > > > __filemap_fdatawrite_range // write inode-Y > > > > with sync_mode WB_SYNC_ALL > > > > do_writepages > > > > f2fs_write_data_pages > > > > __f2fs_write_data_pages // > > > > wb_sync_req[DATA]++ for WB_SYNC_ALL > > > > f2fs_write_cache_pages > > > > f2fs_write_single_data_page > > > > f2fs_do_write_data_page > > > > f2fs_outplace_write_data > > > > f2fs_update_data_blkaddr > > > > f2fs_wait_on_page_writeback > > > > wait_on_page_writeback // wait for > > > > f2fs node page-X > > > > iter i: > > > > progress = __writeback_inodes_wb(wb, work) > > > > . writeback_sb_inodes > > > > . __writeback_single_inode // write inode-Y with sync_mode > > > > WB_SYNC_NONE > > > > . . do_writepages > > > > . . f2fs_write_data_pages > > > > . . . __f2fs_write_data_pages // skip writepages due to > > > > (wb_sync_req[DATA]>0) > > > > . . . wbc->pages_skipped += get_dirty_pages(inode) // > > > > wbc->pages_skipped = 1 > > > > . if (!(inode->i_state & I_DIRTY_ALL)) // i_state = I_SYNC | > > > > I_SYNC_QUEUED > > > > . total_wrote++; // total_wrote = 1 > > > > . requeue_inode // requeue inode-Y to wb->b_dirty queue due to > > > > non-zero pages_skipped > > > > if (progress) // progress = 1 > > > > continue; > > > > iter i+1: > > > > queue_io > > > > // similar process with iter i, infinite for-loop ! > > > > } > > > > blk_finish_plug(&plug) // flush plug won't be called > > > > > > > > Signed-off-by: Chunhai Guo > > > > Thanks for the patch but did you test this patch fixed your deadlock? > > Because the patch seems like a noop to me. Look: > > Yes. I have tested this patch and it indeed fixed this deadlock issue, too. OK, thanks for letting me know! > > > > diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c index > > > > 969ce991b0b0..54cdee906be9 100644 > > > > --- a/fs/fs-writeback.c > > > > +++ b/fs/fs-writeback.c > > > > @@ -1820,6 +1820,7 @@ static long writeback_sb_inodes(struct > > > > super_block *sb, > > > > struct inode *inode = wb_inode(wb->b_io.prev); > > > > struct bdi_writeback *tmp_wb; > > > > long wrote; > > > > + bool is_dirty_before; > > > > > > > > if (inode->i_sb != sb) { > > > > if (work->sb) { > > > > @@ -1881,6 +1882,7 @@ static long writeback_sb_inodes(struct > > > > super_block *sb, > > > > continue; > > > > } > > > > inode->i_state |= I_SYNC; > > > > + is_dirty_before = inode->i_state & I_DIRTY_ALL; > > > > is_dirty_before is going to be set if there's anything dirty - inode, page, > > timestamp. So it can be unset only if there are no dirty pages, in which > > case there are no pages that can be skipped during page writeback, which > > means that requeue_inode() will go and remove inode from b_io/b_dirty lists > > and it will not participate in writeback anymore. > > > > So I don't see how this patch can be helping anything... Please correct me > > if I'm missing anything. > > Honza > > From the dump info, there are only two pages as shown below. One is updated > and another is under writeback. Maybe f2fs counts the writeback page as a > dirty one, so get_dirty_pages() got one. As you said, maybe this is > unreasonable. > > Jaegeuk & Chao, what do you think of this? > > > crash_32> files -p 0xE5A44678 > INODE NRPAGES > e5a44678 2 > > PAGE PHYSICAL MAPPING INDEX CNT FLAGS > e8d0e338 641de000 e5a44810 0 5 a095 locked,waiters,uptodate,lru,private,writeback > e8ad59a0 54528000 e5a44810 1 2 2036 referenced,uptodate,lru,active,private Indeed, incrementing pages_skipped when there's no dirty page is a bit odd. That being said we could also harden requeue_inode() - in particular we could do there: if (wbc->pages_skipped) { /* * Writeback is not making progress due to locked buffers. * Skip this inode for now. Although having skipped pages * is odd for clean inodes, it can happen for some * filesystems so handle that gracefully. */ if (inode->i_state & I_DIRTY_ALL) redirty_tail_locked(inode, wb); else inode_cgwb_move_to_attached(inode, wb); } Does this fix your problem as well? Honza > > Thanks, > > > > > > > > > wbc_attach_and_unlock_inode(&wbc, inode); > > > > > > > > write_chunk = writeback_chunk_size(wb, work); @@ -1918,7 > > > > +1920,7 @@ static long writeback_sb_inodes(struct super_block *sb, > > > > */ > > > > tmp_wb = inode_to_wb_and_lock_list(inode); > > > > spin_lock(&inode->i_lock); > > > > - if (!(inode->i_state & I_DIRTY_ALL)) > > > > + if (!(inode->i_state & I_DIRTY_ALL) && is_dirty_before) > > > > total_wrote++; > > > > requeue_inode(inode, tmp_wb, &wbc); > > > > inode_sync_complete(inode); > > > > -- > > > > 2.25.1 > > > > > > -- > > Jan Kara > > SUSE Labs, CR > -- Jan Kara SUSE Labs, CR