ceph: get snap_rwsem read lock in handle_cap_export for ceph_add_cap
PATCH v2 1/1 ceph: get snap_rwsem read lock in handle_cap_export for ceph_add_cap
ceph_add_cap says in its function documentation that the caller should hold the read lock on the session snap_rwsem. Furthermore, not only ceph_add_cap needs that lock, when it calls to ceph_lookup_snap_realm it eventually calls ceph_get_snap_realm which states via lockdep that snap_rwsem needs to be held. handle_cap_export calls ceph_add_cap without that mdsc->snap_rwsem held. Thus, since ceph_get_snap_realm and ceph_add_cap both need the lock, the common place to acquire that lock is inside handle_cap_export.
--- fs/ceph/caps.c | 3 +++ 1 file changed, 3 insertions(+)
fs/ceph/caps.c +3 -0
@@ -3856,6 +3856,7 @@ static void handle_cap_export(struct inode *inode, struct ceph_mds_caps *ex,dout ("handle_cap_export inode %p ci %p mds%d mseq %d target %d\n" , inode, ci, mds, mseq, target); retry: +down_read (&mdsc->snap_rwsem);spin_lock (&ci->i_ceph_lock); cap =__get_cap_for_mds (ci, mds);if (!cap || cap->cap_id !=le64_to_cpu (ex->cap_id))
@@ -3919,6 +3920,7 @@ static void handle_cap_export(struct inode *inode, struct ceph_mds_caps *ex, }spin_unlock (&ci->i_ceph_lock); +up_read (&mdsc->snap_rwsem);mutex_unlock (&session->s_mutex);/* open target session */
@@ -3944,6 +3946,7 @@ static void handle_cap_export(struct inode *inode, struct ceph_mds_caps *ex, out_unlock:spin_unlock (&ci->i_ceph_lock); +up_read (&mdsc->snap_rwsem);mutex_unlock (&session->s_mutex);if (tsession) {mutex_unlock (&tsession->s_mutex);
Signature · 1 line
2.35.1
Quoted 35 lines · Niels Dossche
ceph_add_capsays in its function documentation that the caller should hold the read lock on the sessionsnap_rwsem. Furthermore, not onlyceph_add_capneeds that lock, when it calls toceph_lookup_snap_realmit eventually callsceph_get_snap_realmwhich states via lockdep thatsnap_rwsemneeds to be held.handle_cap_exportcallsceph_add_capwithout thatmdsc->snap_rwsemheld. Thus, sinceceph_get_snap_realmandceph_add_capboth need the lock, the common place to acquire that lock is insidehandle_cap_export.Signed-off-by Niels Dossche <[email protected]>--- fs/ceph/caps.c | 3 +++ 1 file changed, 3 insertions(+)fs/ceph/caps.c +2
-0@@ -3856,6 +3856,7 @@ static void handle_cap_export(struct inode *inode, struct ceph_mds_caps *ex,dout ("handle_cap_export inode %p ci %p mds%d mseq %d target %d\n" , inode, ci, mds, mseq, target); retry: +down_read (&mdsc->snap_rwsem);spin_lock (&ci->i_ceph_lock); cap =__get_cap_for_mds (ci, mds);if (!cap || cap->cap_id !=le64_to_cpu (ex->cap_id))@@ -3919,6 +3920,7 @@ static void handle_cap_export(struct inode *inode, struct ceph_mds_caps *ex, }spin_unlock (&ci->i_ceph_lock); +up_read (&mdsc->snap_rwsem);mutex_unlock (&session->s_mutex);/* open target session */
fs/ceph/caps.c static void handle_cap_export(struct inode *inode, struct ceph_mds_caps *ex, · line 3952
Quoted 7 lines
fs/ceph/caps.c +1
-0@@ -3944,6 +3946,7 @@ static void handle_cap_export(struct inode *inode, struct ceph_mds_caps *ex, out_unlock:spin_unlock (&ci->i_ceph_lock); +up_read (&mdsc->snap_rwsem);mutex_unlock (&session->s_mutex);if (tsession) {mutex_unlock (&tsession->s_mutex);
Quoted 35 lines · Niels Dossche
ceph_add_capsays in its function documentation that the caller should hold the read lock on the sessionsnap_rwsem. Furthermore, not onlyceph_add_capneeds that lock, when it calls toceph_lookup_snap_realmit eventually callsceph_get_snap_realmwhich states via lockdep thatsnap_rwsemneeds to be held.handle_cap_exportcallsceph_add_capwithout thatmdsc->snap_rwsemheld. Thus, sinceceph_get_snap_realmandceph_add_capboth need the lock, the common place to acquire that lock is insidehandle_cap_export.Signed-off-by Niels Dossche <[email protected]>--- fs/ceph/caps.c | 3 +++ 1 file changed, 3 insertions(+)fs/ceph/caps.c +2
-0@@ -3856,6 +3856,7 @@ static void handle_cap_export(struct inode *inode, struct ceph_mds_caps *ex,dout ("handle_cap_export inode %p ci %p mds%d mseq %d target %d\n" , inode, ci, mds, mseq, target); retry: +down_read (&mdsc->snap_rwsem);spin_lock (&ci->i_ceph_lock); cap =__get_cap_for_mds (ci, mds);if (!cap || cap->cap_id !=le64_to_cpu (ex->cap_id))@@ -3919,6 +3920,7 @@ static void handle_cap_export(struct inode *inode, struct ceph_mds_caps *ex, }spin_unlock (&ci->i_ceph_lock); +up_read (&mdsc->snap_rwsem);mutex_unlock (&session->s_mutex);/* open target session */
fs/ceph/caps.c static void handle_cap_export(struct inode *inode, struct ceph_mds_caps *ex, · line 3952
Quoted 7 lines
fs/ceph/caps.c +1
-0@@ -3944,6 +3946,7 @@ static void handle_cap_export(struct inode *inode, struct ceph_mds_caps *ex, out_unlock:spin_unlock (&ci->i_ceph_lock); +up_read (&mdsc->snap_rwsem);mutex_unlock (&session->s_mutex);if (tsession) {mutex_unlock (&tsession->s_mutex);
Looks good. Merged into testing branch.
Thanks!
Signature · 1 line
Jeff Layton <[email protected]>