From: Jeff Layton <jlayton@kernel.org>
To: xiubli@redhat.com
Cc: idryomov@gmail.com, pdonnell@redhat.com, ceph-devel@vger.kernel.org
Subject: Re: [PATCH 3/5] ceph: flush mdlog before umounting
Date: Tue, 29 Jun 2021 11:34:27 -0400 [thread overview]
Message-ID: <74d612a2a09533fcd184f89e8a1c4d4c0d7354cb.camel@kernel.org> (raw)
In-Reply-To: <20210629044241.30359-4-xiubli@redhat.com>
On Tue, 2021-06-29 at 12:42 +0800, xiubli@redhat.com wrote:
> From: Xiubo Li <xiubli@redhat.com>
>
> Signed-off-by: Xiubo Li <xiubli@redhat.com>
> ---
> fs/ceph/mds_client.c | 29 +++++++++++++++++++++++++++++
> fs/ceph/mds_client.h | 1 +
> include/linux/ceph/ceph_fs.h | 1 +
> 3 files changed, 31 insertions(+)
>
> diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c
> index 96bef289f58f..2db87a5c68d4 100644
> --- a/fs/ceph/mds_client.c
> +++ b/fs/ceph/mds_client.c
> @@ -4689,6 +4689,34 @@ static void wait_requests(struct ceph_mds_client *mdsc)
> dout("wait_requests done\n");
> }
>
> +static void send_flush_mdlog(struct ceph_mds_session *s)
> +{
> + u64 seq = s->s_seq;
> + struct ceph_msg *msg;
> +
The s_seq field is protected by the s_mutex (at least, AFAICT). I think
you probably need to take it before fetching the s_seq and release it
after calling ceph_con_send.
Long term, we probably need to rethink how the session sequence number
handling is done. The s_mutex is a terribly heavyweight mechanism for
this.
> + /*
> + * For the MDS daemons lower than Luminous will crash when it
> + * saw this unknown session request.
> + */
> + if (!CEPH_HAVE_FEATURE(s->s_con.peer_features, SERVER_LUMINOUS))
> + return;
> +
> + dout("send_flush_mdlog to mds%d (%s)s seq %lld\n",
> + s->s_mds, ceph_session_state_name(s->s_state), seq);
> + msg = ceph_create_session_msg(CEPH_SESSION_REQUEST_FLUSH_MDLOG, seq);
> + if (!msg) {
> + pr_err("failed to send_flush_mdlog to mds%d (%s)s seq %lld\n",
> + s->s_mds, ceph_session_state_name(s->s_state), seq);
> + } else {
> + ceph_con_send(&s->s_con, msg);
> + }
> +}
> +
> +void flush_mdlog(struct ceph_mds_client *mdsc)
> +{
> + ceph_mdsc_iterate_sessions(mdsc, send_flush_mdlog, true);
> +}
> +
> /*
> * called before mount is ro, and before dentries are torn down.
> * (hmm, does this still race with new lookups?)
> @@ -4698,6 +4726,7 @@ void ceph_mdsc_pre_umount(struct ceph_mds_client *mdsc)
> dout("pre_umount\n");
> mdsc->stopping = 1;
>
> + flush_mdlog(mdsc);
> ceph_mdsc_iterate_sessions(mdsc, lock_unlock_session, false);
> ceph_flush_dirty_caps(mdsc);
> wait_requests(mdsc);
> diff --git a/fs/ceph/mds_client.h b/fs/ceph/mds_client.h
> index fca2cf427eaf..79d5b8ed62bf 100644
> --- a/fs/ceph/mds_client.h
> +++ b/fs/ceph/mds_client.h
> @@ -537,6 +537,7 @@ extern int ceph_iterate_session_caps(struct ceph_mds_session *session,
> int (*cb)(struct inode *,
> struct ceph_cap *, void *),
> void *arg);
> +extern void flush_mdlog(struct ceph_mds_client *mdsc);
> extern void ceph_mdsc_pre_umount(struct ceph_mds_client *mdsc);
>
> static inline void ceph_mdsc_free_path(char *path, int len)
> diff --git a/include/linux/ceph/ceph_fs.h b/include/linux/ceph/ceph_fs.h
> index 57e5bd63fb7a..ae60696fe40b 100644
> --- a/include/linux/ceph/ceph_fs.h
> +++ b/include/linux/ceph/ceph_fs.h
> @@ -300,6 +300,7 @@ enum {
> CEPH_SESSION_FLUSHMSG_ACK,
> CEPH_SESSION_FORCE_RO,
> CEPH_SESSION_REJECT,
> + CEPH_SESSION_REQUEST_FLUSH_MDLOG,
> };
>
> extern const char *ceph_session_op_name(int op);
--
Jeff Layton <jlayton@kernel.org>
next prev parent reply other threads:[~2021-06-29 15:34 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-29 4:42 [PATCH 0/5] flush the mdlog before waiting on unsafe reqs xiubli
2021-06-29 4:42 ` [PATCH 1/5] ceph: export ceph_create_session_msg xiubli
2021-06-29 13:12 ` Jeff Layton
2021-06-29 13:27 ` Xiubo Li
2021-06-30 12:17 ` Ilya Dryomov
2021-07-01 1:50 ` Xiubo Li
2021-06-29 4:42 ` [PATCH 2/5] ceph: export iterate_sessions xiubli
2021-06-29 15:39 ` Jeff Layton
2021-06-30 0:55 ` Xiubo Li
2021-06-29 4:42 ` [PATCH 3/5] ceph: flush mdlog before umounting xiubli
2021-06-29 15:34 ` Jeff Layton [this message]
2021-06-30 0:36 ` Xiubo Li
2021-06-30 12:39 ` Ilya Dryomov
2021-07-01 1:18 ` Xiubo Li
2021-06-29 4:42 ` [PATCH 4/5] ceph: flush the mdlog before waiting on unsafe reqs xiubli
2021-06-29 13:25 ` Jeff Layton
2021-06-30 1:26 ` Xiubo Li
2021-06-30 12:13 ` Jeff Layton
2021-07-01 1:16 ` Xiubo Li
2021-07-01 3:27 ` Patrick Donnelly
[not found] ` <e917a3e1-2902-604b-5154-98086c95357f@redhat.com>
2021-07-01 23:46 ` Patrick Donnelly
2021-07-02 0:01 ` Xiubo Li
2021-07-02 13:17 ` Xiubo Li
2021-07-02 18:14 ` Patrick Donnelly
2021-07-03 1:33 ` Xiubo Li
2021-06-29 4:42 ` [PATCH 5/5] ceph: fix ceph feature bits xiubli
2021-06-29 15:38 ` Jeff Layton
2021-06-30 0:52 ` Xiubo Li
2021-06-30 12:05 ` Jeff Layton
2021-06-30 12:52 ` Ilya Dryomov
2021-07-01 1:07 ` Xiubo Li
2021-07-01 1:08 ` Xiubo Li
2021-07-01 3:35 ` Xiubo Li
2021-06-29 15:27 ` [PATCH 0/5] flush the mdlog before waiting on unsafe reqs Jeff Layton
2021-06-30 0:35 ` Xiubo Li
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=74d612a2a09533fcd184f89e8a1c4d4c0d7354cb.camel@kernel.org \
--to=jlayton@kernel.org \
--cc=ceph-devel@vger.kernel.org \
--cc=idryomov@gmail.com \
--cc=pdonnell@redhat.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).