X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fllite%2Fstatahead.c;h=315e7621d777693eb82e16a2ed18ff6d0ea5745b;hb=5d4ae6c905b8e8a38a6e4d3195f550a1e2b37ba8;hp=c8532102c558ed4d8e12eef23dcbf266d99cb697;hpb=7d48d7d0fbc77e871e3118a59b907f0cba23200e;p=fs%2Flustre-release.git diff --git a/lustre/llite/statahead.c b/lustre/llite/statahead.c index c853210..315e762 100644 --- a/lustre/llite/statahead.c +++ b/lustre/llite/statahead.c @@ -26,7 +26,7 @@ * GPL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved + * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. */ /* @@ -50,7 +50,7 @@ #include "llite_internal.h" struct ll_sai_entry { - struct list_head se_list; + cfs_list_t se_list; unsigned int se_index; int se_stat; struct ptlrpc_request *se_req; @@ -63,11 +63,11 @@ enum { }; static unsigned int sai_generation = 0; -static spinlock_t sai_generation_lock = SPIN_LOCK_UNLOCKED; +static cfs_spinlock_t sai_generation_lock = CFS_SPIN_LOCK_UNLOCKED; /** * Check whether first entry was stated already or not. - * No need to hold lli_lock, for: + * No need to hold lli_sa_lock, for: * (1) it is me that remove entry from the list * (2) the statahead thread only add new entry to the list */ @@ -76,9 +76,9 @@ 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 (!cfs_list_empty(&sai->sai_entries_stated)) { + entry = cfs_list_entry(sai->sai_entries_stated.next, + struct ll_sai_entry, se_list); if (entry->se_index == sai->sai_index_next) rc = 1; } @@ -87,12 +87,12 @@ static int ll_sai_entry_stated(struct ll_statahead_info *sai) static inline int sa_received_empty(struct ll_statahead_info *sai) { - return list_empty(&sai->sai_entries_received); + return cfs_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); + return !!(sai->sai_index < sai->sai_index_next + sai->sai_max); } static inline int sa_is_running(struct ll_statahead_info *sai) @@ -117,7 +117,7 @@ static inline int sa_is_stopped(struct ll_statahead_info *sai) */ static inline int sa_low_hit(struct ll_statahead_info *sai) { - return ((sai->sai_hit < 4 * sai->sai_miss && sai->sai_hit > 7) || + return ((sai->sai_hit > 7 && sai->sai_hit < 4 * sai->sai_miss) || (sai->sai_consecutive_miss > 8)); } @@ -130,25 +130,23 @@ static inline int sa_low_hit(struct ll_statahead_info *sai) */ static void ll_sai_entry_cleanup(struct ll_sai_entry *entry, int free) { - struct ptlrpc_request *req = entry->se_req; struct md_enqueue_info *minfo = entry->se_minfo; + struct ptlrpc_request *req = entry->se_req; ENTRY; if (minfo) { - struct dentry *dentry = minfo->mi_dentry; - struct lookup_intent *it = &minfo->mi_it; - entry->se_minfo = NULL; - ll_intent_release(it); + ll_intent_release(&minfo->mi_it); + dput(minfo->mi_dentry); + iput(minfo->mi_dir); OBD_FREE_PTR(minfo); - dput(dentry); } if (req) { entry->se_req = NULL; ptlrpc_req_finished(req); } if (free) { - LASSERT(list_empty(&entry->se_list)); + LASSERT(cfs_list_empty(&entry->se_list)); OBD_FREE_PTR(entry); } @@ -163,12 +161,12 @@ static struct ll_statahead_info *ll_sai_alloc(void) if (!sai) return NULL; - spin_lock(&sai_generation_lock); + cfs_spin_lock(&sai_generation_lock); sai->sai_generation = ++sai_generation; if (unlikely(sai_generation == 0)) sai->sai_generation = ++sai_generation; - spin_unlock(&sai_generation_lock); - atomic_set(&sai->sai_refcount, 1); + cfs_spin_unlock(&sai_generation_lock); + cfs_atomic_set(&sai->sai_refcount, 1); sai->sai_max = LL_SA_RPC_MIN; cfs_waitq_init(&sai->sai_waitq); cfs_waitq_init(&sai->sai_thread.t_ctl_waitq); @@ -178,11 +176,11 @@ static struct ll_statahead_info *ll_sai_alloc(void) return sai; } -static inline +static inline struct ll_statahead_info *ll_sai_get(struct ll_statahead_info *sai) { LASSERT(sai); - atomic_inc(&sai->sai_refcount); + cfs_atomic_inc(&sai->sai_refcount); return sai; } @@ -194,13 +192,22 @@ static void ll_sai_put(struct ll_statahead_info *sai) LASSERT(inode != NULL); lli = ll_i2info(inode); - if (atomic_dec_and_lock(&sai->sai_refcount, &lli->lli_lock)) { + LASSERT(lli->lli_sai == sai); + + if (cfs_atomic_dec_and_lock(&sai->sai_refcount, &lli->lli_sa_lock)) { struct ll_sai_entry *entry, *next; + if (unlikely(cfs_atomic_read(&sai->sai_refcount) > 0)) { + /* It is race case, the interpret callback just hold + * a reference count */ + cfs_spin_unlock(&lli->lli_sa_lock); + RETURN_EXIT; + } + LASSERT(lli->lli_opendir_key == NULL); lli->lli_sai = NULL; lli->lli_opendir_pid = 0; - spin_unlock(&lli->lli_lock); + cfs_spin_unlock(&lli->lli_sa_lock); LASSERT(sa_is_stopped(sai)); @@ -210,23 +217,25 @@ static void ll_sai_put(struct ll_statahead_info *sai) PFID(&lli->lli_fid), sai->sai_sent, sai->sai_replied); - list_for_each_entry_safe(entry, next, &sai->sai_entries_sent, - se_list) { - list_del_init(&entry->se_list); + cfs_list_for_each_entry_safe(entry, next, + &sai->sai_entries_sent, se_list) { + cfs_list_del_init(&entry->se_list); ll_sai_entry_cleanup(entry, 1); } - list_for_each_entry_safe(entry, next, &sai->sai_entries_received, - se_list) { - list_del_init(&entry->se_list); + cfs_list_for_each_entry_safe(entry, next, + &sai->sai_entries_received, + se_list) { + cfs_list_del_init(&entry->se_list); ll_sai_entry_cleanup(entry, 1); } - list_for_each_entry_safe(entry, next, &sai->sai_entries_stated, - se_list) { - list_del_init(&entry->se_list); + cfs_list_for_each_entry_safe(entry, next, + &sai->sai_entries_stated, + se_list) { + cfs_list_del_init(&entry->se_list); ll_sai_entry_cleanup(entry, 1); } - OBD_FREE_PTR(sai); iput(inode); + OBD_FREE_PTR(sai); } EXIT; } @@ -248,11 +257,11 @@ ll_sai_entry_init(struct ll_statahead_info *sai, unsigned int index) CDEBUG(D_READA, "alloc sai entry %p index %u\n", entry, index); entry->se_index = index; - entry->se_stat = SA_ENTRY_UNSTATED; + entry->se_stat = SA_ENTRY_UNSTATED; - spin_lock(&lli->lli_lock); - list_add_tail(&entry->se_list, &sai->sai_entries_sent); - spin_unlock(&lli->lli_lock); + cfs_spin_lock(&lli->lli_sa_lock); + cfs_list_add_tail(&entry->se_list, &sai->sai_entries_sent); + cfs_spin_unlock(&lli->lli_sa_lock); RETURN(entry); } @@ -261,30 +270,33 @@ ll_sai_entry_init(struct ll_statahead_info *sai, unsigned int index) * delete it from sai_entries_stated head when fini, it need not * to process entry's member. */ -static void ll_sai_entry_fini(struct ll_statahead_info *sai) +static int ll_sai_entry_fini(struct ll_statahead_info *sai) { struct ll_inode_info *lli = ll_i2info(sai->sai_inode); struct ll_sai_entry *entry; + int rc = 0; ENTRY; - - spin_lock(&lli->lli_lock); + + cfs_spin_lock(&lli->lli_sa_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 (likely(!cfs_list_empty(&sai->sai_entries_stated))) { + entry = cfs_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); + cfs_list_del_init(&entry->se_list); + rc = entry->se_stat; OBD_FREE_PTR(entry); } - } else + } else { LASSERT(sa_is_stopped(sai)); - spin_unlock(&lli->lli_lock); + } + cfs_spin_unlock(&lli->lli_sa_lock); - EXIT; + RETURN(rc); } /** - * inside lli_lock. + * inside lli_sa_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 */ @@ -295,31 +307,33 @@ ll_sai_entry_set(struct ll_statahead_info *sai, unsigned int index, int stat, struct ll_sai_entry *entry; ENTRY; - if (!list_empty(&sai->sai_entries_sent)) { - list_for_each_entry(entry, &sai->sai_entries_sent, se_list) { + if (!cfs_list_empty(&sai->sai_entries_sent)) { + cfs_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) + } else if (entry->se_index > index) { RETURN(NULL); + } } } RETURN(NULL); } /** - * inside lli_lock. + * inside lli_sa_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); + if (!cfs_list_empty(&entry->se_list)) + cfs_list_del_init(&entry->se_list); + cfs_list_add_tail(&entry->se_list, &sai->sai_entries_received); } /** @@ -335,20 +349,21 @@ ll_sai_entry_to_stated(struct ll_statahead_info *sai, struct ll_sai_entry *entry ll_sai_entry_cleanup(entry, 0); - spin_lock(&lli->lli_lock); - if (!list_empty(&entry->se_list)) - list_del_init(&entry->se_list); + cfs_spin_lock(&lli->lli_sa_lock); + if (!cfs_list_empty(&entry->se_list)) + cfs_list_del_init(&entry->se_list); + /* stale entry */ if (unlikely(entry->se_index < sai->sai_index_next)) { - spin_unlock(&lli->lli_lock); + cfs_spin_unlock(&lli->lli_sa_lock); OBD_FREE_PTR(entry); RETURN(0); } - list_for_each_entry_reverse(se, &sai->sai_entries_stated, se_list) { + cfs_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); + cfs_list_add(&entry->se_list, &se->se_list); + cfs_spin_unlock(&lli->lli_sa_lock); RETURN(1); } } @@ -356,8 +371,8 @@ ll_sai_entry_to_stated(struct ll_statahead_info *sai, struct ll_sai_entry *entry /* * I am the first entry. */ - list_add(&entry->se_list, &sai->sai_entries_stated); - spin_unlock(&lli->lli_lock); + cfs_list_add(&entry->se_list, &sai->sai_entries_stated); + cfs_spin_unlock(&lli->lli_sa_lock); RETURN(1); } @@ -370,20 +385,22 @@ static int do_statahead_interpret(struct ll_statahead_info *sai) struct ll_sai_entry *entry; struct ptlrpc_request *req; struct md_enqueue_info *minfo; - struct dentry *dentry; struct lookup_intent *it; + struct dentry *dentry; int rc = 0; struct mdt_body *body; ENTRY; - spin_lock(&lli->lli_lock); + cfs_spin_lock(&lli->lli_sa_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); + entry = cfs_list_entry(sai->sai_entries_received.next, + struct ll_sai_entry, se_list); + cfs_list_del_init(&entry->se_list); + cfs_spin_unlock(&lli->lli_sa_lock); if (unlikely(entry->se_index < sai->sai_index_next)) { + CWARN("Found stale entry: [index %u] [next %u]\n", + entry->se_index, sai->sai_index_next); ll_sai_entry_cleanup(entry, 1); RETURN(0); } @@ -393,8 +410,8 @@ static int do_statahead_interpret(struct ll_statahead_info *sai) req = entry->se_req; minfo = entry->se_minfo; - dentry = minfo->mi_dentry; it = &minfo->mi_it; + dentry = minfo->mi_dentry; body = req_capsule_server_get(&req->rq_pill, &RMF_MDT_BODY); if (body == NULL) @@ -406,26 +423,21 @@ static int do_statahead_interpret(struct ll_statahead_info *sai) */ struct dentry *save = dentry; struct it_cb_data icbd = { - .icbd_parent = dentry->d_parent->d_inode, + .icbd_parent = minfo->mi_dir, .icbd_childp = &dentry }; LASSERT(fid_is_zero(&minfo->mi_data.op_fid2)); - /* - * XXX: No fid in reply, this is probaly cross-ref case. - * SA can't handle it yet. - */ + /* XXX: No fid in reply, this is probaly cross-ref case. + * SA can't handle it yet. */ if (body->valid & OBD_MD_MDS) GOTO(out, rc = -EAGAIN); + /* Here dentry->d_inode might be NULL, because the entry may + * have been removed before we start doing stat ahead. */ rc = ll_lookup_it_finish(req, 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) { @@ -447,23 +459,25 @@ static int do_statahead_interpret(struct ll_statahead_info *sai) GOTO(out, rc); } - spin_lock(&ll_lookup_lock); + cfs_spin_lock(&ll_lookup_lock); spin_lock(&dcache_lock); lock_dentry(dentry); __d_drop(dentry); -#ifdef DCACHE_LUSTRE_INVALID dentry->d_flags &= ~DCACHE_LUSTRE_INVALID; -#endif unlock_dentry(dentry); d_rehash_cond(dentry, 0); spin_unlock(&dcache_lock); - spin_unlock(&ll_lookup_lock); + cfs_spin_unlock(&ll_lookup_lock); ll_lookup_finish_locks(it, dentry); } EXIT; out: + /* The "ll_sai_entry_to_stated()" will drop related ldlm ibits lock + * reference count with ll_intent_drop_lock() called in spite of the + * above operations failed or not. Do not worry about calling + * "ll_intent_drop_lock()" more than once. */ if (likely(ll_sai_entry_to_stated(sai, entry))) cfs_waitq_signal(&sai->sai_waitq); return rc; @@ -473,9 +487,9 @@ static int ll_statahead_interpret(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 dentry *dentry = minfo->mi_dentry; + struct inode *dir = minfo->mi_dir; struct ll_inode_info *lli = ll_i2info(dir); struct ll_statahead_info *sai; struct ll_sai_entry *entry; @@ -484,34 +498,33 @@ static int ll_statahead_interpret(struct ptlrpc_request *req, CDEBUG(D_READA, "interpret statahead %.*s rc %d\n", dentry->d_name.len, dentry->d_name.name, rc); - spin_lock(&lli->lli_lock); + cfs_spin_lock(&lli->lli_sa_lock); + /* stale entry */ if (unlikely(lli->lli_sai == NULL || lli->lli_sai->sai_generation != minfo->mi_generation)) { - spin_unlock(&lli->lli_lock); + cfs_spin_unlock(&lli->lli_sa_lock); ll_intent_release(it); dput(dentry); + iput(dir); OBD_FREE_PTR(minfo); RETURN(-ESTALE); } else { sai = ll_sai_get(lli->lli_sai); - if (rc || dir == NULL) - rc = -ESTALE; - entry = ll_sai_entry_set(sai, (unsigned int)(long)minfo->mi_cbdata, - rc ? SA_ENTRY_UNSTATED : - SA_ENTRY_STATED, req, minfo); + rc < 0 ? rc : 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_spin_unlock(&lli->lli_sa_lock); cfs_waitq_signal(&sai->sai_thread.t_ctl_waitq); } else { - if (!list_empty(&entry->se_list)) - list_del_init(&entry->se_list); + if (!cfs_list_empty(&entry->se_list)) + cfs_list_del_init(&entry->se_list); sai->sai_replied++; - spin_unlock(&lli->lli_lock); + cfs_spin_unlock(&lli->lli_sa_lock); ll_sai_entry_cleanup(entry, 1); } ll_sai_put(sai); @@ -523,6 +536,7 @@ static void sa_args_fini(struct md_enqueue_info *minfo, struct ldlm_enqueue_info *einfo) { LASSERT(minfo && einfo); + iput(minfo->mi_dir); capa_put(minfo->mi_data.op_capa1); capa_put(minfo->mi_data.op_capa2); OBD_FREE_PTR(minfo); @@ -569,6 +583,7 @@ static int sa_args_init(struct inode *dir, struct dentry *dentry, minfo->mi_it.it_op = IT_GETATTR; minfo->mi_dentry = dentry; + minfo->mi_dir = igrab(dir); minfo->mi_cb = ll_statahead_interpret; minfo->mi_generation = lli->lli_sai->sai_generation; minfo->mi_cbdata = (void *)(long)lli->lli_sai->sai_index; @@ -620,10 +635,9 @@ static int do_sa_lookup(struct inode *dir, struct dentry *dentry) * \retval 0 -- will send stat-ahead request * \retval others -- prepare stat-ahead request failed */ -static int do_sa_revalidate(struct dentry *dentry) +static int do_sa_revalidate(struct inode *dir, struct dentry *dentry) { struct inode *inode = dentry->d_inode; - struct inode *dir = dentry->d_parent->d_inode; struct lookup_intent it = { .it_op = IT_GETATTR }; struct md_enqueue_info *minfo; struct ldlm_enqueue_info *einfo; @@ -631,13 +645,13 @@ static int do_sa_revalidate(struct dentry *dentry) int rc; ENTRY; - if (inode == NULL) + if (unlikely(inode == NULL)) RETURN(1); if (d_mountpoint(dentry)) RETURN(1); - if (dentry == dentry->d_sb->s_root) + if (unlikely(dentry == dentry->d_sb->s_root)) RETURN(1); rc = md_revalidate_lock(ll_i2mdexp(dir), &it, ll_inode2fid(inode)); @@ -675,16 +689,12 @@ static int ll_statahead_one(struct dentry *parent, const char* entry_name, struct ll_inode_info *lli = ll_i2info(dir); struct ll_statahead_info *sai = lli->lli_sai; struct qstr name; - struct dentry *dentry; + struct dentry *dentry = NULL; struct ll_sai_entry *se; int rc; ENTRY; -#ifdef DCACHE_LUSTRE_INVALID if (parent->d_flags & DCACHE_LUSTRE_INVALID) { -#else - if (d_unhashed(parent)) { -#endif CDEBUG(D_READA, "parent dentry@%p %.*s is " "invalid, skip statahead\n", parent, parent->d_name.len, parent->d_name.name); @@ -699,26 +709,23 @@ static int ll_statahead_one(struct dentry *parent, const char* entry_name, dentry = d_lookup(parent, &name); if (!dentry) { dentry = d_alloc(parent, &name); - if (dentry) { + if (dentry) rc = do_sa_lookup(dir, dentry); - if (rc) - dput(dentry); - } else { + else GOTO(out, rc = -ENOMEM); - } } else { - rc = do_sa_revalidate(dentry); - if (rc) - dput(dentry); + rc = do_sa_revalidate(dir, dentry); } EXIT; out: if (rc) { + if (dentry != NULL) + dput(dentry); + se->se_stat = rc < 0 ? rc : SA_ENTRY_STATED; 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; if (ll_sai_entry_to_stated(sai, se)) cfs_waitq_signal(&sai->sai_waitq); } else { @@ -729,20 +736,14 @@ out: return rc; } -struct ll_sa_thread_args { - struct dentry *sta_parent; - pid_t sta_pid; -}; - static int ll_statahead_thread(void *arg) { - struct ll_sa_thread_args *sta = arg; - struct dentry *parent = dget(sta->sta_parent); + struct dentry *parent = (struct dentry *)arg; struct inode *dir = parent->d_inode; struct ll_inode_info *lli = ll_i2info(dir); struct ll_sb_info *sbi = ll_i2sbi(dir); - struct ll_statahead_info *sai; - struct ptlrpc_thread *thread; + struct ll_statahead_info *sai = ll_sai_get(lli->lli_sai); + struct ptlrpc_thread *thread = &sai->sai_thread; struct page *page; __u64 pos = 0; int first = 0; @@ -750,32 +751,23 @@ static int ll_statahead_thread(void *arg) struct ll_dir_chain chain; ENTRY; - spin_lock(&lli->lli_lock); - if (unlikely(lli->lli_sai == NULL)) { - spin_unlock(&lli->lli_lock); - dput(parent); - RETURN(-EAGAIN); - } else { - sai = ll_sai_get(lli->lli_sai); - spin_unlock(&lli->lli_lock); - } - { char pname[16]; - snprintf(pname, 15, "ll_sa_%u", sta->sta_pid); + snprintf(pname, 15, "ll_sa_%u", lli->lli_opendir_pid); cfs_daemonize(pname); } - thread = &sai->sai_thread; - sbi->ll_sa_total++; - spin_lock(&lli->lli_lock); + atomic_inc(&sbi->ll_sa_total); + cfs_spin_lock(&lli->lli_sa_lock); thread->t_flags = SVC_RUNNING; - spin_unlock(&lli->lli_lock); + cfs_spin_unlock(&lli->lli_sa_lock); cfs_waitq_signal(&thread->t_ctl_waitq); CDEBUG(D_READA, "start doing statahead for %s\n", parent->d_name.name); + sai->sai_pid = cfs_curproc_pid(); + lli->lli_sa_pos = 0; ll_dir_chain_init(&chain); - page = ll_get_dir_page(dir, pos, 0, &chain); + page = ll_get_dir_page(NULL, dir, pos, 0, &chain); while (1) { struct l_wait_info lwi = { 0 }; @@ -784,24 +776,35 @@ static int ll_statahead_thread(void *arg) if (IS_ERR(page)) { rc = PTR_ERR(page); - CERROR("error reading dir "DFID" at "LPU64"/%u: rc %d\n", - PFID(ll_inode2fid(dir)), pos, - sai->sai_index, rc); + CDEBUG(D_READA, "error reading dir "DFID" at "LPU64 + "/%u: [rc %d] [parent %u]\n", + PFID(ll_inode2fid(dir)), pos, sai->sai_index, + rc, lli->lli_opendir_pid); break; } dp = page_address(page); for (ent = lu_dirent_start(dp); ent != NULL; ent = lu_dirent_next(ent)) { - char *name = ent->lde_name; - int namelen = le16_to_cpu(ent->lde_namelen); + __u64 hash; + int namelen; + char *name; + + hash = le64_to_cpu(ent->lde_hash); + if (unlikely(hash < pos)) + /* + * Skip until we find target hash value. + */ + continue; - if (namelen == 0) + namelen = le16_to_cpu(ent->lde_namelen); + if (unlikely(namelen == 0)) /* * Skip dummy record. */ continue; + name = ent->lde_name; if (name[0] == '.') { if (namelen == 1) { /* @@ -879,7 +882,8 @@ keep_de: * chain is exhausted. * Normal case: continue to the next page. */ - page = ll_get_dir_page(dir, pos, 1, &chain); + lli->lli_sa_pos = pos; + page = ll_get_dir_page(NULL, dir, pos, 1, &chain); } else { /* * go into overflow page. @@ -890,9 +894,9 @@ keep_de: out: ll_dir_chain_fini(&chain); - spin_lock(&lli->lli_lock); + cfs_spin_lock(&lli->lli_sa_lock); thread->t_flags = SVC_STOPPED; - spin_unlock(&lli->lli_lock); + cfs_spin_unlock(&lli->lli_sa_lock); cfs_waitq_signal(&sai->sai_waitq); cfs_waitq_signal(&thread->t_ctl_waitq); ll_sai_put(sai); @@ -905,16 +909,16 @@ out: /** * called in ll_file_release(). */ -void ll_stop_statahead(struct inode *inode, void *key) +void ll_stop_statahead(struct inode *dir, void *key) { - struct ll_inode_info *lli = ll_i2info(inode); + struct ll_inode_info *lli = ll_i2info(dir); if (unlikely(key == NULL)) return; - spin_lock(&lli->lli_lock); + cfs_spin_lock(&lli->lli_sa_lock); if (lli->lli_opendir_key != key || lli->lli_opendir_pid == 0) { - spin_unlock(&lli->lli_lock); + cfs_spin_unlock(&lli->lli_sa_lock); return; } @@ -926,7 +930,7 @@ void ll_stop_statahead(struct inode *inode, void *key) if (!sa_is_stopped(lli->lli_sai)) { thread->t_flags = SVC_STOPPING; - spin_unlock(&lli->lli_lock); + cfs_spin_unlock(&lli->lli_sa_lock); cfs_waitq_signal(&thread->t_ctl_waitq); CDEBUG(D_READA, "stopping statahead thread, pid %d\n", @@ -935,7 +939,7 @@ void ll_stop_statahead(struct inode *inode, void *key) sa_is_stopped(lli->lli_sai), &lwi); } else { - spin_unlock(&lli->lli_lock); + cfs_spin_unlock(&lli->lli_sa_lock); } /* @@ -946,7 +950,7 @@ void ll_stop_statahead(struct inode *inode, void *key) ll_sai_put(lli->lli_sai); } else { lli->lli_opendir_pid = 0; - spin_unlock(&lli->lli_lock); + cfs_spin_unlock(&lli->lli_sa_lock); } } @@ -960,13 +964,14 @@ enum { */ LS_FIRST_DE, /** - * the first hidden dirent, that is ".xxx + * the first hidden dirent, that is "." */ LS_FIRST_DOT_DE }; static int is_first_dirent(struct inode *dir, struct dentry *dentry) { + struct ll_inode_info *lli = ll_i2info(dir); struct ll_dir_chain chain; struct qstr *target = &dentry->d_name; struct page *page; @@ -975,32 +980,39 @@ static int is_first_dirent(struct inode *dir, struct dentry *dentry) int rc = LS_NONE_FIRST_DE; ENTRY; + lli->lli_sa_pos = 0; ll_dir_chain_init(&chain); - page = ll_get_dir_page(dir, pos, 0, &chain); + page = ll_get_dir_page(NULL, dir, pos, 0, &chain); while (1) { struct lu_dirpage *dp; struct lu_dirent *ent; if (IS_ERR(page)) { + struct ll_inode_info *lli = ll_i2info(dir); + rc = PTR_ERR(page); - CERROR("error reading dir "DFID" at "LPU64": rc %d\n", - PFID(ll_inode2fid(dir)), pos, rc); + CERROR("error reading dir "DFID" at "LPU64": " + "[rc %d] [parent %u]\n", + PFID(ll_inode2fid(dir)), pos, + rc, lli->lli_opendir_pid); break; } dp = page_address(page); for (ent = lu_dirent_start(dp); ent != NULL; ent = lu_dirent_next(ent)) { - char *name = ent->lde_name; - int namelen = le16_to_cpu(ent->lde_namelen); + int namelen; + char *name; - if (namelen == 0) + namelen = le16_to_cpu(ent->lde_namelen); + if (unlikely(namelen == 0)) /* * skip dummy record. */ continue; + name = ent->lde_name; if (name[0] == '.') { if (namelen == 1) /* @@ -1025,11 +1037,14 @@ static int is_first_dirent(struct inode *dir, struct dentry *dentry) continue; } - if (target->len == namelen && - memcmp(target->name, name, namelen) == 0) - rc = LS_FIRST_DE + dot_de; - else + if (target->len != namelen || + memcmp(target->name, name, namelen) != 0) rc = LS_NONE_FIRST_DE; + else if (!dot_de) + rc = LS_FIRST_DE; + else + rc = LS_FIRST_DOT_DE; + ll_put_page(page); GOTO(out, rc); } @@ -1042,10 +1057,11 @@ static int is_first_dirent(struct inode *dir, struct dentry *dentry) break; } else if (1) { /* - * chain is exhausted + * chain is exhausted * Normal case: continue to the next page. */ - page = ll_get_dir_page(dir, pos, 1, &chain); + lli->lli_sa_pos = pos; + page = ll_get_dir_page(NULL, dir, pos, 1, &chain); } else { /* * go into overflow page. @@ -1071,19 +1087,21 @@ out: */ int do_statahead_enter(struct inode *dir, struct dentry **dentryp, int lookup) { - struct ll_sb_info *sbi = ll_i2sbi(dir); - struct ll_inode_info *lli = ll_i2info(dir); - struct ll_statahead_info *sai = lli->lli_sai; - struct ll_sa_thread_args sta; - struct l_wait_info lwi = LWI_INTR(LWI_ON_SIGNAL_NOOP, NULL); + struct ll_inode_info *lli; + struct ll_statahead_info *sai; + struct dentry *parent; + struct l_wait_info lwi = { 0 }; int rc = 0; ENTRY; + LASSERT(dir != NULL); + lli = ll_i2info(dir); LASSERT(lli->lli_opendir_pid == cfs_curproc_pid()); + sai = lli->lli_sai; if (sai) { if (unlikely(sa_is_stopped(sai) && - list_empty(&sai->sai_entries_stated))) + cfs_list_empty(&sai->sai_entries_stated))) RETURN(-EBADFD); if ((*dentryp)->d_name.name[0] == '.') { @@ -1113,17 +1131,17 @@ int do_statahead_enter(struct inode *dir, struct dentry **dentryp, int lookup) } } - if (ll_sai_entry_stated(sai)) { - sbi->ll_sa_cached++; - } else { - sbi->ll_sa_blocked++; + if (!ll_sai_entry_stated(sai)) { /* * thread started already, avoid double-stat. */ + lwi = LWI_INTR(LWI_ON_SIGNAL_NOOP, NULL); rc = l_wait_event(sai->sai_waitq, ll_sai_entry_stated(sai) || sa_is_stopped(sai), &lwi); + if (unlikely(rc == -EINTR)) + RETURN(rc); } if (lookup) { @@ -1142,48 +1160,48 @@ int do_statahead_enter(struct inode *dir, struct dentry **dentryp, int lookup) /* * do nothing for revalidate. */ - RETURN(rc); + RETURN(0); } - /* - * I am the "lli_opendir_pid" owner, only me can set "lli_sai". - */ - LASSERT(lli->lli_sai == NULL); - + /* I am the "lli_opendir_pid" owner, only me can set "lli_sai". */ rc = is_first_dirent(dir, *dentryp); - if (rc == LS_NONE_FIRST_DE) { - /* - * 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; - spin_unlock(&lli->lli_lock); - RETURN(-EBADF); - } + if (rc == LS_NONE_FIRST_DE) + /* It is not "ls -{a}l" operation, no need statahead for it. */ + GOTO(out, rc = -EAGAIN); sai = ll_sai_alloc(); if (sai == NULL) - RETURN(-ENOMEM); + GOTO(out, rc = -ENOMEM); sai->sai_ls_all = (rc == LS_FIRST_DOT_DE); sai->sai_inode = igrab(dir); if (unlikely(sai->sai_inode == NULL)) { - CWARN("Do not start stat ahead on dying inode "DFID" .\n", + CWARN("Do not start stat ahead on dying inode "DFID"\n", PFID(&lli->lli_fid)); OBD_FREE_PTR(sai); - RETURN(-ESTALE); + GOTO(out, rc = -ESTALE); } - LASSERT(sai->sai_inode == (*dentryp)->d_parent->d_inode); + /* get parent reference count here, and put it in ll_statahead_thread */ + parent = dget((*dentryp)->d_parent); + if (unlikely(sai->sai_inode != parent->d_inode)) { + struct ll_inode_info *nlli = ll_i2info(parent->d_inode); - sta.sta_parent = (*dentryp)->d_parent; - sta.sta_pid = cfs_curproc_pid(); + CWARN("Race condition, someone changed %.*s just now: " + "old parent "DFID", new parent "DFID"\n", + (*dentryp)->d_name.len, (*dentryp)->d_name.name, + PFID(&lli->lli_fid), PFID(&nlli->lli_fid)); + dput(parent); + iput(sai->sai_inode); + OBD_FREE_PTR(sai); + RETURN(-EAGAIN); + } lli->lli_sai = sai; - rc = cfs_kernel_thread(ll_statahead_thread, &sta, 0); + rc = cfs_kernel_thread(ll_statahead_thread, parent, 0); if (rc < 0) { CERROR("can't start ll_sa thread, rc: %d\n", rc); + dput(parent); lli->lli_opendir_key = NULL; sai->sai_thread.t_flags = SVC_STOPPED; ll_sai_put(sai); @@ -1191,7 +1209,7 @@ int do_statahead_enter(struct inode *dir, struct dentry **dentryp, int lookup) RETURN(-EAGAIN); } - l_wait_event(sai->sai_thread.t_ctl_waitq, + l_wait_event(sai->sai_thread.t_ctl_waitq, sa_is_running(sai) || sa_is_stopped(sai), &lwi); @@ -1200,52 +1218,69 @@ int do_statahead_enter(struct inode *dir, struct dentry **dentryp, int lookup) * lookup, and -EEXIST also indicates that this is the first dirent. */ RETURN(-EEXIST); + +out: + cfs_spin_lock(&lli->lli_sa_lock); + lli->lli_opendir_key = NULL; + lli->lli_opendir_pid = 0; + cfs_spin_unlock(&lli->lli_sa_lock); + return rc; } /** * update hit/miss count. */ -void ll_statahead_exit(struct dentry *dentry, int result) +void ll_statahead_exit(struct inode *dir, 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_statahead_info *sai = lli->lli_sai; + struct ll_inode_info *lli; + struct ll_statahead_info *sai; + struct ll_sb_info *sbi; struct ll_dentry_data *ldd = ll_d2d(dentry); + int rc; ENTRY; - if (lli->lli_opendir_pid == cfs_curproc_pid() && sai) { - if (result >= 1) { - sbi->ll_sa_hit++; - sai->sai_hit++; - sai->sai_consecutive_miss = 0; - sai->sai_max = min(2 * sai->sai_max, sbi->ll_sa_max); - } else { - sbi->ll_sa_miss++; - sai->sai_miss++; - sai->sai_consecutive_miss++; - 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, " - "sent/replied %u/%u. stopping statahead " - "thread: pid %d\n", - parent->d_name.len, parent->d_name.name, - sai->sai_hit, sai->sai_miss, - sai->sai_sent, sai->sai_replied, - cfs_curproc_pid()); - spin_lock(&lli->lli_lock); - if (!sa_is_stopped(sai)) - sai->sai_thread.t_flags = SVC_STOPPING; - spin_unlock(&lli->lli_lock); - } + LASSERT(dir != NULL); + lli = ll_i2info(dir); + LASSERT(lli->lli_opendir_pid == cfs_curproc_pid()); + sai = lli->lli_sai; + LASSERT(sai != NULL); + sbi = ll_i2sbi(dir); + + rc = ll_sai_entry_fini(sai); + /* rc == -ENOENT means such dentry was removed just between statahead + * readdir and pre-fetched, count it as hit. + * + * result == -ENOENT has two meanings: + * 1. such dentry was removed just between statahead pre-fetched and + * main process stat such dentry. + * 2. main process stat non-exist dentry. + * We can not distinguish such two cases, just count them as miss. */ + if (result >= 1 || unlikely(rc == -ENOENT)) { + sai->sai_hit++; + sai->sai_consecutive_miss = 0; + sai->sai_max = min(2 * sai->sai_max, sbi->ll_sa_max); + } else { + sai->sai_miss++; + sai->sai_consecutive_miss++; + if (sa_low_hit(sai) && sa_is_running(sai)) { + atomic_inc(&sbi->ll_sa_wrong); + CDEBUG(D_READA, "Statahead for dir "DFID" hit ratio " + "too low: hit/miss %u/%u, sent/replied %u/%u, " + "stopping statahead thread: pid %d\n", + PFID(&lli->lli_fid), sai->sai_hit, + sai->sai_miss, sai->sai_sent, + sai->sai_replied, cfs_curproc_pid()); + cfs_spin_lock(&lli->lli_sa_lock); + if (!sa_is_stopped(sai)) + sai->sai_thread.t_flags = SVC_STOPPING; + cfs_spin_unlock(&lli->lli_sa_lock); } - - if (!sa_is_stopped(sai)) - cfs_waitq_signal(&sai->sai_thread.t_ctl_waitq); - ll_sai_entry_fini(sai); - if (likely(ldd != NULL)) - ldd->lld_sa_generation = sai->sai_generation; } + + if (!sa_is_stopped(sai)) + cfs_waitq_signal(&sai->sai_thread.t_ctl_waitq); + if (likely(ldd != NULL)) + ldd->lld_sa_generation = sai->sai_generation; + EXIT; }