lkml.org 
[lkml]   [2022]   [Oct]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 6.0 143/862] ext4: fix i_version handling in ext4
    Date
    From: Jeff Layton <jlayton@kernel.org>

    commit a642c2c0827f5604a93f9fa1e5701eecdce4ae22 upstream.

    ext4 currently updates the i_version counter when the atime is updated
    during a read. This is less than ideal as it can cause unnecessary cache
    invalidations with NFSv4 and unnecessary remeasurements for IMA.

    The increment in ext4_mark_iloc_dirty is also problematic since it can
    corrupt the i_version counter for ea_inodes. We aren't bumping the file
    times in ext4_mark_iloc_dirty, so changing the i_version there seems
    wrong, and is the cause of both problems.

    Remove that callsite and add increments to the setattr, setxattr and
    ioctl codepaths, at the same times that we update the ctime. The
    i_version bump that already happens during timestamp updates should take
    care of the rest.

    In ext4_move_extents, increment the i_version on both inodes, and also
    add in missing ctime updates.

    [ Some minor updates since we've already enabled the i_version counter
    unconditionally already via another patch series. -- TYT ]

    Cc: stable@kernel.org
    Cc: Lukas Czerner <lczerner@redhat.com>
    Reviewed-by: Jan Kara <jack@suse.cz>
    Reviewed-by: Christian Brauner (Microsoft) <brauner@kernel.org>
    Signed-off-by: Jeff Layton <jlayton@kernel.org>
    Link: https://lore.kernel.org/r/20220908172448.208585-3-jlayton@kernel.org
    Signed-off-by: Theodore Ts'o <tytso@mit.edu>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    fs/ext4/inode.c | 14 +++++---------
    fs/ext4/ioctl.c | 4 ++++
    fs/ext4/xattr.c | 1 +
    3 files changed, 10 insertions(+), 9 deletions(-)

    --- a/fs/ext4/inode.c
    +++ b/fs/ext4/inode.c
    @@ -5349,6 +5349,7 @@ int ext4_setattr(struct user_namespace *
    int error, rc = 0;
    int orphan = 0;
    const unsigned int ia_valid = attr->ia_valid;
    + bool inc_ivers = true;

    if (unlikely(ext4_forced_shutdown(EXT4_SB(inode->i_sb))))
    return -EIO;
    @@ -5432,8 +5433,8 @@ int ext4_setattr(struct user_namespace *
    return -EINVAL;
    }

    - if (attr->ia_size != inode->i_size)
    - inode_inc_iversion(inode);
    + if (attr->ia_size == inode->i_size)
    + inc_ivers = false;

    if (shrink) {
    if (ext4_should_order_data(inode)) {
    @@ -5535,6 +5536,8 @@ out_mmap_sem:
    }

    if (!error) {
    + if (inc_ivers)
    + inode_inc_iversion(inode);
    setattr_copy(mnt_userns, inode, attr);
    mark_inode_dirty(inode);
    }
    @@ -5738,13 +5741,6 @@ int ext4_mark_iloc_dirty(handle_t *handl
    }
    ext4_fc_track_inode(handle, inode);

    - /*
    - * ea_inodes are using i_version for storing reference count, don't
    - * mess with it
    - */
    - if (!(EXT4_I(inode)->i_flags & EXT4_EA_INODE_FL))
    - inode_inc_iversion(inode);
    -
    /* the do_update_inode consumes one bh->b_count */
    get_bh(iloc->bh);

    --- a/fs/ext4/ioctl.c
    +++ b/fs/ext4/ioctl.c
    @@ -452,6 +452,7 @@ static long swap_inode_boot_loader(struc
    swap_inode_data(inode, inode_bl);

    inode->i_ctime = inode_bl->i_ctime = current_time(inode);
    + inode_inc_iversion(inode);

    inode->i_generation = prandom_u32();
    inode_bl->i_generation = prandom_u32();
    @@ -665,6 +666,7 @@ static int ext4_ioctl_setflags(struct in
    ext4_set_inode_flags(inode, false);

    inode->i_ctime = current_time(inode);
    + inode_inc_iversion(inode);

    err = ext4_mark_iloc_dirty(handle, inode, &iloc);
    flags_err:
    @@ -775,6 +777,7 @@ static int ext4_ioctl_setproject(struct

    EXT4_I(inode)->i_projid = kprojid;
    inode->i_ctime = current_time(inode);
    + inode_inc_iversion(inode);
    out_dirty:
    rc = ext4_mark_iloc_dirty(handle, inode, &iloc);
    if (!err)
    @@ -1257,6 +1260,7 @@ static long __ext4_ioctl(struct file *fi
    err = ext4_reserve_inode_write(handle, inode, &iloc);
    if (err == 0) {
    inode->i_ctime = current_time(inode);
    + inode_inc_iversion(inode);
    inode->i_generation = generation;
    err = ext4_mark_iloc_dirty(handle, inode, &iloc);
    }
    --- a/fs/ext4/xattr.c
    +++ b/fs/ext4/xattr.c
    @@ -2412,6 +2412,7 @@ retry_inode:
    if (!error) {
    ext4_xattr_update_super_block(handle, inode->i_sb);
    inode->i_ctime = current_time(inode);
    + inode_inc_iversion(inode);
    if (!value)
    no_expand = 0;
    error = ext4_mark_iloc_dirty(handle, inode, &is.iloc);

    \
     
     \ /
      Last update: 2022-10-19 10:52    [W:4.030 / U:0.132 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site