Merge tag 'vfs-6.18-rc1.inode' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs

Pull vfs inode updates from Christian Brauner: "This contains a series I originally wrote and that Eric brought over the finish line. It moves out the i_crypt_info and i_verity_info pointers out of 'struct inode' and into the fs-specific part of the inode. So now the few filesytems that actually make use of this pay the price in their own private inode storage instead of forcing it upon every user of struct inode. The pointer for the crypt and verity info is simply found by storing an offset to its address in struct fsverity_operations and struct fscrypt_operations. This shrinks struct inode by 16 bytes. I hope to move a lot more out of it in the future so that struct inode becomes really just about very core stuff that we need, much like struct dentry and struct file, instead of the dumping ground it has become over the years. On top of this are a various changes associated with the ongoing inode lifetime handling rework that multiple people are pushing forward: - Stop accessing inode->i_count directly in f2fs and gfs2. They simply should use the __iget() and iput() helpers - Make the i_state flags an enum - Rework the iput() logic Currently, if we are the last iput, and we have the I_DIRTY_TIME bit set, we will grab a reference on the inode again and then mark it dirty and then redo the put. This is to make sure we delay the time update for as long as possible We can rework this logic to simply dec i_count if it is not 1, and if it is do the time update while still holding the i_count reference Then we can replace the atomic_dec_and_lock with locking the ->i_lock and doing atomic_dec_and_test, since we did the atomic_add_unless above - Add an icount_read() helper and convert everyone that accesses inode->i_count directly for this purpose to use the helper - Expand dump_inode() to dump more information about an inode helping in debugging - Add some might_sleep() annotations to iput() and associated helpers" * tag 'vfs-6.18-rc1.inode' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs: fs: add might_sleep() annotation to iput() and more fs: expand dump_inode() inode: fix whitespace issues fs: add an icount_read helper fs: rework iput logic fs: make the i_state flags an enum fs: stop accessing ->i_count directly in f2fs and gfs2 fsverity: check IS_VERITY() in fsverity_cleanup_inode() fs: remove inode::i_verity_info btrfs: move verity info pointer to fs-specific part of inode f2fs: move verity info pointer to fs-specific part of inode ext4: move verity info pointer to fs-specific part of inode fsverity: add support for info in fs-specific part of inode fs: remove inode::i_crypt_info ceph: move crypt info pointer to fs-specific part of inode ubifs: move crypt info pointer to fs-specific part of inode f2fs: move crypt info pointer to fs-specific part of inode ext4: move crypt info pointer to fs-specific part of inode fscrypt: add support for info in fs-specific part of inode fscrypt: replace raw loads of info pointer with helper function

Author: torvalds

arch/powerpc/platforms/cell/spufs/file.c

@@ -1430,7 +1430,7 @@ static int spufs_mfc_open(struct inode *inode, struct file *file)
 if (ctx->owner != current->mm)
 return -EINVAL;
 
-if (atomic_read(&inode->i_count) != 1)
+if (icount_read(inode) != 1)
 return -EBUSY;
 
 mutex_lock(&ctx->mapping_lock);

fs/btrfs/btrfs_inode.h

@@ -338,6 +338,11 @@ struct btrfs_inode {
 struct list_head delayed_iput;
 
 struct rw_semaphore i_mmap_lock;
+
+#ifdef CONFIG_FS_VERITY
+struct fsverity_info *i_verity_info;
+#endif
+
 struct inode vfs_inode;
 };
 

fs/btrfs/inode.c

@@ -4556,7 +4556,7 @@ static void btrfs_prune_dentries(struct btrfs_root *root)
 
 inode = btrfs_find_first_inode(root, min_ino);
 while (inode) {
-if (atomic_read(&inode->vfs_inode.i_count) > 1)
+if (icount_read(&inode->vfs_inode) > 1)
 d_prune_aliases(&inode->vfs_inode);
 
 min_ino = btrfs_ino(inode) + 1;
@@ -7981,6 +7981,9 @@ static void init_once(void *foo)
 struct btrfs_inode *ei = foo;
 
 inode_init_once(&ei->vfs_inode);
+#ifdef CONFIG_FS_VERITY
+ei->i_verity_info = NULL;
+#endif
 }
 
 void __cold btrfs_destroy_cachep(void)

fs/btrfs/verity.c

@@ -802,6 +802,8 @@ static int btrfs_write_merkle_tree_block(struct inode *inode, const void *buf,
 }
 
 const struct fsverity_operations btrfs_verityops = {
+.inode_info_offs = (int)offsetof(struct btrfs_inode, i_verity_info) -
+ (int)offsetof(struct btrfs_inode, vfs_inode),
 .begin_enable_verity = btrfs_begin_enable_verity,
 .end_enable_verity = btrfs_end_enable_verity,
 .get_verity_descriptor = btrfs_get_verity_descriptor,

fs/ceph/crypto.c

@@ -133,6 +133,8 @@ static const union fscrypt_policy *ceph_get_dummy_policy(struct super_block *sb)
 }
 
 static struct fscrypt_operations ceph_fscrypt_ops = {
+.inode_info_offs= (int)offsetof(struct ceph_inode_info, i_crypt_info) -
+ (int)offsetof(struct ceph_inode_info, netfs.inode),
 .needs_bounce_pages= 1,
 .get_context= ceph_crypt_get_context,
 .set_context= ceph_crypt_set_context,

fs/ceph/inode.c

@@ -711,6 +711,7 @@ struct inode *ceph_alloc_inode(struct super_block *sb)
 ci->i_work_mask = 0;
 memset(&ci->i_btime, '\0', sizeof(ci->i_btime));
 #ifdef CONFIG_FS_ENCRYPTION
+ci->i_crypt_info = NULL;
 ci->fscrypt_auth = NULL;
 ci->fscrypt_auth_len = 0;
 #endif

fs/ceph/mds_client.c

@@ -2221,7 +2221,7 @@ static int trim_caps_cb(struct inode *inode, int mds, void *arg)
 int count;
 dput(dentry);
 d_prune_aliases(inode);
-count = atomic_read(&inode->i_count);
+count = icount_read(inode);
 if (count == 1)
 (*remaining)--;
 doutc(cl, "%p %llx.%llx cap %p pruned, count now %d\n",

fs/ceph/super.h

@@ -463,6 +463,7 @@ struct ceph_inode_info {
 unsigned long i_work_mask;
 
 #ifdef CONFIG_FS_ENCRYPTION
+struct fscrypt_inode_info *i_crypt_info;
 u32 fscrypt_auth_len;
 u32 fscrypt_file_len;
 u8 *fscrypt_auth;

fs/crypto/bio.c

@@ -113,7 +113,7 @@ static int fscrypt_zeroout_range_inline_crypt(const struct inode *inode,
 int fscrypt_zeroout_range(const struct inode *inode, pgoff_t lblk,
  sector_t pblk, unsigned int len)
 {
-const struct fscrypt_inode_info *ci = inode->i_crypt_info;
+const struct fscrypt_inode_info *ci = fscrypt_get_inode_info_raw(inode);
 const unsigned int du_bits = ci->ci_data_unit_bits;
 const unsigned int du_size = 1U << du_bits;
 const unsigned int du_per_page_bits = PAGE_SHIFT - du_bits;

fs/crypto/crypto.c

@@ -173,7 +173,7 @@ struct page *fscrypt_encrypt_pagecache_blocks(struct folio *folio,
 size_t len, size_t offs, gfp_t gfp_flags)
 {
 const struct inode *inode = folio->mapping->host;
-const struct fscrypt_inode_info *ci = inode->i_crypt_info;
+const struct fscrypt_inode_info *ci = fscrypt_get_inode_info_raw(inode);
 const unsigned int du_bits = ci->ci_data_unit_bits;
 const unsigned int du_size = 1U << du_bits;
 struct page *ciphertext_page;
@@ -232,8 +232,9 @@ int fscrypt_encrypt_block_inplace(const struct inode *inode, struct page *page,
 {
 if (WARN_ON_ONCE(inode->i_sb->s_cop->supports_subblock_data_units))
 return -EOPNOTSUPP;
-return fscrypt_crypt_data_unit(inode->i_crypt_info, FS_ENCRYPT,
- lblk_num, page, page, len, offs);
+return fscrypt_crypt_data_unit(fscrypt_get_inode_info_raw(inode),
+ FS_ENCRYPT, lblk_num, page, page, len,
+ offs);
 }
 EXPORT_SYMBOL(fscrypt_encrypt_block_inplace);
 
@@ -255,7 +256,7 @@ int fscrypt_decrypt_pagecache_blocks(struct folio *folio, size_t len,
  size_t offs)
 {
 const struct inode *inode = folio->mapping->host;
-const struct fscrypt_inode_info *ci = inode->i_crypt_info;
+const struct fscrypt_inode_info *ci = fscrypt_get_inode_info_raw(inode);
 const unsigned int du_bits = ci->ci_data_unit_bits;
 const unsigned int du_size = 1U << du_bits;
 u64 index = ((u64)folio->index << (PAGE_SHIFT - du_bits)) +
@@ -305,8 +306,9 @@ int fscrypt_decrypt_block_inplace(const struct inode *inode, struct page *page,
 {
 if (WARN_ON_ONCE(inode->i_sb->s_cop->supports_subblock_data_units))
 return -EOPNOTSUPP;
-return fscrypt_crypt_data_unit(inode->i_crypt_info, FS_DECRYPT,
- lblk_num, page, page, len, offs);
+return fscrypt_crypt_data_unit(fscrypt_get_inode_info_raw(inode),
+ FS_DECRYPT, lblk_num, page, page, len,
+ offs);
 }
 EXPORT_SYMBOL(fscrypt_decrypt_block_inplace);