From: Li Xi Subject: Re: [v8 2/5] ext4: adds project ID support Date: Thu, 15 Jan 2015 15:52:47 +0800 Message-ID: References: <1418102548-5469-1-git-send-email-lixi@ddn.com> <1418102548-5469-3-git-send-email-lixi@ddn.com> <0F8FAF43-54EB-4202-8120-C1D70CF330F0@dilger.ca> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Cc: "linux-fsdevel@vger.kernel.org" , Ext4 Developers List , "linux-api@vger.kernel.org" , "Theodore Ts'o" , Jan Kara , "viro@zeniv.linux.org.uk" , "hch@infradead.org" , Dmitry Monakhov To: Andreas Dilger Return-path: In-Reply-To: <0F8FAF43-54EB-4202-8120-C1D70CF330F0@dilger.ca> Sender: linux-fsdevel-owner@vger.kernel.org List-Id: linux-ext4.vger.kernel.org On Thu, Jan 8, 2015 at 7:11 AM, Andreas Dilger wrote: > On Dec 8, 2014, at 10:22 PM, Li Xi wrote: >> This patch adds a new internal field of ext4 inode to save project >> identifier. Also a new flag EXT4_INODE_PROJINHERIT is added for >> inheriting project ID from parent directory. >> >> Signed-off-by: Li Xi >> Reviewed-by: Jan Kara >> --- >> fs/ext4/ext4.h | 21 +++++++++++++++++---- >> fs/ext4/ialloc.c | 6 ++++++ >> fs/ext4/inode.c | 29 +++++++++++++++++++++++++++++ >> fs/ext4/namei.c | 17 +++++++++++++++++ >> fs/ext4/super.c | 1 + >> include/uapi/linux/fs.h | 1 + >> 6 files changed, 71 insertions(+), 4 deletions(-) >> >> diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h >> index 29c43e7..8bd1da9 100644 >> --- a/fs/ext4/ext4.h >> +++ b/fs/ext4/ext4.h >> @@ -377,16 +377,18 @@ struct flex_groups { >> #define EXT4_EA_INODE_FL 0x00200000 /* Inode used for large EA */ >> #define EXT4_EOFBLOCKS_FL 0x00400000 /* Blocks allocated beyond EOF */ >> #define EXT4_INLINE_DATA_FL 0x10000000 /* Inode has inline data. */ >> +#define EXT4_PROJINHERIT_FL FS_PROJINHERIT_FL /* Create with parents projid */ > > Sigh, only a single on-disk inode flag unused. > >> #define EXT4_RESERVED_FL 0x80000000 /* reserved for ext4 lib */ >> >> -#define EXT4_FL_USER_VISIBLE 0x004BDFFF /* User visible flags */ >> -#define EXT4_FL_USER_MODIFIABLE 0x004380FF /* User modifiable flags */ >> +#define EXT4_FL_USER_VISIBLE 0x204BDFFF /* User visible flags */ >> +#define EXT4_FL_USER_MODIFIABLE 0x204380FF /* User modifiable flags */ >> >> /* Flags that should be inherited by new inodes from their parent. */ >> #define EXT4_FL_INHERITED (EXT4_SECRM_FL | EXT4_UNRM_FL | EXT4_COMPR_FL |\ >> EXT4_SYNC_FL | EXT4_NODUMP_FL | EXT4_NOATIME_FL |\ >> EXT4_NOCOMPR_FL | EXT4_JOURNAL_DATA_FL |\ >> - EXT4_NOTAIL_FL | EXT4_DIRSYNC_FL) >> + EXT4_NOTAIL_FL | EXT4_DIRSYNC_FL |\ >> + EXT4_PROJINHERIT_FL) >> >> /* Flags that are appropriate for regular files (all but dir-specific ones). */ >> #define EXT4_REG_FLMASK (~(EXT4_DIRSYNC_FL | EXT4_TOPDIR_FL)) >> @@ -434,6 +436,7 @@ enum { >> EXT4_INODE_EA_INODE = 21, /* Inode used for large EA */ >> EXT4_INODE_EOFBLOCKS = 22, /* Blocks allocated beyond EOF */ >> EXT4_INODE_INLINE_DATA = 28, /* Data in inode. */ >> + EXT4_INODE_PROJINHERIT = 29, /* Create with parents projid */ >> EXT4_INODE_RESERVED = 31, /* reserved for ext4 lib */ >> }; >> >> @@ -683,6 +686,7 @@ struct ext4_inode { >> __le32 i_crtime; /* File Creation time */ >> __le32 i_crtime_extra; /* extra FileCreationtime (nsec << 2 | epoch) */ >> __le32 i_version_hi; /* high 32 bits for 64-bit version */ >> + __le32 i_projid; /* Project ID */ >> }; >> >> struct move_extent { >> @@ -934,6 +938,7 @@ struct ext4_inode_info { >> >> /* Precomputed uuid+inum+igen checksum for seeding inode checksums */ >> __u32 i_csum_seed; >> + kprojid_t i_projid; >> }; >> >> /* >> @@ -1518,6 +1523,7 @@ static inline void ext4_clear_state_flags(struct ext4_inode_info *ei) >> * GDT_CSUM bits are mutually exclusive. >> */ >> #define EXT4_FEATURE_RO_COMPAT_METADATA_CSUM 0x0400 >> +#define EXT4_FEATURE_RO_COMPAT_PROJECT 0x1000 /* Project quota */ > > I wonder if it makes sense to add EXT4_FEATURE_RO_COMPAT_METADATA_CSUM > here as well, to make it clear why this is skipping a value? > >> #define EXT4_FEATURE_INCOMPAT_COMPRESSION 0x0001 >> #define EXT4_FEATURE_INCOMPAT_FILETYPE 0x0002 >> @@ -1567,7 +1573,8 @@ static inline void ext4_clear_state_flags(struct ext4_inode_info *ei) >> EXT4_FEATURE_RO_COMPAT_HUGE_FILE |\ >> EXT4_FEATURE_RO_COMPAT_BIGALLOC |\ >> EXT4_FEATURE_RO_COMPAT_METADATA_CSUM|\ >> - EXT4_FEATURE_RO_COMPAT_QUOTA) >> + EXT4_FEATURE_RO_COMPAT_QUOTA |\ >> + EXT4_FEATURE_RO_COMPAT_PROJECT) >> >> /* >> * Default values for user and/or group using reserved blocks >> @@ -1575,6 +1582,11 @@ static inline void ext4_clear_state_flags(struct ext4_inode_info *ei) >> #define EXT4_DEF_RESUID 0 >> #define EXT4_DEF_RESGID 0 >> >> +/* >> + * Default project ID >> + */ >> +#define EXT4_DEF_PROJID 0 >> + >> #define EXT4_DEF_INODE_READAHEAD_BLKS 32 >> >> /* >> @@ -2131,6 +2143,7 @@ extern int ext4_zero_partial_blocks(handle_t *handle, struct inode *inode, >> loff_t lstart, loff_t lend); >> extern int ext4_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf); >> extern qsize_t *ext4_get_reserved_space(struct inode *inode); >> +extern int ext4_get_projid(struct inode *inode, kprojid_t *projid); >> extern void ext4_da_update_reserve_space(struct inode *inode, >> int used, int quota_claim); >> >> diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c >> index ac644c3..fefb948 100644 >> --- a/fs/ext4/ialloc.c >> +++ b/fs/ext4/ialloc.c >> @@ -756,6 +756,12 @@ struct inode *__ext4_new_inode(handle_t *handle, struct inode *dir, >> inode->i_gid = dir->i_gid; >> } else >> inode_init_owner(inode, dir, mode); >> + if (EXT4_HAS_RO_COMPAT_FEATURE(sb, EXT4_FEATURE_RO_COMPAT_PROJECT) && >> + ext4_test_inode_flag(dir, EXT4_INODE_PROJINHERIT)) { >> + ei->i_projid = EXT4_I(dir)->i_projid; >> + } else { >> + ei->i_projid = make_kprojid(&init_user_ns, EXT4_DEF_PROJID); >> + } > > (style) no need for { } if only a single line in both if/else parts. > >> dquot_initialize(inode); >> >> if (!goal) >> diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c >> index 5653fa4..29204d4 100644 >> --- a/fs/ext4/inode.c >> +++ b/fs/ext4/inode.c >> @@ -3863,6 +3863,14 @@ static inline void ext4_iget_extra_inode(struct inode *inode, >> EXT4_I(inode)->i_inline_off = 0; >> } >> >> +int ext4_get_projid(struct inode *inode, kprojid_t *projid) >> +{ >> + if (!EXT4_HAS_RO_COMPAT_FEATURE(inode->i_sb, EXT4_FEATURE_RO_COMPAT_PROJECT)) >> + return -EOPNOTSUPP; >> + *projid = EXT4_I(inode)->i_projid; >> + return 0; >> +} >> + >> struct inode *ext4_iget(struct super_block *sb, unsigned long ino) >> { >> struct ext4_iloc iloc; >> @@ -3874,6 +3882,7 @@ struct inode *ext4_iget(struct super_block *sb, unsigned long ino) >> int block; >> uid_t i_uid; >> gid_t i_gid; >> + projid_t i_projid; >> >> inode = iget_locked(sb, ino); >> if (!inode) >> @@ -3923,12 +3932,18 @@ struct inode *ext4_iget(struct super_block *sb, unsigned long ino) >> inode->i_mode = le16_to_cpu(raw_inode->i_mode); >> i_uid = (uid_t)le16_to_cpu(raw_inode->i_uid_low); >> i_gid = (gid_t)le16_to_cpu(raw_inode->i_gid_low); >> + if (EXT4_HAS_RO_COMPAT_FEATURE(sb, EXT4_FEATURE_RO_COMPAT_PROJECT)) >> + i_projid = (projid_t)le32_to_cpu(raw_inode->i_projid); >> + else >> + i_projid = EXT4_DEF_PROJID; >> + >> if (!(test_opt(inode->i_sb, NO_UID32))) { >> i_uid |= le16_to_cpu(raw_inode->i_uid_high) << 16; >> i_gid |= le16_to_cpu(raw_inode->i_gid_high) << 16; >> } >> i_uid_write(inode, i_uid); >> i_gid_write(inode, i_gid); >> + ei->i_projid = make_kprojid(&init_user_ns, i_projid);; >> set_nlink(inode, le16_to_cpu(raw_inode->i_links_count)); >> >> ext4_clear_state_flags(ei); /* Only relevant on 32-bit archs */ >> @@ -4158,6 +4173,7 @@ static int ext4_do_update_inode(handle_t *handle, >> int need_datasync = 0, set_large_file = 0; >> uid_t i_uid; >> gid_t i_gid; >> + projid_t i_projid; >> >> spin_lock(&ei->i_raw_lock); >> >> @@ -4170,6 +4186,7 @@ static int ext4_do_update_inode(handle_t *handle, >> raw_inode->i_mode = cpu_to_le16(inode->i_mode); >> i_uid = i_uid_read(inode); >> i_gid = i_gid_read(inode); >> + i_projid = from_kprojid(&init_user_ns, ei->i_projid); >> if (!(test_opt(inode->i_sb, NO_UID32))) { >> raw_inode->i_uid_low = cpu_to_le16(low_16_bits(i_uid)); >> raw_inode->i_gid_low = cpu_to_le16(low_16_bits(i_gid)); >> @@ -4249,6 +4266,18 @@ static int ext4_do_update_inode(handle_t *handle, >> } >> } >> >> + BUG_ON(!EXT4_HAS_RO_COMPAT_FEATURE(inode->i_sb, >> + EXT4_FEATURE_RO_COMPAT_PROJECT) && >> + i_projid != EXT4_DEF_PROJID); >> + if (i_projid != EXT4_DEF_PROJID && >> + (EXT4_INODE_SIZE(inode->i_sb) <= EXT4_GOOD_OLD_INODE_SIZE || >> + (!EXT4_FITS_IN_INODE(raw_inode, ei, i_projid)))) { >> + spin_unlock(&ei->i_raw_lock); >> + err = -EFBIG; > > I'm not sure if -EFBIG is the best error case, since that is a common > filesystem error. Maybe -EOVERFLOW would be better? > > Also, returning the error from ext4_mark_iloc_dirty->ext4_do_update_inode() > is a bit late in the game, since the inode has already been modified at > this point. That callpath typically only returned an error if the disk > was bad or the journal aborted (again normally because the disk was bad), > so at that point the dirty in-memory data was lost anyway. > > It would be better to check this in the caller before the inode is changed > so that an error can be returned without (essentially) corrupting the > in-memory state. Since the projid should only be set for new inodes (which > will always have enough space, assuming RO_COMPAT_PROJECT cannot be set on > filesystems with 128-byte inodes), or in case of rename into a project > directory, it shouldn't be too big a change. Sorry, I am not sure what I should do to improve this because of the reason that Jan Kara mentioned. Please let me know if I need to do anything about this.