ceph: when filling trace, call ceph_get_inode outside of mutexes
PATCH v2 1/1 ceph: when filling trace, call 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 it deadlocks 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(-)
v2: don't call ceph_get_inode if err < 0
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 ((err >=0 ) && 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 24 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 complete.4) 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 it deadlocks 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
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(-)v2: don't call
ceph_get_inodeif err < 0
Thanks, looks good (AFAICT!).
Cheers,
Signature · 1 line
Luis
Quoted 69 lines
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 ((err >=0 ) && 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