ceph: fix setting of xattrs on async created inodes
PATCH 1/1 ceph: fix setting of xattrs on async created inodes
Currently when we create a file, we spin up an xattr buffer to send along with the create request. If we end up doing an async create however, then we currently pass down a zero-length xattr buffer.
Fix the code to send down the xattr buffer in req->r_pagelist. If the xattrs span more than a page, however give up and don't try to do an async create.
URL: https://bugzilla.redhat.com/show_bug.cgi?id=2063929
--- fs/ceph/file.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)
fs/ceph/file.c +13 -3
@@ -629,9 +629,15 @@ static int ceph_finish_async_create(struct inode *dir, struct dentry *dentry, iinfo.change_attr =1 ;ceph_encode_timespec64 (&iinfo.btime, &now); - iinfo.xattr_len =ARRAY_SIZE (xattr_buf); - iinfo.xattr_data = xattr_buf; -memset (iinfo.xattr_data,0 , iinfo.xattr_len); +if (req->r_pagelist) { + iinfo.xattr_len = req->r_pagelist->length; + iinfo.xattr_data = req->r_pagelist->mapped_tail; + }else { +/* fake it */ + iinfo.xattr_len =ARRAY_SIZE (xattr_buf); + iinfo.xattr_data = xattr_buf; +memset (iinfo.xattr_data,0 , iinfo.xattr_len); + } in.ino =cpu_to_le64 (vino.ino); in.snapid =cpu_to_le64 (CEPH_NOSNAP );
@@ -743,6 +749,10 @@ int ceph_atomic_open(struct inode *dir, struct dentry *dentry, err =ceph_security_init_secctx (dentry, mode, &as_ctx);if (err <0 ) goto out_ctx; +/* Async create can't handle more than a page of xattrs */ +if (as_ctx.pagelist && + !list_is_singular (&as_ctx.pagelist->head)) + try_async = false; }else if (!d_in_lookup (dentry)) {/* If it's not being looked up, it's negative */ return -ENOENT ;
Signature · 1 line
2.35.1
Quoted 41 lines · Jeff Layton
Currently when we create a file, we spin up an xattr buffer to send along with the create request. If we end up doing an async create however, then we currently pass down a zero-length xattr buffer.
Fix the code to send down the xattr buffer in
req->r_pagelist. If the xattrs span more than a page, however give up and don't try to do an async create.Fixes 9a8d03ca2e2c ("ceph: attempt to do async create when possible")URL: https://bugzilla.redhat.com/show_bug.cgi?id=2063929
Reported-by John Fortin <[email protected]>Reported-by Sri Ramanujam <[email protected]>Signed-off-by Jeff Layton <[email protected]>--- fs/ceph/file.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)fs/ceph/file.c +9
-3@@ -629,9 +629,15 @@ static int ceph_finish_async_create(struct inode *dir, struct dentry *dentry, iinfo.change_attr =1 ;ceph_encode_timespec64 (&iinfo.btime, &now); - iinfo.xattr_len =ARRAY_SIZE (xattr_buf); - iinfo.xattr_data = xattr_buf; -memset (iinfo.xattr_data,0 , iinfo.xattr_len); +if (req->r_pagelist) { + iinfo.xattr_len = req->r_pagelist->length; + iinfo.xattr_data = req->r_pagelist->mapped_tail; + }else { +/* fake it */ + iinfo.xattr_len =ARRAY_SIZE (xattr_buf); + iinfo.xattr_data = xattr_buf; +memset (iinfo.xattr_data,0 , iinfo.xattr_len); + } in.ino =cpu_to_le64 (vino.ino); in.snapid =cpu_to_le64 (CEPH_NOSNAP );
fs/ceph/file.c int ceph_atomic_open(struct inode *dir, struct dentry *dentry, · line 758
Quoted 10 lines
fs/ceph/file.c +4
-0@@ -743,6 +749,10 @@ int ceph_atomic_open(struct inode *dir, struct dentry *dentry, err =ceph_security_init_secctx (dentry, mode, &as_ctx);if (err <0 ) goto out_ctx; +/* Async create can't handle more than a page of xattrs */ +if (as_ctx.pagelist && + !list_is_singular (&as_ctx.pagelist->head)) + try_async = false; }else if (!d_in_lookup (dentry)) {/* If it's not being looked up, it's negative */ return -ENOENT ;
Oh, I meant to mark this for stable as well. Xiubo, can you do that when you merge it?
Thanks,
Signature · 1 line
Jeff Layton <[email protected]>
Quoted 39 lines · Jeff Layton
Quoted 38 lines · Jeff Layton
Currently when we create a file, we spin up an xattr buffer to send along with the create request. If we end up doing an async create however, then we currently pass down a zero-length xattr buffer.
Fix the code to send down the xattr buffer in
req->r_pagelist. If the xattrs span more than a page, however give up and don't try to do an async create.Fixes 9a8d03ca2e2c ("ceph: attempt to do async create when possible")URL: https://bugzilla.redhat.com/show_bug.cgi?id=2063929
Reported-by John Fortin <[email protected]>Reported-by Sri Ramanujam <[email protected]>Signed-off-by Jeff Layton <[email protected]>--- fs/ceph/file.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)fs/ceph/file.c +9
-3@@ -629,9 +629,15 @@ static int ceph_finish_async_create(struct inode *dir, struct dentry *dentry, iinfo.change_attr =1 ;ceph_encode_timespec64 (&iinfo.btime, &now); - iinfo.xattr_len =ARRAY_SIZE (xattr_buf); - iinfo.xattr_data = xattr_buf; -memset (iinfo.xattr_data,0 , iinfo.xattr_len); +if (req->r_pagelist) { + iinfo.xattr_len = req->r_pagelist->length; + iinfo.xattr_data = req->r_pagelist->mapped_tail; + }else { +/* fake it */ + iinfo.xattr_len =ARRAY_SIZE (xattr_buf); + iinfo.xattr_data = xattr_buf; +memset (iinfo.xattr_data,0 , iinfo.xattr_len); + }
Quoted 15 lines
fs/ceph/file.c int ceph_atomic_open(struct inode *dir, struct dentry *dentry, · line 758
Quoted 13 lines
fs/ceph/file.c +4
-0in.ino =cpu_to_le64 (vino.ino); in.snapid =cpu_to_le64 (CEPH_NOSNAP );@@ -743,6 +749,10 @@ int ceph_atomic_open(struct inode *dir, struct dentry *dentry, err =ceph_security_init_secctx (dentry, mode, &as_ctx);if (err <0 ) goto out_ctx; +/* Async create can't handle more than a page of xattrs */ +if (as_ctx.pagelist && + !list_is_singular (&as_ctx.pagelist->head)) + try_async = false; }else if (!d_in_lookup (dentry)) {/* If it's not being looked up, it's negative */ return -ENOENT ;Oh, I meant to mark this for stable as well. Xiubo, can you do that when you merge it?
Sure, Jeff.
Looks nice. Merged into the testing branch.
Thanks
-- Xiubo
Looks good. I fixed up the minor spelling error in the comment that Venky noticed too. Merged into testing branch.
Thanks,
Quoted 1 line
Thanks,