From: Xiubo Li <xiubli@redhat.com>
To: "Luis Henriques (SUSE)" <luis.henriques@linux.dev>,
Ilya Dryomov <idryomov@gmail.com>,
Milind Changire <mchangir@redhat.com>
Cc: ceph-devel@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] ceph: fix memory in MDS client cap_auths
Date: Mon, 19 Aug 2024 09:06:45 +0800 [thread overview]
Message-ID: <b8c6e357-29f2-4da2-ab57-7035627b0bd2@redhat.com> (raw)
In-Reply-To: <20240814101750.13293-1-luis.henriques@linux.dev>
Hi Luis,
Good catch!
On 8/14/24 18:17, Luis Henriques (SUSE) wrote:
> The cap_auths that are allocated during an MDS session opening are never
> released, causing a memory leak detected by kmemleak. Fix this by freeing
> the memory allocated when shutting down the mds client.
>
> Fixes: 1d17de9534cb ("ceph: save cap_auths in MDS client when session is opened")
> Signed-off-by: Luis Henriques (SUSE) <luis.henriques@linux.dev>
> ---
> fs/ceph/mds_client.c | 14 ++++++++++++++
> 1 file changed, 14 insertions(+)
>
> diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c
> index 276e34ab3e2c..d798d0a5b2b1 100644
> --- a/fs/ceph/mds_client.c
> +++ b/fs/ceph/mds_client.c
> @@ -6015,6 +6015,20 @@ static void ceph_mdsc_stop(struct ceph_mds_client *mdsc)
> ceph_mdsmap_destroy(mdsc->mdsmap);
> kfree(mdsc->sessions);
> ceph_caps_finalize(mdsc);
> +
> + if (mdsc->s_cap_auths) {
> + int i;
> +
> + mutex_lock(&mdsc->mutex);
BTW, is the lock really needed here ?
IMO it should be safe to remove it because once here the sb has already
been killed and the 'mdsc->stopping' will help guarantee that there
won't be any other thread will access to 'mdsc', Isn't it ?
Else we need to do the lock from the beginning of this function.
Thanks
- Xiubo
> + for (i = 0; i < mdsc->s_cap_auths_num; i++) {
> + kfree(mdsc->s_cap_auths[i].match.gids);
> + kfree(mdsc->s_cap_auths[i].match.path);
> + kfree(mdsc->s_cap_auths[i].match.fs_name);
> + }
> + kfree(mdsc->s_cap_auths);
> + mutex_unlock(&mdsc->mutex);
> + }
> +
> ceph_pool_perm_destroy(mdsc);
> }
>
>
next prev parent reply other threads:[~2024-08-19 1:06 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-14 10:17 Luis Henriques (SUSE)
2024-08-19 1:06 ` Xiubo Li [this message]
2024-08-19 9:30 ` Luis Henriques
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=b8c6e357-29f2-4da2-ab57-7035627b0bd2@redhat.com \
--to=xiubli@redhat.com \
--cc=ceph-devel@vger.kernel.org \
--cc=idryomov@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=luis.henriques@linux.dev \
--cc=mchangir@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
all inboxes | Powered by JetHome®