Dear friends,
This patchset was originally developed by Christian Brauner but I'll continue
to push it forward. Christian allowed me to do that :)
This feature is already actively used/tested with LXD/LXC project.
Git tree (based on https://github.com/ceph/ceph-client.git testing):
v10: https://github.com/mihalicyn/linux/commits/fs.idmapped.ceph.v10
current: https://github.com/mihalicyn/linux/tree/fs.idmapped.ceph
In the version 3 I've changed only two commits:
- fs: export mnt_idmap_get/mnt_idmap_put
- ceph: allow idmapped setattr inode op
and added a new one:
- ceph: pass idmap to __ceph_setattr
In the version 4 I've reworked the ("ceph: stash idmapping in mdsc request")
commit. Now we take idmap refcounter just in place where req->r_mnt_idmap
is filled. It's more safer approach and prevents possible refcounter underflow
on error paths where __register_request wasn't called but ceph_mdsc_release_request is
called.
Changelog for version 5:
- a few commits were squashed into one (as suggested by Xiubo Li)
- started passing an idmapping everywhere (if possible), so a caller
UID/GID-s will be mapped almost everywhere (as suggested by Xiubo Li)
Changelog for version 6:
- rebased on top of testing branch
- passed an idmapping in a few places (readdir, ceph_netfs_issue_op_inline)
Changelog for version 7:
- rebased on top of testing branch
- this thing now requires a new cephfs protocol extension CEPHFS_FEATURE_HAS_OWNER_UIDGID
https://github.com/ceph/ceph/pull/52575
Changelog for version 8:
- rebased on top of testing branch
- added enable_unsafe_idmap module parameter to make idmapped mounts
work with old MDS server versions
- properly handled case when old MDS used with new kernel client
Changelog for version 9:
- added "struct_len" field in struct ceph_mds_request_head as requested by Xiubo Li
Changelog for version 10:
- fill struct_len field properly (use cpu_to_le32)
- add extra checks IS_CEPH_MDS_OP_NEWINODE(..) as requested by Xiubo to match
userspace client behavior
- do not set req->r_mnt_idmap for MKSNAP operation
- atomic_open: set req->r_mnt_idmap only for CEPH_MDS_OP_CREATE as userspace client does
I can confirm that this version passes xfstests and
tested with old MDS (without CEPHFS_FEATURE_HAS_OWNER_UIDGID)
and with recent MDS version.
Links to previous versions:
v1: https://lore.kernel.org/all/[email protected]/
v2: https://lore.kernel.org/lkml/[email protected]/
tree: https://github.com/mihalicyn/linux/commits/fs.idmapped.ceph.v2
v3: https://lore.kernel.org/lkml/[email protected]/#t
v4: https://lore.kernel.org/lkml/[email protected]/#t
tree: https://github.com/mihalicyn/linux/commits/fs.idmapped.ceph.v4
v5: https://lore.kernel.org/lkml/[email protected]/#t
tree: https://github.com/mihalicyn/linux/commits/fs.idmapped.ceph.v5
v6: https://lore.kernel.org/lkml/[email protected]/
tree: https://github.com/mihalicyn/linux/commits/fs.idmapped.ceph.v6
v7: https://lore.kernel.org/all/[email protected]/
tree: https://github.com/mihalicyn/linux/commits/fs.idmapped.ceph.v7
v8: https://lore.kernel.org/all/[email protected]/
tree: -
v9: https://lore.kernel.org/all/[email protected]/
tree: https://github.com/mihalicyn/linux/commits/fs.idmapped.ceph.v9
Kind regards,
Alex
Original description from Christian:
========================================================================
This patch series enables cephfs to support idmapped mounts, i.e. the
ability to alter ownership information on a per-mount basis.
Container managers such as LXD support sharaing data via cephfs between
the host and unprivileged containers and between unprivileged containers.
They may all use different idmappings. Idmapped mounts can be used to
create mounts with the idmapping used for the container (or a different
one specific to the use-case).
There are in fact more use-cases such as remapping ownership for
mountpoints on the host itself to grant or restrict access to different
users or to make it possible to enforce that programs running as root
will write with a non-zero {g,u}id to disk.
The patch series is simple overall and few changes are needed to cephfs.
There is one cephfs specific issue that I would like to discuss and
solve which I explain in detail in:
[PATCH 02/12] ceph: handle idmapped mounts in create_request_message()
It has to do with how to handle mds serves which have id-based access
restrictions configured. I would ask you to please take a look at the
explanation in the aforementioned patch.
The patch series passes the vfs and idmapped mount testsuite as part of
xfstests. To run it you will need a config like:
[ceph]
export FSTYP=ceph
export TEST_DIR=/mnt/test
export TEST_DEV=10.103.182.10:6789:/
export TEST_FS_MOUNT_OPTS="-o name=admin,secret=$password
and then simply call
sudo ./check -g idmapped
========================================================================
Alexander Mikhalitsyn (3):
fs: export mnt_idmap_get/mnt_idmap_put
ceph: add enable_unsafe_idmap module parameter
ceph: pass idmap to __ceph_setattr
Christian Brauner (9):
ceph: stash idmapping in mdsc request
ceph: handle idmapped mounts in create_request_message()
ceph: pass an idmapping to mknod/symlink/mkdir
ceph: allow idmapped getattr inode op
ceph: allow idmapped permission inode op
ceph: allow idmapped setattr inode op
ceph/acl: allow idmapped set_acl inode op
ceph/file: allow idmapped atomic_open inode op
ceph: allow idmapped mounts
fs/ceph/acl.c | 6 +--
fs/ceph/crypto.c | 2 +-
fs/ceph/dir.c | 4 ++
fs/ceph/file.c | 11 ++++-
fs/ceph/inode.c | 29 +++++++------
fs/ceph/mds_client.c | 78 ++++++++++++++++++++++++++++++++---
fs/ceph/mds_client.h | 8 +++-
fs/ceph/super.c | 7 +++-
fs/ceph/super.h | 3 +-
fs/mnt_idmapping.c | 2 +
include/linux/ceph/ceph_fs.h | 10 ++++-
include/linux/mnt_idmapping.h | 3 ++
12 files changed, 136 insertions(+), 27 deletions(-)
--
2.34.1
This parameter is used to decide if we allow
to perform IO on idmapped mount in case when MDS lacks
support of CEPHFS_FEATURE_HAS_OWNER_UIDGID feature.
In this case we can't properly handle MDS permission
checks and if UID/GID-based restrictions are enabled
on the MDS side then IO requests which go through an
idmapped mount may fail with -EACCESS/-EPERM.
Fortunately, for most of users it's not a case and
everything should work fine. But we put work "unsafe"
in the module parameter name to warn users about
possible problems with this feature and encourage
update of cephfs MDS.
Cc: Xiubo Li <[email protected]>
Cc: Jeff Layton <[email protected]>
Cc: Ilya Dryomov <[email protected]>
Cc: [email protected]
Suggested-by: Stéphane Graber <[email protected]>
Signed-off-by: Alexander Mikhalitsyn <[email protected]>
Acked-by: Christian Brauner <[email protected]>
---
fs/ceph/mds_client.c | 28 +++++++++++++++++++++-------
fs/ceph/mds_client.h | 2 ++
fs/ceph/super.c | 5 +++++
3 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c
index 5114de5ea65e..90c4b0689cd6 100644
--- a/fs/ceph/mds_client.c
+++ b/fs/ceph/mds_client.c
@@ -2949,6 +2949,8 @@ static struct ceph_msg *create_request_message(struct ceph_mds_session *session,
int ret;
bool legacy = !(session->s_con.peer_features & CEPH_FEATURE_FS_BTIME);
u16 request_head_version = mds_supported_head_version(session);
+ kuid_t caller_fsuid = req->r_cred->fsuid;
+ kgid_t caller_fsgid = req->r_cred->fsgid;
ret = set_request_path_attr(mdsc, req->r_inode, req->r_dentry,
req->r_parent, req->r_path1, req->r_ino1.ino,
@@ -3046,12 +3048,24 @@ static struct ceph_msg *create_request_message(struct ceph_mds_session *session,
!test_bit(CEPHFS_FEATURE_HAS_OWNER_UIDGID, &session->s_features)) {
WARN_ON_ONCE(!IS_CEPH_MDS_OP_NEWINODE(req->r_op));
- pr_err_ratelimited_client(cl,
- "idmapped mount is used and CEPHFS_FEATURE_HAS_OWNER_UIDGID"
- " is not supported by MDS. Fail request with -EIO.\n");
+ if (enable_unsafe_idmap) {
+ pr_warn_once_client(cl,
+ "idmapped mount is used and CEPHFS_FEATURE_HAS_OWNER_UIDGID"
+ " is not supported by MDS. UID/GID-based restrictions may"
+ " not work properly.\n");
- ret = -EIO;
- goto out_err;
+ caller_fsuid = from_vfsuid(req->r_mnt_idmap, &init_user_ns,
+ VFSUIDT_INIT(req->r_cred->fsuid));
+ caller_fsgid = from_vfsgid(req->r_mnt_idmap, &init_user_ns,
+ VFSGIDT_INIT(req->r_cred->fsgid));
+ } else {
+ pr_err_ratelimited_client(cl,
+ "idmapped mount is used and CEPHFS_FEATURE_HAS_OWNER_UIDGID"
+ " is not supported by MDS. Fail request with -EIO.\n");
+
+ ret = -EIO;
+ goto out_err;
+ }
}
/*
@@ -3103,9 +3117,9 @@ static struct ceph_msg *create_request_message(struct ceph_mds_session *session,
lhead->mdsmap_epoch = cpu_to_le32(mdsc->mdsmap->m_epoch);
lhead->op = cpu_to_le32(req->r_op);
lhead->caller_uid = cpu_to_le32(from_kuid(&init_user_ns,
- req->r_cred->fsuid));
+ caller_fsuid));
lhead->caller_gid = cpu_to_le32(from_kgid(&init_user_ns,
- req->r_cred->fsgid));
+ caller_fsgid));
lhead->ino = cpu_to_le64(req->r_deleg_ino);
lhead->args = req->r_args;
diff --git a/fs/ceph/mds_client.h b/fs/ceph/mds_client.h
index 8f683e8203bd..0945ae4cf3c5 100644
--- a/fs/ceph/mds_client.h
+++ b/fs/ceph/mds_client.h
@@ -619,4 +619,6 @@ static inline int ceph_wait_on_async_create(struct inode *inode)
extern int ceph_wait_on_conflict_unlink(struct dentry *dentry);
extern u64 ceph_get_deleg_ino(struct ceph_mds_session *session);
extern int ceph_restore_deleg_ino(struct ceph_mds_session *session, u64 ino);
+
+extern bool enable_unsafe_idmap;
#endif
diff --git a/fs/ceph/super.c b/fs/ceph/super.c
index 49fd17fbba9f..18bfdfd48cef 100644
--- a/fs/ceph/super.c
+++ b/fs/ceph/super.c
@@ -1680,6 +1680,11 @@ static const struct kernel_param_ops param_ops_mount_syntax = {
module_param_cb(mount_syntax_v1, ¶m_ops_mount_syntax, &mount_support, 0444);
module_param_cb(mount_syntax_v2, ¶m_ops_mount_syntax, &mount_support, 0444);
+bool enable_unsafe_idmap = false;
+module_param(enable_unsafe_idmap, bool, 0644);
+MODULE_PARM_DESC(enable_unsafe_idmap,
+ "Allow to use idmapped mounts with MDS without CEPHFS_FEATURE_HAS_OWNER_UIDGID");
+
module_init(init_ceph);
module_exit(exit_ceph);
--
2.34.1
From: Christian Brauner <[email protected]>
Now that we converted cephfs internally to account for idmapped mounts
allow the creation of idmapped mounts on by setting the FS_ALLOW_IDMAP
flag.
Cc: Xiubo Li <[email protected]>
Cc: Jeff Layton <[email protected]>
Cc: Ilya Dryomov <[email protected]>
Cc: [email protected]
Signed-off-by: Christian Brauner <[email protected]>
Signed-off-by: Alexander Mikhalitsyn <[email protected]>
---
fs/ceph/super.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/ceph/super.c b/fs/ceph/super.c
index 18bfdfd48cef..ad6d40309ebe 100644
--- a/fs/ceph/super.c
+++ b/fs/ceph/super.c
@@ -1581,7 +1581,7 @@ static struct file_system_type ceph_fs_type = {
.name = "ceph",
.init_fs_context = ceph_init_fs_context,
.kill_sb = ceph_kill_sb,
- .fs_flags = FS_RENAME_DOES_D_MOVE,
+ .fs_flags = FS_RENAME_DOES_D_MOVE | FS_ALLOW_IDMAP,
};
MODULE_ALIAS_FS("ceph");
--
2.34.1
From: Christian Brauner <[email protected]>
Inode operations that create a new filesystem object such as ->mknod,
->create, ->mkdir() and others don't take a {g,u}id argument explicitly.
Instead the caller's fs{g,u}id is used for the {g,u}id of the new
filesystem object.
In order to ensure that the correct {g,u}id is used map the caller's
fs{g,u}id for creation requests. This doesn't require complex changes.
It suffices to pass in the relevant idmapping recorded in the request
message. If this request message was triggered from an inode operation
that creates filesystem objects it will have passed down the relevant
idmaping. If this is a request message that was triggered from an inode
operation that doens't need to take idmappings into account the initial
idmapping is passed down which is an identity mapping.
This change uses a new cephfs protocol extension CEPHFS_FEATURE_HAS_OWNER_UIDGID
which adds two new fields (owner_{u,g}id) to the request head structure.
So, we need to ensure that MDS supports it otherwise we need to fail
any IO that comes through an idmapped mount because we can't process it
in a proper way. MDS server without such an extension will use caller_{u,g}id
fields to set a new inode owner UID/GID which is incorrect because caller_{u,g}id
values are unmapped. At the same time we can't map these fields with an
idmapping as it can break UID/GID-based permission checks logic on the
MDS side. This problem was described with a lot of details at [1], [2].
[1] https://lore.kernel.org/lkml/CAEivzxfw1fHO2TFA4dx3u23ZKK6Q+EThfzuibrhA3RKM=ZOYLg@mail.gmail.com/
[2] https://lore.kernel.org/all/[email protected]/
Link: https://github.com/ceph/ceph/pull/52575
Link: https://tracker.ceph.com/issues/62217
Cc: Xiubo Li <[email protected]>
Cc: Jeff Layton <[email protected]>
Cc: Ilya Dryomov <[email protected]>
Cc: [email protected]
Co-Developed-by: Alexander Mikhalitsyn <[email protected]>
Signed-off-by: Christian Brauner <[email protected]>
Signed-off-by: Alexander Mikhalitsyn <[email protected]>
Acked-by: Christian Brauner <[email protected]>
---
v7:
- reworked to use two new fields for owner UID/GID (https://github.com/ceph/ceph/pull/52575)
v8:
- properly handled case when old MDS used with new kernel client
v10:
- fill struct_len field properly (use cpu_to_le32)
- add extra checks IS_CEPH_MDS_OP_NEWINODE(..) as requested by Xiubo to match
userspace client behavior
---
fs/ceph/mds_client.c | 55 ++++++++++++++++++++++++++++++++++--
fs/ceph/mds_client.h | 5 +++-
include/linux/ceph/ceph_fs.h | 10 ++++++-
3 files changed, 65 insertions(+), 5 deletions(-)
diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c
index 8829f55103da..5114de5ea65e 100644
--- a/fs/ceph/mds_client.c
+++ b/fs/ceph/mds_client.c
@@ -2902,6 +2902,17 @@ static void encode_mclientrequest_tail(void **p, const struct ceph_mds_request *
}
}
+static inline u16 mds_supported_head_version(struct ceph_mds_session *session)
+{
+ if (!test_bit(CEPHFS_FEATURE_32BITS_RETRY_FWD, &session->s_features))
+ return 1;
+
+ if (!test_bit(CEPHFS_FEATURE_HAS_OWNER_UIDGID, &session->s_features))
+ return 2;
+
+ return CEPH_MDS_REQUEST_HEAD_VERSION;
+}
+
static struct ceph_mds_request_head_legacy *
find_legacy_request_head(void *p, u64 features)
{
@@ -2923,6 +2934,7 @@ static struct ceph_msg *create_request_message(struct ceph_mds_session *session,
{
int mds = session->s_mds;
struct ceph_mds_client *mdsc = session->s_mdsc;
+ struct ceph_client *cl = mdsc->fsc->client;
struct ceph_msg *msg;
struct ceph_mds_request_head_legacy *lhead;
const char *path1 = NULL;
@@ -2936,7 +2948,7 @@ static struct ceph_msg *create_request_message(struct ceph_mds_session *session,
void *p, *end;
int ret;
bool legacy = !(session->s_con.peer_features & CEPH_FEATURE_FS_BTIME);
- bool old_version = !test_bit(CEPHFS_FEATURE_32BITS_RETRY_FWD, &session->s_features);
+ u16 request_head_version = mds_supported_head_version(session);
ret = set_request_path_attr(mdsc, req->r_inode, req->r_dentry,
req->r_parent, req->r_path1, req->r_ino1.ino,
@@ -2977,8 +2989,10 @@ static struct ceph_msg *create_request_message(struct ceph_mds_session *session,
*/
if (legacy)
len = sizeof(struct ceph_mds_request_head_legacy);
- else if (old_version)
+ else if (request_head_version == 1)
len = sizeof(struct ceph_mds_request_head_old);
+ else if (request_head_version == 2)
+ len = offsetofend(struct ceph_mds_request_head, ext_num_fwd);
else
len = sizeof(struct ceph_mds_request_head);
@@ -3028,6 +3042,18 @@ static struct ceph_msg *create_request_message(struct ceph_mds_session *session,
lhead = find_legacy_request_head(msg->front.iov_base,
session->s_con.peer_features);
+ if ((req->r_mnt_idmap != &nop_mnt_idmap) &&
+ !test_bit(CEPHFS_FEATURE_HAS_OWNER_UIDGID, &session->s_features)) {
+ WARN_ON_ONCE(!IS_CEPH_MDS_OP_NEWINODE(req->r_op));
+
+ pr_err_ratelimited_client(cl,
+ "idmapped mount is used and CEPHFS_FEATURE_HAS_OWNER_UIDGID"
+ " is not supported by MDS. Fail request with -EIO.\n");
+
+ ret = -EIO;
+ goto out_err;
+ }
+
/*
* The ceph_mds_request_head_legacy didn't contain a version field, and
* one was added when we moved the message version from 3->4.
@@ -3035,17 +3061,40 @@ static struct ceph_msg *create_request_message(struct ceph_mds_session *session,
if (legacy) {
msg->hdr.version = cpu_to_le16(3);
p = msg->front.iov_base + sizeof(*lhead);
- } else if (old_version) {
+ } else if (request_head_version == 1) {
struct ceph_mds_request_head_old *ohead = msg->front.iov_base;
msg->hdr.version = cpu_to_le16(4);
ohead->version = cpu_to_le16(1);
p = msg->front.iov_base + sizeof(*ohead);
+ } else if (request_head_version == 2) {
+ struct ceph_mds_request_head *nhead = msg->front.iov_base;
+
+ msg->hdr.version = cpu_to_le16(6);
+ nhead->version = cpu_to_le16(2);
+
+ p = msg->front.iov_base + offsetofend(struct ceph_mds_request_head, ext_num_fwd);
} else {
struct ceph_mds_request_head *nhead = msg->front.iov_base;
+ kuid_t owner_fsuid;
+ kgid_t owner_fsgid;
msg->hdr.version = cpu_to_le16(6);
nhead->version = cpu_to_le16(CEPH_MDS_REQUEST_HEAD_VERSION);
+ nhead->struct_len = cpu_to_le32(sizeof(struct ceph_mds_request_head));
+
+ if (IS_CEPH_MDS_OP_NEWINODE(req->r_op)) {
+ owner_fsuid = from_vfsuid(req->r_mnt_idmap, &init_user_ns,
+ VFSUIDT_INIT(req->r_cred->fsuid));
+ owner_fsgid = from_vfsgid(req->r_mnt_idmap, &init_user_ns,
+ VFSGIDT_INIT(req->r_cred->fsgid));
+ nhead->owner_uid = cpu_to_le32(from_kuid(&init_user_ns, owner_fsuid));
+ nhead->owner_gid = cpu_to_le32(from_kgid(&init_user_ns, owner_fsgid));
+ } else {
+ nhead->owner_uid = cpu_to_le32(-1);
+ nhead->owner_gid = cpu_to_le32(-1);
+ }
+
p = msg->front.iov_base + sizeof(*nhead);
}
diff --git a/fs/ceph/mds_client.h b/fs/ceph/mds_client.h
index e3bbf3ba8ee8..8f683e8203bd 100644
--- a/fs/ceph/mds_client.h
+++ b/fs/ceph/mds_client.h
@@ -33,8 +33,10 @@ enum ceph_feature_type {
CEPHFS_FEATURE_NOTIFY_SESSION_STATE,
CEPHFS_FEATURE_OP_GETVXATTR,
CEPHFS_FEATURE_32BITS_RETRY_FWD,
+ CEPHFS_FEATURE_NEW_SNAPREALM_INFO,
+ CEPHFS_FEATURE_HAS_OWNER_UIDGID,
- CEPHFS_FEATURE_MAX = CEPHFS_FEATURE_32BITS_RETRY_FWD,
+ CEPHFS_FEATURE_MAX = CEPHFS_FEATURE_HAS_OWNER_UIDGID,
};
#define CEPHFS_FEATURES_CLIENT_SUPPORTED { \
@@ -49,6 +51,7 @@ enum ceph_feature_type {
CEPHFS_FEATURE_NOTIFY_SESSION_STATE, \
CEPHFS_FEATURE_OP_GETVXATTR, \
CEPHFS_FEATURE_32BITS_RETRY_FWD, \
+ CEPHFS_FEATURE_HAS_OWNER_UIDGID, \
}
/*
diff --git a/include/linux/ceph/ceph_fs.h b/include/linux/ceph/ceph_fs.h
index 5f2301ee88bc..d0ead0b6354c 100644
--- a/include/linux/ceph/ceph_fs.h
+++ b/include/linux/ceph/ceph_fs.h
@@ -357,6 +357,11 @@ enum {
CEPH_MDS_OP_RENAMESNAP = 0x01403,
};
+#define IS_CEPH_MDS_OP_NEWINODE(op) (op == CEPH_MDS_OP_CREATE || \
+ op == CEPH_MDS_OP_MKNOD || \
+ op == CEPH_MDS_OP_MKDIR || \
+ op == CEPH_MDS_OP_SYMLINK)
+
extern const char *ceph_mds_op_name(int op);
#define CEPH_SETATTR_MODE (1 << 0)
@@ -499,7 +504,7 @@ struct ceph_mds_request_head_legacy {
union ceph_mds_request_args args;
} __attribute__ ((packed));
-#define CEPH_MDS_REQUEST_HEAD_VERSION 2
+#define CEPH_MDS_REQUEST_HEAD_VERSION 3
struct ceph_mds_request_head_old {
__le16 version; /* struct version */
@@ -530,6 +535,9 @@ struct ceph_mds_request_head {
__le32 ext_num_retry; /* new count retry attempts */
__le32 ext_num_fwd; /* new count fwd attempts */
+
+ __le32 struct_len; /* to store size of struct ceph_mds_request_head */
+ __le32 owner_uid, owner_gid; /* used for OPs which create inodes */
} __attribute__ ((packed));
/* cap/lease release record */
--
2.34.1
LGTM.
Reviewed-by: Xiubo Li <[email protected]>
I will queue this to the 'testing' branch and then we will run ceph qa
tests.
Thanks Alex.
- Xiubo
On 8/7/23 21:26, Alexander Mikhalitsyn wrote:
> Dear friends,
>
> This patchset was originally developed by Christian Brauner but I'll continue
> to push it forward. Christian allowed me to do that :)
>
> This feature is already actively used/tested with LXD/LXC project.
>
> Git tree (based on https://github.com/ceph/ceph-client.git testing):
> v10: https://github.com/mihalicyn/linux/commits/fs.idmapped.ceph.v10
> current: https://github.com/mihalicyn/linux/tree/fs.idmapped.ceph
>
> In the version 3 I've changed only two commits:
> - fs: export mnt_idmap_get/mnt_idmap_put
> - ceph: allow idmapped setattr inode op
> and added a new one:
> - ceph: pass idmap to __ceph_setattr
>
> In the version 4 I've reworked the ("ceph: stash idmapping in mdsc request")
> commit. Now we take idmap refcounter just in place where req->r_mnt_idmap
> is filled. It's more safer approach and prevents possible refcounter underflow
> on error paths where __register_request wasn't called but ceph_mdsc_release_request is
> called.
>
> Changelog for version 5:
> - a few commits were squashed into one (as suggested by Xiubo Li)
> - started passing an idmapping everywhere (if possible), so a caller
> UID/GID-s will be mapped almost everywhere (as suggested by Xiubo Li)
>
> Changelog for version 6:
> - rebased on top of testing branch
> - passed an idmapping in a few places (readdir, ceph_netfs_issue_op_inline)
>
> Changelog for version 7:
> - rebased on top of testing branch
> - this thing now requires a new cephfs protocol extension CEPHFS_FEATURE_HAS_OWNER_UIDGID
> https://github.com/ceph/ceph/pull/52575
>
> Changelog for version 8:
> - rebased on top of testing branch
> - added enable_unsafe_idmap module parameter to make idmapped mounts
> work with old MDS server versions
> - properly handled case when old MDS used with new kernel client
>
> Changelog for version 9:
> - added "struct_len" field in struct ceph_mds_request_head as requested by Xiubo Li
>
> Changelog for version 10:
> - fill struct_len field properly (use cpu_to_le32)
> - add extra checks IS_CEPH_MDS_OP_NEWINODE(..) as requested by Xiubo to match
> userspace client behavior
> - do not set req->r_mnt_idmap for MKSNAP operation
> - atomic_open: set req->r_mnt_idmap only for CEPH_MDS_OP_CREATE as userspace client does
>
> I can confirm that this version passes xfstests and
> tested with old MDS (without CEPHFS_FEATURE_HAS_OWNER_UIDGID)
> and with recent MDS version.
>
> Links to previous versions:
> v1: https://lore.kernel.org/all/[email protected]/
> v2: https://lore.kernel.org/lkml/[email protected]/
> tree: https://github.com/mihalicyn/linux/commits/fs.idmapped.ceph.v2
> v3: https://lore.kernel.org/lkml/[email protected]/#t
> v4: https://lore.kernel.org/lkml/[email protected]/#t
> tree: https://github.com/mihalicyn/linux/commits/fs.idmapped.ceph.v4
> v5: https://lore.kernel.org/lkml/[email protected]/#t
> tree: https://github.com/mihalicyn/linux/commits/fs.idmapped.ceph.v5
> v6: https://lore.kernel.org/lkml/[email protected]/
> tree: https://github.com/mihalicyn/linux/commits/fs.idmapped.ceph.v6
> v7: https://lore.kernel.org/all/[email protected]/
> tree: https://github.com/mihalicyn/linux/commits/fs.idmapped.ceph.v7
> v8: https://lore.kernel.org/all/[email protected]/
> tree: -
> v9: https://lore.kernel.org/all/[email protected]/
> tree: https://github.com/mihalicyn/linux/commits/fs.idmapped.ceph.v9
>
> Kind regards,
> Alex
>
> Original description from Christian:
> ========================================================================
> This patch series enables cephfs to support idmapped mounts, i.e. the
> ability to alter ownership information on a per-mount basis.
>
> Container managers such as LXD support sharaing data via cephfs between
> the host and unprivileged containers and between unprivileged containers.
> They may all use different idmappings. Idmapped mounts can be used to
> create mounts with the idmapping used for the container (or a different
> one specific to the use-case).
>
> There are in fact more use-cases such as remapping ownership for
> mountpoints on the host itself to grant or restrict access to different
> users or to make it possible to enforce that programs running as root
> will write with a non-zero {g,u}id to disk.
>
> The patch series is simple overall and few changes are needed to cephfs.
> There is one cephfs specific issue that I would like to discuss and
> solve which I explain in detail in:
>
> [PATCH 02/12] ceph: handle idmapped mounts in create_request_message()
>
> It has to do with how to handle mds serves which have id-based access
> restrictions configured. I would ask you to please take a look at the
> explanation in the aforementioned patch.
>
> The patch series passes the vfs and idmapped mount testsuite as part of
> xfstests. To run it you will need a config like:
>
> [ceph]
> export FSTYP=ceph
> export TEST_DIR=/mnt/test
> export TEST_DEV=10.103.182.10:6789:/
> export TEST_FS_MOUNT_OPTS="-o name=admin,secret=$password
>
> and then simply call
>
> sudo ./check -g idmapped
>
> ========================================================================
>
> Alexander Mikhalitsyn (3):
> fs: export mnt_idmap_get/mnt_idmap_put
> ceph: add enable_unsafe_idmap module parameter
> ceph: pass idmap to __ceph_setattr
>
> Christian Brauner (9):
> ceph: stash idmapping in mdsc request
> ceph: handle idmapped mounts in create_request_message()
> ceph: pass an idmapping to mknod/symlink/mkdir
> ceph: allow idmapped getattr inode op
> ceph: allow idmapped permission inode op
> ceph: allow idmapped setattr inode op
> ceph/acl: allow idmapped set_acl inode op
> ceph/file: allow idmapped atomic_open inode op
> ceph: allow idmapped mounts
>
> fs/ceph/acl.c | 6 +--
> fs/ceph/crypto.c | 2 +-
> fs/ceph/dir.c | 4 ++
> fs/ceph/file.c | 11 ++++-
> fs/ceph/inode.c | 29 +++++++------
> fs/ceph/mds_client.c | 78 ++++++++++++++++++++++++++++++++---
> fs/ceph/mds_client.h | 8 +++-
> fs/ceph/super.c | 7 +++-
> fs/ceph/super.h | 3 +-
> fs/mnt_idmapping.c | 2 +
> include/linux/ceph/ceph_fs.h | 10 ++++-
> include/linux/mnt_idmapping.h | 3 ++
> 12 files changed, 136 insertions(+), 27 deletions(-)
>
On 8/8/23 14:30, Aleksandr Mikhalitsyn wrote:
> On Tue, Aug 8, 2023 at 2:45 AM Xiubo Li <[email protected]> wrote:
>> LGTM.
>>
>> Reviewed-by: Xiubo Li <[email protected]>
>>
>> I will queue this to the 'testing' branch and then we will run ceph qa
>> tests.
> Thanks, Xiubo!
>
> JFYI: commit ordering in
> https://github.com/ceph/ceph-client/commits/testing looks a little bit
> weird
> probably something got wrong during patch application to the tree.
I will check it.
Thanks
- Xiubo
> Kind regards,
> Alex
>
>> Thanks Alex.
>>
>> - Xiubo
>>
>> On 8/7/23 21:26, Alexander Mikhalitsyn wrote:
>>> Dear friends,
>>>
>>> This patchset was originally developed by Christian Brauner but I'll continue
>>> to push it forward. Christian allowed me to do that :)
>>>
>>> This feature is already actively used/tested with LXD/LXC project.
>>>
>>> Git tree (based on https://github.com/ceph/ceph-client.git testing):
>>> v10: https://github.com/mihalicyn/linux/commits/fs.idmapped.ceph.v10
>>> current: https://github.com/mihalicyn/linux/tree/fs.idmapped.ceph
>>>
>>> In the version 3 I've changed only two commits:
>>> - fs: export mnt_idmap_get/mnt_idmap_put
>>> - ceph: allow idmapped setattr inode op
>>> and added a new one:
>>> - ceph: pass idmap to __ceph_setattr
>>>
>>> In the version 4 I've reworked the ("ceph: stash idmapping in mdsc request")
>>> commit. Now we take idmap refcounter just in place where req->r_mnt_idmap
>>> is filled. It's more safer approach and prevents possible refcounter underflow
>>> on error paths where __register_request wasn't called but ceph_mdsc_release_request is
>>> called.
>>>
>>> Changelog for version 5:
>>> - a few commits were squashed into one (as suggested by Xiubo Li)
>>> - started passing an idmapping everywhere (if possible), so a caller
>>> UID/GID-s will be mapped almost everywhere (as suggested by Xiubo Li)
>>>
>>> Changelog for version 6:
>>> - rebased on top of testing branch
>>> - passed an idmapping in a few places (readdir, ceph_netfs_issue_op_inline)
>>>
>>> Changelog for version 7:
>>> - rebased on top of testing branch
>>> - this thing now requires a new cephfs protocol extension CEPHFS_FEATURE_HAS_OWNER_UIDGID
>>> https://github.com/ceph/ceph/pull/52575
>>>
>>> Changelog for version 8:
>>> - rebased on top of testing branch
>>> - added enable_unsafe_idmap module parameter to make idmapped mounts
>>> work with old MDS server versions
>>> - properly handled case when old MDS used with new kernel client
>>>
>>> Changelog for version 9:
>>> - added "struct_len" field in struct ceph_mds_request_head as requested by Xiubo Li
>>>
>>> Changelog for version 10:
>>> - fill struct_len field properly (use cpu_to_le32)
>>> - add extra checks IS_CEPH_MDS_OP_NEWINODE(..) as requested by Xiubo to match
>>> userspace client behavior
>>> - do not set req->r_mnt_idmap for MKSNAP operation
>>> - atomic_open: set req->r_mnt_idmap only for CEPH_MDS_OP_CREATE as userspace client does
>>>
>>> I can confirm that this version passes xfstests and
>>> tested with old MDS (without CEPHFS_FEATURE_HAS_OWNER_UIDGID)
>>> and with recent MDS version.
>>>
>>> Links to previous versions:
>>> v1: https://lore.kernel.org/all/[email protected]/
>>> v2: https://lore.kernel.org/lkml/[email protected]/
>>> tree: https://github.com/mihalicyn/linux/commits/fs.idmapped.ceph.v2
>>> v3: https://lore.kernel.org/lkml/[email protected]/#t
>>> v4: https://lore.kernel.org/lkml/[email protected]/#t
>>> tree: https://github.com/mihalicyn/linux/commits/fs.idmapped.ceph.v4
>>> v5: https://lore.kernel.org/lkml/[email protected]/#t
>>> tree: https://github.com/mihalicyn/linux/commits/fs.idmapped.ceph.v5
>>> v6: https://lore.kernel.org/lkml/[email protected]/
>>> tree: https://github.com/mihalicyn/linux/commits/fs.idmapped.ceph.v6
>>> v7: https://lore.kernel.org/all/[email protected]/
>>> tree: https://github.com/mihalicyn/linux/commits/fs.idmapped.ceph.v7
>>> v8: https://lore.kernel.org/all/[email protected]/
>>> tree: -
>>> v9: https://lore.kernel.org/all/[email protected]/
>>> tree: https://github.com/mihalicyn/linux/commits/fs.idmapped.ceph.v9
>>>
>>> Kind regards,
>>> Alex
>>>
>>> Original description from Christian:
>>> ========================================================================
>>> This patch series enables cephfs to support idmapped mounts, i.e. the
>>> ability to alter ownership information on a per-mount basis.
>>>
>>> Container managers such as LXD support sharaing data via cephfs between
>>> the host and unprivileged containers and between unprivileged containers.
>>> They may all use different idmappings. Idmapped mounts can be used to
>>> create mounts with the idmapping used for the container (or a different
>>> one specific to the use-case).
>>>
>>> There are in fact more use-cases such as remapping ownership for
>>> mountpoints on the host itself to grant or restrict access to different
>>> users or to make it possible to enforce that programs running as root
>>> will write with a non-zero {g,u}id to disk.
>>>
>>> The patch series is simple overall and few changes are needed to cephfs.
>>> There is one cephfs specific issue that I would like to discuss and
>>> solve which I explain in detail in:
>>>
>>> [PATCH 02/12] ceph: handle idmapped mounts in create_request_message()
>>>
>>> It has to do with how to handle mds serves which have id-based access
>>> restrictions configured. I would ask you to please take a look at the
>>> explanation in the aforementioned patch.
>>>
>>> The patch series passes the vfs and idmapped mount testsuite as part of
>>> xfstests. To run it you will need a config like:
>>>
>>> [ceph]
>>> export FSTYP=ceph
>>> export TEST_DIR=/mnt/test
>>> export TEST_DEV=10.103.182.10:6789:/
>>> export TEST_FS_MOUNT_OPTS="-o name=admin,secret=$password
>>>
>>> and then simply call
>>>
>>> sudo ./check -g idmapped
>>>
>>> ========================================================================
>>>
>>> Alexander Mikhalitsyn (3):
>>> fs: export mnt_idmap_get/mnt_idmap_put
>>> ceph: add enable_unsafe_idmap module parameter
>>> ceph: pass idmap to __ceph_setattr
>>>
>>> Christian Brauner (9):
>>> ceph: stash idmapping in mdsc request
>>> ceph: handle idmapped mounts in create_request_message()
>>> ceph: pass an idmapping to mknod/symlink/mkdir
>>> ceph: allow idmapped getattr inode op
>>> ceph: allow idmapped permission inode op
>>> ceph: allow idmapped setattr inode op
>>> ceph/acl: allow idmapped set_acl inode op
>>> ceph/file: allow idmapped atomic_open inode op
>>> ceph: allow idmapped mounts
>>>
>>> fs/ceph/acl.c | 6 +--
>>> fs/ceph/crypto.c | 2 +-
>>> fs/ceph/dir.c | 4 ++
>>> fs/ceph/file.c | 11 ++++-
>>> fs/ceph/inode.c | 29 +++++++------
>>> fs/ceph/mds_client.c | 78 ++++++++++++++++++++++++++++++++---
>>> fs/ceph/mds_client.h | 8 +++-
>>> fs/ceph/super.c | 7 +++-
>>> fs/ceph/super.h | 3 +-
>>> fs/mnt_idmapping.c | 2 +
>>> include/linux/ceph/ceph_fs.h | 10 ++++-
>>> include/linux/mnt_idmapping.h | 3 ++
>>> 12 files changed, 136 insertions(+), 27 deletions(-)
>>>
On Tue, Aug 8, 2023 at 2:45 AM Xiubo Li <[email protected]> wrote:
>
> LGTM.
>
> Reviewed-by: Xiubo Li <[email protected]>
>
> I will queue this to the 'testing' branch and then we will run ceph qa
> tests.
Thanks, Xiubo!
JFYI: commit ordering in
https://github.com/ceph/ceph-client/commits/testing looks a little bit
weird
probably something got wrong during patch application to the tree.
Kind regards,
Alex
>
> Thanks Alex.
>
> - Xiubo
>
> On 8/7/23 21:26, Alexander Mikhalitsyn wrote:
> > Dear friends,
> >
> > This patchset was originally developed by Christian Brauner but I'll continue
> > to push it forward. Christian allowed me to do that :)
> >
> > This feature is already actively used/tested with LXD/LXC project.
> >
> > Git tree (based on https://github.com/ceph/ceph-client.git testing):
> > v10: https://github.com/mihalicyn/linux/commits/fs.idmapped.ceph.v10
> > current: https://github.com/mihalicyn/linux/tree/fs.idmapped.ceph
> >
> > In the version 3 I've changed only two commits:
> > - fs: export mnt_idmap_get/mnt_idmap_put
> > - ceph: allow idmapped setattr inode op
> > and added a new one:
> > - ceph: pass idmap to __ceph_setattr
> >
> > In the version 4 I've reworked the ("ceph: stash idmapping in mdsc request")
> > commit. Now we take idmap refcounter just in place where req->r_mnt_idmap
> > is filled. It's more safer approach and prevents possible refcounter underflow
> > on error paths where __register_request wasn't called but ceph_mdsc_release_request is
> > called.
> >
> > Changelog for version 5:
> > - a few commits were squashed into one (as suggested by Xiubo Li)
> > - started passing an idmapping everywhere (if possible), so a caller
> > UID/GID-s will be mapped almost everywhere (as suggested by Xiubo Li)
> >
> > Changelog for version 6:
> > - rebased on top of testing branch
> > - passed an idmapping in a few places (readdir, ceph_netfs_issue_op_inline)
> >
> > Changelog for version 7:
> > - rebased on top of testing branch
> > - this thing now requires a new cephfs protocol extension CEPHFS_FEATURE_HAS_OWNER_UIDGID
> > https://github.com/ceph/ceph/pull/52575
> >
> > Changelog for version 8:
> > - rebased on top of testing branch
> > - added enable_unsafe_idmap module parameter to make idmapped mounts
> > work with old MDS server versions
> > - properly handled case when old MDS used with new kernel client
> >
> > Changelog for version 9:
> > - added "struct_len" field in struct ceph_mds_request_head as requested by Xiubo Li
> >
> > Changelog for version 10:
> > - fill struct_len field properly (use cpu_to_le32)
> > - add extra checks IS_CEPH_MDS_OP_NEWINODE(..) as requested by Xiubo to match
> > userspace client behavior
> > - do not set req->r_mnt_idmap for MKSNAP operation
> > - atomic_open: set req->r_mnt_idmap only for CEPH_MDS_OP_CREATE as userspace client does
> >
> > I can confirm that this version passes xfstests and
> > tested with old MDS (without CEPHFS_FEATURE_HAS_OWNER_UIDGID)
> > and with recent MDS version.
> >
> > Links to previous versions:
> > v1: https://lore.kernel.org/all/[email protected]/
> > v2: https://lore.kernel.org/lkml/[email protected]/
> > tree: https://github.com/mihalicyn/linux/commits/fs.idmapped.ceph.v2
> > v3: https://lore.kernel.org/lkml/[email protected]/#t
> > v4: https://lore.kernel.org/lkml/[email protected]/#t
> > tree: https://github.com/mihalicyn/linux/commits/fs.idmapped.ceph.v4
> > v5: https://lore.kernel.org/lkml/[email protected]/#t
> > tree: https://github.com/mihalicyn/linux/commits/fs.idmapped.ceph.v5
> > v6: https://lore.kernel.org/lkml/[email protected]/
> > tree: https://github.com/mihalicyn/linux/commits/fs.idmapped.ceph.v6
> > v7: https://lore.kernel.org/all/[email protected]/
> > tree: https://github.com/mihalicyn/linux/commits/fs.idmapped.ceph.v7
> > v8: https://lore.kernel.org/all/[email protected]/
> > tree: -
> > v9: https://lore.kernel.org/all/[email protected]/
> > tree: https://github.com/mihalicyn/linux/commits/fs.idmapped.ceph.v9
> >
> > Kind regards,
> > Alex
> >
> > Original description from Christian:
> > ========================================================================
> > This patch series enables cephfs to support idmapped mounts, i.e. the
> > ability to alter ownership information on a per-mount basis.
> >
> > Container managers such as LXD support sharaing data via cephfs between
> > the host and unprivileged containers and between unprivileged containers.
> > They may all use different idmappings. Idmapped mounts can be used to
> > create mounts with the idmapping used for the container (or a different
> > one specific to the use-case).
> >
> > There are in fact more use-cases such as remapping ownership for
> > mountpoints on the host itself to grant or restrict access to different
> > users or to make it possible to enforce that programs running as root
> > will write with a non-zero {g,u}id to disk.
> >
> > The patch series is simple overall and few changes are needed to cephfs.
> > There is one cephfs specific issue that I would like to discuss and
> > solve which I explain in detail in:
> >
> > [PATCH 02/12] ceph: handle idmapped mounts in create_request_message()
> >
> > It has to do with how to handle mds serves which have id-based access
> > restrictions configured. I would ask you to please take a look at the
> > explanation in the aforementioned patch.
> >
> > The patch series passes the vfs and idmapped mount testsuite as part of
> > xfstests. To run it you will need a config like:
> >
> > [ceph]
> > export FSTYP=ceph
> > export TEST_DIR=/mnt/test
> > export TEST_DEV=10.103.182.10:6789:/
> > export TEST_FS_MOUNT_OPTS="-o name=admin,secret=$password
> >
> > and then simply call
> >
> > sudo ./check -g idmapped
> >
> > ========================================================================
> >
> > Alexander Mikhalitsyn (3):
> > fs: export mnt_idmap_get/mnt_idmap_put
> > ceph: add enable_unsafe_idmap module parameter
> > ceph: pass idmap to __ceph_setattr
> >
> > Christian Brauner (9):
> > ceph: stash idmapping in mdsc request
> > ceph: handle idmapped mounts in create_request_message()
> > ceph: pass an idmapping to mknod/symlink/mkdir
> > ceph: allow idmapped getattr inode op
> > ceph: allow idmapped permission inode op
> > ceph: allow idmapped setattr inode op
> > ceph/acl: allow idmapped set_acl inode op
> > ceph/file: allow idmapped atomic_open inode op
> > ceph: allow idmapped mounts
> >
> > fs/ceph/acl.c | 6 +--
> > fs/ceph/crypto.c | 2 +-
> > fs/ceph/dir.c | 4 ++
> > fs/ceph/file.c | 11 ++++-
> > fs/ceph/inode.c | 29 +++++++------
> > fs/ceph/mds_client.c | 78 ++++++++++++++++++++++++++++++++---
> > fs/ceph/mds_client.h | 8 +++-
> > fs/ceph/super.c | 7 +++-
> > fs/ceph/super.h | 3 +-
> > fs/mnt_idmapping.c | 2 +
> > include/linux/ceph/ceph_fs.h | 10 ++++-
> > include/linux/mnt_idmapping.h | 3 ++
> > 12 files changed, 136 insertions(+), 27 deletions(-)
> >
>
On Tue, Aug 8, 2023 at 2:45 AM Xiubo Li <[email protected]> wrote:
>
> LGTM.
>
> Reviewed-by: Xiubo Li <[email protected]>
>
> I will queue this to the 'testing' branch and then we will run ceph qa
> tests.
>
> Thanks Alex.
>
> - Xiubo
Hi Xiubo,
will this series be landed to 6.6?
Userspace part was backported and merged to the Ceph Quincy release
(https://github.com/ceph/ceph/pull/53139)
And waiting to be tested and merged to the Ceph reef and pacific releases.
But the kernel part is still in the testing branch.
Kind regards,
Alex
>
> On 8/7/23 21:26, Alexander Mikhalitsyn wrote:
> > Dear friends,
> >
> > This patchset was originally developed by Christian Brauner but I'll continue
> > to push it forward. Christian allowed me to do that :)
> >
> > This feature is already actively used/tested with LXD/LXC project.
> >
> > Git tree (based on https://github.com/ceph/ceph-client.git testing):
> > v10: https://github.com/mihalicyn/linux/commits/fs.idmapped.ceph.v10
> > current: https://github.com/mihalicyn/linux/tree/fs.idmapped.ceph
> >
> > In the version 3 I've changed only two commits:
> > - fs: export mnt_idmap_get/mnt_idmap_put
> > - ceph: allow idmapped setattr inode op
> > and added a new one:
> > - ceph: pass idmap to __ceph_setattr
> >
> > In the version 4 I've reworked the ("ceph: stash idmapping in mdsc request")
> > commit. Now we take idmap refcounter just in place where req->r_mnt_idmap
> > is filled. It's more safer approach and prevents possible refcounter underflow
> > on error paths where __register_request wasn't called but ceph_mdsc_release_request is
> > called.
> >
> > Changelog for version 5:
> > - a few commits were squashed into one (as suggested by Xiubo Li)
> > - started passing an idmapping everywhere (if possible), so a caller
> > UID/GID-s will be mapped almost everywhere (as suggested by Xiubo Li)
> >
> > Changelog for version 6:
> > - rebased on top of testing branch
> > - passed an idmapping in a few places (readdir, ceph_netfs_issue_op_inline)
> >
> > Changelog for version 7:
> > - rebased on top of testing branch
> > - this thing now requires a new cephfs protocol extension CEPHFS_FEATURE_HAS_OWNER_UIDGID
> > https://github.com/ceph/ceph/pull/52575
> >
> > Changelog for version 8:
> > - rebased on top of testing branch
> > - added enable_unsafe_idmap module parameter to make idmapped mounts
> > work with old MDS server versions
> > - properly handled case when old MDS used with new kernel client
> >
> > Changelog for version 9:
> > - added "struct_len" field in struct ceph_mds_request_head as requested by Xiubo Li
> >
> > Changelog for version 10:
> > - fill struct_len field properly (use cpu_to_le32)
> > - add extra checks IS_CEPH_MDS_OP_NEWINODE(..) as requested by Xiubo to match
> > userspace client behavior
> > - do not set req->r_mnt_idmap for MKSNAP operation
> > - atomic_open: set req->r_mnt_idmap only for CEPH_MDS_OP_CREATE as userspace client does
> >
> > I can confirm that this version passes xfstests and
> > tested with old MDS (without CEPHFS_FEATURE_HAS_OWNER_UIDGID)
> > and with recent MDS version.
> >
> > Links to previous versions:
> > v1: https://lore.kernel.org/all/[email protected]/
> > v2: https://lore.kernel.org/lkml/[email protected]/
> > tree: https://github.com/mihalicyn/linux/commits/fs.idmapped.ceph.v2
> > v3: https://lore.kernel.org/lkml/[email protected]/#t
> > v4: https://lore.kernel.org/lkml/[email protected]/#t
> > tree: https://github.com/mihalicyn/linux/commits/fs.idmapped.ceph.v4
> > v5: https://lore.kernel.org/lkml/[email protected]/#t
> > tree: https://github.com/mihalicyn/linux/commits/fs.idmapped.ceph.v5
> > v6: https://lore.kernel.org/lkml/[email protected]/
> > tree: https://github.com/mihalicyn/linux/commits/fs.idmapped.ceph.v6
> > v7: https://lore.kernel.org/all/[email protected]/
> > tree: https://github.com/mihalicyn/linux/commits/fs.idmapped.ceph.v7
> > v8: https://lore.kernel.org/all/[email protected]/
> > tree: -
> > v9: https://lore.kernel.org/all/[email protected]/
> > tree: https://github.com/mihalicyn/linux/commits/fs.idmapped.ceph.v9
> >
> > Kind regards,
> > Alex
> >
> > Original description from Christian:
> > ========================================================================
> > This patch series enables cephfs to support idmapped mounts, i.e. the
> > ability to alter ownership information on a per-mount basis.
> >
> > Container managers such as LXD support sharaing data via cephfs between
> > the host and unprivileged containers and between unprivileged containers.
> > They may all use different idmappings. Idmapped mounts can be used to
> > create mounts with the idmapping used for the container (or a different
> > one specific to the use-case).
> >
> > There are in fact more use-cases such as remapping ownership for
> > mountpoints on the host itself to grant or restrict access to different
> > users or to make it possible to enforce that programs running as root
> > will write with a non-zero {g,u}id to disk.
> >
> > The patch series is simple overall and few changes are needed to cephfs.
> > There is one cephfs specific issue that I would like to discuss and
> > solve which I explain in detail in:
> >
> > [PATCH 02/12] ceph: handle idmapped mounts in create_request_message()
> >
> > It has to do with how to handle mds serves which have id-based access
> > restrictions configured. I would ask you to please take a look at the
> > explanation in the aforementioned patch.
> >
> > The patch series passes the vfs and idmapped mount testsuite as part of
> > xfstests. To run it you will need a config like:
> >
> > [ceph]
> > export FSTYP=ceph
> > export TEST_DIR=/mnt/test
> > export TEST_DEV=10.103.182.10:6789:/
> > export TEST_FS_MOUNT_OPTS="-o name=admin,secret=$password
> >
> > and then simply call
> >
> > sudo ./check -g idmapped
> >
> > ========================================================================
> >
> > Alexander Mikhalitsyn (3):
> > fs: export mnt_idmap_get/mnt_idmap_put
> > ceph: add enable_unsafe_idmap module parameter
> > ceph: pass idmap to __ceph_setattr
> >
> > Christian Brauner (9):
> > ceph: stash idmapping in mdsc request
> > ceph: handle idmapped mounts in create_request_message()
> > ceph: pass an idmapping to mknod/symlink/mkdir
> > ceph: allow idmapped getattr inode op
> > ceph: allow idmapped permission inode op
> > ceph: allow idmapped setattr inode op
> > ceph/acl: allow idmapped set_acl inode op
> > ceph/file: allow idmapped atomic_open inode op
> > ceph: allow idmapped mounts
> >
> > fs/ceph/acl.c | 6 +--
> > fs/ceph/crypto.c | 2 +-
> > fs/ceph/dir.c | 4 ++
> > fs/ceph/file.c | 11 ++++-
> > fs/ceph/inode.c | 29 +++++++------
> > fs/ceph/mds_client.c | 78 ++++++++++++++++++++++++++++++++---
> > fs/ceph/mds_client.h | 8 +++-
> > fs/ceph/super.c | 7 +++-
> > fs/ceph/super.h | 3 +-
> > fs/mnt_idmapping.c | 2 +
> > include/linux/ceph/ceph_fs.h | 10 ++++-
> > include/linux/mnt_idmapping.h | 3 ++
> > 12 files changed, 136 insertions(+), 27 deletions(-)
> >
>
On 10/17/23 17:20, Aleksandr Mikhalitsyn wrote:
> On Tue, Aug 8, 2023 at 2:45 AM Xiubo Li <[email protected]> wrote:
>> LGTM.
>>
>> Reviewed-by: Xiubo Li <[email protected]>
>>
>> I will queue this to the 'testing' branch and then we will run ceph qa
>> tests.
>>
>> Thanks Alex.
>>
>> - Xiubo
> Hi Xiubo,
>
> will this series be landed to 6.6?
>
> Userspace part was backported and merged to the Ceph Quincy release
> (https://github.com/ceph/ceph/pull/53139)
> And waiting to be tested and merged to the Ceph reef and pacific releases.
> But the kernel part is still in the testing branch.
This changes have been in the 'testing' branch for more than two mounts
and well test, till now we haven't seen any issue.
IMO it should be ready.
Ilya ?
Thanks
- Xiubo
> Kind regards,
> Alex
>
>> On 8/7/23 21:26, Alexander Mikhalitsyn wrote:
>>> Dear friends,
>>>
>>> This patchset was originally developed by Christian Brauner but I'll continue
>>> to push it forward. Christian allowed me to do that :)
>>>
>>> This feature is already actively used/tested with LXD/LXC project.
>>>
>>> Git tree (based on https://github.com/ceph/ceph-client.git testing):
>>> v10: https://github.com/mihalicyn/linux/commits/fs.idmapped.ceph.v10
>>> current: https://github.com/mihalicyn/linux/tree/fs.idmapped.ceph
>>>
>>> In the version 3 I've changed only two commits:
>>> - fs: export mnt_idmap_get/mnt_idmap_put
>>> - ceph: allow idmapped setattr inode op
>>> and added a new one:
>>> - ceph: pass idmap to __ceph_setattr
>>>
>>> In the version 4 I've reworked the ("ceph: stash idmapping in mdsc request")
>>> commit. Now we take idmap refcounter just in place where req->r_mnt_idmap
>>> is filled. It's more safer approach and prevents possible refcounter underflow
>>> on error paths where __register_request wasn't called but ceph_mdsc_release_request is
>>> called.
>>>
>>> Changelog for version 5:
>>> - a few commits were squashed into one (as suggested by Xiubo Li)
>>> - started passing an idmapping everywhere (if possible), so a caller
>>> UID/GID-s will be mapped almost everywhere (as suggested by Xiubo Li)
>>>
>>> Changelog for version 6:
>>> - rebased on top of testing branch
>>> - passed an idmapping in a few places (readdir, ceph_netfs_issue_op_inline)
>>>
>>> Changelog for version 7:
>>> - rebased on top of testing branch
>>> - this thing now requires a new cephfs protocol extension CEPHFS_FEATURE_HAS_OWNER_UIDGID
>>> https://github.com/ceph/ceph/pull/52575
>>>
>>> Changelog for version 8:
>>> - rebased on top of testing branch
>>> - added enable_unsafe_idmap module parameter to make idmapped mounts
>>> work with old MDS server versions
>>> - properly handled case when old MDS used with new kernel client
>>>
>>> Changelog for version 9:
>>> - added "struct_len" field in struct ceph_mds_request_head as requested by Xiubo Li
>>>
>>> Changelog for version 10:
>>> - fill struct_len field properly (use cpu_to_le32)
>>> - add extra checks IS_CEPH_MDS_OP_NEWINODE(..) as requested by Xiubo to match
>>> userspace client behavior
>>> - do not set req->r_mnt_idmap for MKSNAP operation
>>> - atomic_open: set req->r_mnt_idmap only for CEPH_MDS_OP_CREATE as userspace client does
>>>
>>> I can confirm that this version passes xfstests and
>>> tested with old MDS (without CEPHFS_FEATURE_HAS_OWNER_UIDGID)
>>> and with recent MDS version.
>>>
>>> Links to previous versions:
>>> v1: https://lore.kernel.org/all/[email protected]/
>>> v2: https://lore.kernel.org/lkml/[email protected]/
>>> tree: https://github.com/mihalicyn/linux/commits/fs.idmapped.ceph.v2
>>> v3: https://lore.kernel.org/lkml/[email protected]/#t
>>> v4: https://lore.kernel.org/lkml/[email protected]/#t
>>> tree: https://github.com/mihalicyn/linux/commits/fs.idmapped.ceph.v4
>>> v5: https://lore.kernel.org/lkml/[email protected]/#t
>>> tree: https://github.com/mihalicyn/linux/commits/fs.idmapped.ceph.v5
>>> v6: https://lore.kernel.org/lkml/[email protected]/
>>> tree: https://github.com/mihalicyn/linux/commits/fs.idmapped.ceph.v6
>>> v7: https://lore.kernel.org/all/[email protected]/
>>> tree: https://github.com/mihalicyn/linux/commits/fs.idmapped.ceph.v7
>>> v8: https://lore.kernel.org/all/[email protected]/
>>> tree: -
>>> v9: https://lore.kernel.org/all/[email protected]/
>>> tree: https://github.com/mihalicyn/linux/commits/fs.idmapped.ceph.v9
>>>
>>> Kind regards,
>>> Alex
>>>
>>> Original description from Christian:
>>> ========================================================================
>>> This patch series enables cephfs to support idmapped mounts, i.e. the
>>> ability to alter ownership information on a per-mount basis.
>>>
>>> Container managers such as LXD support sharaing data via cephfs between
>>> the host and unprivileged containers and between unprivileged containers.
>>> They may all use different idmappings. Idmapped mounts can be used to
>>> create mounts with the idmapping used for the container (or a different
>>> one specific to the use-case).
>>>
>>> There are in fact more use-cases such as remapping ownership for
>>> mountpoints on the host itself to grant or restrict access to different
>>> users or to make it possible to enforce that programs running as root
>>> will write with a non-zero {g,u}id to disk.
>>>
>>> The patch series is simple overall and few changes are needed to cephfs.
>>> There is one cephfs specific issue that I would like to discuss and
>>> solve which I explain in detail in:
>>>
>>> [PATCH 02/12] ceph: handle idmapped mounts in create_request_message()
>>>
>>> It has to do with how to handle mds serves which have id-based access
>>> restrictions configured. I would ask you to please take a look at the
>>> explanation in the aforementioned patch.
>>>
>>> The patch series passes the vfs and idmapped mount testsuite as part of
>>> xfstests. To run it you will need a config like:
>>>
>>> [ceph]
>>> export FSTYP=ceph
>>> export TEST_DIR=/mnt/test
>>> export TEST_DEV=10.103.182.10:6789:/
>>> export TEST_FS_MOUNT_OPTS="-o name=admin,secret=$password
>>>
>>> and then simply call
>>>
>>> sudo ./check -g idmapped
>>>
>>> ========================================================================
>>>
>>> Alexander Mikhalitsyn (3):
>>> fs: export mnt_idmap_get/mnt_idmap_put
>>> ceph: add enable_unsafe_idmap module parameter
>>> ceph: pass idmap to __ceph_setattr
>>>
>>> Christian Brauner (9):
>>> ceph: stash idmapping in mdsc request
>>> ceph: handle idmapped mounts in create_request_message()
>>> ceph: pass an idmapping to mknod/symlink/mkdir
>>> ceph: allow idmapped getattr inode op
>>> ceph: allow idmapped permission inode op
>>> ceph: allow idmapped setattr inode op
>>> ceph/acl: allow idmapped set_acl inode op
>>> ceph/file: allow idmapped atomic_open inode op
>>> ceph: allow idmapped mounts
>>>
>>> fs/ceph/acl.c | 6 +--
>>> fs/ceph/crypto.c | 2 +-
>>> fs/ceph/dir.c | 4 ++
>>> fs/ceph/file.c | 11 ++++-
>>> fs/ceph/inode.c | 29 +++++++------
>>> fs/ceph/mds_client.c | 78 ++++++++++++++++++++++++++++++++---
>>> fs/ceph/mds_client.h | 8 +++-
>>> fs/ceph/super.c | 7 +++-
>>> fs/ceph/super.h | 3 +-
>>> fs/mnt_idmapping.c | 2 +
>>> include/linux/ceph/ceph_fs.h | 10 ++++-
>>> include/linux/mnt_idmapping.h | 3 ++
>>> 12 files changed, 136 insertions(+), 27 deletions(-)
>>>
On Thu, Oct 19, 2023 at 7:42 AM Xiubo Li <[email protected]> wrote:
>
>
> On 10/17/23 17:20, Aleksandr Mikhalitsyn wrote:
> > On Tue, Aug 8, 2023 at 2:45 AM Xiubo Li <[email protected]> wrote:
> >> LGTM.
> >>
> >> Reviewed-by: Xiubo Li <[email protected]>
> >>
> >> I will queue this to the 'testing' branch and then we will run ceph qa
> >> tests.
> >>
> >> Thanks Alex.
> >>
> >> - Xiubo
> > Hi Xiubo,
> >
> > will this series be landed to 6.6?
> >
> > Userspace part was backported and merged to the Ceph Quincy release
> > (https://github.com/ceph/ceph/pull/53139)
> > And waiting to be tested and merged to the Ceph reef and pacific releases.
> > But the kernel part is still in the testing branch.
>
> This changes have been in the 'testing' branch for more than two mounts
> and well test, till now we haven't seen any issue.
>
> IMO it should be ready.
Thanks, Xiubo!
It would be awesome to have this in v.6.6.
Kind regards,
Alex
>
> Ilya ?
>
> Thanks
>
> - Xiubo
>
>
> > Kind regards,
> > Alex
> >
> >> On 8/7/23 21:26, Alexander Mikhalitsyn wrote:
> >>> Dear friends,
> >>>
> >>> This patchset was originally developed by Christian Brauner but I'll continue
> >>> to push it forward. Christian allowed me to do that :)
> >>>
> >>> This feature is already actively used/tested with LXD/LXC project.
> >>>
> >>> Git tree (based on https://github.com/ceph/ceph-client.git testing):
> >>> v10: https://github.com/mihalicyn/linux/commits/fs.idmapped.ceph.v10
> >>> current: https://github.com/mihalicyn/linux/tree/fs.idmapped.ceph
> >>>
> >>> In the version 3 I've changed only two commits:
> >>> - fs: export mnt_idmap_get/mnt_idmap_put
> >>> - ceph: allow idmapped setattr inode op
> >>> and added a new one:
> >>> - ceph: pass idmap to __ceph_setattr
> >>>
> >>> In the version 4 I've reworked the ("ceph: stash idmapping in mdsc request")
> >>> commit. Now we take idmap refcounter just in place where req->r_mnt_idmap
> >>> is filled. It's more safer approach and prevents possible refcounter underflow
> >>> on error paths where __register_request wasn't called but ceph_mdsc_release_request is
> >>> called.
> >>>
> >>> Changelog for version 5:
> >>> - a few commits were squashed into one (as suggested by Xiubo Li)
> >>> - started passing an idmapping everywhere (if possible), so a caller
> >>> UID/GID-s will be mapped almost everywhere (as suggested by Xiubo Li)
> >>>
> >>> Changelog for version 6:
> >>> - rebased on top of testing branch
> >>> - passed an idmapping in a few places (readdir, ceph_netfs_issue_op_inline)
> >>>
> >>> Changelog for version 7:
> >>> - rebased on top of testing branch
> >>> - this thing now requires a new cephfs protocol extension CEPHFS_FEATURE_HAS_OWNER_UIDGID
> >>> https://github.com/ceph/ceph/pull/52575
> >>>
> >>> Changelog for version 8:
> >>> - rebased on top of testing branch
> >>> - added enable_unsafe_idmap module parameter to make idmapped mounts
> >>> work with old MDS server versions
> >>> - properly handled case when old MDS used with new kernel client
> >>>
> >>> Changelog for version 9:
> >>> - added "struct_len" field in struct ceph_mds_request_head as requested by Xiubo Li
> >>>
> >>> Changelog for version 10:
> >>> - fill struct_len field properly (use cpu_to_le32)
> >>> - add extra checks IS_CEPH_MDS_OP_NEWINODE(..) as requested by Xiubo to match
> >>> userspace client behavior
> >>> - do not set req->r_mnt_idmap for MKSNAP operation
> >>> - atomic_open: set req->r_mnt_idmap only for CEPH_MDS_OP_CREATE as userspace client does
> >>>
> >>> I can confirm that this version passes xfstests and
> >>> tested with old MDS (without CEPHFS_FEATURE_HAS_OWNER_UIDGID)
> >>> and with recent MDS version.
> >>>
> >>> Links to previous versions:
> >>> v1: https://lore.kernel.org/all/[email protected]/
> >>> v2: https://lore.kernel.org/lkml/[email protected]/
> >>> tree: https://github.com/mihalicyn/linux/commits/fs.idmapped.ceph.v2
> >>> v3: https://lore.kernel.org/lkml/[email protected]/#t
> >>> v4: https://lore.kernel.org/lkml/[email protected]/#t
> >>> tree: https://github.com/mihalicyn/linux/commits/fs.idmapped.ceph.v4
> >>> v5: https://lore.kernel.org/lkml/[email protected]/#t
> >>> tree: https://github.com/mihalicyn/linux/commits/fs.idmapped.ceph.v5
> >>> v6: https://lore.kernel.org/lkml/[email protected]/
> >>> tree: https://github.com/mihalicyn/linux/commits/fs.idmapped.ceph.v6
> >>> v7: https://lore.kernel.org/all/[email protected]/
> >>> tree: https://github.com/mihalicyn/linux/commits/fs.idmapped.ceph.v7
> >>> v8: https://lore.kernel.org/all/[email protected]/
> >>> tree: -
> >>> v9: https://lore.kernel.org/all/[email protected]/
> >>> tree: https://github.com/mihalicyn/linux/commits/fs.idmapped.ceph.v9
> >>>
> >>> Kind regards,
> >>> Alex
> >>>
> >>> Original description from Christian:
> >>> ========================================================================
> >>> This patch series enables cephfs to support idmapped mounts, i.e. the
> >>> ability to alter ownership information on a per-mount basis.
> >>>
> >>> Container managers such as LXD support sharaing data via cephfs between
> >>> the host and unprivileged containers and between unprivileged containers.
> >>> They may all use different idmappings. Idmapped mounts can be used to
> >>> create mounts with the idmapping used for the container (or a different
> >>> one specific to the use-case).
> >>>
> >>> There are in fact more use-cases such as remapping ownership for
> >>> mountpoints on the host itself to grant or restrict access to different
> >>> users or to make it possible to enforce that programs running as root
> >>> will write with a non-zero {g,u}id to disk.
> >>>
> >>> The patch series is simple overall and few changes are needed to cephfs.
> >>> There is one cephfs specific issue that I would like to discuss and
> >>> solve which I explain in detail in:
> >>>
> >>> [PATCH 02/12] ceph: handle idmapped mounts in create_request_message()
> >>>
> >>> It has to do with how to handle mds serves which have id-based access
> >>> restrictions configured. I would ask you to please take a look at the
> >>> explanation in the aforementioned patch.
> >>>
> >>> The patch series passes the vfs and idmapped mount testsuite as part of
> >>> xfstests. To run it you will need a config like:
> >>>
> >>> [ceph]
> >>> export FSTYP=ceph
> >>> export TEST_DIR=/mnt/test
> >>> export TEST_DEV=10.103.182.10:6789:/
> >>> export TEST_FS_MOUNT_OPTS="-o name=admin,secret=$password
> >>>
> >>> and then simply call
> >>>
> >>> sudo ./check -g idmapped
> >>>
> >>> ========================================================================
> >>>
> >>> Alexander Mikhalitsyn (3):
> >>> fs: export mnt_idmap_get/mnt_idmap_put
> >>> ceph: add enable_unsafe_idmap module parameter
> >>> ceph: pass idmap to __ceph_setattr
> >>>
> >>> Christian Brauner (9):
> >>> ceph: stash idmapping in mdsc request
> >>> ceph: handle idmapped mounts in create_request_message()
> >>> ceph: pass an idmapping to mknod/symlink/mkdir
> >>> ceph: allow idmapped getattr inode op
> >>> ceph: allow idmapped permission inode op
> >>> ceph: allow idmapped setattr inode op
> >>> ceph/acl: allow idmapped set_acl inode op
> >>> ceph/file: allow idmapped atomic_open inode op
> >>> ceph: allow idmapped mounts
> >>>
> >>> fs/ceph/acl.c | 6 +--
> >>> fs/ceph/crypto.c | 2 +-
> >>> fs/ceph/dir.c | 4 ++
> >>> fs/ceph/file.c | 11 ++++-
> >>> fs/ceph/inode.c | 29 +++++++------
> >>> fs/ceph/mds_client.c | 78 ++++++++++++++++++++++++++++++++---
> >>> fs/ceph/mds_client.h | 8 +++-
> >>> fs/ceph/super.c | 7 +++-
> >>> fs/ceph/super.h | 3 +-
> >>> fs/mnt_idmapping.c | 2 +
> >>> include/linux/ceph/ceph_fs.h | 10 ++++-
> >>> include/linux/mnt_idmapping.h | 3 ++
> >>> 12 files changed, 136 insertions(+), 27 deletions(-)
> >>>
>