Received: by 2002:a05:6a10:1a4d:0:0:0:0 with SMTP id nk13csp3622808pxb; Fri, 4 Feb 2022 12:36:44 -0800 (PST) X-Google-Smtp-Source: ABdhPJxlfj9vDeJX5Qm92mS6eVFcnS4ZPKtfreuWqZym4dumdgwtZ58urSmFmh4tiYNueB0GGeQR X-Received: by 2002:a17:903:11c3:: with SMTP id q3mr4833958plh.97.1644007004264; Fri, 04 Feb 2022 12:36:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644007004; cv=none; d=google.com; s=arc-20160816; b=LoIn6IN7dkFh5v2kxciJIfz2mtO4/H+oblHdrfpUTsW0zbNuiHNf3BdPKN4S6o+Ygm xFHeEPSHRsCqsR9kY+YAS1nvbKVa2vSqBUY2JZtJCkwOigCItYD5G3nWEeKlAtwvVMRK iCSwrS+VaTh+JG6lcEH8/vngc/xhtM1+xZmWwPnKZEc2+zbEe3CWu+ZRcWciiBfNv5+h 6g20LnpKtKnQ/HZ053Q4QADEZhC12ZAA2gfOwTd6x6dNMRuIZ+yi8aNZ9/1ULTzeLV/M z1tZixgIePfeNpAkROe/O7dVAOPK1+yMto3Qh8Phmgmnmb6qwgPxPQcSFXupCqSFamSE uyOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:in-reply-to:from :references:cc:to:content-language:subject:user-agent:mime-version :date:message-id:dkim-signature; bh=neOTmA4TX+ql3GV/bpwz8/t/VmtjHLvdPxnRdt9elLk=; b=xvedWbknkXlCkjsKrlj99ovzZCvlietqHgO3vMKhNI4bHPo6oD7YogGR7ZVjzsX9aB g1RLiC259cT5cyZVYzzs40CzB5E+Ye+xaTcAOKhE/wH3UuVhxuPgZlfx1RcxUs8Z998D xcy3VRY8+9Lpd1q1FNX7mFGcaBXI4OyyIJGR69+LC5a3fDLnkk14vZiTJnr1hJQXQN/4 KHb+QO/GY7D+f9HrARI1w1ynpGxMQCZoqvKBEwsp9IhKChY+hEGb6/TnNSQQzPQVyIXk 0vxNXvzOht9C1y4YH6Hkirs15y+cW2h0WYUCfqXqHthYSppPHfMk2QxNdPd0lJmFMo4O 6ZyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=JiUudjs7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 4si2942513pgm.456.2022.02.04.12.36.32; Fri, 04 Feb 2022 12:36:44 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=JiUudjs7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1351581AbiBCO6B (ORCPT + 99 others); Thu, 3 Feb 2022 09:58:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36018 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236285AbiBCO6A (ORCPT ); Thu, 3 Feb 2022 09:58:00 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BF4A8C061714 for ; Thu, 3 Feb 2022 06:57:59 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 87F9AB8347E for ; Thu, 3 Feb 2022 14:57:58 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A3C5AC340E4; Thu, 3 Feb 2022 14:57:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1643900277; bh=Ks22gSDrqIChyIuOe9jWB9tU+82I1HQzBzexKQlVy+8=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=JiUudjs7lQELou29GEr4Y4qUOJ4Iq1wQIofGnGMVh96xtnGl2EJqKneLGsCkOTKA9 Vo9BG5fq69h6dcO3Qw/ahzAo7ZjjenKpHhizHDR34CJt1l/rlIqtywMNf2E/gSYAlX dulwcQMyLD04D6QiOdbyZ932Xbt2QuYeqkWUsvUgtCCwYQ2dzRfPEhmucGEXRCW9rC k/cJHweuE4GUA1p/ecYFGI9EDziHQABlhYa1KJR1QdtD0Q+zET0kxJ6pevGG2jhDcb BhLeFhW8AMBJSNdze9p8UW6GssNQTWEmHao/L/zjQWfTerolD5AvIVo+5aH+/O69EL AymmI2cRK/o1Q== Message-ID: <86a175d3-c438-505b-1dbc-4ef6e8b5adcb@kernel.org> Date: Thu, 3 Feb 2022 22:57:51 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.4.0 Subject: Re: [PATCH] f2fs: fix to avoid potential deadlock Content-Language: en-US To: Jaegeuk Kim Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, Zhiguo Niu , Jing Xia References: <20220127054449.24711-1-chao@kernel.org> <51be77f1-6e85-d46d-d0d3-c06d2055a190@kernel.org> From: Chao Yu In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2022/2/3 9:51, Jaegeuk Kim wrote: > On 01/29, Chao Yu wrote: >> On 2022/1/29 8:37, Jaegeuk Kim wrote: >>> On 01/28, Chao Yu wrote: >>>> On 2022/1/28 5:59, Jaegeuk Kim wrote: >>>>> On 01/27, Chao Yu wrote: >>>>>> Quoted from Jing Xia's report, there is a potential deadlock may happen >>>>>> between kworker and checkpoint as below: >>>>>> >>>>>> [T:writeback] [T:checkpoint] >>>>>> - wb_writeback >>>>>> - blk_start_plug >>>>>> bio contains NodeA was plugged in writeback threads >>>>> >>>>> I'm still trying to understand more precisely. So, how is it possible to >>>>> have bio having node write in this current context? >>>> >>>> IMO, after above blk_start_plug(), it may plug some inode's node page in kworker >>>> during writebacking node_inode's data page (which should be node page)? >>> >>> Wasn't that added into a different task->plug? >> >> I'm not sure I've got your concern correctly... >> >> Do you mean NodeA and other IOs from do_writepages() were plugged in >> different local plug variables? > > I think so. I guess block plug helper says it doesn't allow to use nested plug, so there is only one plug in kworker thread? void blk_start_plug_nr_ios(struct blk_plug *plug, unsigned short nr_ios) { struct task_struct *tsk = current; /* * If this is a nested plug, don't actually assign it. */ if (tsk->plug) return; ... } Thanks, > >> >> Thanks, >> >>> >>>> >>>> Thanks, >>>> >>>>> >>>>>> - do_writepages -- sync write inodeB, inc wb_sync_req[DATA] >>>>>> - f2fs_write_data_pages >>>>>> - f2fs_write_single_data_page -- write last dirty page >>>>>> - f2fs_do_write_data_page >>>>>> - set_page_writeback -- clear page dirty flag and >>>>>> PAGECACHE_TAG_DIRTY tag in radix tree >>>>>> - f2fs_outplace_write_data >>>>>> - f2fs_update_data_blkaddr >>>>>> - f2fs_wait_on_page_writeback -- wait NodeA to writeback here >>>>>> - inode_dec_dirty_pages >>>>>> - writeback_sb_inodes >>>>>> - writeback_single_inode >>>>>> - do_writepages >>>>>> - f2fs_write_data_pages -- skip writepages due to wb_sync_req[DATA] >>>>>> - wbc->pages_skipped += get_dirty_pages() -- PAGECACHE_TAG_DIRTY is not set but get_dirty_pages() returns one >>>>>> - requeue_inode -- requeue inode to wb->b_dirty queue due to non-zero.pages_skipped >>>>>> - blk_finish_plug >>>>>> >>>>>> Let's try to avoid deadlock condition by forcing unplugging previous bio via >>>>>> blk_finish_plug(current->plug) once we'v skipped writeback in writepages() >>>>>> due to valid sbi->wb_sync_req[DATA/NODE]. >>>>>> >>>>>> Fixes: 687de7f1010c ("f2fs: avoid IO split due to mixed WB_SYNC_ALL and WB_SYNC_NONE") >>>>>> Signed-off-by: Zhiguo Niu >>>>>> Signed-off-by: Jing Xia >>>>>> Signed-off-by: Chao Yu >>>>>> --- >>>>>> fs/f2fs/data.c | 6 +++++- >>>>>> fs/f2fs/node.c | 6 +++++- >>>>>> 2 files changed, 10 insertions(+), 2 deletions(-) >>>>>> >>>>>> diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c >>>>>> index 76d6fe7b0c8f..932a4c81acaf 100644 >>>>>> --- a/fs/f2fs/data.c >>>>>> +++ b/fs/f2fs/data.c >>>>>> @@ -3174,8 +3174,12 @@ static int __f2fs_write_data_pages(struct address_space *mapping, >>>>>> /* to avoid spliting IOs due to mixed WB_SYNC_ALL and WB_SYNC_NONE */ >>>>>> if (wbc->sync_mode == WB_SYNC_ALL) >>>>>> atomic_inc(&sbi->wb_sync_req[DATA]); >>>>>> - else if (atomic_read(&sbi->wb_sync_req[DATA])) >>>>>> + else if (atomic_read(&sbi->wb_sync_req[DATA])) { >>>>>> + /* to avoid potential deadlock */ >>>>>> + if (current->plug) >>>>>> + blk_finish_plug(current->plug); >>>>>> goto skip_write; >>>>>> + } >>>>>> if (__should_serialize_io(inode, wbc)) { >>>>>> mutex_lock(&sbi->writepages); >>>>>> diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c >>>>>> index 556fcd8457f3..69c6bcaf5aae 100644 >>>>>> --- a/fs/f2fs/node.c >>>>>> +++ b/fs/f2fs/node.c >>>>>> @@ -2106,8 +2106,12 @@ static int f2fs_write_node_pages(struct address_space *mapping, >>>>>> if (wbc->sync_mode == WB_SYNC_ALL) >>>>>> atomic_inc(&sbi->wb_sync_req[NODE]); >>>>>> - else if (atomic_read(&sbi->wb_sync_req[NODE])) >>>>>> + else if (atomic_read(&sbi->wb_sync_req[NODE])) { >>>>>> + /* to avoid potential deadlock */ >>>>>> + if (current->plug) >>>>>> + blk_finish_plug(current->plug); >>>>>> goto skip_write; >>>>>> + } >>>>>> trace_f2fs_writepages(mapping->host, wbc, NODE); >>>>>> -- >>>>>> 2.32.0