From: Xiubo Li <xiubli@redhat.com>
To: Jeff Layton <jlayton@kernel.org>, ceph-devel@vger.kernel.org
Cc: lhenriques@suse.de, linux-fsdevel@vger.kernel.org,
linux-fscrypt@vger.kernel.org, dhowells@redhat.com
Subject: Re: [RFC PATCH v7 07/24] ceph: add fscrypt_* handling to caps.c
Date: Wed, 7 Jul 2021 20:47:56 +0800 [thread overview]
Message-ID: <8b3bd09a-a4ab-176f-091b-1b40c24a2084@redhat.com> (raw)
In-Reply-To: <82a5c4dbcb9ccc131ab426490484334b02627691.camel@kernel.org>
On 7/7/21 8:02 PM, Jeff Layton wrote:
> On Wed, 2021-07-07 at 15:20 +0800, Xiubo Li wrote:
>> Hi Jeff,
>>
>> There has some following patches in your "fscrypt" branch, which is not
>> posted yet, the commit is:
>>
>> "3161d2f549db ceph: size handling for encrypted inodes in cap updates"
>>
>> It seems buggy.
>>
> Yes. Those are still quite rough. If I haven't posted them, then YMMV. I
> often push them to -experimental branches just for backup purposes. You
> may want to wait on reviewing those until I've had a chance to clean
> them up and post them.
Yeah, sure.
I am reviewing the code from you experimental branch.
>> In the encode_cap_msg() you have removed the 'fscrypt_file_len' and and
>> added a new 8 bytes' data encoding:
>>
>> ceph_encode_32(&p, arg->fscrypt_auth_len);
>> ceph_encode_copy(&p, arg->fscrypt_auth, arg->fscrypt_auth_len);
>> - ceph_encode_32(&p, arg->fscrypt_file_len);
>> - ceph_encode_copy(&p, arg->fscrypt_file, arg->fscrypt_file_len);
>> + ceph_encode_32(&p, sizeof(__le64));
>> + ceph_encode_64(&p, fc->size);
>>
>> That means no matter the 'arg->encrypted' is true or not, here it will
>> always encode extra 8 bytes' data ?
>>
>>
>> But in cap_msg_size(), you are making it optional:
>>
>>
>> static inline int cap_msg_size(struct cap_msg_args *arg)
>> {
>> return CAP_MSG_FIXED_FIELDS + arg->fscrypt_auth_len +
>> - arg->fscrypt_file_len;
>> + arg->encrypted ? sizeof(__le64) : 0;
>> }
>>
>>
>> Have I missed something important here ?
>>
>> Thanks
>>
> Nope, you're right. I had fixed that one in my local branch already, and
> just hadn't yet pushed it to the repo. I'll plan to clean this up a bit
> later today and push an updated branch.
Cool.
Thanks.
>
>> On 6/25/21 9:58 PM, Jeff Layton wrote:
>>> Signed-off-by: Jeff Layton <jlayton@kernel.org>
>>> ---
>>> fs/ceph/caps.c | 62 +++++++++++++++++++++++++++++++++++++++-----------
>>> 1 file changed, 49 insertions(+), 13 deletions(-)
>>>
>>> diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c
>>> index 038f59cc4250..1be6c5148700 100644
>>> --- a/fs/ceph/caps.c
>>> +++ b/fs/ceph/caps.c
>>> @@ -13,6 +13,7 @@
>>> #include "super.h"
>>> #include "mds_client.h"
>>> #include "cache.h"
>>> +#include "crypto.h"
>>> #include <linux/ceph/decode.h>
>>> #include <linux/ceph/messenger.h>
>>>
>>> @@ -1229,15 +1230,12 @@ struct cap_msg_args {
>>> umode_t mode;
>>> bool inline_data;
>>> bool wake;
>>> + u32 fscrypt_auth_len;
>>> + u32 fscrypt_file_len;
>>> + u8 fscrypt_auth[sizeof(struct ceph_fscrypt_auth)]; // for context
>>> + u8 fscrypt_file[sizeof(u64)]; // for size
>>> };
>>>
>>> -/*
>>> - * cap struct size + flock buffer size + inline version + inline data size +
>>> - * osd_epoch_barrier + oldest_flush_tid
>>> - */
>>> -#define CAP_MSG_SIZE (sizeof(struct ceph_mds_caps) + \
>>> - 4 + 8 + 4 + 4 + 8 + 4 + 4 + 4 + 8 + 8 + 4)
>>> -
>>> /* Marshal up the cap msg to the MDS */
>>> static void encode_cap_msg(struct ceph_msg *msg, struct cap_msg_args *arg)
>>> {
>>> @@ -1253,7 +1251,7 @@ static void encode_cap_msg(struct ceph_msg *msg, struct cap_msg_args *arg)
>>> arg->size, arg->max_size, arg->xattr_version,
>>> arg->xattr_buf ? (int)arg->xattr_buf->vec.iov_len : 0);
>>>
>>> - msg->hdr.version = cpu_to_le16(10);
>>> + msg->hdr.version = cpu_to_le16(12);
>>> msg->hdr.tid = cpu_to_le64(arg->flush_tid);
>>>
>>> fc = msg->front.iov_base;
>>> @@ -1324,6 +1322,16 @@ static void encode_cap_msg(struct ceph_msg *msg, struct cap_msg_args *arg)
>>>
>>> /* Advisory flags (version 10) */
>>> ceph_encode_32(&p, arg->flags);
>>> +
>>> + /* dirstats (version 11) - these are r/o on the client */
>>> + ceph_encode_64(&p, 0);
>>> + ceph_encode_64(&p, 0);
>>> +
>>> + /* fscrypt_auth and fscrypt_file (version 12) */
>>> + ceph_encode_32(&p, arg->fscrypt_auth_len);
>>> + ceph_encode_copy(&p, arg->fscrypt_auth, arg->fscrypt_auth_len);
>>> + ceph_encode_32(&p, arg->fscrypt_file_len);
>>> + ceph_encode_copy(&p, arg->fscrypt_file, arg->fscrypt_file_len);
>>> }
>>>
>>> /*
>>> @@ -1445,6 +1453,26 @@ static void __prep_cap(struct cap_msg_args *arg, struct ceph_cap *cap,
>>> }
>>> }
>>> arg->flags = flags;
>>> + if (ci->fscrypt_auth_len &&
>>> + WARN_ON_ONCE(ci->fscrypt_auth_len != sizeof(struct ceph_fscrypt_auth))) {
>>> + /* Don't set this if it isn't right size */
>>> + arg->fscrypt_auth_len = 0;
>>> + } else {
>>> + arg->fscrypt_auth_len = ci->fscrypt_auth_len;
>>> + memcpy(arg->fscrypt_auth, ci->fscrypt_auth,
>>> + min_t(size_t, ci->fscrypt_auth_len, sizeof(arg->fscrypt_auth)));
>>> + }
>>> + /* FIXME: use this to track "real" size */
>>> + arg->fscrypt_file_len = 0;
>>> +}
>>> +
>>> +#define CAP_MSG_FIXED_FIELDS (sizeof(struct ceph_mds_caps) + \
>>> + 4 + 8 + 4 + 4 + 8 + 4 + 4 + 4 + 8 + 8 + 4 + 8 + 8 + 4 + 4)
>>> +
>>> +static inline int cap_msg_size(struct cap_msg_args *arg)
>>> +{
>>> + return CAP_MSG_FIXED_FIELDS + arg->fscrypt_auth_len +
>>> + arg->fscrypt_file_len;
>>> }
>>>
>>> /*
>>> @@ -1457,7 +1485,7 @@ static void __send_cap(struct cap_msg_args *arg, struct ceph_inode_info *ci)
>>> struct ceph_msg *msg;
>>> struct inode *inode = &ci->vfs_inode;
>>>
>>> - msg = ceph_msg_new(CEPH_MSG_CLIENT_CAPS, CAP_MSG_SIZE, GFP_NOFS, false);
>>> + msg = ceph_msg_new(CEPH_MSG_CLIENT_CAPS, cap_msg_size(arg), GFP_NOFS, false);
>>> if (!msg) {
>>> pr_err("error allocating cap msg: ino (%llx.%llx) flushing %s tid %llu, requeuing cap.\n",
>>> ceph_vinop(inode), ceph_cap_string(arg->dirty),
>>> @@ -1483,10 +1511,6 @@ static inline int __send_flush_snap(struct inode *inode,
>>> struct cap_msg_args arg;
>>> struct ceph_msg *msg;
>>>
>>> - msg = ceph_msg_new(CEPH_MSG_CLIENT_CAPS, CAP_MSG_SIZE, GFP_NOFS, false);
>>> - if (!msg)
>>> - return -ENOMEM;
>>> -
>>> arg.session = session;
>>> arg.ino = ceph_vino(inode).ino;
>>> arg.cid = 0;
>>> @@ -1524,6 +1548,18 @@ static inline int __send_flush_snap(struct inode *inode,
>>> arg.flags = 0;
>>> arg.wake = false;
>>>
>>> + /*
>>> + * No fscrypt_auth changes from a capsnap. It will need
>>> + * to update fscrypt_file on size changes (TODO).
>>> + */
>>> + arg.fscrypt_auth_len = 0;
>>> + arg.fscrypt_file_len = 0;
>>> +
>>> + msg = ceph_msg_new(CEPH_MSG_CLIENT_CAPS, cap_msg_size(&arg),
>>> + GFP_NOFS, false);
>>> + if (!msg)
>>> + return -ENOMEM;
>>> +
>>> encode_cap_msg(msg, &arg);
>>> ceph_con_send(&arg.session->s_con, msg);
>>> return 0;
next prev parent reply other threads:[~2021-07-07 12:48 UTC|newest]
Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-25 13:58 [RFC PATCH v7 00/24] ceph+fscrypt: context, filename and symlink support Jeff Layton
2021-06-25 13:58 ` [RFC PATCH v7 01/24] vfs: export new_inode_pseudo Jeff Layton
2021-06-25 13:58 ` [RFC PATCH v7 02/24] fscrypt: export fscrypt_base64_encode and fscrypt_base64_decode Jeff Layton
2021-07-11 17:40 ` Eric Biggers
2021-07-12 11:55 ` Jeff Layton
2021-07-12 14:22 ` Eric Biggers
2021-07-12 14:32 ` Jeff Layton
2021-06-25 13:58 ` [RFC PATCH v7 03/24] fscrypt: export fscrypt_fname_encrypt and fscrypt_fname_encrypted_size Jeff Layton
2021-07-11 17:43 ` Eric Biggers
2021-06-25 13:58 ` [RFC PATCH v7 04/24] fscrypt: add fscrypt_context_for_new_inode Jeff Layton
2021-07-11 17:44 ` Eric Biggers
2021-06-25 13:58 ` [RFC PATCH v7 05/24] ceph: preallocate inode for ops that may create one Jeff Layton
2021-07-07 3:37 ` Xiubo Li
2021-07-07 12:05 ` Jeff Layton
2021-06-25 13:58 ` [RFC PATCH v7 06/24] ceph: parse new fscrypt_auth and fscrypt_file fields in inode traces Jeff Layton
2021-07-07 3:53 ` Xiubo Li
2021-07-07 12:09 ` Jeff Layton
2021-07-07 12:46 ` Xiubo Li
2021-07-07 10:47 ` Luis Henriques
2021-07-07 11:19 ` Xiubo Li
2021-07-07 12:19 ` Jeff Layton
2021-07-07 14:32 ` Luis Henriques
2021-07-07 14:56 ` Luis Henriques
2021-07-08 2:56 ` Xiubo Li
2021-07-08 11:26 ` Jeff Layton
2021-06-25 13:58 ` [RFC PATCH v7 07/24] ceph: add fscrypt_* handling to caps.c Jeff Layton
2021-07-07 7:20 ` Xiubo Li
2021-07-07 12:02 ` Jeff Layton
2021-07-07 12:47 ` Xiubo Li [this message]
2021-07-11 23:00 ` Eric Biggers
2021-07-12 13:22 ` Jeff Layton
2021-06-25 13:58 ` [RFC PATCH v7 08/24] ceph: add ability to set fscrypt_auth via setattr Jeff Layton
2021-07-07 8:11 ` Xiubo Li
2021-07-07 12:10 ` Jeff Layton
2021-07-07 10:47 ` Luis Henriques
2021-07-07 12:25 ` Jeff Layton
2021-06-25 13:58 ` [RFC PATCH v7 09/24] ceph: crypto context handling for ceph Jeff Layton
2021-06-25 13:58 ` [RFC PATCH v7 10/24] ceph: implement -o test_dummy_encryption mount option Jeff Layton
2021-06-25 13:58 ` [RFC PATCH v7 11/24] ceph: add routine to create fscrypt context prior to RPC Jeff Layton
2021-07-07 10:48 ` Luis Henriques
2021-07-07 12:29 ` Jeff Layton
2021-06-25 13:58 ` [RFC PATCH v7 12/24] ceph: add fscrypt ioctls Jeff Layton
2021-07-08 7:30 ` Xiubo Li
2021-07-08 11:26 ` Jeff Layton
2021-07-08 11:32 ` Xiubo Li
2021-06-25 13:58 ` [RFC PATCH v7 13/24] ceph: decode alternate_name in lease info Jeff Layton
2021-06-25 13:58 ` [RFC PATCH v7 14/24] ceph: make ceph_msdc_build_path use ref-walk Jeff Layton
2021-06-25 13:58 ` [RFC PATCH v7 15/24] ceph: add encrypted fname handling to ceph_mdsc_build_path Jeff Layton
2021-07-11 22:53 ` Eric Biggers
2021-07-12 12:36 ` Jeff Layton
2021-06-25 13:58 ` [RFC PATCH v7 16/24] ceph: send altname in MClientRequest Jeff Layton
2021-06-25 13:58 ` [RFC PATCH v7 17/24] ceph: properly set DCACHE_NOKEY_NAME flag in lookup Jeff Layton
2021-06-25 13:58 ` [RFC PATCH v7 18/24] ceph: make d_revalidate call fscrypt revalidator for encrypted dentries Jeff Layton
2021-06-25 13:58 ` [RFC PATCH v7 19/24] ceph: add helpers for converting names for userland presentation Jeff Layton
2021-06-25 13:58 ` [RFC PATCH v7 20/24] ceph: add fscrypt support to ceph_fill_trace Jeff Layton
2021-06-25 13:58 ` [RFC PATCH v7 21/24] ceph: add support to readdir for encrypted filenames Jeff Layton
2021-06-25 13:58 ` [RFC PATCH v7 22/24] ceph: create symlinks with encrypted and base64-encoded targets Jeff Layton
2021-06-25 13:58 ` [RFC PATCH v7 23/24] ceph: make ceph_get_name decrypt filenames Jeff Layton
2021-06-25 13:58 ` [RFC PATCH v7 24/24] ceph: add a new ceph.fscrypt.auth vxattr Jeff Layton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8b3bd09a-a4ab-176f-091b-1b40c24a2084@redhat.com \
--to=xiubli@redhat.com \
--cc=ceph-devel@vger.kernel.org \
--cc=dhowells@redhat.com \
--cc=jlayton@kernel.org \
--cc=lhenriques@suse.de \
--cc=linux-fscrypt@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).