From: "Yan, Zheng" <ukernel@gmail.com>
To: Wu Bo <wubo40@huawei.com>
Cc: Jeff Layton <jlayton@kernel.org>, Sage Weil <sage@redhat.com>,
Ilya Dryomov <idryomov@gmail.com>,
ceph-devel <ceph-devel@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
liuzhiqiang26@huawei.com, linfeilong@huawei.com
Subject: Re: [PATCH V2] fs/ceph:fix double unlock in handle_cap_export()
Date: Thu, 30 Apr 2020 10:50:57 +0800 [thread overview]
Message-ID: <CAAM7YA=OU2jJ9F_p1fAknaxZCDWMY7w9yiRE0z0uqxDNYPG5Mg@mail.gmail.com> (raw)
In-Reply-To: <6c99072a-f92b-b7e8-9aef-509d1a9ee985@huawei.com>
On Wed, Apr 29, 2020 at 8:49 AM Wu Bo <wubo40@huawei.com> wrote:
>
> On 2020/4/28 22:48, Jeff Layton wrote:
> > On Tue, 2020-04-28 at 21:13 +0800, Wu Bo wrote:
> >> if the ceph_mdsc_open_export_target_session() return fails,
> >> should add a lock to avoid twice unlocking.
> >> Because the lock will be released at the retry or out_unlock tag.
> >>
> >
> > The problem looks real, but...
> >
> >> --
> >> v1 -> v2:
> >> add spin_lock(&ci->i_ceph_lock) before goto out_unlock tag.
> >>
> >> Signed-off-by: Wu Bo <wubo40@huawei.com>
> >> ---
> >> fs/ceph/caps.c | 27 +++++++++++++++------------
> >> 1 file changed, 15 insertions(+), 12 deletions(-)
> >>
> >> diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c
> >> index 185db76..414c0e2 100644
> >> --- a/fs/ceph/caps.c
> >> +++ b/fs/ceph/caps.c
> >> @@ -3731,22 +3731,25 @@ static void handle_cap_export(struct inode *inode, struct ceph_mds_caps *ex,
> >>
> >> /* open target session */
> >> tsession = ceph_mdsc_open_export_target_session(mdsc, target);
> >> - if (!IS_ERR(tsession)) {
> >> - if (mds > target) {
> >> - mutex_lock(&session->s_mutex);
> >> - mutex_lock_nested(&tsession->s_mutex,
> >> - SINGLE_DEPTH_NESTING);
> >> - } else {
> >> - mutex_lock(&tsession->s_mutex);
> >> - mutex_lock_nested(&session->s_mutex,
> >> - SINGLE_DEPTH_NESTING);
> >> - }
> >> - new_cap = ceph_get_cap(mdsc, NULL);
> >> - } else {
> >> + if (IS_ERR(tsession)) {
> >> WARN_ON(1);
> >> tsession = NULL;
> >> target = -1;
> >> + mutex_lock(&session->s_mutex);
> >> + spin_lock(&ci->i_ceph_lock);
> >> + goto out_unlock;
> >
> > Why did you make this case goto out_unlock instead of retrying as it did
> > before?
> >
>
> If the problem occurs, target = -1, and goto retry lable, you need to
> call __get_cap_for_mds() or even call __ceph_remove_cap(), and then jump
> to out_unlock lable. All I think is unnecessary, goto out_unlock instead
> of retrying directly.
>
__ceph_remove_cap() must be called even if opening target session
failed. I think adding a mutex_lock(&session->s_mutex) to the
IS_ERR(tsession) block should be enough.
> Thanks.
> Wu Bo
>
> >> + }
> >> +
> >> + if (mds > target) {
> >> + mutex_lock(&session->s_mutex);
> >> + mutex_lock_nested(&tsession->s_mutex,
> >> + SINGLE_DEPTH_NESTING);
> >> + } else {
> >> + mutex_lock(&tsession->s_mutex);
> >> + mutex_lock_nested(&session->s_mutex,
> >> + SINGLE_DEPTH_NESTING);
> >> }
> >> + new_cap = ceph_get_cap(mdsc, NULL);
> >> goto retry;
> >>
> >> out_unlock:
> >
>
>
next prev parent reply other threads:[~2020-04-30 2:51 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-28 13:13 [PATCH V2] fs/ceph:fix double unlock in handle_cap_export() Wu Bo
2020-04-28 14:48 ` Jeff Layton
2020-04-29 0:46 ` Wu Bo
2020-04-29 15:31 ` Jeff Layton
2020-04-30 2:50 ` Yan, Zheng [this message]
2020-04-30 4:31 ` Wu Bo
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='CAAM7YA=OU2jJ9F_p1fAknaxZCDWMY7w9yiRE0z0uqxDNYPG5Mg@mail.gmail.com' \
--to=ukernel@gmail.com \
--cc=ceph-devel@vger.kernel.org \
--cc=idryomov@gmail.com \
--cc=jlayton@kernel.org \
--cc=linfeilong@huawei.com \
--cc=linux-kernel@vger.kernel.org \
--cc=liuzhiqiang26@huawei.com \
--cc=sage@redhat.com \
--cc=wubo40@huawei.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).