Commit 659caaf6 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'ceph-for-5.10-rc3' of git://github.com/ceph/ceph-client

Pull ceph fix from Ilya Dryomov:
 "A fix for a potential stall on umount caused by the MDS dropping our
  REQUEST_CLOSE message. The code that handled this case was
  inadvertently disabled in 5.9, this patch removes it entirely and
  fixes the problem in a way that is consistent with ceph-fuse"

* tag 'ceph-for-5.10-rc3' of git://github.com/ceph/ceph-client:
  ceph: check session state after bumping session->s_seq
parents 03f0f5ad 62575e27
...@@ -4074,7 +4074,7 @@ void ceph_handle_caps(struct ceph_mds_session *session, ...@@ -4074,7 +4074,7 @@ void ceph_handle_caps(struct ceph_mds_session *session,
vino.snap, inode); vino.snap, inode);
mutex_lock(&session->s_mutex); mutex_lock(&session->s_mutex);
session->s_seq++; inc_session_sequence(session);
dout(" mds%d seq %lld cap seq %u\n", session->s_mds, session->s_seq, dout(" mds%d seq %lld cap seq %u\n", session->s_mds, session->s_seq,
(unsigned)seq); (unsigned)seq);
......
...@@ -4231,7 +4231,7 @@ static void handle_lease(struct ceph_mds_client *mdsc, ...@@ -4231,7 +4231,7 @@ static void handle_lease(struct ceph_mds_client *mdsc,
dname.len, dname.name); dname.len, dname.name);
mutex_lock(&session->s_mutex); mutex_lock(&session->s_mutex);
session->s_seq++; inc_session_sequence(session);
if (!inode) { if (!inode) {
dout("handle_lease no inode %llx\n", vino.ino); dout("handle_lease no inode %llx\n", vino.ino);
...@@ -4385,28 +4385,48 @@ static void maybe_recover_session(struct ceph_mds_client *mdsc) ...@@ -4385,28 +4385,48 @@ static void maybe_recover_session(struct ceph_mds_client *mdsc)
bool check_session_state(struct ceph_mds_session *s) bool check_session_state(struct ceph_mds_session *s)
{ {
if (s->s_state == CEPH_MDS_SESSION_CLOSING) { switch (s->s_state) {
dout("resending session close request for mds%d\n", case CEPH_MDS_SESSION_OPEN:
s->s_mds); if (s->s_ttl && time_after(jiffies, s->s_ttl)) {
request_close_session(s);
return false;
}
if (s->s_ttl && time_after(jiffies, s->s_ttl)) {
if (s->s_state == CEPH_MDS_SESSION_OPEN) {
s->s_state = CEPH_MDS_SESSION_HUNG; s->s_state = CEPH_MDS_SESSION_HUNG;
pr_info("mds%d hung\n", s->s_mds); pr_info("mds%d hung\n", s->s_mds);
} }
} break;
if (s->s_state == CEPH_MDS_SESSION_NEW || case CEPH_MDS_SESSION_CLOSING:
s->s_state == CEPH_MDS_SESSION_RESTARTING || /* Should never reach this when we're unmounting */
s->s_state == CEPH_MDS_SESSION_CLOSED || WARN_ON_ONCE(true);
s->s_state == CEPH_MDS_SESSION_REJECTED) fallthrough;
/* this mds is failed or recovering, just wait */ case CEPH_MDS_SESSION_NEW:
case CEPH_MDS_SESSION_RESTARTING:
case CEPH_MDS_SESSION_CLOSED:
case CEPH_MDS_SESSION_REJECTED:
return false; return false;
}
return true; return true;
} }
/*
* If the sequence is incremented while we're waiting on a REQUEST_CLOSE reply,
* then we need to retransmit that request.
*/
void inc_session_sequence(struct ceph_mds_session *s)
{
lockdep_assert_held(&s->s_mutex);
s->s_seq++;
if (s->s_state == CEPH_MDS_SESSION_CLOSING) {
int ret;
dout("resending session close request for mds%d\n", s->s_mds);
ret = request_close_session(s);
if (ret < 0)
pr_err("unable to close session to mds%d: %d\n",
s->s_mds, ret);
}
}
/* /*
* delayed work -- periodically trim expired leases, renew caps with mds * delayed work -- periodically trim expired leases, renew caps with mds
*/ */
......
...@@ -480,6 +480,7 @@ struct ceph_mds_client { ...@@ -480,6 +480,7 @@ struct ceph_mds_client {
extern const char *ceph_mds_op_name(int op); extern const char *ceph_mds_op_name(int op);
extern bool check_session_state(struct ceph_mds_session *s); extern bool check_session_state(struct ceph_mds_session *s);
void inc_session_sequence(struct ceph_mds_session *s);
extern struct ceph_mds_session * extern struct ceph_mds_session *
__ceph_lookup_mds_session(struct ceph_mds_client *, int mds); __ceph_lookup_mds_session(struct ceph_mds_client *, int mds);
......
...@@ -53,7 +53,7 @@ void ceph_handle_quota(struct ceph_mds_client *mdsc, ...@@ -53,7 +53,7 @@ void ceph_handle_quota(struct ceph_mds_client *mdsc,
/* increment msg sequence number */ /* increment msg sequence number */
mutex_lock(&session->s_mutex); mutex_lock(&session->s_mutex);
session->s_seq++; inc_session_sequence(session);
mutex_unlock(&session->s_mutex); mutex_unlock(&session->s_mutex);
/* lookup inode */ /* lookup inode */
......
...@@ -873,7 +873,7 @@ void ceph_handle_snap(struct ceph_mds_client *mdsc, ...@@ -873,7 +873,7 @@ void ceph_handle_snap(struct ceph_mds_client *mdsc,
ceph_snap_op_name(op), split, trace_len); ceph_snap_op_name(op), split, trace_len);
mutex_lock(&session->s_mutex); mutex_lock(&session->s_mutex);
session->s_seq++; inc_session_sequence(session);
mutex_unlock(&session->s_mutex); mutex_unlock(&session->s_mutex);
down_write(&mdsc->snap_rwsem); down_write(&mdsc->snap_rwsem);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment