f2fs: fix to retrieve inline xattr space
PATCH 1/2 f2fs: fix to retrieve inline xattr space
With below mkfs and mount option, generic/339 of fstest will report that scratch image becomes corrupted.
MKFS_OPTIONS -- -O extra_attr -O project_quota -O inode_checksum -O flexible_inline_xattr -O inode_crtime -f /dev/zram1 MOUNT_OPTIONS -- -o acl,user_xattr -o discard,noinline_xattr /dev/zram1 /mnt/scratch_f2fs
[ASSERT] (f2fs_check_dirent_position:1315) --> Wrong position of dirent pino:1970, name: (...) level:8, dir_level:0, pgofs:951, correct range:[900, 901]
In old kernel, inline data and directory always reserved 200 bytes in inode layout, even if inline_xattr is disabled, then new kernel tries to retrieve that space for non-inline xattr inode, but for inline dentry, its layout size should be fixed, so we just keep that reserved space.
But the problem here is that, after inline dentry conversion, inline dentry layout no longer exists, if we still reserve inline xattr space, after dents updates, there will be a hole in inline xattr space, which can break hierarchy hash directory structure.
This patch fixes this issue by retrieving inline xattr space after inline dentry conversion.
--- fs/f2fs/inline.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
fs/f2fs/inline.c +17 -0
@@ -420,6 +420,14 @@ static int f2fs_move_inline_dirents(struct inode *dir, struct page *ipage,stat_dec_inline_dir (dir);clear_inode_flag (dir,FI_INLINE_DENTRY ); +/* +* should retrieve reserved space which was used to keep +* inline_dentry's structure for backward compatibility. +*/ +if (!f2fs_sb_has_flexible_inline_xattr (F2FS_I_SB (dir)) && + !f2fs_has_inline_xattr (dir)) +F2FS_I (dir)->i_inline_xattr_size =0 ; +f2fs_i_depth_write (dir,1 );if (i_size_read (dir) <PAGE_SIZE )f2fs_i_size_write (dir,PAGE_SIZE );
@@ -501,6 +509,15 @@ static int f2fs_move_rehashed_dirents(struct inode *dir, struct page *ipage,stat_dec_inline_dir (dir);clear_inode_flag (dir,FI_INLINE_DENTRY ); + +/* +* should retrieve reserved space which was used to keep +* inline_dentry's structure for backward compatibility. +*/ +if (!f2fs_sb_has_flexible_inline_xattr (F2FS_I_SB (dir)) && + !f2fs_has_inline_xattr (dir)) +F2FS_I (dir)->i_inline_xattr_size =0 ; +kvfree (backup_dentry);return 0 ; recover:
Signature · 1 line
2.18.0.rc1
PATCH 2/2 f2fs: fix to use inline space only if inline_xattr is enable
With below mkfs and mount option:
MKFS_OPTIONS -- -O extra_attr -O project_quota -O inode_checksum -O flexible_inline_xattr -O inode_crtime -f MOUNT_OPTIONS -- -o noinline_xattr
We may miss xattr data with below testcase:
- mkdir dir
- setfattr -n "user.name" -v 0 dir
- for ((i = 0; i < 190; i++)) do touch dir/$i; done
- umount
- mount
- getfattr -n "user.name" dir
user.name: No such attribute
The root cause is that we persist xattr data into reserved inline xattr space, even if inline_xattr is not enable in inline directory inode, after inline dentry conversion, reserved space no longer exists, so that xattr data missed.
Let's use inline xattr space only if inline_xattr flag is set on inode to fix this iusse.
--- fs/f2fs/f2fs.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/f2fs/f2fs.h +3 -1
@@ -2569,7 +2569,9 @@ static inline void *inline_xattr_addr(struct inode *inode, struct page *page)static inline int inline_xattr_size (struct inode *inode) { -return get_inline_xattr_addrs (inode) *sizeof (__le32); +if (f2fs_has_inline_xattr (inode)) +return get_inline_xattr_addrs (inode) *sizeof (__le32); +return 0 ; }static inline int f2fs_has_inline_data (struct inode *inode)
Signature · 1 line
2.18.0.rc1