Received: by 2002:ac0:a582:0:0:0:0:0 with SMTP id m2-v6csp2307742imm; Thu, 18 Oct 2018 12:23:31 -0700 (PDT) X-Google-Smtp-Source: ACcGV61LBltHR4eLASfg1YHNbgG+bdYYhnQg6MrIX4z8l2+8eaO02skfqaqqXL4G99UGlY5gDQfM X-Received: by 2002:a17:902:758f:: with SMTP id j15-v6mr31905328pll.160.1539890611405; Thu, 18 Oct 2018 12:23:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539890611; cv=none; d=google.com; s=arc-20160816; b=FYwuWYy9dqo9bLuJXC2DY5sPkJdqw0wkmD5JwgQqmjxQvVWsl0OZboWMdNJuGIyf1J Ucu79gR1/DE6IYGqCYGNhzMwUudBUQ7Z9LD3G2wRikZtz6+AzEe5tmaTqg8E+GIZqXQ4 f6UOydDslGdUZ/T6fSRhqUVzhNPnbOn6N4vmjayuJvt/7VTKCwEmGw1PIFu4BBPpOMu+ +g4lsmDEHH+2sW/GqmixxjXQZswdW7asx6q12vH+kn/0ZDJpGAAu9v8Xx8eAFd4y7DuF SDyQAfJ6l904B2B5SETh8h6EbhrIE3oDYpLcAVUeRtJvicAZKpPQ4Pjr3vk2yfH+wsnD 4SHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:in-reply-to :content-disposition:mime-version:references:message-id:subject:cc :to:from:date:dkim-signature; bh=fTrHTdKte/qPJwFQRka4cfKMrQ0QSPTd1uOK/VYKW2g=; b=vjHZlh5+41Fbwb8aBrMzunbp2l0s0KAQuK0c772GY2a82MiicBl9IlewgKw47BZbaV sV0Y4HYQZqSIW6uZbmUelTzy9/oviNOnrxGWGactfea29se4TrV9knc2u/W5U34yMeJm jJx6hyGbehXPmlhszfVf+aJ8+/pazkrV7+8WoT+bdTZxbjr8wco+JVe6P+X86KEMBvvu veTWAJi5xsEsLu+4C4uUQBzFIJNnrCEATDMzGGKMEdtnmdIrRzwLb10uZcdJKy2a4elD CX0tkIvSgiJgbMR6+64RUqq+xEBzvMZLY4dyFfQ5s59SGa3jojPMuCp5gBi69qr4W+Nw ovfA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=pgo0ASTC; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 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 vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x10-v6si19362511pfm.136.2018.10.18.12.23.14; Thu, 18 Oct 2018 12:23:31 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=pgo0ASTC; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 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 S1726702AbeJSDG0 (ORCPT + 99 others); Thu, 18 Oct 2018 23:06:26 -0400 Received: from mail.kernel.org ([198.145.29.99]:43180 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726173AbeJSDG0 (ORCPT ); Thu, 18 Oct 2018 23:06:26 -0400 Received: from localhost (unknown [104.132.1.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 208F82054F; Thu, 18 Oct 2018 19:04:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1539889442; bh=QWSP8bzfF7J7/lBgqNpUeBuOJxEL2KpA/Cq8WpYtQbE=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=pgo0ASTCB9T6SaEhj9C+oivWs6gKMPhTJLENkATw+AlmjmrSHuiXN3GTmDVBBhWH9 oBJxZDEyEvkpDbAPANGkfb80pCq6+sNYXg3Ty+Cg9eQfYFnjLMLfPx0qLKAh4zpAyc ZalhuD59RZZ+mG5Z1lEexT+0IrJXpt0NywOIHUy4= Date: Thu, 18 Oct 2018 12:04:01 -0700 From: Jaegeuk Kim To: Chao Yu Cc: Chao Yu , linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, Weichao Guo Subject: Re: [PATCH v11] f2fs: guarantee journalled quota data by checkpoint Message-ID: <20181018190401.GC50556@jaegeuk-macbookpro.roam.corp.google.com> References: <20180920120500.21026-1-chao@kernel.org> <20181001000618.GC17407@jaegeuk-macbookpro.roam.corp.google.com> <20181001012911.GF17407@jaegeuk-macbookpro.roam.corp.google.com> <73df627f-5b12-71cd-9a52-41f187d5516d@kernel.org> <20181001014915.GG17407@jaegeuk-macbookpro.roam.corp.google.com> <143b572f-8044-eae2-d321-79040beba4f4@kernel.org> <20181002164514.GA93409@jaegeuk-macbookpro.roam.corp.google.com> <9a3f0b96-8d29-121a-b31b-1eeb7c2e92c2@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <9a3f0b96-8d29-121a-b31b-1eeb7c2e92c2@huawei.com> User-Agent: Mutt/1.8.2 (2017-04-18) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 10/17, Chao Yu wrote: > Jaegeuk, > > Sorry for the long delay, I'm busy on other thing. > > I'm trying your fixing code on both fsck and kernel with 'run.sh > por_fsstress' case. > > And got below output, is that normal in updated fsck? I didn't have time to > look into this. Yeah, I just stopped to allocate new blocks to fix quota, if there may have some data to be reocvered at the next mount time. > > Info: checkpoint state = 8c6 : quota_need_fsck nat_bits crc > compacted_summary orphan_inodes sudden-power-off > [fsck_chk_quota_files:1755] Fixing Quota file ([ 0] ino [0x4]) > [ERROR] quotaio_tree.c:83:write_blk:: Cannot write block (1320): > Inappropriate ioctl for device > [ERROR] quotaio_tree.c:110:get_free_dqblk:: Cannot allocate new quota block > (out of disk space). > [ERROR] quotaio_tree.c:315:dq_insert_tree:: Cannot write quota (id > 67368348): Inappropriate ioctl for device > [fsck_chk_quota_files:1755] Fixing Quota file ([ 1] ino [0x5]) > [ERROR] quotaio_tree.c:83:write_blk:: Cannot write block (1332): > Inappropriate ioctl for device > [ERROR] quotaio_tree.c:110:get_free_dqblk:: Cannot allocate new quota block > (out of disk space). > [ERROR] quotaio_tree.c:315:dq_insert_tree:: Cannot write quota (id > 73435216): Inappropriate ioctl for device > > Thanks, > > > On 2018/10/3 0:45, Jaegeuk Kim wrote: > > On 10/01, Chao Yu wrote: > >> On 2018-10-1 9:49, Jaegeuk Kim wrote: > >>> On 10/01, Chao Yu wrote: > >>>> On 2018-10-1 9:29, Jaegeuk Kim wrote: > >>>>> On 10/01, Chao Yu wrote: > >>>>>> Hi Jaegeuk, > >>>>>> > >>>>>> On 2018-10-1 8:06, Jaegeuk Kim wrote: > >>>>>>> Hi Chao, > >>>>>>> > >>>>>>> This fails on fsstress with godown without fault injection. Could you please > >>>>>>> test a bit? I assumed that this patch should give no fsck failure along with > >>>>>>> valid checkpoint having no flag. > >>>>>> > >>>>>> Okay, let me reproduce with that case. > >>>>>> > >>>>>>> > >>>>>>> BTW, I'm in doubt that f2fs_lock_all covers entire quota modification. What > >>>>>>> about prepare_write_begin() -> f2fs_get_block() ... -> inc_valid_block_count()? > >>>>>> > >>>>>> If quota data changed in above path, we will detect that in below condition: > >>>>>> > >>>>>> block_operation() > >>>>>> > >>>>>> down_write(&sbi->node_change); > >>>>>> > >>>>>> if (__need_flush_quota(sbi)) { > >>>>>> up_write(&sbi->node_change); > >>>>>> f2fs_unlock_all(sbi); > >>>>>> goto retry_flush_quotas; > >>>>>> } > >>>>>> > >>>>>> So there is no problem? > >>>>> > >>>>> We may need to check quota is dirty, since we have no way to detect by > >>>>> f2fs structures? > >>>> > >>>> Below condition can check that. > >>>> > >>>> static bool __need_flush_quota(struct f2fs_sb_info *sbi) > >>>> { > >>>> ... > >>>> if (is_sbi_flag_set(sbi, SBI_QUOTA_NEED_FLUSH)) > >>>> return true; > >>>> if (get_pages(sbi, F2FS_DIRTY_QDATA)) > >>>> return true; > >>>> ... > >>>> } > >>>> > >>>> static int f2fs_dquot_mark_dquot_dirty(struct dquot *dquot) > >>>> { > >>>> ... > >>>> ret = dquot_mark_dquot_dirty(dquot); > >>>> > >>>> /* if we are using journalled quota */ > >>>> if (is_journalled_quota(sbi)) > >>>> set_sbi_flag(sbi, SBI_QUOTA_NEED_FLUSH); > >>>> ... > >>>> } > >>> > >>> Okay, then, could you please run the above stress test to reproduce this? > >> > >> Sure, let me try this case and fix it. > >> > >> Could you check other patches in mailing list, and test them instead? > > > > With the below change, the test result is much better for now. > > Let me know, if you have further concern. > > > > --- > > fs/f2fs/checkpoint.c | 6 ++++++ > > fs/f2fs/super.c | 4 +++- > > 2 files changed, 9 insertions(+), 1 deletion(-) > > > > diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c > > index a1facfbfc5c7..b111c6201023 100644 > > --- a/fs/f2fs/checkpoint.c > > +++ b/fs/f2fs/checkpoint.c > > @@ -1111,6 +1111,8 @@ static int block_operations(struct f2fs_sb_info *sbi) > > > > retry_flush_quotas: > > if (__need_flush_quota(sbi)) { > > + int locked; > > + > > if (++cnt > DEFAULT_RETRY_QUOTA_FLUSH_COUNT) { > > set_sbi_flag(sbi, SBI_QUOTA_SKIP_FLUSH); > > f2fs_lock_all(sbi); > > @@ -1118,7 +1120,11 @@ static int block_operations(struct f2fs_sb_info *sbi) > > } > > clear_sbi_flag(sbi, SBI_QUOTA_NEED_FLUSH); > > > > + /* only failed during mount/umount/freeze/quotactl */ > > + locked = down_read_trylock(&sbi->sb->s_umount); > > f2fs_quota_sync(sbi->sb, -1); > > + if (locked) > > + up_read(&sbi->sb->s_umount); > > } > > > > f2fs_lock_all(sbi); > > diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c > > index a28c245b1288..b39f60d57120 100644 > > --- a/fs/f2fs/super.c > > +++ b/fs/f2fs/super.c > > @@ -1706,6 +1706,7 @@ static ssize_t f2fs_quota_read(struct super_block *sb, int type, char *data, > > congestion_wait(BLK_RW_ASYNC, HZ/50); > > goto repeat; > > } > > + set_sbi_flag(F2FS_SB(sb), SBI_QUOTA_NEED_REPAIR); > > return PTR_ERR(page); > > } > > > > @@ -1717,6 +1718,7 @@ static ssize_t f2fs_quota_read(struct super_block *sb, int type, char *data, > > } > > if (unlikely(!PageUptodate(page))) { > > f2fs_put_page(page, 1); > > + set_sbi_flag(F2FS_SB(sb), SBI_QUOTA_NEED_REPAIR); > > return -EIO; > > } > > > > @@ -1758,6 +1760,7 @@ static ssize_t f2fs_quota_write(struct super_block *sb, int type, > > congestion_wait(BLK_RW_ASYNC, HZ/50); > > goto retry; > > } > > + set_sbi_flag(F2FS_SB(sb), SBI_QUOTA_NEED_REPAIR); > > break; > > } > > > > @@ -1794,7 +1797,6 @@ static qsize_t *f2fs_get_reserved_space(struct inode *inode) > > > > static int f2fs_quota_on_mount(struct f2fs_sb_info *sbi, int type) > > { > > - > > if (is_set_ckpt_flags(sbi, CP_QUOTA_NEED_FSCK_FLAG)) { > > f2fs_msg(sbi->sb, KERN_ERR, > > "quota sysfile may be corrupted, skip loading it"); > >