Skip to content

Commit 51d3114

Browse files
lxbszidryomov
authored andcommitted
ceph: switch to corrected encoding of max_xattr_size in mdsmap
The addition of bal_rank_mask with encoding version 17 was merged into ceph.git in Oct 2022 and made it into v18.2.0 release normally. A few months later, the much delayed addition of max_xattr_size got merged, also with encoding version 17, placed before bal_rank_mask in the encoding -- but it didn't make v18.2.0 release. The way this ended up being resolved on the MDS side is that bal_rank_mask will continue to be encoded in version 17 while max_xattr_size is now encoded in version 18. This does mean that older kernels will misdecode version 17, but this is also true for v18.2.0 and v18.2.1 clients in userspace. The best we can do is backport this adjustment -- see ceph.git commit 78abfeaff27fee343fb664db633de5b221699a73 for details. [ idryomov: changelog ] Cc: stable@vger.kernel.org Link: https://tracker.ceph.com/issues/64440 Fixes: d93231a ("ceph: prevent a client from exceeding the MDS maximum xattr size") Signed-off-by: Xiubo Li <xiubli@redhat.com> Reviewed-by: Patrick Donnelly <pdonnell@ibm.com> Reviewed-by: Venky Shankar <vshankar@redhat.com> Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
1 parent d206a76 commit 51d3114

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

fs/ceph/mdsmap.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -380,10 +380,11 @@ struct ceph_mdsmap *ceph_mdsmap_decode(struct ceph_mds_client *mdsc, void **p,
380380
ceph_decode_skip_8(p, end, bad_ext);
381381
/* required_client_features */
382382
ceph_decode_skip_set(p, end, 64, bad_ext);
383+
/* bal_rank_mask */
384+
ceph_decode_skip_string(p, end, bad_ext);
385+
}
386+
if (mdsmap_ev >= 18) {
383387
ceph_decode_64_safe(p, end, m->m_max_xattr_size, bad_ext);
384-
} else {
385-
/* This forces the usage of the (sync) SETXATTR Op */
386-
m->m_max_xattr_size = 0;
387388
}
388389
bad_ext:
389390
doutc(cl, "m_enabled: %d, m_damaged: %d, m_num_laggy: %d\n",

fs/ceph/mdsmap.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,11 @@ struct ceph_mdsmap {
2727
u32 m_session_timeout; /* seconds */
2828
u32 m_session_autoclose; /* seconds */
2929
u64 m_max_file_size;
30-
u64 m_max_xattr_size; /* maximum size for xattrs blob */
30+
/*
31+
* maximum size for xattrs blob.
32+
* Zeroed by default to force the usage of the (sync) SETXATTR Op.
33+
*/
34+
u64 m_max_xattr_size;
3135
u32 m_max_mds; /* expected up:active mds number */
3236
u32 m_num_active_mds; /* actual up:active mds number */
3337
u32 possible_max_rank; /* possible max rank index */

0 commit comments

Comments
 (0)