From: Luis Henriques <lhenriques@suse.de>
To: Jeff Layton <jlayton@kernel.org>
Cc: Xiubo Li <xiubli@redhat.com>,
ceph-devel@vger.kernel.org, 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 15:56:35 +0100 [thread overview]
Message-ID: <YOXAo8Q0GQoWaAQE@suse.de> (raw)
In-Reply-To: <YOW67YA8e6vivdkh@suse.de>
On Wed, Jul 07, 2021 at 03:32:13PM +0100, Luis Henriques wrote:
> On Wed, Jul 07, 2021 at 08:19:25AM -0400, Jeff Layton wrote:
> > On Wed, 2021-07-07 at 19:19 +0800, Xiubo Li wrote:
> > > On 7/7/21 6:47 PM, Luis Henriques wrote:
> > > > On Fri, Jun 25, 2021 at 09:58:16AM -0400, 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);
> > > > > + }
> > > > I think we also need to free iinfo->fscrypt_auth here if ci->fscrypt_auth
> > > > is already set. Something like:
> > > >
> > > > if (iinfo->fscrypt_auth_len) {
> > > > if (!ci->fscrypt_auth) {
> > > > ...
> > > > } else {
> > > > kfree(iinfo->fscrypt_auth);
> > > > iinfo->fscrypt_auth = NULL;
> > > > }
> > > > }
> > > >
> > > IMO, this should be okay because it will be freed in
> > > destroy_reply_info() when putting the request.
> > >
> > >
> >
> > Yes. All of that should get cleaned up with the request.
>
> Hmm... ok, so maybe I missed something because I *did* saw kmemleak
> complaining. Maybe it was on the READDIR path. /me goes look again.
Ah, that was indeed the problem. So, here's a quick hack to fix
destroy_reply_info() so that it also frees the extra memory from READDIR:
@@ -686,12 +686,23 @@ 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)
{
+ int i = 0;
+
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;
+
+ for (i = 0; i < info->dir_nr; i++) {
+ struct ceph_mds_reply_dir_entry *rde = info->dir_entries + i;
+ if (rde->inode.fscrypt_auth_len)
+ kfree(rde->inode.fscrypt_auth);
+ }
+
free_pages((unsigned long)info->dir_entries, get_order(info->dir_buf_size));
}
Cheers,
--
Luís
next prev parent reply other threads:[~2021-07-07 14:56 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 [this message]
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=YOXAo8Q0GQoWaAQE@suse.de \
--to=lhenriques@suse.de \
--cc=ceph-devel@vger.kernel.org \
--cc=dhowells@redhat.com \
--cc=jlayton@kernel.org \
--cc=linux-fscrypt@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=xiubli@redhat.com \
/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).