From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A367A63A8; Wed, 27 Dec 2023 07:10:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="PEoX05FN" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5224CC433C8; Wed, 27 Dec 2023 07:10:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1703661039; bh=j/vrVg0JXSm76eMraSC0QENbVnPO+PnML1tSAEZdzD0=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=PEoX05FN2o6lEct5iERitcxpJm9Lu98BR3utOR/LjGPse01HaKf8G0YXKWd3W/u4b fHSkn4C5UovfU5dtwx6NjNNi7T2Te6EgLxavjPwuyGdqOy+z2HulETanC+WMhvehwA gOzSrZGAOqOoZST11Xn2GacRIKBnAoZxRTvy9xtnJEOGnQHwE/6mZOOGoqK5IQS+Un yD8bKU/XY726TseeWONmbmAT9ldofOkaGM0IR+sRRCW2JnyZxJBYQixvqjJUQVH9Oq 5C7IxSWTAkobJkW2vuZJqCh88AL2RT5Y9T5lHl4E1nWaICLOJMjXeDT3M9b13YdsRg LigVSpG4aWqBA== Message-ID: Date: Wed, 27 Dec 2023 15:10:32 +0800 Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [f2fs-dev] [PATCH 2/3] f2fs: move release of block devices to after kill_block_super() Content-Language: en-US To: Eric Biggers , linux-fsdevel@vger.kernel.org Cc: linux-fscrypt@vger.kernel.org, Christoph Hellwig , Josef Bacik , linux-btrfs@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net References: <20231213040018.73803-1-ebiggers@kernel.org> <20231213040018.73803-3-ebiggers@kernel.org> From: Chao Yu In-Reply-To: <20231213040018.73803-3-ebiggers@kernel.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 2023/12/13 12:00, Eric Biggers wrote: > From: Eric Biggers > > Call destroy_device_list() and free the f2fs_sb_info from > kill_f2fs_super(), after the call to kill_block_super(). This is > necessary to order it after the call to fscrypt_destroy_keyring() once > generic_shutdown_super() starts calling fscrypt_destroy_keyring() just > after calling ->put_super. This is because fscrypt_destroy_keyring() > may call into f2fs_get_devices() via the fscrypt_operations. > > Signed-off-by: Eric Biggers > --- > fs/f2fs/super.c | 12 +++++++----- > 1 file changed, 7 insertions(+), 5 deletions(-) > > diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c > index 033af907c3b1d..ba95a341a9a36 100644 > --- a/fs/f2fs/super.c > +++ b/fs/f2fs/super.c > @@ -1710,42 +1710,39 @@ static void f2fs_put_super(struct super_block *sb) > f2fs_destroy_node_manager(sbi); > f2fs_destroy_segment_manager(sbi); > > /* flush s_error_work before sbi destroy */ > flush_work(&sbi->s_error_work); > > f2fs_destroy_post_read_wq(sbi); > > kvfree(sbi->ckpt); > > - sb->s_fs_info = NULL; > if (sbi->s_chksum_driver) > crypto_free_shash(sbi->s_chksum_driver); > kfree(sbi->raw_super); > > - destroy_device_list(sbi); > f2fs_destroy_page_array_cache(sbi); > f2fs_destroy_xattr_caches(sbi); > mempool_destroy(sbi->write_io_dummy); > #ifdef CONFIG_QUOTA > for (i = 0; i < MAXQUOTAS; i++) > kfree(F2FS_OPTION(sbi).s_qf_names[i]); > #endif > fscrypt_free_dummy_policy(&F2FS_OPTION(sbi).dummy_enc_policy); > destroy_percpu_info(sbi); > f2fs_destroy_iostat(sbi); > for (i = 0; i < NR_PAGE_TYPE; i++) > kvfree(sbi->write_io[i]); > #if IS_ENABLED(CONFIG_UNICODE) > utf8_unload(sb->s_encoding); > #endif > - kfree(sbi); > } > > int f2fs_sync_fs(struct super_block *sb, int sync) > { > struct f2fs_sb_info *sbi = F2FS_SB(sb); > int err = 0; > > if (unlikely(f2fs_cp_error(sbi))) > return 0; > if (unlikely(is_sbi_flag_set(sbi, SBI_CP_DISABLED))) > @@ -4895,23 +4892,23 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent) > } > > static struct dentry *f2fs_mount(struct file_system_type *fs_type, int flags, > const char *dev_name, void *data) > { > return mount_bdev(fs_type, flags, dev_name, data, f2fs_fill_super); > } > > static void kill_f2fs_super(struct super_block *sb) > { > - if (sb->s_root) { > - struct f2fs_sb_info *sbi = F2FS_SB(sb); > + struct f2fs_sb_info *sbi = F2FS_SB(sb); > > + if (sb->s_root) { > set_sbi_flag(sbi, SBI_IS_CLOSE); > f2fs_stop_gc_thread(sbi); > f2fs_stop_discard_thread(sbi); > > #ifdef CONFIG_F2FS_FS_COMPRESSION > /* > * latter evict_inode() can bypass checking and invalidating > * compress inode cache. > */ > if (test_opt(sbi, COMPRESS_CACHE)) > @@ -4924,20 +4921,25 @@ static void kill_f2fs_super(struct super_block *sb) > .reason = CP_UMOUNT, > }; > stat_inc_cp_call_count(sbi, TOTAL_CALL); > f2fs_write_checkpoint(sbi, &cpc); > } > > if (is_sbi_flag_set(sbi, SBI_IS_RECOVERED) && f2fs_readonly(sb)) > sb->s_flags &= ~SB_RDONLY; > } > kill_block_super(sb); > + if (sbi) { Can you please add one single line comment here to expand why we need to delay destroying device_list? Other code part looks good to me. Thanks, > + destroy_device_list(sbi); > + kfree(sbi); > + sb->s_fs_info = NULL; > + } > } > > static struct file_system_type f2fs_fs_type = { > .owner = THIS_MODULE, > .name = "f2fs", > .mount = f2fs_mount, > .kill_sb = kill_f2fs_super, > .fs_flags = FS_REQUIRES_DEV | FS_ALLOW_IDMAP, > }; > MODULE_ALIAS_FS("f2fs");