mirror of https://gitee.com/openkylin/linux.git
f2fs: fix potential data inconsistence of checkpoint
Previously, we changed lock from cp_rwsem to node_change, it solved
the deadlock issue which was caused by below race condition:
Thread A Thread B
- f2fs_setattr
- f2fs_lock_op -- read_lock
- dquot_transfer
- __dquot_transfer
- dquot_acquire
- commit_dqblk
- f2fs_quota_write
- f2fs_write_begin
- f2fs_write_failed
- write_checkpoint
- block_operations
- f2fs_lock_all -- write_lock
- f2fs_truncate_blocks
- f2fs_lock_op -- read_lock
But it breaks the sematics of cp_rwsem, in other callers like:
- f2fs_file_write_iter -> f2fs_write_begin -> f2fs_write_failed
- f2fs_direct_IO -> f2fs_write_failed
We allow to truncate dnode w/o cp_rwsem held, result in incorrect sit
bitmap update, which can cause further data corruption.
So this patch reverts previous fix implementation, and try to fix
deadlock by skipping calling f2fs_truncate_blocks() in f2fs_write_failed()
only for quota file, and keep the preallocated data/node in the tail of
quota file, we can expecte that the preallocated space can be used to
store quota info latter soon.
Fixes: af033b2aa8
("f2fs: guarantee journalled quota data by checkpoint")
Signed-off-by: Gao Xiang <gaoxiang25@huawei.com>
Signed-off-by: Sheng Yong <shengyong1@huawei.com>
Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
This commit is contained in:
parent
025cdb166c
commit
c42d28ce3e
|
@ -2312,7 +2312,8 @@ static void f2fs_write_failed(struct address_space *mapping, loff_t to)
|
||||||
down_write(&F2FS_I(inode)->i_mmap_sem);
|
down_write(&F2FS_I(inode)->i_mmap_sem);
|
||||||
|
|
||||||
truncate_pagecache(inode, i_size);
|
truncate_pagecache(inode, i_size);
|
||||||
f2fs_truncate_blocks(inode, i_size, true, true);
|
if (!IS_NOQUOTA(inode))
|
||||||
|
f2fs_truncate_blocks(inode, i_size, true);
|
||||||
|
|
||||||
up_write(&F2FS_I(inode)->i_mmap_sem);
|
up_write(&F2FS_I(inode)->i_mmap_sem);
|
||||||
up_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]);
|
up_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]);
|
||||||
|
|
|
@ -2843,8 +2843,7 @@ static inline bool is_valid_data_blkaddr(struct f2fs_sb_info *sbi,
|
||||||
*/
|
*/
|
||||||
int f2fs_sync_file(struct file *file, loff_t start, loff_t end, int datasync);
|
int f2fs_sync_file(struct file *file, loff_t start, loff_t end, int datasync);
|
||||||
void f2fs_truncate_data_blocks(struct dnode_of_data *dn);
|
void f2fs_truncate_data_blocks(struct dnode_of_data *dn);
|
||||||
int f2fs_truncate_blocks(struct inode *inode, u64 from, bool lock,
|
int f2fs_truncate_blocks(struct inode *inode, u64 from, bool lock);
|
||||||
bool buf_write);
|
|
||||||
int f2fs_truncate(struct inode *inode);
|
int f2fs_truncate(struct inode *inode);
|
||||||
int f2fs_getattr(const struct path *path, struct kstat *stat,
|
int f2fs_getattr(const struct path *path, struct kstat *stat,
|
||||||
u32 request_mask, unsigned int flags);
|
u32 request_mask, unsigned int flags);
|
||||||
|
|
|
@ -589,8 +589,7 @@ static int truncate_partial_data_page(struct inode *inode, u64 from,
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int f2fs_truncate_blocks(struct inode *inode, u64 from, bool lock,
|
int f2fs_truncate_blocks(struct inode *inode, u64 from, bool lock)
|
||||||
bool buf_write)
|
|
||||||
{
|
{
|
||||||
struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
|
struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
|
||||||
struct dnode_of_data dn;
|
struct dnode_of_data dn;
|
||||||
|
@ -598,7 +597,6 @@ int f2fs_truncate_blocks(struct inode *inode, u64 from, bool lock,
|
||||||
int count = 0, err = 0;
|
int count = 0, err = 0;
|
||||||
struct page *ipage;
|
struct page *ipage;
|
||||||
bool truncate_page = false;
|
bool truncate_page = false;
|
||||||
int flag = buf_write ? F2FS_GET_BLOCK_PRE_AIO : F2FS_GET_BLOCK_PRE_DIO;
|
|
||||||
|
|
||||||
trace_f2fs_truncate_blocks_enter(inode, from);
|
trace_f2fs_truncate_blocks_enter(inode, from);
|
||||||
|
|
||||||
|
@ -608,7 +606,7 @@ int f2fs_truncate_blocks(struct inode *inode, u64 from, bool lock,
|
||||||
goto free_partial;
|
goto free_partial;
|
||||||
|
|
||||||
if (lock)
|
if (lock)
|
||||||
__do_map_lock(sbi, flag, true);
|
f2fs_lock_op(sbi);
|
||||||
|
|
||||||
ipage = f2fs_get_node_page(sbi, inode->i_ino);
|
ipage = f2fs_get_node_page(sbi, inode->i_ino);
|
||||||
if (IS_ERR(ipage)) {
|
if (IS_ERR(ipage)) {
|
||||||
|
@ -646,7 +644,7 @@ int f2fs_truncate_blocks(struct inode *inode, u64 from, bool lock,
|
||||||
err = f2fs_truncate_inode_blocks(inode, free_from);
|
err = f2fs_truncate_inode_blocks(inode, free_from);
|
||||||
out:
|
out:
|
||||||
if (lock)
|
if (lock)
|
||||||
__do_map_lock(sbi, flag, false);
|
f2fs_unlock_op(sbi);
|
||||||
free_partial:
|
free_partial:
|
||||||
/* lastly zero out the first data page */
|
/* lastly zero out the first data page */
|
||||||
if (!err)
|
if (!err)
|
||||||
|
@ -681,7 +679,7 @@ int f2fs_truncate(struct inode *inode)
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
err = f2fs_truncate_blocks(inode, i_size_read(inode), true, false);
|
err = f2fs_truncate_blocks(inode, i_size_read(inode), true);
|
||||||
if (err)
|
if (err)
|
||||||
return err;
|
return err;
|
||||||
|
|
||||||
|
@ -1262,7 +1260,7 @@ static int f2fs_collapse_range(struct inode *inode, loff_t offset, loff_t len)
|
||||||
new_size = i_size_read(inode) - len;
|
new_size = i_size_read(inode) - len;
|
||||||
truncate_pagecache(inode, new_size);
|
truncate_pagecache(inode, new_size);
|
||||||
|
|
||||||
ret = f2fs_truncate_blocks(inode, new_size, true, false);
|
ret = f2fs_truncate_blocks(inode, new_size, true);
|
||||||
up_write(&F2FS_I(inode)->i_mmap_sem);
|
up_write(&F2FS_I(inode)->i_mmap_sem);
|
||||||
if (!ret)
|
if (!ret)
|
||||||
f2fs_i_size_write(inode, new_size);
|
f2fs_i_size_write(inode, new_size);
|
||||||
|
@ -1447,7 +1445,7 @@ static int f2fs_insert_range(struct inode *inode, loff_t offset, loff_t len)
|
||||||
f2fs_balance_fs(sbi, true);
|
f2fs_balance_fs(sbi, true);
|
||||||
|
|
||||||
down_write(&F2FS_I(inode)->i_mmap_sem);
|
down_write(&F2FS_I(inode)->i_mmap_sem);
|
||||||
ret = f2fs_truncate_blocks(inode, i_size_read(inode), true, false);
|
ret = f2fs_truncate_blocks(inode, i_size_read(inode), true);
|
||||||
up_write(&F2FS_I(inode)->i_mmap_sem);
|
up_write(&F2FS_I(inode)->i_mmap_sem);
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
|
@ -298,7 +298,7 @@ bool f2fs_recover_inline_data(struct inode *inode, struct page *npage)
|
||||||
clear_inode_flag(inode, FI_INLINE_DATA);
|
clear_inode_flag(inode, FI_INLINE_DATA);
|
||||||
f2fs_put_page(ipage, 1);
|
f2fs_put_page(ipage, 1);
|
||||||
} else if (ri && (ri->i_inline & F2FS_INLINE_DATA)) {
|
} else if (ri && (ri->i_inline & F2FS_INLINE_DATA)) {
|
||||||
if (f2fs_truncate_blocks(inode, 0, false, false))
|
if (f2fs_truncate_blocks(inode, 0, false))
|
||||||
return false;
|
return false;
|
||||||
goto process_inline;
|
goto process_inline;
|
||||||
}
|
}
|
||||||
|
@ -470,7 +470,7 @@ static int f2fs_add_inline_entries(struct inode *dir, void *inline_dentry)
|
||||||
return 0;
|
return 0;
|
||||||
punch_dentry_pages:
|
punch_dentry_pages:
|
||||||
truncate_inode_pages(&dir->i_data, 0);
|
truncate_inode_pages(&dir->i_data, 0);
|
||||||
f2fs_truncate_blocks(dir, 0, false, false);
|
f2fs_truncate_blocks(dir, 0, false);
|
||||||
f2fs_remove_dirty_inode(dir);
|
f2fs_remove_dirty_inode(dir);
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue