Commit e21165bf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ceph-for-6.7-rc1' of https://github.com/ceph/ceph-client 

Pull ceph updates from Ilya Dryomov:

 - support for idmapped mounts in CephFS (Christian Brauner, Alexander
   Mikhalitsyn).

   The series was originally developed by Christian and later picked up
   and brought over the finish line by Alexander, who also contributed
   an enabler on the MDS side (separate owner_{u,g}id fields on the
   wire).

   The required exports for mnt_idmap_{get,put}() in VFS have been acked
   by Christian and received no objection from Christoph.

 - a churny change in CephFS logging to include cluster and client
   identifiers in log and debug messages (Xiubo Li).

   This would help in scenarios with dozens of CephFS mounts on the same
   node which are getting increasingly common, especially in the
   Kubernetes world.

* tag 'ceph-for-6.7-rc1' of https://github.com/ceph/ceph-client:
  ceph: allow idmapped mounts
  ceph: allow idmapped atomic_open inode op
  ceph: allow idmapped set_acl inode op
  ceph: allow idmapped setattr inode op
  ceph: pass idmap to __ceph_setattr
  ceph: allow idmapped permission inode op
  ceph: allow idmapped getattr inode op
  ceph: pass an idmapping to mknod/symlink/mkdir
  ceph: add enable_unsafe_idmap module parameter
  ceph: handle idmapped mounts in create_request_message()
  ceph: stash idmapping in mdsc request
  fs: export mnt_idmap_get/mnt_idmap_put
  libceph, ceph: move mdsmap.h to fs/ceph
  ceph: print cluster fsid and client global_id in all debug logs
  ceph: rename _to_client() to _to_fs_client()
  ceph: pass the mdsc to several helpers
  libceph: add doutc and *_client debug macros support
parents 56d428ae 56d2e2cf

fs/ceph/acl.c

+7 −5
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/slab.h>



#include "super.h"

#include "mds_client.h"



static inline void ceph_set_cached_acl(struct inode *inode,

					int type, struct posix_acl *acl)
@@ -31,6 +32,7 @@ static inline void ceph_set_cached_acl(struct inode *inode, 


struct posix_acl *ceph_get_acl(struct inode *inode, int type, bool rcu)

{

	struct ceph_client *cl = ceph_inode_to_client(inode);

	int size;

	unsigned int retry_cnt = 0;

	const char *name;
@@ -72,7 +74,7 @@ struct posix_acl *ceph_get_acl(struct inode *inode, int type, bool rcu) 
	} else if (size == -ENODATA || size == 0) {

		acl = NULL;

	} else {

		pr_err_ratelimited("get acl %llx.%llx failed, err=%d\n",

		pr_err_ratelimited_client(cl, "%llx.%llx failed, err=%d\n",

					  ceph_vinop(inode), size);

		acl = ERR_PTR(-EIO);

	}
@@ -105,7 +107,7 @@ int ceph_set_acl(struct mnt_idmap *idmap, struct dentry *dentry, 
	case ACL_TYPE_ACCESS:

		name = XATTR_NAME_POSIX_ACL_ACCESS;

		if (acl) {

			ret = posix_acl_update_mode(&nop_mnt_idmap, inode,

			ret = posix_acl_update_mode(idmap, inode,

						    &new_mode, &acl);

			if (ret)

				goto out;
@@ -140,7 +142,7 @@ int ceph_set_acl(struct mnt_idmap *idmap, struct dentry *dentry, 
		newattrs.ia_ctime = current_time(inode);

		newattrs.ia_mode = new_mode;

		newattrs.ia_valid = ATTR_MODE | ATTR_CTIME;

		ret = __ceph_setattr(inode, &newattrs, NULL);

		ret = __ceph_setattr(idmap, inode, &newattrs, NULL);

		if (ret)

			goto out_free;

	}
@@ -151,7 +153,7 @@ int ceph_set_acl(struct mnt_idmap *idmap, struct dentry *dentry, 
			newattrs.ia_ctime = old_ctime;

			newattrs.ia_mode = old_mode;

			newattrs.ia_valid = ATTR_MODE | ATTR_CTIME;

			__ceph_setattr(inode, &newattrs, NULL);

			__ceph_setattr(idmap, inode, &newattrs, NULL);

		}

		goto out_free;

	}

fs/ceph/addr.c

+163 −136

File changed.

Preview size limit exceeded, changes collapsed.

fs/ceph/cache.c

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
void ceph_fscache_register_inode_cookie(struct inode *inode)

{

	struct ceph_inode_info *ci = ceph_inode(inode);

	struct ceph_fs_client *fsc = ceph_inode_to_client(inode);

	struct ceph_fs_client *fsc = ceph_inode_to_fs_client(inode);



	/* No caching for filesystem? */

	if (!fsc->fscache)

fs/ceph/caps.c

+438 −325

File changed.

Preview size limit exceeded, changes collapsed.

fs/ceph/crypto.c

+28 −15
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ static int ceph_crypt_set_context(struct inode *inode, const void *ctx, 


	cia.fscrypt_auth = cfa;



	ret = __ceph_setattr(inode, &attr, &cia);

	ret = __ceph_setattr(&nop_mnt_idmap, inode, &attr, &cia);

	if (ret == 0)

		inode_set_flags(inode, S_ENCRYPTED, S_ENCRYPTED);

	kfree(cia.fscrypt_auth);
@@ -129,7 +129,7 @@ static bool ceph_crypt_empty_dir(struct inode *inode) 


static const union fscrypt_policy *ceph_get_dummy_policy(struct super_block *sb)

{

	return ceph_sb_to_client(sb)->fsc_dummy_enc_policy.policy;

	return ceph_sb_to_fs_client(sb)->fsc_dummy_enc_policy.policy;

}



static struct fscrypt_operations ceph_fscrypt_ops = {
@@ -212,6 +212,7 @@ void ceph_fscrypt_as_ctx_to_req(struct ceph_mds_request *req, 
static struct inode *parse_longname(const struct inode *parent,

				    const char *name, int *name_len)

{

	struct ceph_client *cl = ceph_inode_to_client(parent);

	struct inode *dir = NULL;

	struct ceph_vino vino = { .snap = CEPH_NOSNAP };

	char *inode_number;
@@ -223,12 +224,12 @@ static struct inode *parse_longname(const struct inode *parent, 
	name++;

	name_end = strrchr(name, '_');

	if (!name_end) {

		dout("Failed to parse long snapshot name: %s\n", name);

		doutc(cl, "failed to parse long snapshot name: %s\n", name);

		return ERR_PTR(-EIO);

	}

	*name_len = (name_end - name);

	if (*name_len <= 0) {

		pr_err("Failed to parse long snapshot name\n");

		pr_err_client(cl, "failed to parse long snapshot name\n");

		return ERR_PTR(-EIO);

	}
@@ -240,7 +241,7 @@ static struct inode *parse_longname(const struct inode *parent, 
		return ERR_PTR(-ENOMEM);

	ret = kstrtou64(inode_number, 10, &vino.ino);

	if (ret) {

		dout("Failed to parse inode number: %s\n", name);

		doutc(cl, "failed to parse inode number: %s\n", name);

		dir = ERR_PTR(ret);

		goto out;

	}
@@ -251,7 +252,7 @@ static struct inode *parse_longname(const struct inode *parent, 
		/* This can happen if we're not mounting cephfs on the root */

		dir = ceph_get_inode(parent->i_sb, vino, NULL);

		if (IS_ERR(dir))

			dout("Can't find inode %s (%s)\n", inode_number, name);

			doutc(cl, "can't find inode %s (%s)\n", inode_number, name);

	}



out:
@@ -262,6 +263,7 @@ static struct inode *parse_longname(const struct inode *parent, 
int ceph_encode_encrypted_dname(struct inode *parent, struct qstr *d_name,

				char *buf)

{

	struct ceph_client *cl = ceph_inode_to_client(parent);

	struct inode *dir = parent;

	struct qstr iname;

	u32 len;
@@ -330,7 +332,7 @@ int ceph_encode_encrypted_dname(struct inode *parent, struct qstr *d_name, 


	/* base64 encode the encrypted name */

	elen = ceph_base64_encode(cryptbuf, len, buf);

	dout("base64-encoded ciphertext name = %.*s\n", elen, buf);

	doutc(cl, "base64-encoded ciphertext name = %.*s\n", elen, buf);



	/* To understand the 240 limit, see CEPH_NOHASH_NAME_MAX comments */

	WARN_ON(elen > 240);
@@ -505,7 +507,10 @@ int ceph_fscrypt_decrypt_block_inplace(const struct inode *inode, 
				  struct page *page, unsigned int len,

				  unsigned int offs, u64 lblk_num)

{

	dout("%s: len %u offs %u blk %llu\n", __func__, len, offs, lblk_num);

	struct ceph_client *cl = ceph_inode_to_client(inode);



	doutc(cl, "%p %llx.%llx len %u offs %u blk %llu\n", inode,

	      ceph_vinop(inode), len, offs, lblk_num);

	return fscrypt_decrypt_block_inplace(inode, page, len, offs, lblk_num);

}
@@ -514,7 +519,10 @@ int ceph_fscrypt_encrypt_block_inplace(const struct inode *inode, 
				  unsigned int offs, u64 lblk_num,

				  gfp_t gfp_flags)

{

	dout("%s: len %u offs %u blk %llu\n", __func__, len, offs, lblk_num);

	struct ceph_client *cl = ceph_inode_to_client(inode);



	doutc(cl, "%p %llx.%llx len %u offs %u blk %llu\n", inode,

	      ceph_vinop(inode), len, offs, lblk_num);

	return fscrypt_encrypt_block_inplace(inode, page, len, offs, lblk_num,

					     gfp_flags);

}
@@ -583,6 +591,7 @@ int ceph_fscrypt_decrypt_extents(struct inode *inode, struct page **page, 
				 u64 off, struct ceph_sparse_extent *map,

				 u32 ext_cnt)

{

	struct ceph_client *cl = ceph_inode_to_client(inode);

	int i, ret = 0;

	struct ceph_inode_info *ci = ceph_inode(inode);

	u64 objno, objoff;
@@ -590,7 +599,8 @@ int ceph_fscrypt_decrypt_extents(struct inode *inode, struct page **page, 


	/* Nothing to do for empty array */

	if (ext_cnt == 0) {

		dout("%s: empty array, ret 0\n", __func__);

		doutc(cl, "%p %llx.%llx empty array, ret 0\n", inode,

		      ceph_vinop(inode));

		return 0;

	}
@@ -604,14 +614,17 @@ int ceph_fscrypt_decrypt_extents(struct inode *inode, struct page **page, 
		int fret;



		if ((ext->off | ext->len) & ~CEPH_FSCRYPT_BLOCK_MASK) {

			pr_warn("%s: bad encrypted sparse extent idx %d off %llx len %llx\n",

				__func__, i, ext->off, ext->len);

			pr_warn_client(cl,

				"%p %llx.%llx bad encrypted sparse extent "

				"idx %d off %llx len %llx\n",

				inode, ceph_vinop(inode), i, ext->off,

				ext->len);

			return -EIO;

		}

		fret = ceph_fscrypt_decrypt_pages(inode, &page[pgidx],

						 off + pgsoff, ext->len);

		dout("%s: [%d] 0x%llx~0x%llx fret %d\n", __func__, i,

				ext->off, ext->len, fret);

		doutc(cl, "%p %llx.%llx [%d] 0x%llx~0x%llx fret %d\n", inode,

		      ceph_vinop(inode), i, ext->off, ext->len, fret);

		if (fret < 0) {

			if (ret == 0)

				ret = fret;
@@ -619,7 +632,7 @@ int ceph_fscrypt_decrypt_extents(struct inode *inode, struct page **page, 
		}

		ret = pgsoff + fret;

	}

	dout("%s: ret %d\n", __func__, ret);

	doutc(cl, "ret %d\n", ret);

	return ret;

}