Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp24643imu; Mon, 26 Nov 2018 16:33:09 -0800 (PST) X-Google-Smtp-Source: AFSGD/UZoI2xCH7dNb/Mq0FbicyTt9J8SpzeVnjdax5du011WkoXH61KLVNBS8etsjSyoDwYZ2Jb X-Received: by 2002:a17:902:f20b:: with SMTP id gn11mr10412890plb.274.1543278789263; Mon, 26 Nov 2018 16:33:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543278789; cv=none; d=google.com; s=arc-20160816; b=Mz55c+FMfEgJdxptfMcP21I6FkgzC65ryAPy8Cq6Uo1ChNnhz8XBF4pmlxkJzl3dz0 QubOIMdoMTGT4pJxRPaJ8QF3s3/DV9TuSqF9Vz6qimfUJwOwG4odTuv9doK1rUbvdvNH I22jtuyartuiFv97Vp5e01GNLmxMcNY9EqBq/GoPqjdN267y/OvzCXP93Ug4HVrb9wm4 C0fubva88ZlMLyeTGHxMH5XgiVqDdD8EY3lnklD8m8628kOWacic/I+n18FxxePNfLzZ SEwJw1ek594yzXRC9CUSiDOpqWfkBxq8hJ5TUzlVweWnxrWV6ucHzJDSVDx5R0510ChH KXtQ== 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=h3lmLY9nQPPbwyRQuovcc+poDOZHh30NS/y+qjSC1zI=; b=HgihexmWNkMAEC95g2ZCQd5bzfrNdb3697FTsgFNcnEkl3CkOq/0UnZ8Hnln7JQoW6 sIj/rXDW+U0QBz9Isk0J6pMqqY/sMuQK/4DK4NPUUveLj48LNYUIlmF2jRp77+Li/FFD Jgt/5xoKvurTxE7+wnFny1crrJ727CKkPg6Xu4j1+MPV7+l1lpnw14uFMJKSlyhG3eKo Cus3sYWf8sXFv3CL+RmNj+MsLmMIjT5AcRiE6U4Aqv8ilYXY6f2ITGUd4vaLqau1s8jF H4XQPHnLgmqIDt/+ih2x61Vk0jQ+xeiJQMc52EEkNrsRJxeCda4dpxWE99yDfR2iIiEA c+nA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=oRadpCso; 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 c12si1790730pgh.257.2018.11.26.16.32.53; Mon, 26 Nov 2018 16:33:09 -0800 (PST) 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=oRadpCso; 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 S1727664AbeK0L0u (ORCPT + 99 others); Tue, 27 Nov 2018 06:26:50 -0500 Received: from mail.kernel.org ([198.145.29.99]:43158 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727445AbeK0L0u (ORCPT ); Tue, 27 Nov 2018 06:26:50 -0500 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 C1BF620828; Tue, 27 Nov 2018 00:30:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1543278651; bh=Oj5K98F2ugsuRuPUyUrl7aX6mkYxoAC7R3S4Tug13f4=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=oRadpCsovooYwExFHWweSWa5o0ngjc9GnXksD8ZJfxWVO400ps6wtbxiA5sxuPVWr +4WM0CFE/6HAPdHzQ7D9jTEpZjDYrX03cQQEuPyN7UmMSAtlkS5CQxEVKSYtPYIyR0 bgIEzaZfEEO/xlsJkVeYUBFWoSq3hSWFmCyfylrc= Date: Mon, 26 Nov 2018 16:30:50 -0800 From: Jaegeuk Kim To: Sahitya Tummala Cc: Chao Yu , linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2] f2fs: fix sbi->extent_list corruption issue Message-ID: <20181127003050.GG55960@jaegeuk-macbookpro.roam.corp.google.com> References: <1543207640-31033-1-git-send-email-stummala@codeaurora.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1543207640-31033-1-git-send-email-stummala@codeaurora.org> 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 11/26, Sahitya Tummala wrote: > When there is a failure in f2fs_fill_super() after/during > the recovery of fsync'd nodes, it frees the current sbi and > retries again. This time the mount is successful, but the files > that got recovered before retry, still holds the extent tree, > whose extent nodes list is corrupted since sbi and sbi->extent_list > is freed up. The list_del corruption issue is observed when the > file system is getting unmounted and when those recoverd files extent > node is being freed up in the below context. > > list_del corruption. prev->next should be fffffff1e1ef5480, but was (null) > <...> > kernel BUG at kernel/msm-4.14/lib/list_debug.c:53! > task: fffffff1f46f2280 task.stack: ffffff8008068000 > lr : __list_del_entry_valid+0x94/0xb4 > pc : __list_del_entry_valid+0x94/0xb4 > <...> > Call trace: > __list_del_entry_valid+0x94/0xb4 > __release_extent_node+0xb0/0x114 > __free_extent_tree+0x58/0x7c > f2fs_shrink_extent_tree+0xdc/0x3b0 > f2fs_leave_shrinker+0x28/0x7c > f2fs_put_super+0xfc/0x1e0 > generic_shutdown_super+0x70/0xf4 > kill_block_super+0x2c/0x5c > kill_f2fs_super+0x44/0x50 > deactivate_locked_super+0x60/0x8c > deactivate_super+0x68/0x74 > cleanup_mnt+0x40/0x78 > __cleanup_mnt+0x1c/0x28 > task_work_run+0x48/0xd0 > do_notify_resume+0x678/0xe98 > work_pending+0x8/0x14 > > Fix this by cleaning up inodes, extent tree and nodes of those > recovered files before freeing up sbi and before next retry. > > Signed-off-by: Sahitya Tummala > --- > v2: > -call evict_inodes() and f2fs_shrink_extent_tree() to cleanup inodes > > fs/f2fs/f2fs.h | 1 + > fs/f2fs/shrinker.c | 2 +- > fs/f2fs/super.c | 13 ++++++++++++- > 3 files changed, 14 insertions(+), 2 deletions(-) > > diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h > index 1e03197..aaee63b 100644 > --- a/fs/f2fs/f2fs.h > +++ b/fs/f2fs/f2fs.h > @@ -3407,6 +3407,7 @@ struct rb_entry *f2fs_lookup_rb_tree_ret(struct rb_root_cached *root, > bool f2fs_check_rb_tree_consistence(struct f2fs_sb_info *sbi, > struct rb_root_cached *root); > unsigned int f2fs_shrink_extent_tree(struct f2fs_sb_info *sbi, int nr_shrink); > +unsigned long __count_extent_cache(struct f2fs_sb_info *sbi); > bool f2fs_init_extent_tree(struct inode *inode, struct f2fs_extent *i_ext); > void f2fs_drop_extent_tree(struct inode *inode); > unsigned int f2fs_destroy_extent_node(struct inode *inode); > diff --git a/fs/f2fs/shrinker.c b/fs/f2fs/shrinker.c > index 9e13db9..7e3c13b 100644 > --- a/fs/f2fs/shrinker.c > +++ b/fs/f2fs/shrinker.c > @@ -30,7 +30,7 @@ static unsigned long __count_free_nids(struct f2fs_sb_info *sbi) > return count > 0 ? count : 0; > } > > -static unsigned long __count_extent_cache(struct f2fs_sb_info *sbi) > +unsigned long __count_extent_cache(struct f2fs_sb_info *sbi) > { > return atomic_read(&sbi->total_zombie_tree) + > atomic_read(&sbi->total_ext_node); > diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c > index af58b2c..769e7b1 100644 > --- a/fs/f2fs/super.c > +++ b/fs/f2fs/super.c > @@ -3016,6 +3016,16 @@ static void f2fs_tuning_parameters(struct f2fs_sb_info *sbi) > sbi->readdir_ra = 1; > } > > +static void f2fs_cleanup_inodes(struct f2fs_sb_info *sbi) > +{ > + struct super_block *sb = sbi->sb; > + > + sync_filesystem(sb); This writes another checkpoint, which would not be what this retrial intended. How about adding a condition in f2fs_may_extent_tree() when adding extents? Likewise, if (shrinker is not registered) return false; > + shrink_dcache_sb(sb); > + evict_inodes(sb); > + f2fs_shrink_extent_tree(sbi, __count_extent_cache(sbi)); > +} > + > static int f2fs_fill_super(struct super_block *sb, void *data, int silent) > { > struct f2fs_sb_info *sbi; > @@ -3402,6 +3412,8 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent) > * falls into an infinite loop in f2fs_sync_meta_pages(). > */ > truncate_inode_pages_final(META_MAPPING(sbi)); > + /* cleanup recovery and quota inodes */ > + f2fs_cleanup_inodes(sbi); > f2fs_unregister_sysfs(sbi); > free_root_inode: > dput(sb->s_root); > @@ -3445,7 +3457,6 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent) > /* give only one another chance */ > if (retry) { > retry = false; > - shrink_dcache_sb(sb); > goto try_onemore; > } > return err; > -- > Qualcomm India Private Limited, on behalf of Qualcomm Innovation Center, Inc. > Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.