ceph: check caps immediately after async creating finishes
cover ceph: check caps immediately after async creating finishes
From: Xiubo Li <[email protected]>
Xiubo Li (2):
ceph: remove useless session parameter for check_caps()
ceph: try to check caps immediately after async creating finishes
fs/ceph/addr.c | 2 +- fs/ceph/caps.c | 25 +++++++++++-------------- fs/ceph/file.c | 26 ++++++++++++++++---------- fs/ceph/inode.c | 6 +++--- fs/ceph/ioctl.c | 2 +- fs/ceph/super.h | 4 ++-- 6 files changed, 34 insertions(+), 31 deletions(-)
Signature · 1 line
2.31.1
PATCH 1/2 ceph: remove useless session parameter for check_caps()
From: Xiubo Li <[email protected]>
The session parameter makes no sense any more.
URL: https://tracker.ceph.com/issues/46904
Signed-off-by Xiubo Li <[email protected]>
--- fs/ceph/addr.c | 2 +- fs/ceph/caps.c | 23 +++++++++-------------- fs/ceph/file.c | 17 +++++++---------- fs/ceph/inode.c | 6 +++--- fs/ceph/ioctl.c | 2 +- fs/ceph/super.h | 3 +-- 6 files changed, 22 insertions(+), 31 deletions(-)
fs/ceph/addr.c +1 -1
@@ -1363,7 +1363,7 @@ static int ceph_write_end(struct file *file, struct address_space *mapping,folio_put (folio);if (check_cap) -ceph_check_caps (ceph_inode (inode),CHECK_CAPS_AUTHONLY ,NULL ); +ceph_check_caps (ceph_inode (inode),CHECK_CAPS_AUTHONLY );return copied; }
fs/ceph/caps.c +9 -14
@@ -1949,8 +1949,7 @@ bool __ceph_should_report_size(struct ceph_inode_info *ci)* CHECK_CAPS_FLUSH - we should flush any dirty caps immediately, without * further delay. */ -void ceph_check_caps (struct ceph_inode_info *ci,int flags, -struct ceph_mds_session *session) +void ceph_check_caps (struct ceph_inode_info *ci,int flags) {struct inode *inode = &ci->netfs.inode;struct ceph_mds_client *mdsc =ceph_sb_to_mdsc (inode->i_sb);
@@ -1964,15 +1963,12 @@ void ceph_check_caps(struct ceph_inode_info *ci, int flags,bool queue_invalidate = false;bool tried_invalidate = false;bool queue_writeback = false; - -if (session) -ceph_get_mds_session (session); +struct ceph_mds_session *session =NULL ;spin_lock (&ci->i_ceph_lock);if (ci->i_ceph_flags &CEPH_I_ASYNC_CREATE ) {/* Don't send messages until we get async create reply */ spin_unlock (&ci->i_ceph_lock); -ceph_put_mds_session (session);return ; }
@@ -2926,7 +2922,7 @@ static void check_max_size(struct inode *inode, loff_t endoff) check =1 ;spin_unlock (&ci->i_ceph_lock);if (check) -ceph_check_caps (ci,CHECK_CAPS_AUTHONLY ,NULL ); +ceph_check_caps (ci,CHECK_CAPS_AUTHONLY ); }static inline int get_used_fmode (int caps)
@@ -3215,7 +3211,7 @@ static void __ceph_put_cap_refs(struct ceph_inode_info *ci, int had,switch (mode) {case PUT_CAP_REFS_SYNC :if (last) -ceph_check_caps (ci,0 ,NULL ); +ceph_check_caps (ci,0 );else if (flushsnaps)ceph_flush_snaps (ci,NULL );break ;
@@ -3330,7 +3326,7 @@ void ceph_put_wrbuffer_cap_refs(struct ceph_inode_info *ci, int nr,spin_unlock (&ci->i_ceph_lock);if (last) { -ceph_check_caps (ci,0 ,NULL ); +ceph_check_caps (ci,0 ); }else if (flush_snaps) {ceph_flush_snaps (ci,NULL ); }
@@ -3679,10 +3675,9 @@ static void handle_cap_grant(struct inode *inode,mutex_unlock (&session->s_mutex);if (check_caps ==1 ) -ceph_check_caps (ci,CHECK_CAPS_AUTHONLY |CHECK_CAPS_NOINVAL , - session); +ceph_check_caps (ci,CHECK_CAPS_AUTHONLY |CHECK_CAPS_NOINVAL );else if (check_caps ==2 ) -ceph_check_caps (ci,CHECK_CAPS_NOINVAL , session); +ceph_check_caps (ci,CHECK_CAPS_NOINVAL ); }/*
@@ -4421,7 +4416,7 @@ unsigned long ceph_check_delayed_caps(struct ceph_mds_client *mdsc)if (inode) {spin_unlock (&mdsc->cap_delay_lock);dout ("check_delayed_caps on %p\n" , inode); -ceph_check_caps (ci,0 ,NULL ); +ceph_check_caps (ci,0 );iput (inode);spin_lock (&mdsc->cap_delay_lock); }
@@ -4450,7 +4445,7 @@ static void flush_dirty_session_caps(struct ceph_mds_session *s)dout ("flush_dirty_caps %llx.%llx\n" ,ceph_vinop (inode));spin_unlock (&mdsc->cap_dirty_lock);ceph_wait_on_async_create (inode); -ceph_check_caps (ci,CHECK_CAPS_FLUSH ,NULL ); +ceph_check_caps (ci,CHECK_CAPS_FLUSH );iput (inode);spin_lock (&mdsc->cap_dirty_lock); }
fs/ceph/file.c +7 -10
@@ -313,7 +313,7 @@ int ceph_renew_caps(struct inode *inode, int fmode)spin_unlock (&ci->i_ceph_lock);dout ("renew caps %p want %s issued %s updating mds_wanted\n" , inode,ceph_cap_string (wanted),ceph_cap_string (issued)); -ceph_check_caps (ci,0 ,NULL ); +ceph_check_caps (ci,0 );return 0 ; }spin_unlock (&ci->i_ceph_lock);
@@ -413,7 +413,7 @@ int ceph_open(struct inode *inode, struct file *file)if ((issued & wanted) != wanted && (mds_wanted & wanted) != wanted &&ceph_snap (inode) !=CEPH_SNAPDIR ) -ceph_check_caps (ci,0 ,NULL ); +ceph_check_caps (ci,0 );return ceph_init_file (inode, file, fmode); } else if (ceph_snap(inode) != CEPH_NOSNAP &&
@@ -1142,7 +1142,7 @@ static void ceph_aio_complete(struct inode *inode,loff_t endoff = aio_req->iocb->ki_pos + aio_req->total_len;if (endoff >i_size_read (inode)) {if (ceph_inode_set_size (inode, endoff)) -ceph_check_caps (ci,CHECK_CAPS_AUTHONLY ,NULL ); +ceph_check_caps (ci,CHECK_CAPS_AUTHONLY ); }spin_lock (&ci->i_ceph_lock);
@@ -1488,8 +1488,7 @@ ceph_direct_read_write(struct kiocb *iocb, struct iov_iter *iter,if (write && pos > size) {if (ceph_inode_set_size (inode, pos))ceph_check_caps (ceph_inode (inode), -CHECK_CAPS_AUTHONLY , -NULL ); +CHECK_CAPS_AUTHONLY ); } }
@@ -1644,8 +1643,7 @@ ceph_sync_write(struct kiocb *iocb, struct iov_iter *from, loff_t pos, check_caps =ceph_inode_set_size (inode, pos);if (check_caps)ceph_check_caps (ceph_inode (inode), -CHECK_CAPS_AUTHONLY , -NULL ); +CHECK_CAPS_AUTHONLY ); } }
@@ -1973,7 +1971,7 @@ static ssize_t ceph_write_iter(struct kiocb *iocb, struct iov_iter *from)if (dirty)__mark_inode_dirty (inode, dirty);if (ceph_quota_is_max_bytes_approaching (inode, iocb->ki_pos)) -ceph_check_caps (ci,CHECK_CAPS_FLUSH ,NULL ); +ceph_check_caps (ci,CHECK_CAPS_FLUSH ); } dout("aio_write %p %llx.%llx %llu~%u dropping cap refs on %s\n",
@@ -2588,8 +2586,7 @@ static ssize_t __ceph_copy_file_range(struct file *src_file, loff_t src_off,/* Let the MDS know about dst file size change */ if (ceph_inode_set_size (dst_inode, dst_off) ||ceph_quota_is_max_bytes_approaching (dst_inode, dst_off)) -ceph_check_caps (dst_ci,CHECK_CAPS_AUTHONLY |CHECK_CAPS_FLUSH , -NULL ); +ceph_check_caps (dst_ci,CHECK_CAPS_AUTHONLY |CHECK_CAPS_FLUSH ); }/* Mark Fw dirty */ spin_lock (&dst_ci->i_ceph_lock);
fs/ceph/inode.c +3 -3
@@ -2101,7 +2101,7 @@ static void ceph_do_invalidate_pages(struct inode *inode)mutex_unlock (&ci->i_truncate_mutex); out:if (check) -ceph_check_caps (ci,0 ,NULL ); +ceph_check_caps (ci,0 ); }/*
@@ -2161,7 +2161,7 @@ void __ceph_do_pending_vmtruncate(struct inode *inode)mutex_unlock (&ci->i_truncate_mutex);if (wrbuffer_refs ==0 ) -ceph_check_caps (ci,0 ,NULL ); +ceph_check_caps (ci,0 );wake_up_all (&ci->i_cap_wq); }
@@ -2183,7 +2183,7 @@ static void ceph_inode_work(struct work_struct *work)__ceph_do_pending_vmtruncate (inode);if (test_and_clear_bit (CEPH_I_WORK_CHECK_CAPS , &ci->i_work_mask)) -ceph_check_caps (ci,0 ,NULL ); +ceph_check_caps (ci,0 );if (test_and_clear_bit (CEPH_I_WORK_FLUSH_SNAPS , &ci->i_work_mask))ceph_flush_snaps (ci,NULL );
fs/ceph/ioctl.c +1 -1
@@ -254,7 +254,7 @@ static long ceph_ioctl_lazyio(struct file *file)spin_unlock (&ci->i_ceph_lock);dout ("ioctl_layzio: file %p marked lazy\n" , file); -ceph_check_caps (ci,0 ,NULL ); +ceph_check_caps (ci,0 ); }else {dout ("ioctl_layzio: file %p already lazy\n" , file); }
fs/ceph/super.h +1 -2
@@ -1228,8 +1228,7 @@ extern void ceph_remove_capsnap(struct inode *inode,extern void ceph_flush_snaps (struct ceph_inode_info *ci,struct ceph_mds_session **psession);extern bool __ceph_should_report_size (struct ceph_inode_info *ci); -extern void ceph_check_caps (struct ceph_inode_info *ci,int flags, -struct ceph_mds_session *session); +extern void ceph_check_caps (struct ceph_inode_info *ci,int flags);extern unsigned long ceph_check_delayed_caps (struct ceph_mds_client *mdsc);extern void ceph_flush_dirty_caps (struct ceph_mds_client *mdsc);extern int ceph_drop_caps_for_unlink (struct inode *inode);
Signature · 1 line
2.31.1
PATCH 2/2 ceph: try to check caps immediately after async creating finishes
In reply to [email protected]From: Xiubo Li <[email protected]>
We should call the check_caps() again immediately after the async creating finishes in case the MDS is waiting for caps revocation to finish.
URL: https://tracker.ceph.com/issues/46904
Signed-off-by Xiubo Li <[email protected]>
--- fs/ceph/caps.c | 2 ++ fs/ceph/file.c | 9 +++++++++ fs/ceph/super.h | 1 + 3 files changed, 12 insertions(+)
fs/ceph/caps.c +2 -0
@@ -1967,6 +1967,8 @@ void ceph_check_caps(struct ceph_inode_info *ci, int flags)spin_lock (&ci->i_ceph_lock);if (ci->i_ceph_flags &CEPH_I_ASYNC_CREATE ) { + ci->i_ceph_flags |=CEPH_I_ASYNC_CHECK_CAPS ; +/* Don't send messages until we get async create reply */ spin_unlock (&ci->i_ceph_lock);return ;
fs/ceph/file.c +9 -0
@@ -539,14 +539,23 @@ static void wake_async_create_waiters(struct inode *inode, struct ceph_mds_session *session) {struct ceph_inode_info *ci =ceph_inode (inode); +bool check_cap = false;spin_lock (&ci->i_ceph_lock);if (ci->i_ceph_flags &CEPH_I_ASYNC_CREATE ) { ci->i_ceph_flags &= ~CEPH_I_ASYNC_CREATE ;wake_up_bit (&ci->i_ceph_flags,CEPH_ASYNC_CREATE_BIT ); + +if (ci->i_ceph_flags &CEPH_I_ASYNC_CHECK_CAPS ) { + ci->i_ceph_flags &= ~CEPH_I_ASYNC_CHECK_CAPS ; + check_cap = true; + } }ceph_kick_flushing_inode_caps (session, ci);spin_unlock (&ci->i_ceph_lock); + +if (check_cap) +ceph_check_caps (ci,CHECK_CAPS_FLUSH ); } static void ceph_async_create_cb(struct ceph_mds_client *mdsc,
fs/ceph/super.h +1 -0
@@ -607,6 +607,7 @@ static inline struct inode *ceph_find_inode(struct super_block *sb,#define CEPH_ASYNC_CREATE_BIT (12)/* async create in flight for this */ #define CEPH_I_ASYNC_CREATE (1 << CEPH_ASYNC_CREATE_BIT)#define CEPH_I_SHUTDOWN (1 << 13)/* inode is no longer usable */ +#define CEPH_I_ASYNC_CHECK_CAPS (1 << 14)/* check caps immediately after async creating finishes */ /* * Masks of ceph inode work.
Signature · 1 line
2.31.1