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 06/24] ceph: parse new fscrypt_auth and fscrypt_file fields in inode traces
Date: Wed, 7 Jul 2021 20:46:28 +0800 [thread overview]
Message-ID: <47a3c1bb-6277-45f5-4cb5-94eaa4e3787b@redhat.com> (raw)
In-Reply-To: <ca7405d2353adb1af1b9ff2555785ba01b6266f3.camel@kernel.org>
On 7/7/21 8:09 PM, Jeff Layton wrote:
> On Wed, 2021-07-07 at 11:53 +0800, Xiubo Li wrote:
>> On 6/25/21 9:58 PM, Jeff Layton wrote:
>>> ...and store them in the ceph_inode_info.
>>>
>>> Signed-off-by: Jeff Layton <jlayton@kernel.org>
>>> ---
>>> fs/ceph/file.c | 2 ++
>>> fs/ceph/inode.c | 18 ++++++++++++++++++
>>> fs/ceph/mds_client.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
>>> fs/ceph/mds_client.h | 4 ++++
>>> fs/ceph/super.h | 6 ++++++
>>> 5 files changed, 74 insertions(+)
>>>
>>> diff --git a/fs/ceph/file.c b/fs/ceph/file.c
>>> index 2cda398ba64d..ea0e85075b7b 100644
>>> --- a/fs/ceph/file.c
>>> +++ b/fs/ceph/file.c
>>> @@ -592,6 +592,8 @@ static int ceph_finish_async_create(struct inode *dir, struct inode *inode,
>>> iinfo.xattr_data = xattr_buf;
>>> memset(iinfo.xattr_data, 0, iinfo.xattr_len);
>>>
>>> + /* FIXME: set fscrypt_auth and fscrypt_file */
>>> +
>>> in.ino = cpu_to_le64(vino.ino);
>>> in.snapid = cpu_to_le64(CEPH_NOSNAP);
>>> in.version = cpu_to_le64(1); // ???
>>> diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c
>>> index f62785e4dbcb..b620281ea65b 100644
>>> --- a/fs/ceph/inode.c
>>> +++ b/fs/ceph/inode.c
>>> @@ -611,6 +611,13 @@ struct inode *ceph_alloc_inode(struct super_block *sb)
>>>
>>> ci->i_meta_err = 0;
>>>
>>> +#ifdef CONFIG_FS_ENCRYPTION
>>> + ci->fscrypt_auth = NULL;
>>> + ci->fscrypt_auth_len = 0;
>>> + ci->fscrypt_file = NULL;
>>> + ci->fscrypt_file_len = 0;
>>> +#endif
>>> +
>>> return &ci->vfs_inode;
>>> }
>>>
>>> @@ -619,6 +626,9 @@ void ceph_free_inode(struct inode *inode)
>>> struct ceph_inode_info *ci = ceph_inode(inode);
>>>
>>> kfree(ci->i_symlink);
>>> +#ifdef CONFIG_FS_ENCRYPTION
>>> + kfree(ci->fscrypt_auth);
>>> +#endif
>>> kmem_cache_free(ceph_inode_cachep, ci);
>>> }
>>>
>>> @@ -1021,6 +1031,14 @@ int ceph_fill_inode(struct inode *inode, struct page *locked_page,
>>> xattr_blob = NULL;
>>> }
>>>
>>> + if (iinfo->fscrypt_auth_len && !ci->fscrypt_auth) {
>>> + ci->fscrypt_auth_len = iinfo->fscrypt_auth_len;
>>> + ci->fscrypt_auth = iinfo->fscrypt_auth;
>>> + iinfo->fscrypt_auth = NULL;
>>> + iinfo->fscrypt_auth_len = 0;
>>> + inode_set_flags(inode, S_ENCRYPTED, S_ENCRYPTED);
>>> + }
>>> +
>>> /* finally update i_version */
>>> if (le64_to_cpu(info->version) > ci->i_version)
>>> ci->i_version = le64_to_cpu(info->version);
>>> diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c
>>> index 3b3a14024ca0..9c994effc51d 100644
>>> --- a/fs/ceph/mds_client.c
>>> +++ b/fs/ceph/mds_client.c
>>> @@ -183,8 +183,48 @@ static int parse_reply_info_in(void **p, void *end,
>>> info->rsnaps = 0;
>>> }
>>>
>>> + if (struct_v >= 5) {
>>> + u32 alen;
>>> +
>>> + ceph_decode_32_safe(p, end, alen, bad);
>>> +
>>> + while (alen--) {
>>> + u32 len;
>>> +
>>> + /* key */
>>> + ceph_decode_32_safe(p, end, len, bad);
>>> + ceph_decode_skip_n(p, end, len, bad);
>>> + /* value */
>>> + ceph_decode_32_safe(p, end, len, bad);
>>> + ceph_decode_skip_n(p, end, len, bad);
>>> + }
>>> + }
>>> +
>>> + /* fscrypt flag -- ignore */
>>> + if (struct_v >= 6)
>>> + ceph_decode_skip_8(p, end, bad);
>>> +
>>> + if (struct_v >= 7) {
>>> + ceph_decode_32_safe(p, end, info->fscrypt_auth_len, bad);
>>> + if (info->fscrypt_auth_len) {
>>> + info->fscrypt_auth = kmalloc(info->fscrypt_auth_len, GFP_KERNEL);
>>> + if (!info->fscrypt_auth)
>>> + return -ENOMEM;
>>> + ceph_decode_copy_safe(p, end, info->fscrypt_auth,
>>> + info->fscrypt_auth_len, bad);
>>> + }
>>> + ceph_decode_32_safe(p, end, info->fscrypt_file_len, bad);
>>> + if (info->fscrypt_file_len) {
>>> + info->fscrypt_file = kmalloc(info->fscrypt_file_len, GFP_KERNEL);
>>> + if (!info->fscrypt_file)
>>> + return -ENOMEM;
>> Should we kfree(info->fscrypt_auth) before return ?
>>
>> I didn't anywhere is freeing it.
>>
> It'll get freed in destroy_reply_info(). We could do it here, but it
> should be fine to wait until we're tearing the "info" structure down.
>
Yeah, I just missed the destory_reply_info() code that time.
>>
>>> + ceph_decode_copy_safe(p, end, info->fscrypt_file,
>>> + info->fscrypt_file_len, bad);
>>> + }
>>> + }
>>> *p = end;
>>> } else {
>>> + /* legacy (unversioned) struct */
>>> if (features & CEPH_FEATURE_MDS_INLINE_DATA) {
>>> ceph_decode_64_safe(p, end, info->inline_version, bad);
>>> ceph_decode_32_safe(p, end, info->inline_len, bad);
>>> @@ -625,6 +665,10 @@ static int parse_reply_info(struct ceph_mds_session *s, struct ceph_msg *msg,
>>>
>>> static void destroy_reply_info(struct ceph_mds_reply_info_parsed *info)
>>> {
>>> + kfree(info->diri.fscrypt_auth);
>>> + kfree(info->diri.fscrypt_file);
>>> + kfree(info->targeti.fscrypt_auth);
>>> + kfree(info->targeti.fscrypt_file);
>>> if (!info->dir_entries)
>>> return;
>>> free_pages((unsigned long)info->dir_entries, get_order(info->dir_buf_size));
>>> diff --git a/fs/ceph/mds_client.h b/fs/ceph/mds_client.h
>>> index 64ea9d853b8d..0c3cc61fd038 100644
>>> --- a/fs/ceph/mds_client.h
>>> +++ b/fs/ceph/mds_client.h
>>> @@ -88,6 +88,10 @@ struct ceph_mds_reply_info_in {
>>> s32 dir_pin;
>>> struct ceph_timespec btime;
>>> struct ceph_timespec snap_btime;
>>> + u8 *fscrypt_auth;
>>> + u8 *fscrypt_file;
>>> + u32 fscrypt_auth_len;
>>> + u32 fscrypt_file_len;
>>> u64 rsnaps;
>>> u64 change_attr;
>>> };
>>> diff --git a/fs/ceph/super.h b/fs/ceph/super.h
>>> index 0cd94b296f5f..e032737fe472 100644
>>> --- a/fs/ceph/super.h
>>> +++ b/fs/ceph/super.h
>>> @@ -429,6 +429,12 @@ struct ceph_inode_info {
>>>
>>> #ifdef CONFIG_CEPH_FSCACHE
>>> struct fscache_cookie *fscache;
>>> +#endif
>>> +#ifdef CONFIG_FS_ENCRYPTION
>>> + u32 fscrypt_auth_len;
>>> + u32 fscrypt_file_len;
>>> + u8 *fscrypt_auth;
>>> + u8 *fscrypt_file;
>>> #endif
>>> errseq_t i_meta_err;
>>>
next prev parent reply other threads:[~2021-07-07 12:46 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 [this message]
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
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=47a3c1bb-6277-45f5-4cb5-94eaa4e3787b@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).