ceph: when filling trace, do ceph_get_inode outside of mutexes
PATCH 1/1 ceph: when filling trace, do ceph_get_inode outside of mutexes
Geng Jichao reported a rather complex deadlock involving several moving parts:
1) readahead is issued against an inode and some of its pages are locked while the read is in flight
2) the same inode is evicted from the cache, and this task gets stuck waiting for the page lock because of the above readahead
3) another task is processing a reply trace, and looks up the inode being evicted while holding the s_mutex. That ends up waiting for the eviction to complete
4) a write reply for an unrelated inode is then processed in the ceph_con_workfn job. It calls ceph_check_caps after putting wrbuffer caps, and that gets stuck waiting on the s_mutex held by 3.
The reply to "1" is stuck behind the write reply in "4", so we deadlock at that point.
This patch changes the trace processing to call ceph_get_inode outside of the s_mutex and snap_rwsem, which should break the cycle above.
URL: https://tracker.ceph.com/issues/47998
--- fs/ceph/inode.c | 13 ++++--------- fs/ceph/mds_client.c | 15 +++++++++++++++ 2 files changed, 19 insertions(+), 9 deletions(-)
fs/ceph/inode.c +4 -9
@@ -1315,15 +1315,10 @@ int ceph_fill_trace(struct super_block *sb, struct ceph_mds_request *req) }if (rinfo->head->is_target) { - tvino.ino =le64_to_cpu (rinfo->targeti.in->ino); - tvino.snap =le64_to_cpu (rinfo->targeti.in->snapid); - - in =ceph_get_inode (sb, tvino); -if (IS_ERR (in)) { - err =PTR_ERR (in); - goto done; - } +/* Should be filled in by handle_reply */ +BUG_ON (!req->r_target_inode); + in = req->r_target_inode; err = ceph_fill_inode(in, req->r_locked_page, &rinfo->targeti, NULL, session, (!test_bit(CEPH_MDS_R_ABORTED, &req->r_req_flags) &&
@@ -1333,13 +1328,13 @@ int ceph_fill_trace(struct super_block *sb, struct ceph_mds_request *req)if (err <0 ) {pr_err ("ceph_fill_inode badness %p %llx.%llx\n" , in,ceph_vinop (in)); + req->r_target_inode =NULL ;if (in->i_state &I_NEW )discard_new_inode (in);else iput (in); goto done; } - req->r_target_inode = in;if (in->i_state &I_NEW )unlock_new_inode (in); }
fs/ceph/mds_client.c +15 -0
@@ -3179,6 +3179,21 @@ static void handle_reply(struct ceph_mds_session *session, struct ceph_msg *msg) err =parse_reply_info (session, msg, rinfo, session->s_con.peer_features);mutex_unlock (&mdsc->mutex); +/* Must find target inode outside of mutexes to avoid deadlocks */ +if (rinfo->head->is_target) { +struct inode *in; +struct ceph_vino tvino = { .ino =le64_to_cpu (rinfo->targeti.in->ino), + .snap =le64_to_cpu (rinfo->targeti.in->snapid) }; + + in =ceph_get_inode (mdsc->fsc->sb, tvino); +if (IS_ERR (in)) { + err =PTR_ERR (in); +mutex_lock (&session->s_mutex); + goto out_err; + } + req->r_target_inode = in; + } +mutex_lock (&session->s_mutex);if (err <0 ) {pr_err ("mdsc_handle_reply got corrupt reply mds%d(tid:%lld)\n" , mds, tid);
Signature · 1 line
2.28.0
Quoted 23 lines · Jeff Layton
Geng Jichao reported a rather complex deadlock involving several moving parts:
1) readahead is issued against an inode and some of its pages are locked while the read is in flight
2) the same inode is evicted from the cache, and this task gets stuck waiting for the page lock because of the above readahead
3) another task is processing a reply trace, and looks up the inode being evicted while holding the
s_mutex. That ends up waiting for the eviction to complete4) a write reply for an unrelated inode is then processed in the
ceph_con_workfnjob. It callsceph_check_capsafter putting wrbuffer caps, and that gets stuck waiting on thes_mutexheld by 3.The reply to "1" is stuck behind the write reply in "4", so we deadlock at that point.
This patch changes the trace processing to call
ceph_get_inodeoutside of thes_mutexandsnap_rwsem, which should break the cycle above.
Quoted 8 lines
URL: https://tracker.ceph.com/issues/47998
Reported-by Geng Jichao <[email protected]>Signed-off-by Jeff Layton <[email protected]>---
fs/ceph/inode.c | 13 ++++---------
fs/ceph/mds_client.c | 15 +++++++++++++++2 files changed, 19 insertions(+), 9 deletions(-)
My belief is that this patch probably won't hurt anything and might fix this specific deadlock. I do however wonder if we might have a whole class of deadlocks of this nature. I can't quite prove it by inspection though, so testing with this would be a good datapoint.
Quoted 73 lines
fs/ceph/inode.c +0
-0@@ -1315,15 +1315,10 @@ int ceph_fill_trace(struct super_block *sb, struct ceph_mds_request *req) }if (
rinfo->head->is_target) {fs/ceph/inode.c +2
-8- tvino.ino =le64_to_cpu (rinfo->targeti.in->ino); - tvino.snap =le64_to_cpu (rinfo->targeti.in->snapid); - - in =ceph_get_inode (sb, tvino); -if (IS_ERR (in)) { - err =PTR_ERR (in); - goto done; - } +/* Should be filled in by handle_reply */ +BUG_ON (!req->r_target_inode);fs/ceph/inode.c +1
-0+ in = req->r_target_inode;err = ceph_fill_inode(in,
req->r_locked_page,&rinfo->targeti, NULL, session, (!test_bit(CEPH_MDS_R_ABORTED,&req->r_req_flags) &&fs/ceph/inode.c +1
-0@@ -1333,13 +1328,13 @@ int ceph_fill_trace(struct super_block *sb, struct ceph_mds_request *req) if (err < 0) { pr_err("ceph_fill_inode badness %p %llx.%llx\n", in, ceph_vinop(in)); + req->r_target_inode =NULL ; if (in->i_state & I_NEW) discard_new_inode(in);else
iput(in);
goto done;
}fs/ceph/inode.c +0
-1- req->r_target_inode = in;if (
in->i_state&I_NEW)
unlock_new_inode(in);
}fs/ceph/mds_client.c +0
-0@@ -3179,6 +3179,21 @@ static void handle_reply(struct ceph_mds_session *session, struct ceph_msg *msg) err = parse_reply_info(session, msg, rinfo, session->s_con.peer_features); mutex_unlock(&mdsc->mutex);fs/ceph/mds_client.c +15
-0+/* Must find target inode outside of mutexes to avoid deadlocks */ +if (rinfo->head->is_target) { +struct inode *in; +struct ceph_vino tvino = { .ino =le64_to_cpu (rinfo->targeti.in->ino), + .snap =le64_to_cpu (rinfo->targeti.in->snapid) }; + + in =ceph_get_inode (mdsc->fsc->sb, tvino); +if (IS_ERR (in)) { + err =PTR_ERR (in); +mutex_lock (&session->s_mutex); + goto out_err; + } + req->r_target_inode = in; + } +
mutex_lock(&session->s_mutex);
if (err < 0) {
pr_err("mdsc_handle_reply got corrupt reply mds%d(tid:%lld)\n", mds, tid);
Signature · 1 line
Jeff Layton <[email protected]>
Quoted 33 lines · Jeff Layton
Quoted 23 lines · Jeff Layton
Geng Jichao reported a rather complex deadlock involving several moving parts:
1) readahead is issued against an inode and some of its pages are locked while the read is in flight
2) the same inode is evicted from the cache, and this task gets stuck waiting for the page lock because of the above readahead
3) another task is processing a reply trace, and looks up the inode being evicted while holding the
s_mutex. That ends up waiting for the eviction to complete4) a write reply for an unrelated inode is then processed in the
ceph_con_workfnjob. It callsceph_check_capsafter putting wrbuffer caps, and that gets stuck waiting on thes_mutexheld by 3.The reply to "1" is stuck behind the write reply in "4", so we deadlock at that point.
This patch changes the trace processing to call
ceph_get_inodeoutside of thes_mutexandsnap_rwsem, which should break the cycle above.Quoted 8 lines
URL: https://tracker.ceph.com/issues/47998
Reported-by Geng Jichao <[email protected]>Signed-off-by Jeff Layton <[email protected]>---
fs/ceph/inode.c | 13 ++++---------
fs/ceph/mds_client.c | 15 +++++++++++++++2 files changed, 19 insertions(+), 9 deletions(-)
Quoted 4 lines
My belief is that this patch probably won't hurt anything and might fix this specific deadlock. I do however wonder if we might have a whole class of deadlocks of this nature. I can't quite prove it by inspection though, so testing with this would be a good datapoint.
Yeah, I keep staring at this and can't decide either. But I agree with
you: this may or may not fix the issue, but shouldn't hurt. Just a minor comment bellow:
Quoted 55 lines
Quoted 55 lines
fs/ceph/inode.c +0
-0@@ -1315,15 +1315,10 @@ int ceph_fill_trace(struct super_block *sb, struct ceph_mds_request *req) }if (
rinfo->head->is_target) {fs/ceph/inode.c +2
-8- tvino.ino =le64_to_cpu (rinfo->targeti.in->ino); - tvino.snap =le64_to_cpu (rinfo->targeti.in->snapid); - - in =ceph_get_inode (sb, tvino); -if (IS_ERR (in)) { - err =PTR_ERR (in); - goto done; - } +/* Should be filled in by handle_reply */ +BUG_ON (!req->r_target_inode);fs/ceph/inode.c +1
-0+ in = req->r_target_inode;err = ceph_fill_inode(in,
req->r_locked_page,&rinfo->targeti, NULL, session, (!test_bit(CEPH_MDS_R_ABORTED,&req->r_req_flags) &&fs/ceph/inode.c +1
-0@@ -1333,13 +1328,13 @@ int ceph_fill_trace(struct super_block *sb, struct ceph_mds_request *req) if (err < 0) { pr_err("ceph_fill_inode badness %p %llx.%llx\n", in, ceph_vinop(in)); + req->r_target_inode =NULL ; if (in->i_state & I_NEW) discard_new_inode(in);else
iput(in);
goto done;
}fs/ceph/inode.c +0
-1- req->r_target_inode = in;if (
in->i_state&I_NEW)
unlock_new_inode(in);
}fs/ceph/mds_client.c +0
-0@@ -3179,6 +3179,21 @@ static void handle_reply(struct ceph_mds_session *session, struct ceph_msg *msg) err = parse_reply_info(session, msg, rinfo, session->s_con.peer_features); mutex_unlock(&mdsc->mutex);
Quoted 2 lines
fs/ceph/mds_client.c static void handle_reply(struct ceph_mds_session *session, struct ceph_msg *msg) · line 3183
Quoted 2 lines
fs/ceph/mds_client.c +2
-0+/* Must find target inode outside of mutexes to avoid deadlocks */ +if (rinfo->head->is_target) {
This condition should probably be
if ((err >= 0) && rinfo->head->is_target) {This would allow a faster exit path and eventually avoid masking this 'err' value with another one from ceph_get_inode().
Cheers,
Signature · 1 line
Luis
Quoted 20 lines
Quoted 16 lines
fs/ceph/mds_client.c +13
-0+struct inode *in; +struct ceph_vino tvino = { .ino =le64_to_cpu (rinfo->targeti.in->ino), + .snap =le64_to_cpu (rinfo->targeti.in->snapid) }; + + in =ceph_get_inode (mdsc->fsc->sb, tvino); +if (IS_ERR (in)) { + err =PTR_ERR (in); +mutex_lock (&session->s_mutex); + goto out_err; + } + req->r_target_inode = in; + } +
mutex_lock(&session->s_mutex);
if (err < 0) {
pr_err("mdsc_handle_reply got corrupt reply mds%d(tid:%lld)\n", mds, tid);Signature · 1 line
Jeff Layton <[email protected]>
Quoted 104 lines · Luis Henriques
Quoted 33 lines · Jeff Layton
Quoted 23 lines · Jeff Layton
Geng Jichao reported a rather complex deadlock involving several moving parts:
1) readahead is issued against an inode and some of its pages are locked while the read is in flight
2) the same inode is evicted from the cache, and this task gets stuck waiting for the page lock because of the above readahead
3) another task is processing a reply trace, and looks up the inode being evicted while holding the
s_mutex. That ends up waiting for the eviction to complete4) a write reply for an unrelated inode is then processed in the
ceph_con_workfnjob. It callsceph_check_capsafter putting wrbuffer caps, and that gets stuck waiting on thes_mutexheld by 3.The reply to "1" is stuck behind the write reply in "4", so we deadlock at that point.
This patch changes the trace processing to call
ceph_get_inodeoutside of thes_mutexandsnap_rwsem, which should break the cycle above.Quoted 8 lines
URL: https://tracker.ceph.com/issues/47998
Reported-by Geng Jichao <[email protected]>Signed-off-by Jeff Layton <[email protected]>---
fs/ceph/inode.c | 13 ++++---------
fs/ceph/mds_client.c | 15 +++++++++++++++2 files changed, 19 insertions(+), 9 deletions(-)Quoted 4 lines
My belief is that this patch probably won't hurt anything and might fix this specific deadlock. I do however wonder if we might have a whole class of deadlocks of this nature. I can't quite prove it by inspection though, so testing with this would be a good datapoint.
Yeah, I keep staring at this and can't decide either. But I agree with
you: this may or may not fix the issue, but shouldn't hurt. Just a minor comment bellow:Quoted 55 lines
Quoted 55 lines
fs/ceph/inode.c +0
-0@@ -1315,15 +1315,10 @@ int ceph_fill_trace(struct super_block *sb, struct ceph_mds_request *req) }if (
rinfo->head->is_target) {fs/ceph/inode.c +2
-8- tvino.ino =le64_to_cpu (rinfo->targeti.in->ino); - tvino.snap =le64_to_cpu (rinfo->targeti.in->snapid); - - in =ceph_get_inode (sb, tvino); -if (IS_ERR (in)) { - err =PTR_ERR (in); - goto done; - } +/* Should be filled in by handle_reply */ +BUG_ON (!req->r_target_inode);fs/ceph/inode.c +1
-0+ in = req->r_target_inode;err = ceph_fill_inode(in,
req->r_locked_page,&rinfo->targeti, NULL, session, (!test_bit(CEPH_MDS_R_ABORTED,&req->r_req_flags) &&fs/ceph/inode.c +1
-0@@ -1333,13 +1328,13 @@ int ceph_fill_trace(struct super_block *sb, struct ceph_mds_request *req) if (err < 0) { pr_err("ceph_fill_inode badness %p %llx.%llx\n", in, ceph_vinop(in)); + req->r_target_inode =NULL ; if (in->i_state & I_NEW) discard_new_inode(in);else
iput(in);
goto done;
}fs/ceph/inode.c +0
-1- req->r_target_inode = in;if (
in->i_state&I_NEW)
unlock_new_inode(in);
}fs/ceph/mds_client.c +0
-0@@ -3179,6 +3179,21 @@ static void handle_reply(struct ceph_mds_session *session, struct ceph_msg *msg) err = parse_reply_info(session, msg, rinfo, session->s_con.peer_features); mutex_unlock(&mdsc->mutex);Quoted 2 lines
fs/ceph/mds_client.c static void handle_reply(struct ceph_mds_session *session, struct ceph_msg *msg) · line 3183
Quoted 2 lines
fs/ceph/mds_client.c +2
-0+/* Must find target inode outside of mutexes to avoid deadlocks */ +if (rinfo->head->is_target) {This condition should probably be
Quoted 5 lines
if ((err >= 0) && rinfo->head->is_target) {This would allow a faster exit path and eventually avoid masking this 'err' value with another one from
ceph_get_inode().
Good catch. I'll fix that and send a v2.
Thanks,
Signature · 1 line
Jeff Layton <[email protected]>