From ae310f0e4196cca5753a334d938ffa2fa288ac08 Mon Sep 17 00:00:00 2001 From: fanyong Date: Thu, 10 Jul 2008 07:32:02 +0000 Subject: [PATCH] Branch b1_8 b=15927 i=johann i=huanghua (1) replace ptlrpcd with the statahead thread to interpret the async statahead RPC callback. (2) update from HEAD for dropping unnecessary "mi_exp". --- lustre/include/lustre_mds.h | 6 - lustre/llite/dcache.c | 2 +- lustre/llite/llite_internal.h | 10 +- lustre/llite/statahead.c | 653 +++++++++++++++++++++++++++++------------- lustre/mdc/mdc_locks.c | 20 +- 5 files changed, 463 insertions(+), 228 deletions(-) diff --git a/lustre/include/lustre_mds.h b/lustre/include/lustre_mds.h index 47d5073..b41465a 100644 --- a/lustre/include/lustre_mds.h +++ b/lustre/include/lustre_mds.h @@ -237,7 +237,6 @@ typedef int (* md_enqueue_cb_t)(struct obd_export *exp, int rc); struct md_enqueue_info { - struct obd_export *mi_exp; struct mdc_op_data mi_data; struct lookup_intent mi_it; struct lustre_handle mi_lockh; @@ -247,9 +246,4 @@ struct md_enqueue_info { void *mi_cbdata; }; -struct mdc_enqueue_args { - struct md_enqueue_info *ma_mi; - struct ldlm_enqueue_info *ma_ei; -}; - #endif diff --git a/lustre/llite/dcache.c b/lustre/llite/dcache.c index 96e01b1..b49d782 100644 --- a/lustre/llite/dcache.c +++ b/lustre/llite/dcache.c @@ -35,7 +35,7 @@ #include "llite_internal.h" /* should NOT be called with the dcache lock, see fs/dcache.c */ -static void ll_release(struct dentry *de) +void ll_release(struct dentry *de) { struct ll_dentry_data *lld; ENTRY; diff --git a/lustre/llite/llite_internal.h b/lustre/llite/llite_internal.h index 5605f8c..0eab8b3 100644 --- a/lustre/llite/llite_internal.h +++ b/lustre/llite/llite_internal.h @@ -650,6 +650,7 @@ int ll_dir_getstripe(struct inode *inode, struct lov_mds_md **lmm, extern struct dentry_operations ll_init_d_ops; extern struct dentry_operations ll_d_ops; extern struct dentry_operations ll_fini_d_ops; +void ll_release(struct dentry *de); void ll_intent_drop_lock(struct lookup_intent *); void ll_intent_release(struct lookup_intent *); extern void ll_set_dd(struct dentry *de); @@ -859,6 +860,7 @@ int ll_removexattr(struct dentry *dentry, const char *name); /* per inode struct, for dir only */ struct ll_statahead_info { struct inode *sai_inode; + struct dentry *sai_first; /* first dentry item */ unsigned int sai_generation; /* generation for statahead */ atomic_t sai_refcount; /* when access this struct, hold * refcount */ @@ -867,6 +869,8 @@ struct ll_statahead_info { * reply */ unsigned int sai_max; /* max ahead of lookup */ unsigned int sai_index; /* index of statahead entry */ + unsigned int sai_index_next; /* index for the next statahead + * entry to be stated */ unsigned int sai_hit; /* hit count */ unsigned int sai_miss; /* miss count: * for "ls -al" case, it includes @@ -884,11 +888,13 @@ struct ll_statahead_info { * hidden entries */ cfs_waitq_t sai_waitq; /* stat-ahead wait queue */ struct ptlrpc_thread sai_thread; /* stat-ahead thread */ - struct list_head sai_entries; /* stat-ahead entries */ + struct list_head sai_entries_sent; /* entries sent out */ + struct list_head sai_entries_received; /* entries returned */ + struct list_head sai_entries_stated; /* entries stated */ }; int do_statahead_enter(struct inode *dir, struct dentry **dentry, int lookup); -void ll_statahead_exit(struct dentry *dentry, int result); +int ll_statahead_exit(struct dentry *dentry, int result); void ll_stop_statahead(struct inode *inode, void *key); static inline diff --git a/lustre/llite/statahead.c b/lustre/llite/statahead.c index 6262dd0..0c39ed1 100644 --- a/lustre/llite/statahead.c +++ b/lustre/llite/statahead.c @@ -38,6 +38,8 @@ struct ll_sai_entry { struct list_head se_list; unsigned int se_index; int se_stat; + struct ptlrpc_request *se_req; + struct md_enqueue_info *se_minfo; }; enum { @@ -45,9 +47,100 @@ enum { SA_ENTRY_STATED }; +struct dentry_operations ll_sai_d_ops = { + .d_release = ll_release, +}; + static unsigned int sai_generation = 0; static spinlock_t sai_generation_lock = SPIN_LOCK_UNLOCKED; +/** + * Check whether first entry was stated already or not. + * No need to hold lli_lock, for: + * (1) it is me that remove entry from the list + * (2) the statahead thread only add new entry to the list + */ +static int ll_sai_entry_stated(struct ll_statahead_info *sai) +{ + struct ll_sai_entry *entry; + int rc = 0; + + if (!list_empty(&sai->sai_entries_stated)) { + entry = list_entry(sai->sai_entries_stated.next, + struct ll_sai_entry, se_list); + if (entry->se_index == sai->sai_index_next) + rc = 1; + } + return rc; +} + +static inline int sa_received_empty(struct ll_statahead_info *sai) +{ + return list_empty(&sai->sai_entries_received); +} + +static inline int sa_not_full(struct ll_statahead_info *sai) +{ + return sai->sai_index < sai->sai_hit + sai->sai_miss + sai->sai_max; +} + +static inline int sa_is_running(struct ll_statahead_info *sai) +{ + return !!(sai->sai_thread.t_flags & SVC_RUNNING); +} + +static inline int sa_is_stopping(struct ll_statahead_info *sai) +{ + return !!(sai->sai_thread.t_flags & SVC_STOPPING); +} + +static inline int sa_is_stopped(struct ll_statahead_info *sai) +{ + return !!(sai->sai_thread.t_flags & SVC_STOPPED); +} + +/** + * (1) hit ratio less than 80% + * or + * (2) consecutive miss more than 8 + */ +static inline int sa_low_hit(struct ll_statahead_info *sai) +{ + return ((sai->sai_hit < 4 * sai->sai_miss && sai->sai_hit > 7) || + (sai->sai_consecutive_miss > 8)); +} + +/** + * process the deleted entry's member and free the entry. + * (1) release intent + * (2) free md_enqueue_info + * (3) drop dentry's ref count + * (4) release request's ref count + */ +static void ll_sai_entry_cleanup(struct ll_sai_entry *entry) +{ + struct ptlrpc_request *req = entry->se_req; + struct md_enqueue_info *minfo = entry->se_minfo; + ENTRY; + + if (minfo) { + struct dentry *dentry = minfo->mi_dentry; + struct lookup_intent *it = &minfo->mi_it; + + entry->se_minfo = NULL; + ll_intent_release(it); + OBD_FREE_PTR(minfo); + dput(dentry); + } + if (req) { + entry->se_req = NULL; + ptlrpc_req_finished(req); + } + OBD_FREE_PTR(entry); + + EXIT; +} + static struct ll_statahead_info *ll_sai_alloc(void) { struct ll_statahead_info *sai; @@ -65,7 +158,9 @@ static struct ll_statahead_info *ll_sai_alloc(void) sai->sai_max = LL_SA_RPC_MIN; cfs_waitq_init(&sai->sai_waitq); cfs_waitq_init(&sai->sai_thread.t_ctl_waitq); - CFS_INIT_LIST_HEAD(&sai->sai_entries); + CFS_INIT_LIST_HEAD(&sai->sai_entries_sent); + CFS_INIT_LIST_HEAD(&sai->sai_entries_received); + CFS_INIT_LIST_HEAD(&sai->sai_entries_stated); return sai; } @@ -89,7 +184,7 @@ static void ll_sai_put(struct ll_statahead_info *sai) lli->lli_sai = NULL; spin_unlock(&lli->lli_lock); - LASSERT(sai->sai_thread.t_flags & SVC_STOPPED); + LASSERT(sa_is_stopped(sai)); if (sai->sai_sent > sai->sai_replied) CDEBUG(D_READA,"statahead for dir %lu/%u does not " @@ -97,19 +192,33 @@ static void ll_sai_put(struct ll_statahead_info *sai) inode->i_ino, inode->i_generation, sai->sai_sent, sai->sai_replied); - list_for_each_entry_safe(entry, next, &sai->sai_entries, + list_for_each_entry_safe(entry, next, &sai->sai_entries_sent, se_list) { list_del(&entry->se_list); - OBD_FREE_PTR(entry); + ll_sai_entry_cleanup(entry); } + list_for_each_entry_safe(entry, next, &sai->sai_entries_received, + se_list) { + list_del(&entry->se_list); + ll_sai_entry_cleanup(entry); + } + list_for_each_entry_safe(entry, next, &sai->sai_entries_stated, + se_list) { + list_del(&entry->se_list); + ll_sai_entry_cleanup(entry); + } + dput(sai->sai_first); OBD_FREE_PTR(sai); iput(inode); } EXIT; } +/** + * insert it into sai_entries_sent tail when init. + */ static struct ll_sai_entry * -ll_sai_entry_get(struct ll_statahead_info *sai, unsigned int index, int stat) +ll_sai_entry_init(struct ll_statahead_info *sai, unsigned int index) { struct ll_inode_info *lli = ll_i2info(sai->sai_inode); struct ll_sai_entry *entry; @@ -118,148 +227,183 @@ ll_sai_entry_get(struct ll_statahead_info *sai, unsigned int index, int stat) OBD_ALLOC_PTR(entry); if (entry == NULL) RETURN(ERR_PTR(-ENOMEM)); - - CDEBUG(D_READA, "alloc sai entry %p index %u, stat %d\n", - entry, index, stat); + + CDEBUG(D_READA, "alloc sai entry %p index %u\n", + entry, index); entry->se_index = index; - entry->se_stat = stat; + entry->se_stat = SA_ENTRY_UNSTATED; spin_lock(&lli->lli_lock); - list_add_tail(&entry->se_list, &sai->sai_entries); + list_add_tail(&entry->se_list, &sai->sai_entries_sent); spin_unlock(&lli->lli_lock); RETURN(entry); } -/* - * inside lli_lock - * return value: - * 0: can not find the entry with the index - * 1: it is the first entry - * 2: it is not the first entry +/** + * delete it from sai_entries_stated head when fini, it need not + * to process entry's member. */ -static int -ll_sai_entry_set(struct ll_statahead_info *sai, unsigned int index, int stat) +static void ll_sai_entry_fini(struct ll_statahead_info *sai) { - struct ll_sai_entry *entry; - int rc = 0; + struct ll_inode_info *lli = ll_i2info(sai->sai_inode); + struct ll_sai_entry *entry; ENTRY; - - if (list_empty(&sai->sai_entries)) - RETURN(0); - - entry = list_entry(sai->sai_entries.next, struct ll_sai_entry, se_list); - if (entry->se_index == index) - GOTO(out, rc = 1); - - while (entry->se_list.next != &sai->sai_entries && - entry->se_index < index) { - entry = list_entry(entry->se_list.next, struct ll_sai_entry, - se_list); - if (entry->se_index == index) - GOTO(out, rc = 2); - } + + spin_lock(&lli->lli_lock); + sai->sai_index_next++; + if (likely(!list_empty(&sai->sai_entries_stated))) { + entry = list_entry(sai->sai_entries_stated.next, + struct ll_sai_entry, se_list); + if (entry->se_index < sai->sai_index_next) { + list_del(&entry->se_list); + OBD_FREE_PTR(entry); + } + } else + LASSERT(sa_is_stopped(sai)); + spin_unlock(&lli->lli_lock); EXIT; - -out: - if (rc) { - LASSERT(entry->se_stat == SA_ENTRY_UNSTATED); - entry->se_stat = stat; - } - - return rc; } -/* - * Check whether first entry was stated already or not. - * No need to hold lli_lock, for: - * (1) it is me that remove entry from the list - * (2) the statahead thread only add new entry to the list tail +/** + * inside lli_lock. + * \retval NULL : can not find the entry in sai_entries_sent with the index + * \retval entry: find the entry in sai_entries_sent with the index */ -static int ll_sai_entry_stated(struct ll_statahead_info *sai) +static struct ll_sai_entry * +ll_sai_entry_set(struct ll_statahead_info *sai, unsigned int index, int stat, + struct ptlrpc_request *req, struct md_enqueue_info *minfo) { - struct ll_sai_entry *entry; - int rc = 0; + struct ll_sai_entry *entry; ENTRY; - if (!list_empty(&sai->sai_entries)) { - entry = list_entry(sai->sai_entries.next, struct ll_sai_entry, - se_list); - rc = (entry->se_stat != SA_ENTRY_UNSTATED); + if (!list_empty(&sai->sai_entries_sent)) { + list_for_each_entry(entry, &sai->sai_entries_sent, + se_list) { + if (entry->se_index == index) { + entry->se_stat = stat; + entry->se_req = ptlrpc_request_addref(req); + entry->se_minfo = minfo; + RETURN(entry); + } else if (entry->se_index > index) + RETURN(NULL); + } } + RETURN(NULL); +} - RETURN(rc); +/** + * inside lli_lock. + * Move entry to sai_entries_received and + * insert it into sai_entries_received tail. + */ +static inline void +ll_sai_entry_to_received(struct ll_statahead_info *sai, struct ll_sai_entry *entry) +{ + if (!list_empty(&entry->se_list)) + list_del_init(&entry->se_list); + list_add_tail(&entry->se_list, &sai->sai_entries_received); } -static void ll_sai_entry_put(struct ll_statahead_info *sai) +/** + * Move entry to sai_entries_stated and + * sort with the index. + */ +static int +ll_sai_entry_to_stated(struct ll_statahead_info *sai, struct ll_sai_entry *entry) { struct ll_inode_info *lli = ll_i2info(sai->sai_inode); - struct ll_sai_entry *entry; + struct ll_sai_entry *se; ENTRY; - + spin_lock(&lli->lli_lock); - if (!list_empty(&sai->sai_entries)) { - entry = list_entry(sai->sai_entries.next, - struct ll_sai_entry, se_list); - list_del(&entry->se_list); - OBD_FREE_PTR(entry); + if (!list_empty(&entry->se_list)) + list_del_init(&entry->se_list); + + if (unlikely(entry->se_index < sai->sai_index_next)) { + spin_unlock(&lli->lli_lock); + ll_sai_entry_cleanup(entry); + RETURN(0); } - spin_unlock(&lli->lli_lock); - EXIT; + list_for_each_entry_reverse(se, &sai->sai_entries_stated, se_list) { + if (se->se_index < entry->se_index) { + list_add(&entry->se_list, &se->se_list); + spin_unlock(&lli->lli_lock); + RETURN(1); + } + } + + /* + * I am the first entry. + */ + list_add(&entry->se_list, &sai->sai_entries_stated); + spin_unlock(&lli->lli_lock); + RETURN(1); } -/* finish lookup/revalidate */ -static int ll_statahead_interpret(struct obd_export *exp, - struct ptlrpc_request *req, - struct md_enqueue_info *minfo, - int rc) +/** + * finish lookup/revalidate. + */ +static int do_statahead_interpret(struct ll_statahead_info *sai) { - struct lookup_intent *it = &minfo->mi_it; - struct dentry *dentry = minfo->mi_dentry; - struct inode *dir = dentry->d_parent->d_inode; - struct ll_inode_info *lli = ll_i2info(dir); - struct ll_statahead_info *sai = NULL; + struct ll_inode_info *lli = ll_i2info(sai->sai_inode); + struct ll_sai_entry *entry; + struct ptlrpc_request *req; + struct md_enqueue_info *minfo; + struct dentry *dentry; + struct lookup_intent *it; + int rc = 0; ENTRY; - CDEBUG(D_READA, "interpret statahead %.*s rc %d\n", - dentry->d_name.len, dentry->d_name.name, rc); - spin_lock(&lli->lli_lock); - if (unlikely(lli->lli_sai == NULL || - lli->lli_sai->sai_generation != minfo->mi_generation)) { - spin_unlock(&lli->lli_lock); - GOTO(out_free, rc = -ESTALE); - } else { - sai = ll_sai_get(lli->lli_sai); - spin_unlock(&lli->lli_lock); + LASSERT(!sa_received_empty(sai)); + entry = list_entry(sai->sai_entries_received.next, struct ll_sai_entry, + se_list); + list_del_init(&entry->se_list); + spin_unlock(&lli->lli_lock); + + if (unlikely(entry->se_index < sai->sai_index_next)) { + ll_sai_entry_cleanup(entry); + RETURN(0); } - if (rc || dir == NULL) - GOTO(out, rc); + req = entry->se_req; + minfo = entry->se_minfo; + dentry = minfo->mi_dentry; + it = &minfo->mi_it; + + if (entry->se_stat != SA_ENTRY_STATED) + GOTO(out, rc = entry->se_stat); if (dentry->d_inode == NULL) { - /* lookup */ + /* + * lookup. + */ struct dentry *save = dentry; struct it_cb_data icbd = { - .icbd_parent = dir, + .icbd_parent = dentry->d_parent->d_inode, .icbd_childp = &dentry }; rc = lookup_it_finish(req, DLM_REPLY_REC_OFF, it, &icbd); if (!rc) - /* + /* * Here dentry->d_inode might be NULL, * because the entry may have been removed before * we start doing stat ahead. */ ll_lookup_finish_locks(it, dentry); - if (dentry != save) + if (dentry != save) { + minfo->mi_dentry = dentry; dput(save); + } } else { - /* revalidate */ + /* + * revalidate. + */ struct mds_body *body; body = lustre_msg_buf(req->rq_repmsg, DLM_REPLY_REC_OFF, @@ -291,36 +435,66 @@ static int ll_statahead_interpret(struct obd_export *exp, EXIT; out: - if (sai != NULL) { - int first; + if (likely(ll_sai_entry_to_stated(sai, entry))) { + entry->se_minfo = NULL; + entry->se_req = NULL; + cfs_waitq_signal(&sai->sai_waitq); + ll_intent_release(it); + OBD_FREE_PTR(minfo); + dput(dentry); + ptlrpc_req_finished(req); + } + return rc; +} - sai->sai_replied++; - spin_lock(&lli->lli_lock); - first = ll_sai_entry_set(sai, - (unsigned int)(long)minfo->mi_cbdata, - SA_ENTRY_STATED); - /* - * wake up the "ls -l" process only when the first entry - * returned. - */ +static int ll_statahead_interpret(struct obd_export *exp, + struct ptlrpc_request *req, + struct md_enqueue_info *minfo, + int rc) +{ + struct dentry *dentry = minfo->mi_dentry; + struct lookup_intent *it = &minfo->mi_it; + struct inode *dir = dentry->d_parent->d_inode; + struct ll_inode_info *lli = ll_i2info(dir); + struct ll_statahead_info *sai; + struct ll_sai_entry *entry; + ENTRY; + + CDEBUG(D_READA, "interpret statahead %.*s rc %d\n", + dentry->d_name.len, dentry->d_name.name, rc); + + spin_lock(&lli->lli_lock); + if (unlikely(lli->lli_sai == NULL || + lli->lli_sai->sai_generation != minfo->mi_generation)) { spin_unlock(&lli->lli_lock); - if (first == 1) - cfs_waitq_signal(&sai->sai_waitq); - else if (first == 0) - CDEBUG(D_READA, "can't find sai entry for dir " - "%lu/%u generation %u index %d\n", - dir->i_ino, dir->i_generation, - minfo->mi_generation, - (unsigned int)(long)minfo->mi_cbdata); + ll_intent_release(it); + dput(dentry); + OBD_FREE_PTR(minfo); + RETURN(-ESTALE); + } else { + sai = lli->lli_sai; + if (rc || dir == NULL) + rc = -ESTALE; - ll_sai_put(sai); + entry = ll_sai_entry_set(sai, + (unsigned int)(long)minfo->mi_cbdata, + rc ? SA_ENTRY_UNSTATED : + SA_ENTRY_STATED, req, minfo); + LASSERT(entry != NULL); + if (likely(sa_is_running(sai))) { + ll_sai_entry_to_received(sai, entry); + sai->sai_replied++; + spin_unlock(&lli->lli_lock); + cfs_waitq_signal(&sai->sai_thread.t_ctl_waitq); + } else { + if (!list_empty(&entry->se_list)) + list_del_init(&entry->se_list); + sai->sai_replied++; + spin_unlock(&lli->lli_lock); + ll_sai_entry_cleanup(entry); + } + RETURN(rc); } -out_free: - ll_intent_release(it); - OBD_FREE_PTR(minfo); - - dput(dentry); - return rc; } static void sa_args_fini(struct md_enqueue_info *minfo, @@ -349,7 +523,6 @@ static int sa_args_prep(struct inode *dir, struct dentry *dentry, return -ENOMEM; } - minfo->mi_exp = ll_i2mdcexp(dir); minfo->mi_it.it_op = IT_GETATTR; minfo->mi_dentry = dentry; minfo->mi_cb = ll_statahead_interpret; @@ -369,7 +542,9 @@ static int sa_args_prep(struct inode *dir, struct dentry *dentry, return 0; } -/* similar to ll_lookup_it(). */ +/** + * similar to ll_lookup_it(). + */ static int do_sa_lookup(struct inode *dir, struct dentry *dentry) { struct md_enqueue_info *minfo; @@ -385,7 +560,7 @@ static int do_sa_lookup(struct inode *dir, struct dentry *dentry) dentry->d_name.name, dentry->d_name.len, 0, NULL); if (rc == 0) - rc = mdc_intent_getattr_async(minfo->mi_exp, minfo, einfo); + rc = mdc_intent_getattr_async(ll_i2mdcexp(dir), minfo, einfo); if (rc) sa_args_fini(minfo, einfo); @@ -393,16 +568,16 @@ static int do_sa_lookup(struct inode *dir, struct dentry *dentry) RETURN(rc); } -/* +/** * similar to ll_revalidate_it(). - * return value: - * 1 -- dentry valid - * 0 -- will send stat-ahead request - * others -- prepare stat-ahead request failed + * \retval 1 -- dentry valid + * \retval 0 -- will send stat-ahead request + * \retval others -- prepare stat-ahead request failed */ static int do_sa_revalidate(struct dentry *dentry) { struct inode *inode = dentry->d_inode; + struct inode *dir = dentry->d_parent->d_inode; struct ll_fid fid; struct lookup_intent it = { .it_op = IT_GETATTR }; struct md_enqueue_info *minfo; @@ -421,13 +596,13 @@ static int do_sa_revalidate(struct dentry *dentry) ll_inode2fid(&fid, inode); - rc = mdc_revalidate_lock(ll_i2mdcexp(inode), &it, &fid); + rc = mdc_revalidate_lock(ll_i2mdcexp(dir), &it, &fid); if (rc == 1) { ll_intent_release(&it); RETURN(1); } - rc = sa_args_prep(dentry->d_parent->d_inode, dentry, &minfo, &einfo); + rc = sa_args_prep(dir, dentry, &minfo, &einfo); if (rc) RETURN(rc); @@ -435,7 +610,7 @@ static int do_sa_revalidate(struct dentry *dentry) inode, dentry->d_name.name, dentry->d_name.len, 0, NULL); if (rc == 0) - rc = mdc_intent_getattr_async(minfo->mi_exp, minfo, einfo); + rc = mdc_intent_getattr_async(ll_i2mdcexp(dir), minfo, einfo); if (rc) sa_args_fini(minfo, einfo); @@ -459,12 +634,13 @@ static inline void ll_name2qstr(struct qstr *this, const char *name, int namelen static int ll_statahead_one(struct dentry *parent, struct ll_dir_entry *de) { - struct inode *dir = parent->d_inode; - struct ll_inode_info *lli = ll_i2info(dir); - struct qstr name; - struct dentry *dentry; - struct ll_sai_entry *se; - int rc; + struct inode *dir = parent->d_inode; + struct ll_inode_info *lli = ll_i2info(dir); + struct ll_statahead_info *sai = lli->lli_sai; + struct qstr name; + struct dentry *dentry; + struct ll_sai_entry *se; + int rc; ENTRY; #ifdef DCACHE_LUSTRE_INVALID @@ -478,8 +654,7 @@ static int ll_statahead_one(struct dentry *parent, struct ll_dir_entry *de) RETURN(-EINVAL); } - se = ll_sai_entry_get(lli->lli_sai, lli->lli_sai->sai_index, - SA_ENTRY_UNSTATED); + se = ll_sai_entry_init(sai, sai->sai_index); if (IS_ERR(se)) RETURN(PTR_ERR(se)); @@ -507,34 +682,15 @@ out: CDEBUG(D_READA, "set sai entry %p index %u stat %d rc %d\n", se, se->se_index, se->se_stat, rc); se->se_stat = rc; - cfs_waitq_signal(&lli->lli_sai->sai_waitq); + if (ll_sai_entry_to_stated(sai, se)) + cfs_waitq_signal(&sai->sai_waitq); } else { - lli->lli_sai->sai_sent++; + sai->sai_sent++; } - lli->lli_sai->sai_index++; + sai->sai_index++; return rc; } - -static inline int sa_check_stop(struct ll_statahead_info *sai) -{ - return !!(sai->sai_thread.t_flags & SVC_STOPPING); -} - -static inline int sa_not_full(struct ll_statahead_info *sai) -{ - return sai->sai_index < sai->sai_hit + sai->sai_miss + sai->sai_max; -} - -/* (1) hit ratio less than 80% - * or - * (2) consecutive miss more than 8 - */ -static inline int sa_low_hit(struct ll_statahead_info *sai) -{ - return ((sai->sai_hit < 4 * sai->sai_miss && sai->sai_hit > 7) || - (sai->sai_consecutive_miss > 8)); -} struct ll_sa_thread_args { struct dentry *sta_parent; @@ -573,11 +729,25 @@ static int ll_statahead_thread(void *arg) struct page *page; npages = dir_pages(dir); - /* reach the end of dir */ + /* + * reach the end of dir. + */ if (index >= npages) { CDEBUG(D_READA, "reach end, index/npages %lu/%lu\n", index, npages); - break; + + while (1) { + l_wait_event(thread->t_ctl_waitq, + !sa_is_running(sai) || + !sa_received_empty(sai) || + sai->sai_sent == sai->sai_replied, + &lwi); + if (!sa_received_empty(sai) && + sa_is_running(sai)) + do_statahead_interpret(sai); + else + GOTO(out, rc); + } } page = ll_get_dir_page(dir, index); @@ -593,35 +763,56 @@ static int ll_statahead_thread(void *arg) limit = kaddr + CFS_PAGE_SIZE - ll_dir_rec_len(1); de = (struct ll_dir_entry *)kaddr; if (!index) { - de = ll_dir_next_entry(de); /* skip "." */ - de = ll_dir_next_entry(de); /* skip ".." */ + /* + * skip "." + */ + de = ll_dir_next_entry(de); + /* + * skip ".." + */ + de = ll_dir_next_entry(de); } for (; (char*)de <= limit; de = ll_dir_next_entry(de)) { - if (!de->lde_inode) + if (de->lde_inode == 0) continue; if (de->lde_name[0] == '.' && !sai->sai_ls_all) { - /* skip hidden files */ + /* + * skip hidden files.. + */ sai->sai_skip_hidden++; continue; } - /* don't stat-ahead first entry */ + /* + * don't stat-ahead first entry. + */ if (unlikely(!first)) { first++; continue; } +keep_de: l_wait_event(thread->t_ctl_waitq, - sa_check_stop(sai) || sa_not_full(sai), + !sa_is_running(sai) || sa_not_full(sai) || + !sa_received_empty(sai), &lwi); - if (unlikely(sa_check_stop(sai))) { + while (!sa_received_empty(sai) && sa_is_running(sai)) + do_statahead_interpret(sai); + + if (unlikely(!sa_is_running(sai))) { ll_put_page(page); GOTO(out, rc); } + if (!sa_not_full(sai)) + /* + * do not skip the current de. + */ + goto keep_de; + rc = ll_statahead_one(parent, de); if (rc < 0) { ll_put_page(page); @@ -632,6 +823,7 @@ static int ll_statahead_thread(void *arg) index++; } EXIT; + out: spin_lock(&lli->lli_lock); thread->t_flags = SVC_STOPPED; @@ -645,7 +837,9 @@ out: return rc; } -/* called in ll_file_release() */ +/** + * called in ll_file_release(). + */ void ll_stop_statahead(struct inode *inode, void *key) { struct ll_inode_info *lli = ll_i2info(inode); @@ -665,7 +859,7 @@ void ll_stop_statahead(struct inode *inode, void *key) struct l_wait_info lwi = { 0 }; thread = &lli->lli_sai->sai_thread; - if (!(thread->t_flags & SVC_STOPPED)) { + if (!sa_is_stopped(lli->lli_sai)) { thread->t_flags = SVC_STOPPING; spin_unlock(&lli->lli_lock); cfs_waitq_signal(&thread->t_ctl_waitq); @@ -673,7 +867,7 @@ void ll_stop_statahead(struct inode *inode, void *key) CDEBUG(D_READA, "stopping statahead thread, pid %d\n", cfs_curproc_pid()); l_wait_event(thread->t_ctl_waitq, - thread->t_flags & SVC_STOPPED, + sa_is_stopped(lli->lli_sai), &lwi); } else { spin_unlock(&lli->lli_lock); @@ -691,9 +885,18 @@ void ll_stop_statahead(struct inode *inode, void *key) } enum { - LS_NONE_FIRST_DE = 0, /* not first dirent, or is "." */ - LS_FIRST_DE, /* the first non-hidden dirent */ - LS_FIRST_DOT_DE /* the first hidden dirent, that is ".xxx" */ + /* + * not first dirent, or is "." + */ + LS_NONE_FIRST_DE = 0, + /* + * the first non-hidden dirent + */ + LS_FIRST_DE, + /* + * the first hidden dirent, that is ".xxx + */ + LS_FIRST_DOT_DE }; static int is_first_dirent(struct inode *dir, struct dentry *dentry) @@ -708,7 +911,9 @@ static int is_first_dirent(struct inode *dir, struct dentry *dentry) while (1) { npages = dir_pages(dir); - /* reach the end of dir */ + /* + * reach the end of dir. + */ if (index >= npages) { CDEBUG(D_READA, "reach end, index/npages %lu/%lu\n", index, npages); @@ -731,14 +936,18 @@ static int is_first_dirent(struct inode *dir, struct dentry *dentry) strncmp(de->lde_name, ".", 1) == 0))) CWARN("Maybe got bad on-disk dir: %lu\n", dir->i_ino); - /* skip "." or ingore bad entry */ + /* + * skip "." or ingore bad entry. + */ de = ll_dir_next_entry(de); if (unlikely(!(de->lde_name_len == 2 && strncmp(de->lde_name, "..", 2) == 0))) CWARN("Maybe got bad on-disk dir: %lu\n", dir->i_ino); - /* skip ".." or ingore bad entry */ + /* + * skip ".." or ingore bad entry. + */ de = ll_dir_next_entry(de); } @@ -772,14 +981,14 @@ static int is_first_dirent(struct inode *dir, struct dentry *dentry) RETURN(rc); } -/* Start statahead thread if this is the first dir entry. +/** + * Start statahead thread if this is the first dir entry. * Otherwise if a thread is started already, wait it until it is ahead of me. - * Return value: - * 0 -- miss - * 1 -- hit - * -EEXIST -- stat ahead thread started, and this is the first dentry - * -EBADFD -- statahead thread exit and not dentry available - * others -- error + * \retval 0 -- stat ahead thread process such dentry, for lookup, it miss + * \retval 1 -- stat ahead thread process such dentry, for lookup, it hit + * \retval -EEXIST -- stat ahead thread started, and this is the first dentry + * \retval -EBADFD -- statahead thread exit and not dentry available + * \retval others -- error */ int do_statahead_enter(struct inode *dir, struct dentry **dentryp, int lookup) { @@ -794,10 +1003,20 @@ int do_statahead_enter(struct inode *dir, struct dentry **dentryp, int lookup) LASSERT(lli->lli_opendir_pid == cfs_curproc_pid()); if (sai) { - if (unlikely(sai->sai_thread.t_flags & SVC_STOPPED && - list_empty(&sai->sai_entries))) + if (unlikely(sa_is_stopped(sai) && + list_empty(&sai->sai_entries_stated))) RETURN(-EBADFD); + /* + * skip the first dentry. + */ + if (unlikely((*dentryp)->d_name.len == + sai->sai_first->d_name.len && + !strncmp((*dentryp)->d_name.name, + sai->sai_first->d_name.name, + sai->sai_first->d_name.len))) + RETURN(-EEXIST); + if ((*dentryp)->d_name.name[0] == '.') { if (likely(sai->sai_ls_all || sai->sai_miss_hidden >= sai->sai_skip_hidden)) { @@ -829,10 +1048,11 @@ int do_statahead_enter(struct inode *dir, struct dentry **dentryp, int lookup) sbi->ll_sa_cached++; } else { sbi->ll_sa_blocked++; - /* thread started already, avoid double-stat */ + /* + * thread started already, avoid double-stat. + */ l_wait_event(sai->sai_waitq, - ll_sai_entry_stated(sai) || - sai->sai_thread.t_flags & SVC_STOPPED, + ll_sai_entry_stated(sai) || sa_is_stopped(sai), &lwi); } @@ -848,16 +1068,22 @@ int do_statahead_enter(struct inode *dir, struct dentry **dentryp, int lookup) RETURN(1); } } - /* do nothing for revalidate */ + /* + * do nothing for revalidate. + */ RETURN(0); } - /* I am the "lli_opendir_pid" owner, only me can set "lli_sai". */ + /* + * I am the "lli_opendir_pid" owner, only me can set "lli_sai". + */ LASSERT(lli->lli_sai == NULL); rc = is_first_dirent(dir, *dentryp); if (rc == LS_NONE_FIRST_DE) { - /* It is not "ls -{a}l" operation, no need statahead for it */ + /* + * It is not "ls -{a}l" operation, no need statahead for it. + */ spin_lock(&lli->lli_lock); lli->lli_opendir_key = NULL; lli->lli_opendir_pid = 0; @@ -868,8 +1094,9 @@ int do_statahead_enter(struct inode *dir, struct dentry **dentryp, int lookup) sai = ll_sai_alloc(); if (sai == NULL) RETURN(-ENOMEM); - + sai->sai_inode = igrab(dir); + sai->sai_first = dget(*dentryp); sai->sai_ls_all = (rc == LS_FIRST_DOT_DE); sta.sta_parent = (*dentryp)->d_parent; @@ -886,7 +1113,7 @@ int do_statahead_enter(struct inode *dir, struct dentry **dentryp, int lookup) } l_wait_event(sai->sai_thread.t_ctl_waitq, - sai->sai_thread.t_flags & (SVC_RUNNING | SVC_STOPPED), + sa_is_running(sai) || sa_is_stopped(sai), &lwi); /* @@ -896,21 +1123,24 @@ int do_statahead_enter(struct inode *dir, struct dentry **dentryp, int lookup) RETURN(-EEXIST); } -/* update hit/miss count */ -void ll_statahead_exit(struct dentry *dentry, int result) +/** + * update hit/miss count. + */ +int ll_statahead_exit(struct dentry *dentry, int result) { struct dentry *parent = dentry->d_parent; struct ll_inode_info *lli = ll_i2info(parent->d_inode); struct ll_sb_info *sbi = ll_i2sbi(parent->d_inode); struct ll_dentry_data *ldd = ll_d2d(dentry); + ENTRY; if (lli->lli_opendir_pid != cfs_curproc_pid()) - return; + RETURN(-EBADFD); if (lli->lli_sai) { struct ll_statahead_info *sai = lli->lli_sai; - if (result == 1) { + if (result >= 1) { sbi->ll_sa_hit++; sai->sai_hit++; sai->sai_consecutive_miss = 0; @@ -919,8 +1149,7 @@ void ll_statahead_exit(struct dentry *dentry, int result) sbi->ll_sa_miss++; sai->sai_miss++; sai->sai_consecutive_miss++; - if (sa_low_hit(sai) && - sai->sai_thread.t_flags & SVC_RUNNING) { + if (sa_low_hit(sai) && sa_is_running(sai)) { sbi->ll_sa_wrong++; CDEBUG(D_READA, "statahead for dir %.*s hit " "ratio too low: hit/miss %u/%u, " @@ -931,16 +1160,30 @@ void ll_statahead_exit(struct dentry *dentry, int result) sai->sai_sent, sai->sai_replied, cfs_curproc_pid()); spin_lock(&lli->lli_lock); - if (!(sai->sai_thread.t_flags & SVC_STOPPED)) + if (!sa_is_stopped(sai)) sai->sai_thread.t_flags = SVC_STOPPING; spin_unlock(&lli->lli_lock); } } - cfs_waitq_signal(&sai->sai_thread.t_ctl_waitq); - ll_sai_entry_put(sai); + if (!sa_is_stopped(sai)) + cfs_waitq_signal(&sai->sai_thread.t_ctl_waitq); + ll_sai_entry_fini(sai); + + if (unlikely(ldd == NULL)) { + ll_set_dd(dentry); + ldd = ll_d2d(dentry); + if (ldd != NULL && dentry->d_op == NULL) { + lock_dentry(dentry); + dentry->d_op = dentry->d_op ? : &ll_sai_d_ops; + unlock_dentry(dentry); + } + } if (likely(ldd != NULL)) ldd->lld_sa_generation = sai->sai_generation; + else + RETURN(-ENOMEM); } + RETURN(0); } diff --git a/lustre/mdc/mdc_locks.c b/lustre/mdc/mdc_locks.c index d06c739..596a49d 100644 --- a/lustre/mdc/mdc_locks.c +++ b/lustre/mdc/mdc_locks.c @@ -812,21 +812,15 @@ EXPORT_SYMBOL(mdc_intent_lock); static int mdc_intent_getattr_async_interpret(struct ptlrpc_request *req, void *unused, int rc) { - struct mdc_enqueue_args *ma; - struct md_enqueue_info *minfo; - struct ldlm_enqueue_info *einfo; - struct obd_export *exp; + struct obd_export *exp = req->rq_async_args.pointer_arg[0]; + struct md_enqueue_info *minfo = req->rq_async_args.pointer_arg[1]; + struct ldlm_enqueue_info *einfo = req->rq_async_args.pointer_arg[2]; struct lookup_intent *it; struct lustre_handle *lockh; struct obd_device *obddev; int flags = LDLM_FL_HAS_INTENT; ENTRY; - ma = (struct mdc_enqueue_args *)&req->rq_async_args; - minfo = ma->ma_mi; - einfo = ma->ma_ei; - - exp = minfo->mi_exp; it = &minfo->mi_it; lockh = &minfo->mi_lockh; @@ -874,7 +868,6 @@ int mdc_intent_getattr_async(struct obd_export *exp, ldlm_policy_data_t policy = { .l_inodebits = { MDS_INODELOCK_LOOKUP } }; - struct mdc_enqueue_args *aa; int rc; int flags = LDLM_FL_HAS_INTENT; ENTRY; @@ -895,10 +888,9 @@ int mdc_intent_getattr_async(struct obd_export *exp, RETURN(rc); } - CLASSERT(sizeof(*aa) < sizeof(req->rq_async_args)); - aa = (struct mdc_enqueue_args *)&req->rq_async_args; - aa->ma_mi = minfo; - aa->ma_ei = einfo; + req->rq_async_args.pointer_arg[0] = exp; + req->rq_async_args.pointer_arg[1] = minfo; + req->rq_async_args.pointer_arg[2] = einfo; req->rq_interpret_reply = mdc_intent_getattr_async_interpret; ptlrpcd_add_req(req); -- 1.8.3.1