From: Jeff Layton <jlayton@kernel.org>
To: Xiubo Li <xiubli@redhat.com>, ceph-devel@vger.kernel.org
Cc: idryomov@gmail.com
Subject: Re: [PATCH] ceph: cancel delayed work instead of flushing on mdsc teardown
Date: Thu, 29 Jul 2021 07:34:32 -0400 [thread overview]
Message-ID: <10e669ce9cfc2cda22e4762ba62b34fbaecb5102.camel@kernel.org> (raw)
In-Reply-To: <0c57b1e2-90a6-3580-3ca4-aa95cd1c7126@redhat.com>
On Thu, 2021-07-29 at 10:56 +0800, Xiubo Li wrote:
> On 7/28/21 4:12 AM, Jeff Layton wrote:
> > The first thing metric_delayed_work does is check mdsc->stopping,
> > and then return immediately if it's set...which is good since we would
> > have already torn down the metric structures at this point, otherwise.
> >
> > Worse yet, it's possible that the ceph_metric_destroy call could race
> > with the delayed_work, in which case we could end up a end up accessing
> > destroyed percpu variables.
> >
> > At this point in the mdsc teardown, the "stopping" flag has already been
> > set, so there's no benefit to flushing the work. Just cancel it instead,
> > and do so before we tear down the metrics structures.
> >
> > Cc: Xiubo Li <xiubli@redhat.com>
> > Signed-off-by: Jeff Layton <jlayton@kernel.org>
> > ---
> > fs/ceph/mds_client.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c
> > index c43091a30ba8..d3f2baf3c352 100644
> > --- a/fs/ceph/mds_client.c
> > +++ b/fs/ceph/mds_client.c
> > @@ -4977,9 +4977,9 @@ void ceph_mdsc_destroy(struct ceph_fs_client *fsc)
> >
> > ceph_mdsc_stop(mdsc);
> >
> > + cancel_delayed_work_sync(&mdsc->metric.delayed_work);
> > ceph_metric_destroy(&mdsc->metric);
> >
>
> In the "ceph_metric_destroy()" it will also do
> "cancel_delayed_work_sync(&mdsc->metric.delayed_work)".
>
> We can just move the it to the front of the _destory().
>
>
Good point! I'll send a v2 after I test it out.
>
> > - flush_delayed_work(&mdsc->metric.delayed_work);
> > fsc->mdsc = NULL;
> > kfree(mdsc);
> > dout("mdsc_destroy %p done\n", mdsc);
>
Thanks,
--
Jeff Layton <jlayton@kernel.org>
prev parent reply other threads:[~2021-07-29 11:34 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-27 20:12 [PATCH] ceph: cancel delayed work instead of flushing on mdsc teardown Jeff Layton
2021-07-29 2:56 ` Xiubo Li
2021-07-29 11:34 ` Jeff Layton [this message]
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=10e669ce9cfc2cda22e4762ba62b34fbaecb5102.camel@kernel.org \
--to=jlayton@kernel.org \
--cc=ceph-devel@vger.kernel.org \
--cc=idryomov@gmail.com \
--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).