X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fldlm%2Fldlm_lockd.c;h=f5fc1f8d7ea352ad878e7108f45e16b6747edadc;hp=870ae2320e1d63d5e19635289ca0d0e301747cfb;hb=386e9768ee923fa926f106920fab245418eb7ca6;hpb=8073f0e4bef2db551a4b4bcaeb72a9986571f1bd diff --git a/lustre/ldlm/ldlm_lockd.c b/lustre/ldlm/ldlm_lockd.c index 870ae23..f5fc1f8 100644 --- a/lustre/ldlm/ldlm_lockd.c +++ b/lustre/ldlm/ldlm_lockd.c @@ -26,7 +26,7 @@ * GPL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. */ /* @@ -63,7 +63,7 @@ CFS_MODULE_PARM(ldlm_num_threads, "i", int, 0444, extern cfs_mem_cache_t *ldlm_resource_slab; extern cfs_mem_cache_t *ldlm_lock_slab; -static struct semaphore ldlm_ref_sem; +static cfs_semaphore_t ldlm_ref_sem; static int ldlm_refcount; /* LDLM state */ @@ -86,15 +86,15 @@ static inline unsigned int ldlm_get_rq_timeout(void) #ifdef __KERNEL__ /* w_l_spinlock protects both waiting_locks_list and expired_lock_thread */ -static spinlock_t waiting_locks_spinlock; /* BH lock (timer) */ -static struct list_head waiting_locks_list; +static cfs_spinlock_t waiting_locks_spinlock; /* BH lock (timer) */ +static cfs_list_t waiting_locks_list; static cfs_timer_t waiting_locks_timer; static struct expired_lock_thread { cfs_waitq_t elt_waitq; int elt_state; int elt_dump; - struct list_head elt_expired_locks; + cfs_list_t elt_expired_locks; } expired_lock_thread; #endif @@ -103,36 +103,39 @@ static struct expired_lock_thread { #define ELT_TERMINATE 2 struct ldlm_bl_pool { - spinlock_t blp_lock; + cfs_spinlock_t blp_lock; /* * blp_prio_list is used for callbacks that should be handled * as a priority. It is used for LDLM_FL_DISCARD_DATA requests. * see bug 13843 */ - struct list_head blp_prio_list; + cfs_list_t blp_prio_list; /* * blp_list is used for all other callbacks which are likely * to take longer to process. */ - struct list_head blp_list; + cfs_list_t blp_list; cfs_waitq_t blp_waitq; - struct completion blp_comp; - atomic_t blp_num_threads; - atomic_t blp_busy_threads; + cfs_completion_t blp_comp; + cfs_atomic_t blp_num_threads; + cfs_atomic_t blp_busy_threads; int blp_min_threads; int blp_max_threads; }; struct ldlm_bl_work_item { - struct list_head blwi_entry; - struct ldlm_namespace *blwi_ns; + cfs_list_t blwi_entry; + struct ldlm_namespace *blwi_ns; struct ldlm_lock_desc blwi_ld; - struct ldlm_lock *blwi_lock; - struct list_head blwi_head; + struct ldlm_lock *blwi_lock; + cfs_list_t blwi_head; int blwi_count; + cfs_completion_t blwi_comp; + int blwi_mode; + int blwi_mem_pressure; }; #ifdef __KERNEL__ @@ -142,16 +145,16 @@ static inline int have_expired_locks(void) int need_to_run; ENTRY; - spin_lock_bh(&waiting_locks_spinlock); - need_to_run = !list_empty(&expired_lock_thread.elt_expired_locks); - spin_unlock_bh(&waiting_locks_spinlock); + cfs_spin_lock_bh(&waiting_locks_spinlock); + need_to_run = !cfs_list_empty(&expired_lock_thread.elt_expired_locks); + cfs_spin_unlock_bh(&waiting_locks_spinlock); RETURN(need_to_run); } static int expired_lock_main(void *arg) { - struct list_head *expired = &expired_lock_thread.elt_expired_locks; + cfs_list_t *expired = &expired_lock_thread.elt_expired_locks; struct l_wait_info lwi = { 0 }; int do_dump; @@ -167,9 +170,9 @@ static int expired_lock_main(void *arg) expired_lock_thread.elt_state == ELT_TERMINATE, &lwi); - spin_lock_bh(&waiting_locks_spinlock); + cfs_spin_lock_bh(&waiting_locks_spinlock); if (expired_lock_thread.elt_dump) { - spin_unlock_bh(&waiting_locks_spinlock); + cfs_spin_unlock_bh(&waiting_locks_spinlock); /* from waiting_locks_callback, but not in timer */ libcfs_debug_dumplog(); @@ -177,42 +180,51 @@ static int expired_lock_main(void *arg) "waiting_locks_callback", expired_lock_thread.elt_dump); - spin_lock_bh(&waiting_locks_spinlock); + cfs_spin_lock_bh(&waiting_locks_spinlock); expired_lock_thread.elt_dump = 0; } do_dump = 0; - while (!list_empty(expired)) { + while (!cfs_list_empty(expired)) { struct obd_export *export; struct ldlm_lock *lock; - lock = list_entry(expired->next, struct ldlm_lock, + lock = cfs_list_entry(expired->next, struct ldlm_lock, l_pending_chain); if ((void *)lock < LP_POISON + CFS_PAGE_SIZE && (void *)lock >= LP_POISON) { - spin_unlock_bh(&waiting_locks_spinlock); + cfs_spin_unlock_bh(&waiting_locks_spinlock); CERROR("free lock on elt list %p\n", lock); LBUG(); } - list_del_init(&lock->l_pending_chain); + cfs_list_del_init(&lock->l_pending_chain); if ((void *)lock->l_export < LP_POISON + CFS_PAGE_SIZE && (void *)lock->l_export >= LP_POISON) { CERROR("lock with free export on elt list %p\n", lock->l_export); lock->l_export = NULL; LDLM_ERROR(lock, "free export"); + /* release extra ref grabbed by + * ldlm_add_waiting_lock() or + * ldlm_failed_ast() */ + LDLM_LOCK_RELEASE(lock); continue; } - export = class_export_get(lock->l_export); - spin_unlock_bh(&waiting_locks_spinlock); + export = class_export_lock_get(lock->l_export, lock); + cfs_spin_unlock_bh(&waiting_locks_spinlock); do_dump++; class_fail_export(export); - class_export_put(export); - spin_lock_bh(&waiting_locks_spinlock); + class_export_lock_put(export, lock); + + /* release extra ref grabbed by ldlm_add_waiting_lock() + * or ldlm_failed_ast() */ + LDLM_LOCK_RELEASE(lock); + + cfs_spin_lock_bh(&waiting_locks_spinlock); } - spin_unlock_bh(&waiting_locks_spinlock); + cfs_spin_unlock_bh(&waiting_locks_spinlock); if (do_dump && obd_dump_on_eviction) { CERROR("dump the log upon eviction\n"); @@ -230,18 +242,44 @@ static int expired_lock_main(void *arg) static int ldlm_add_waiting_lock(struct ldlm_lock *lock); +/** + * Check if there is a request in the export request list + * which prevents the lock canceling. + */ +static int ldlm_lock_busy(struct ldlm_lock *lock) +{ + struct ptlrpc_request *req; + int match = 0; + ENTRY; + + if (lock->l_export == NULL) + return 0; + + cfs_spin_lock_bh(&lock->l_export->exp_rpc_lock); + cfs_list_for_each_entry(req, &lock->l_export->exp_queued_rpc, + rq_exp_list) { + if (req->rq_ops->hpreq_lock_match) { + match = req->rq_ops->hpreq_lock_match(req, lock); + if (match) + break; + } + } + cfs_spin_unlock_bh(&lock->l_export->exp_rpc_lock); + RETURN(match); +} + /* This is called from within a timer interrupt and cannot schedule */ static void waiting_locks_callback(unsigned long unused) { struct ldlm_lock *lock, *last = NULL; repeat: - spin_lock_bh(&waiting_locks_spinlock); - while (!list_empty(&waiting_locks_list)) { - lock = list_entry(waiting_locks_list.next, struct ldlm_lock, - l_pending_chain); - - if (cfs_time_after(lock->l_callback_timeout, cfs_time_current()) || + cfs_spin_lock_bh(&waiting_locks_spinlock); + while (!cfs_list_empty(&waiting_locks_list)) { + lock = cfs_list_entry(waiting_locks_list.next, struct ldlm_lock, + l_pending_chain); + if (cfs_time_after(lock->l_callback_timeout, + cfs_time_current()) || (lock->l_req_mode == LCK_GROUP)) break; @@ -256,8 +294,8 @@ repeat: lock->l_export->exp_connection->c_remote_uuid.uuid, libcfs_nid2str(lock->l_export->exp_connection->c_peer.nid)); - list_del_init(&lock->l_pending_chain); - spin_unlock_bh(&waiting_locks_spinlock); + cfs_list_del_init(&lock->l_pending_chain); + cfs_spin_unlock_bh(&waiting_locks_spinlock); ldlm_add_waiting_lock(lock); goto repeat; } @@ -272,26 +310,54 @@ repeat: lock->l_export->exp_connection->c_remote_uuid.uuid, libcfs_nid2str(lock->l_export->exp_connection->c_peer.nid)); - list_del_init(&lock->l_pending_chain); - spin_unlock_bh(&waiting_locks_spinlock); + cfs_list_del_init(&lock->l_pending_chain); + cfs_spin_unlock_bh(&waiting_locks_spinlock); ldlm_add_waiting_lock(lock); goto repeat; } + /* Check if we need to prolong timeout */ + if (!OBD_FAIL_CHECK(OBD_FAIL_PTLRPC_HPREQ_TIMEOUT) && + ldlm_lock_busy(lock)) { + int cont = 1; + + if (lock->l_pending_chain.next == &waiting_locks_list) + cont = 0; + + LDLM_LOCK_GET(lock); + + cfs_spin_unlock_bh(&waiting_locks_spinlock); + LDLM_DEBUG(lock, "prolong the busy lock"); + ldlm_refresh_waiting_lock(lock, + ldlm_get_enq_timeout(lock)); + cfs_spin_lock_bh(&waiting_locks_spinlock); + + if (!cont) { + LDLM_LOCK_RELEASE(lock); + break; + } + + LDLM_LOCK_RELEASE(lock); + continue; + } + ldlm_lock_to_ns(lock)->ns_timeouts++; LDLM_ERROR(lock, "lock callback timer expired after %lds: " "evicting client at %s ", - cfs_time_current_sec()- lock->l_enqueued_time.tv_sec, + cfs_time_current_sec()- lock->l_last_activity, libcfs_nid2str( lock->l_export->exp_connection->c_peer.nid)); last = lock; - list_del(&lock->l_pending_chain); - list_add(&lock->l_pending_chain, - &expired_lock_thread.elt_expired_locks); + /* no needs to take an extra ref on the lock since it was in + * the waiting_locks_list and ldlm_add_waiting_lock() + * already grabbed a ref */ + cfs_list_del(&lock->l_pending_chain); + cfs_list_add(&lock->l_pending_chain, + &expired_lock_thread.elt_expired_locks); } - if (!list_empty(&expired_lock_thread.elt_expired_locks)) { + if (!cfs_list_empty(&expired_lock_thread.elt_expired_locks)) { if (obd_dump_on_timeout) expired_lock_thread.elt_dump = __LINE__; @@ -302,14 +368,14 @@ repeat: * Make sure the timer will fire again if we have any locks * left. */ - if (!list_empty(&waiting_locks_list)) { + if (!cfs_list_empty(&waiting_locks_list)) { cfs_time_t timeout_rounded; - lock = list_entry(waiting_locks_list.next, struct ldlm_lock, - l_pending_chain); + lock = cfs_list_entry(waiting_locks_list.next, struct ldlm_lock, + l_pending_chain); timeout_rounded = (cfs_time_t)round_timeout(lock->l_callback_timeout); cfs_timer_arm(&waiting_locks_timer, timeout_rounded); } - spin_unlock_bh(&waiting_locks_spinlock); + cfs_spin_unlock_bh(&waiting_locks_spinlock); } /* @@ -317,20 +383,26 @@ repeat: * lock. We add it to the pending-callback chain, and schedule the lock-timeout * timer to fire appropriately. (We round up to the next second, to avoid * floods of timer firings during periods of high lock contention and traffic). + * As done by ldlm_add_waiting_lock(), the caller must grab a lock reference + * if it has been added to the waiting list (1 is returned). * * Called with the namespace lock held. */ -static int __ldlm_add_waiting_lock(struct ldlm_lock *lock) +static int __ldlm_add_waiting_lock(struct ldlm_lock *lock, int seconds) { - int timeout; + cfs_time_t timeout; cfs_time_t timeout_rounded; - if (!list_empty(&lock->l_pending_chain)) + if (!cfs_list_empty(&lock->l_pending_chain)) return 0; - timeout = ldlm_get_enq_timeout(lock); + if (OBD_FAIL_CHECK(OBD_FAIL_PTLRPC_HPREQ_NOTIMEOUT) || + OBD_FAIL_CHECK(OBD_FAIL_PTLRPC_HPREQ_TIMEOUT)) + seconds = 1; - lock->l_callback_timeout = cfs_time_shift(timeout); + timeout = cfs_time_shift(seconds); + if (likely(cfs_time_after(timeout, lock->l_callback_timeout))) + lock->l_callback_timeout = timeout; timeout_rounded = round_timeout(lock->l_callback_timeout); @@ -341,20 +413,22 @@ static int __ldlm_add_waiting_lock(struct ldlm_lock *lock) } /* if the new lock has a shorter timeout than something earlier on the list, we'll wait the longer amount of time; no big deal. */ - list_add_tail(&lock->l_pending_chain, &waiting_locks_list); /* FIFO */ + /* FIFO */ + cfs_list_add_tail(&lock->l_pending_chain, &waiting_locks_list); return 1; } static int ldlm_add_waiting_lock(struct ldlm_lock *lock) { int ret; + int timeout = ldlm_get_enq_timeout(lock); LASSERT(!(lock->l_flags & LDLM_FL_CANCEL_ON_BLOCK)); - spin_lock_bh(&waiting_locks_spinlock); + cfs_spin_lock_bh(&waiting_locks_spinlock); if (lock->l_destroyed) { static cfs_time_t next; - spin_unlock_bh(&waiting_locks_spinlock); + cfs_spin_unlock_bh(&waiting_locks_spinlock); LDLM_ERROR(lock, "not waiting on destroyed lock (bug 5653)"); if (cfs_time_after(cfs_time_current(), next)) { next = cfs_time_shift(14400); @@ -363,11 +437,16 @@ static int ldlm_add_waiting_lock(struct ldlm_lock *lock) return 0; } - ret = __ldlm_add_waiting_lock(lock); - spin_unlock_bh(&waiting_locks_spinlock); + ret = __ldlm_add_waiting_lock(lock, timeout); + if (ret) + /* grab ref on the lock if it has been added to the + * waiting list */ + LDLM_LOCK_GET(lock); + cfs_spin_unlock_bh(&waiting_locks_spinlock); - LDLM_DEBUG(lock, "%sadding to wait list", - ret == 0 ? "not re-" : ""); + LDLM_DEBUG(lock, "%sadding to wait list(timeout: %d, AT: %s)", + ret == 0 ? "not re-" : "", timeout, + AT_OFF ? "off" : "on"); return ret; } @@ -375,14 +454,16 @@ static int ldlm_add_waiting_lock(struct ldlm_lock *lock) * Remove a lock from the pending list, likely because it had its cancellation * callback arrive without incident. This adjusts the lock-timeout timer if * needed. Returns 0 if the lock wasn't pending after all, 1 if it was. + * As done by ldlm_del_waiting_lock(), the caller must release the lock + * reference when the lock is removed from any list (1 is returned). * * Called with namespace lock held. */ -int __ldlm_del_waiting_lock(struct ldlm_lock *lock) +static int __ldlm_del_waiting_lock(struct ldlm_lock *lock) { - struct list_head *list_next; + cfs_list_t *list_next; - if (list_empty(&lock->l_pending_chain)) + if (cfs_list_empty(&lock->l_pending_chain)) return 0; list_next = lock->l_pending_chain.next; @@ -393,13 +474,13 @@ int __ldlm_del_waiting_lock(struct ldlm_lock *lock) cfs_timer_disarm(&waiting_locks_timer); } else { struct ldlm_lock *next; - next = list_entry(list_next, struct ldlm_lock, - l_pending_chain); + next = cfs_list_entry(list_next, struct ldlm_lock, + l_pending_chain); cfs_timer_arm(&waiting_locks_timer, round_timeout(next->l_callback_timeout)); } } - list_del_init(&lock->l_pending_chain); + cfs_list_del_init(&lock->l_pending_chain); return 1; } @@ -410,13 +491,17 @@ int ldlm_del_waiting_lock(struct ldlm_lock *lock) if (lock->l_export == NULL) { /* We don't have a "waiting locks list" on clients. */ - LDLM_DEBUG(lock, "client lock: no-op"); + CDEBUG(D_DLMTRACE, "Client lock %p : no-op\n", lock); return 0; } - spin_lock_bh(&waiting_locks_spinlock); + cfs_spin_lock_bh(&waiting_locks_spinlock); ret = __ldlm_del_waiting_lock(lock); - spin_unlock_bh(&waiting_locks_spinlock); + cfs_spin_unlock_bh(&waiting_locks_spinlock); + if (ret) + /* release lock ref if it has indeed been removed + * from a list */ + LDLM_LOCK_RELEASE(lock); LDLM_DEBUG(lock, "%s", ret == 0 ? "wasn't waiting" : "removed"); return ret; @@ -427,7 +512,7 @@ int ldlm_del_waiting_lock(struct ldlm_lock *lock) * * Called with namespace lock held. */ -int ldlm_refresh_waiting_lock(struct ldlm_lock *lock) +int ldlm_refresh_waiting_lock(struct ldlm_lock *lock, int timeout) { if (lock->l_export == NULL) { /* We don't have a "waiting locks list" on clients. */ @@ -435,22 +520,23 @@ int ldlm_refresh_waiting_lock(struct ldlm_lock *lock) return 0; } - spin_lock_bh(&waiting_locks_spinlock); + cfs_spin_lock_bh(&waiting_locks_spinlock); - if (list_empty(&lock->l_pending_chain)) { - spin_unlock_bh(&waiting_locks_spinlock); + if (cfs_list_empty(&lock->l_pending_chain)) { + cfs_spin_unlock_bh(&waiting_locks_spinlock); LDLM_DEBUG(lock, "wasn't waiting"); return 0; } + /* we remove/add the lock to the waiting list, so no needs to + * release/take a lock reference */ __ldlm_del_waiting_lock(lock); - __ldlm_add_waiting_lock(lock); - spin_unlock_bh(&waiting_locks_spinlock); + __ldlm_add_waiting_lock(lock, timeout); + cfs_spin_unlock_bh(&waiting_locks_spinlock); LDLM_DEBUG(lock, "refreshed"); return 1; } - #else /* !__KERNEL__ */ static int ldlm_add_waiting_lock(struct ldlm_lock *lock) @@ -464,7 +550,7 @@ int ldlm_del_waiting_lock(struct ldlm_lock *lock) RETURN(0); } -int ldlm_refresh_waiting_lock(struct ldlm_lock *lock) +int ldlm_refresh_waiting_lock(struct ldlm_lock *lock, int timeout) { RETURN(0); } @@ -473,20 +559,26 @@ int ldlm_refresh_waiting_lock(struct ldlm_lock *lock) static void ldlm_failed_ast(struct ldlm_lock *lock, int rc, const char *ast_type) { - struct ptlrpc_connection *conn = lock->l_export->exp_connection; - char *str = libcfs_nid2str(conn->c_peer.nid); - - LCONSOLE_ERROR_MSG(0x138, "A client on nid %s was evicted from " - "service %s.\n", str, - lock->l_export->exp_obd->obd_name); - - LCONSOLE_ERROR_MSG(0x012, "Lock %s callback to %s timed out for " - "resource %d\n", ast_type, - obd_export_nid2str(lock->l_export), rc); + LCONSOLE_ERROR_MSG(0x138, "%s: A client on nid %s was evicted due " + "to a lock %s callback time out: rc %d\n", + lock->l_export->exp_obd->obd_name, + obd_export_nid2str(lock->l_export), ast_type, rc); if (obd_dump_on_timeout) libcfs_debug_dumplog(); +#ifdef __KERNEL__ + cfs_spin_lock_bh(&waiting_locks_spinlock); + if (__ldlm_del_waiting_lock(lock) == 0) + /* the lock was not in any list, grab an extra ref before adding + * the lock to the expired list */ + LDLM_LOCK_GET(lock); + cfs_list_add(&lock->l_pending_chain, + &expired_lock_thread.elt_expired_locks); + cfs_waitq_signal(&expired_lock_thread.elt_waitq); + cfs_spin_unlock_bh(&waiting_locks_spinlock); +#else class_fail_export(lock->l_export); +#endif } static int ldlm_handle_ast_error(struct ldlm_lock *lock, @@ -514,19 +606,29 @@ static int ldlm_handle_ast_error(struct ldlm_lock *lock, ldlm_failed_ast(lock, rc, ast_type); } } else if (rc) { - if (rc == -EINVAL) + if (rc == -EINVAL) { + struct ldlm_resource *res = lock->l_resource; LDLM_DEBUG(lock, "client (nid %s) returned %d" " from %s AST - normal race", libcfs_nid2str(peer.nid), req->rq_repmsg ? lustre_msg_get_status(req->rq_repmsg) : -1, ast_type); - else + if (res) { + /* update lvbo to return proper attributes. + * see bug 23174 */ + ldlm_resource_getref(res); + ldlm_res_lvbo_update(res, NULL, 1); + ldlm_resource_putref(res); + } + + } else { LDLM_ERROR(lock, "client (nid %s) returned %d " "from %s AST", libcfs_nid2str(peer.nid), (req->rq_repmsg != NULL) ? lustre_msg_get_status(req->rq_repmsg) : 0, ast_type); + } ldlm_lock_cancel(lock); /* Server-side AST functions are called from ldlm_reprocess_all, * which needs to be told to please restart its reprocessing. */ @@ -536,7 +638,8 @@ static int ldlm_handle_ast_error(struct ldlm_lock *lock, return rc; } -static int ldlm_cb_interpret(struct ptlrpc_request *req, void *data, int rc) +static int ldlm_cb_interpret(const struct lu_env *env, + struct ptlrpc_request *req, void *data, int rc) { struct ldlm_cb_set_arg *arg; struct ldlm_lock *lock; @@ -548,21 +651,15 @@ static int ldlm_cb_interpret(struct ptlrpc_request *req, void *data, int rc) lock = req->rq_async_args.pointer_arg[1]; LASSERT(lock != NULL); if (rc != 0) { - /* If client canceled the lock but the cancel has not - * been recieved yet, we need to update lvbo to have the - * proper attributes cached. */ - if (rc == -EINVAL && arg->type == LDLM_BL_CALLBACK) - ldlm_res_lvbo_update(lock->l_resource, NULL, - 0, 1); - rc = ldlm_handle_ast_error(lock, req, rc, + rc = ldlm_handle_ast_error(lock, req, rc, arg->type == LDLM_BL_CALLBACK ? "blocking" : "completion"); - } + } - LDLM_LOCK_PUT(lock); + LDLM_LOCK_RELEASE(lock); if (rc == -ERESTART) - atomic_set(&arg->restart, 1); + cfs_atomic_set(&arg->restart, 1); RETURN(0); } @@ -581,15 +678,40 @@ static inline int ldlm_bl_and_cp_ast_fini(struct ptlrpc_request *req, if (rc == 0) /* If we cancelled the lock, we need to restart * ldlm_reprocess_queue */ - atomic_set(&arg->restart, 1); + cfs_atomic_set(&arg->restart, 1); } else { LDLM_LOCK_GET(lock); ptlrpc_set_add_req(arg->set, req); - } + } RETURN(rc); } +/** + * Check if there are requests in the export request list which prevent + * the lock canceling and make these requests high priority ones. + */ +static void ldlm_lock_reorder_req(struct ldlm_lock *lock) +{ + struct ptlrpc_request *req; + ENTRY; + + if (lock->l_export == NULL) { + LDLM_DEBUG(lock, "client lock: no-op"); + RETURN_EXIT; + } + + cfs_spin_lock_bh(&lock->l_export->exp_rpc_lock); + cfs_list_for_each_entry(req, &lock->l_export->exp_queued_rpc, + rq_exp_list) { + if (!req->rq_hp && req->rq_ops->hpreq_lock_match && + req->rq_ops->hpreq_lock_match(req, lock)) + ptlrpc_hpreq_reorder(req); + } + cfs_spin_unlock_bh(&lock->l_export->exp_rpc_lock); + EXIT; +} + /* * ->l_blocking_ast() method for server-side locks. This is invoked when newly * enqueued server lock conflicts with given one. @@ -619,6 +741,8 @@ int ldlm_server_blocking_ast(struct ldlm_lock *lock, ldlm_lock_dump(D_ERROR, lock, 0); } + ldlm_lock_reorder_req(lock); + req = ptlrpc_request_alloc_pack(lock->l_export->exp_imp_reverse, &RQF_LDLM_BL_CALLBACK, LUSTRE_DLM_VERSION, LDLM_BL_CALLBACK); @@ -668,12 +792,13 @@ int ldlm_server_blocking_ast(struct ldlm_lock *lock, } req->rq_send_state = LUSTRE_IMP_FULL; - /* ptlrpc_prep_req already set timeout */ + /* ptlrpc_request_alloc_pack already set timeout */ if (AT_OFF) req->rq_timeout = ldlm_get_rq_timeout(); - if (lock->l_export && lock->l_export->exp_ldlm_stats) - lprocfs_counter_incr(lock->l_export->exp_ldlm_stats, + if (lock->l_export && lock->l_export->exp_nid_stats && + lock->l_export->exp_nid_stats->nid_ldlm_stats) + lprocfs_counter_incr(lock->l_export->exp_nid_stats->nid_ldlm_stats, LDLM_BL_CALLBACK - LDLM_FIRST_OPC); rc = ldlm_bl_and_cp_ast_fini(req, arg, lock, instant_cancel); @@ -686,7 +811,6 @@ int ldlm_server_completion_ast(struct ldlm_lock *lock, int flags, void *data) struct ldlm_cb_set_arg *arg = data; struct ldlm_request *body; struct ptlrpc_request *req; - struct timeval granted_time; long total_enqueue_wait; int instant_cancel = 0; int rc = 0; @@ -695,25 +819,19 @@ int ldlm_server_completion_ast(struct ldlm_lock *lock, int flags, void *data) LASSERT(lock != NULL); LASSERT(data != NULL); - do_gettimeofday(&granted_time); - total_enqueue_wait = cfs_timeval_sub(&granted_time, - &lock->l_enqueued_time, NULL); - - if (total_enqueue_wait / ONE_MILLION > obd_timeout) - /* non-fatal with AT - change to LDLM_DEBUG? */ - LDLM_ERROR(lock, "enqueue wait took %luus from "CFS_TIME_T, - total_enqueue_wait, lock->l_enqueued_time.tv_sec); + total_enqueue_wait = cfs_time_sub(cfs_time_current_sec(), + lock->l_last_activity); - req = ptlrpc_request_alloc(lock->l_export->exp_imp_reverse, + req = ptlrpc_request_alloc(lock->l_export->exp_imp_reverse, &RQF_LDLM_CP_CALLBACK); - if (req == NULL) - RETURN(-ENOMEM); + if (req == NULL) + RETURN(-ENOMEM); - lock_res_and_lock(lock); - if (lock->l_resource->lr_lvb_len) + /* server namespace, doesn't need lock */ + if (lock->l_resource->lr_lvb_len) { req_capsule_set_size(&req->rq_pill, &RMF_DLM_LVB, RCL_CLIENT, lock->l_resource->lr_lvb_len); - unlock_res_and_lock(lock); + } rc = ptlrpc_request_pack(req, LUSTRE_DLM_VERSION, LDLM_CP_CALLBACK); if (rc) { @@ -733,24 +851,34 @@ int ldlm_server_completion_ast(struct ldlm_lock *lock, int flags, void *data) if (lock->l_resource->lr_lvb_len) { void *lvb = req_capsule_client_get(&req->rq_pill, &RMF_DLM_LVB); - lock_res_and_lock(lock); + cfs_down(&lock->l_resource->lr_lvb_sem); memcpy(lvb, lock->l_resource->lr_lvb_data, lock->l_resource->lr_lvb_len); - unlock_res_and_lock(lock); + cfs_up(&lock->l_resource->lr_lvb_sem); } - LDLM_DEBUG(lock, "server preparing completion AST (after %ldus wait)", + LDLM_DEBUG(lock, "server preparing completion AST (after %lds wait)", total_enqueue_wait); /* Server-side enqueue wait time estimate, used in __ldlm_add_waiting_lock to set future enqueue timers */ - at_add(&lock->l_resource->lr_namespace->ns_at_estimate, - total_enqueue_wait / ONE_MILLION); + if (total_enqueue_wait < ldlm_get_enq_timeout(lock)) + at_measured(ldlm_lock_to_ns_at(lock), + total_enqueue_wait); + else + /* bz18618. Don't add lock enqueue time we spend waiting for a + previous callback to fail. Locks waiting legitimately will + get extended by ldlm_refresh_waiting_lock regardless of the + estimate, so it's okay to underestimate here. */ + LDLM_DEBUG(lock, "lock completed after %lus; estimate was %ds. " + "It is likely that a previous callback timed out.", + total_enqueue_wait, + at_get(ldlm_lock_to_ns_at(lock))); ptlrpc_request_set_replen(req); req->rq_send_state = LUSTRE_IMP_FULL; - /* ptlrpc_prep_req already set timeout */ + /* ptlrpc_request_pack already set timeout */ if (AT_OFF) req->rq_timeout = ldlm_get_rq_timeout(); @@ -758,6 +886,8 @@ int ldlm_server_completion_ast(struct ldlm_lock *lock, int flags, void *data) lock_res_and_lock(lock); if (lock->l_flags & LDLM_FL_AST_SENT) { body->lock_flags |= LDLM_FL_AST_SENT; + /* copy ast flags like LDLM_FL_DISCARD_DATA */ + body->lock_flags |= (lock->l_flags & LDLM_AST_FLAGS); /* We might get here prior to ldlm_handle_enqueue setting * LDLM_FL_CANCEL_ON_BLOCK flag. Then we will put this lock @@ -777,8 +907,9 @@ int ldlm_server_completion_ast(struct ldlm_lock *lock, int flags, void *data) } unlock_res_and_lock(lock); - if (lock->l_export && lock->l_export->exp_ldlm_stats) - lprocfs_counter_incr(lock->l_export->exp_ldlm_stats, + if (lock->l_export && lock->l_export->exp_nid_stats && + lock->l_export->exp_nid_stats->nid_ldlm_stats) + lprocfs_counter_incr(lock->l_export->exp_nid_stats->nid_ldlm_stats, LDLM_CP_CALLBACK - LDLM_FIRST_OPC); rc = ldlm_bl_and_cp_ast_fini(req, arg, lock, instant_cancel); @@ -807,21 +938,21 @@ int ldlm_server_glimpse_ast(struct ldlm_lock *lock, void *data) body->lock_handle[0] = lock->l_remote_handle; ldlm_lock2desc(lock, &body->lock_desc); - lock_res_and_lock(lock); + /* server namespace, doesn't need lock */ req_capsule_set_size(&req->rq_pill, &RMF_DLM_LVB, RCL_SERVER, lock->l_resource->lr_lvb_len); - unlock_res_and_lock(lock); res = lock->l_resource; ptlrpc_request_set_replen(req); req->rq_send_state = LUSTRE_IMP_FULL; - /* ptlrpc_prep_req already set timeout */ + /* ptlrpc_request_alloc_pack already set timeout */ if (AT_OFF) req->rq_timeout = ldlm_get_rq_timeout(); - if (lock->l_export && lock->l_export->exp_ldlm_stats) - lprocfs_counter_incr(lock->l_export->exp_ldlm_stats, + if (lock->l_export && lock->l_export->exp_nid_stats && + lock->l_export->exp_nid_stats->nid_ldlm_stats) + lprocfs_counter_incr(lock->l_export->exp_nid_stats->nid_ldlm_stats, LDLM_GL_CALLBACK - LDLM_FIRST_OPC); rc = ptlrpc_queue_wait(req); @@ -830,8 +961,8 @@ int ldlm_server_glimpse_ast(struct ldlm_lock *lock, void *data) else if (rc != 0) rc = ldlm_handle_ast_error(lock, req, rc, "glimpse"); else - rc = ldlm_res_lvbo_update(res, req->rq_repmsg, - REPLY_REC_OFF, 1); + rc = ldlm_res_lvbo_update(res, req, 1); + ptlrpc_req_finished(req); if (rc == -ERESTART) ldlm_reprocess_all(res); @@ -876,7 +1007,7 @@ static void ldlm_svc_get_eopc(const struct ldlm_request *dlm_req, if (op) lprocfs_counter_incr(srv_stats, op); - return ; + return; } /* @@ -907,8 +1038,9 @@ int ldlm_handle_enqueue0(struct ldlm_namespace *ns, ldlm_svc_get_eopc(dlm_req, req->rq_rqbd->rqbd_service->srv_stats); - if (req->rq_export->exp_ldlm_stats) - lprocfs_counter_incr(req->rq_export->exp_ldlm_stats, + if (req->rq_export && req->rq_export->exp_nid_stats && + req->rq_export->exp_nid_stats->nid_ldlm_stats) + lprocfs_counter_incr(req->rq_export->exp_nid_stats->nid_ldlm_stats, LDLM_ENQUEUE - LDLM_FIRST_OPC); if (unlikely(dlm_req->lock_desc.l_resource.lr_type < LDLM_MIN_TYPE || @@ -960,8 +1092,8 @@ int ldlm_handle_enqueue0(struct ldlm_namespace *ns, if (unlikely(flags & LDLM_FL_REPLAY)) { /* Find an existing lock in the per-export lock hash */ - lock = lustre_hash_lookup(req->rq_export->exp_lock_hash, - (void *)&dlm_req->lock_handle[0]); + lock = cfs_hash_lookup(req->rq_export->exp_lock_hash, + (void *)&dlm_req->lock_handle[0]); if (lock != NULL) { DEBUG_REQ(D_DLMTRACE, req, "found existing lock cookie " LPX64, lock->l_handle.h_cookie); @@ -973,29 +1105,30 @@ int ldlm_handle_enqueue0(struct ldlm_namespace *ns, lock = ldlm_lock_create(ns, &dlm_req->lock_desc.l_resource.lr_name, dlm_req->lock_desc.l_resource.lr_type, dlm_req->lock_desc.l_req_mode, - cbs->lcs_blocking, cbs->lcs_completion, - cbs->lcs_glimpse, NULL, 0); + cbs, NULL, 0); if (!lock) GOTO(out, rc = -ENOMEM); - do_gettimeofday(&lock->l_enqueued_time); + lock->l_last_activity = cfs_time_current_sec(); lock->l_remote_handle = dlm_req->lock_handle[0]; LDLM_DEBUG(lock, "server-side enqueue handler, new lock created"); OBD_FAIL_TIMEOUT(OBD_FAIL_LDLM_ENQUEUE_BLOCKED, obd_timeout * 2); - /* Don't enqueue a lock onto the export if it has already - * been evicted. Cancel it now instead. (bug 3822) */ - if (req->rq_export->exp_failed) { - LDLM_ERROR(lock, "lock on destroyed export %p", req->rq_export); + /* Don't enqueue a lock onto the export if it is been disonnected + * due to eviction (bug 3822) or server umount (bug 24324). + * Cancel it now instead. */ + if (req->rq_export->exp_disconnected) { + LDLM_ERROR(lock, "lock on disconnected export %p", + req->rq_export); GOTO(out, rc = -ENOTCONN); } - lock->l_export = class_export_get(req->rq_export); + lock->l_export = class_export_lock_get(req->rq_export, lock); if (lock->l_export->exp_lock_hash) - lustre_hash_add(lock->l_export->exp_lock_hash, - &lock->l_remote_handle, - &lock->l_exp_hash); + cfs_hash_add(lock->l_export->exp_lock_hash, + &lock->l_remote_handle, + &lock->l_exp_hash); existing_lock: @@ -1004,13 +1137,11 @@ existing_lock: * local_lock_enqueue by the policy function. */ cookie = req; } else { - lock_res_and_lock(lock); if (lock->l_resource->lr_lvb_len) { req_capsule_set_size(&req->rq_pill, &RMF_DLM_LVB, RCL_SERVER, lock->l_resource->lr_lvb_len); } - unlock_res_and_lock(lock); if (OBD_FAIL_CHECK(OBD_FAIL_LDLM_ENQUEUE_EXTENT_ERR)) GOTO(out, rc = -ENOMEM); @@ -1044,9 +1175,10 @@ existing_lock: dlm_rep->lock_flags |= dlm_req->lock_flags & LDLM_INHERIT_FLAGS; lock->l_flags |= dlm_req->lock_flags & LDLM_INHERIT_FLAGS; - /* Don't move a pending lock onto the export if it has already - * been evicted. Cancel it now instead. (bug 5683) */ - if (unlikely(req->rq_export->exp_failed || + /* Don't move a pending lock onto the export if it has already been + * disconnected due to eviction (bug 5683) or server umount (bug 24324). + * Cancel it now instead. */ + if (unlikely(req->rq_export->exp_disconnected || OBD_FAIL_CHECK(OBD_FAIL_LDLM_ENQUEUE_OLD_EXPORT))) { LDLM_ERROR(lock, "lock on destroyed export %p", req->rq_export); rc = -ENOTCONN; @@ -1055,9 +1187,9 @@ existing_lock: if (lock->l_granted_mode == lock->l_req_mode) { /* * Only cancel lock if it was granted, because it would - * be destroyed immediatelly and would never be granted + * be destroyed immediately and would never be granted * in the future, causing timeouts on client. Not - * granted lock will be cancelled immediatelly after + * granted lock will be cancelled immediately after * sending completion AST. */ if (dlm_rep->lock_flags & LDLM_FL_CANCEL_ON_BLOCK) { @@ -1076,7 +1208,7 @@ existing_lock: if (unlikely(!(lock->l_flags & LDLM_FL_CANCEL_ON_BLOCK) || !(dlm_rep->lock_flags & LDLM_FL_CANCEL_ON_BLOCK))){ CERROR("Granting sync lock to libclient. " - "req fl %d, rep fl %d, lock fl %d\n", + "req fl %d, rep fl %d, lock fl "LPX64"\n", dlm_req->lock_flags, dlm_rep->lock_flags, lock->l_flags); LDLM_ERROR(lock, "sync lock"); @@ -1110,7 +1242,6 @@ existing_lock: LDLM_DEBUG(lock, "server-side enqueue handler, sending reply" "(err=%d, rc=%d)", err, rc); - lock_res_and_lock(lock); if (rc == 0) { if (lock->l_resource->lr_lvb_len > 0) { void *lvb; @@ -1120,19 +1251,22 @@ existing_lock: LASSERTF(lvb != NULL, "req %p, lock %p\n", req, lock); + cfs_down(&lock->l_resource->lr_lvb_sem); memcpy(lvb, lock->l_resource->lr_lvb_data, lock->l_resource->lr_lvb_len); + cfs_up(&lock->l_resource->lr_lvb_sem); } } else { + lock_res_and_lock(lock); ldlm_resource_unlink_lock(lock); ldlm_lock_destroy_nolock(lock); + unlock_res_and_lock(lock); } - unlock_res_and_lock(lock); if (!err && dlm_req->lock_desc.l_resource.lr_type != LDLM_FLOCK) ldlm_reprocess_all(lock->l_resource); - LDLM_LOCK_PUT(lock); + LDLM_LOCK_RELEASE(lock); } LDLM_DEBUG_NOLOCK("server-side enqueue handler END (lock %p, rc %d)", @@ -1172,8 +1306,9 @@ int ldlm_handle_convert0(struct ptlrpc_request *req, int rc; ENTRY; - if (req->rq_export && req->rq_export->exp_ldlm_stats) - lprocfs_counter_incr(req->rq_export->exp_ldlm_stats, + if (req->rq_export && req->rq_export->exp_nid_stats && + req->rq_export->exp_nid_stats->nid_ldlm_stats) + lprocfs_counter_incr(req->rq_export->exp_nid_stats->nid_ldlm_stats, LDLM_CONVERT - LDLM_FIRST_OPC); rc = req_capsule_server_pack(&req->rq_pill); @@ -1191,7 +1326,7 @@ int ldlm_handle_convert0(struct ptlrpc_request *req, LDLM_DEBUG(lock, "server-side convert handler START"); - do_gettimeofday(&lock->l_enqueued_time); + lock->l_last_activity = cfs_time_current_sec(); res = ldlm_lock_convert(lock, dlm_req->lock_desc.l_req_mode, &dlm_rep->lock_flags); if (res) { @@ -1265,11 +1400,13 @@ int ldlm_request_cancel(struct ptlrpc_request *req, if (res != pres) { if (pres != NULL) { ldlm_reprocess_all(pres); + LDLM_RESOURCE_DELREF(pres); ldlm_resource_putref(pres); } if (res != NULL) { ldlm_resource_getref(res); - ldlm_res_lvbo_update(res, NULL, 0, 1); + LDLM_RESOURCE_ADDREF(res); + ldlm_res_lvbo_update(res, NULL, 1); } pres = res; } @@ -1278,6 +1415,7 @@ int ldlm_request_cancel(struct ptlrpc_request *req, } if (pres != NULL) { ldlm_reprocess_all(pres); + LDLM_RESOURCE_DELREF(pres); ldlm_resource_putref(pres); } LDLM_DEBUG_NOLOCK("server-side cancel handler END"); @@ -1296,8 +1434,9 @@ int ldlm_handle_cancel(struct ptlrpc_request *req) RETURN(-EFAULT); } - if (req->rq_export && req->rq_export->exp_ldlm_stats) - lprocfs_counter_incr(req->rq_export->exp_ldlm_stats, + if (req->rq_export && req->rq_export->exp_nid_stats && + req->rq_export->exp_nid_stats->nid_ldlm_stats) + lprocfs_counter_incr(req->rq_export->exp_nid_stats->nid_ldlm_stats, LDLM_CANCEL - LDLM_FIRST_OPC); rc = req_capsule_server_pack(&req->rq_pill); @@ -1307,10 +1446,7 @@ int ldlm_handle_cancel(struct ptlrpc_request *req) if (!ldlm_request_cancel(req, dlm_req, 0)) req->rq_status = ESTALE; - if (ptlrpc_reply(req) != 0) - LBUG(); - - RETURN(0); + RETURN(ptlrpc_reply(req)); } void ldlm_handle_bl_callback(struct ldlm_namespace *ns, @@ -1319,7 +1455,7 @@ void ldlm_handle_bl_callback(struct ldlm_namespace *ns, int do_ast; ENTRY; - LDLM_DEBUG(lock, "client blocking AST callback handler START"); + LDLM_DEBUG(lock, "client blocking AST callback handler"); lock_res_and_lock(lock); lock->l_flags |= LDLM_FL_CBPENDING; @@ -1331,18 +1467,18 @@ void ldlm_handle_bl_callback(struct ldlm_namespace *ns, unlock_res_and_lock(lock); if (do_ast) { - LDLM_DEBUG(lock, "already unused, calling " - "callback (%p)", lock->l_blocking_ast); + CDEBUG(D_DLMTRACE, "Lock %p already unused, calling callback (%p)\n", + lock, lock->l_blocking_ast); if (lock->l_blocking_ast != NULL) lock->l_blocking_ast(lock, ld, lock->l_ast_data, LDLM_CB_BLOCKING); } else { - LDLM_DEBUG(lock, "Lock still has references, will be" - " cancelled later"); + CDEBUG(D_DLMTRACE, "Lock %p is referenced, will be cancelled later\n", + lock); } LDLM_DEBUG(lock, "client blocking callback handler END"); - LDLM_LOCK_PUT(lock); + LDLM_LOCK_RELEASE(lock); EXIT; } @@ -1359,7 +1495,8 @@ static void ldlm_handle_cp_callback(struct ptlrpc_request *req, if (OBD_FAIL_CHECK(OBD_FAIL_LDLM_CANCEL_BL_CB_RACE)) { int to = cfs_time_seconds(1); while (to > 0) { - cfs_schedule_timeout(CFS_TASK_INTERRUPTIBLE, to); + cfs_schedule_timeout_and_set_state( + CFS_TASK_INTERRUPTIBLE, to); if (lock->l_granted_mode == lock->l_req_mode || lock->l_destroyed) break; @@ -1372,7 +1509,7 @@ static void ldlm_handle_cp_callback(struct ptlrpc_request *req, /* bug 11300: the lock has already been granted */ unlock_res_and_lock(lock); LDLM_DEBUG(lock, "Double grant race happened"); - LDLM_LOCK_PUT(lock); + LDLM_LOCK_RELEASE(lock); EXIT; return; } @@ -1394,10 +1531,10 @@ static void ldlm_handle_cp_callback(struct ptlrpc_request *req, &lock->l_resource->lr_name, sizeof(lock->l_resource->lr_name)) != 0) { unlock_res_and_lock(lock); - if (ldlm_lock_change_resource(ns, lock, + if (ldlm_lock_change_resource(ns, lock, &dlm_req->lock_desc.l_resource.lr_name) != 0) { LDLM_ERROR(lock, "Failed to allocate resource"); - LDLM_LOCK_PUT(lock); + LDLM_LOCK_RELEASE(lock); EXIT; return; } @@ -1420,9 +1557,8 @@ static void ldlm_handle_cp_callback(struct ptlrpc_request *req, LDLM_ERROR(lock, "completion AST did not contain " "expected LVB!"); } else { - void *lvb = req_capsule_client_swab_get(&req->rq_pill, - &RMF_DLM_LVB, - (void *)lock->l_lvb_swabber); + void *lvb = req_capsule_client_get(&req->rq_pill, + &RMF_DLM_LVB); memcpy(lock->l_lvb_data, lvb, lock->l_lvb_len); } } @@ -1432,11 +1568,15 @@ static void ldlm_handle_cp_callback(struct ptlrpc_request *req, LDLM_DEBUG(lock, "callback handler finished, about to run_ast_work"); + /* Let Enqueue to call osc_lock_upcall() and initialize + * l_ast_data */ + OBD_FAIL_TIMEOUT(OBD_FAIL_OSC_CP_ENQ_RACE, 2); + ldlm_run_ast_work(&ast_list, LDLM_WORK_CP_AST); LDLM_DEBUG_NOLOCK("client completion callback handler END (lock %p)", lock); - LDLM_LOCK_PUT(lock); + LDLM_LOCK_RELEASE(lock); EXIT; } @@ -1474,7 +1614,7 @@ static void ldlm_handle_gl_callback(struct ptlrpc_request *req, return; } unlock_res_and_lock(lock); - LDLM_LOCK_PUT(lock); + LDLM_LOCK_RELEASE(lock); EXIT; } @@ -1493,66 +1633,164 @@ static int ldlm_callback_reply(struct ptlrpc_request *req, int rc) } #ifdef __KERNEL__ -static int ldlm_bl_to_thread(struct ldlm_namespace *ns, - struct ldlm_lock_desc *ld, struct ldlm_lock *lock, - struct list_head *cancels, int count) +static int __ldlm_bl_to_thread(struct ldlm_bl_work_item *blwi, int mode) { struct ldlm_bl_pool *blp = ldlm_state->ldlm_bl_pool; - struct ldlm_bl_work_item *blwi; ENTRY; - if (cancels && count == 0) - RETURN(0); + cfs_spin_lock(&blp->blp_lock); + if (blwi->blwi_lock && blwi->blwi_lock->l_flags & LDLM_FL_DISCARD_DATA) { + /* add LDLM_FL_DISCARD_DATA requests to the priority list */ + cfs_list_add_tail(&blwi->blwi_entry, &blp->blp_prio_list); + } else { + /* other blocking callbacks are added to the regular list */ + cfs_list_add_tail(&blwi->blwi_entry, &blp->blp_list); + } + cfs_spin_unlock(&blp->blp_lock); - OBD_ALLOC(blwi, sizeof(*blwi)); - if (blwi == NULL) - RETURN(-ENOMEM); + cfs_waitq_signal(&blp->blp_waitq); + + /* can not use blwi->blwi_mode as blwi could be already freed in + LDLM_ASYNC mode */ + if (mode == LDLM_SYNC) + cfs_wait_for_completion(&blwi->blwi_comp); + + RETURN(0); +} + +static inline void init_blwi(struct ldlm_bl_work_item *blwi, + struct ldlm_namespace *ns, + struct ldlm_lock_desc *ld, + cfs_list_t *cancels, int count, + struct ldlm_lock *lock, + int mode) +{ + cfs_init_completion(&blwi->blwi_comp); + CFS_INIT_LIST_HEAD(&blwi->blwi_head); + + if (cfs_memory_pressure_get()) + blwi->blwi_mem_pressure = 1; blwi->blwi_ns = ns; + blwi->blwi_mode = mode; if (ld != NULL) blwi->blwi_ld = *ld; if (count) { - list_add(&blwi->blwi_head, cancels); - list_del_init(cancels); + cfs_list_add(&blwi->blwi_head, cancels); + cfs_list_del_init(cancels); blwi->blwi_count = count; } else { blwi->blwi_lock = lock; } - spin_lock(&blp->blp_lock); - if (lock && lock->l_flags & LDLM_FL_DISCARD_DATA) { - /* add LDLM_FL_DISCARD_DATA requests to the priority list */ - list_add_tail(&blwi->blwi_entry, &blp->blp_prio_list); +} + +static int ldlm_bl_to_thread(struct ldlm_namespace *ns, + struct ldlm_lock_desc *ld, struct ldlm_lock *lock, + cfs_list_t *cancels, int count, int mode) +{ + ENTRY; + + if (cancels && count == 0) + RETURN(0); + + if (mode == LDLM_SYNC) { + /* if it is synchronous call do minimum mem alloc, as it could + * be triggered from kernel shrinker + */ + struct ldlm_bl_work_item blwi; + memset(&blwi, 0, sizeof(blwi)); + init_blwi(&blwi, ns, ld, cancels, count, lock, LDLM_SYNC); + RETURN(__ldlm_bl_to_thread(&blwi, LDLM_SYNC)); } else { - /* other blocking callbacks are added to the regular list */ - list_add_tail(&blwi->blwi_entry, &blp->blp_list); - } - cfs_waitq_signal(&blp->blp_waitq); - spin_unlock(&blp->blp_lock); + struct ldlm_bl_work_item *blwi; + OBD_ALLOC(blwi, sizeof(*blwi)); + if (blwi == NULL) + RETURN(-ENOMEM); + init_blwi(blwi, ns, ld, cancels, count, lock, LDLM_ASYNC); - RETURN(0); + RETURN(__ldlm_bl_to_thread(blwi, LDLM_ASYNC)); + } } + #endif int ldlm_bl_to_thread_lock(struct ldlm_namespace *ns, struct ldlm_lock_desc *ld, struct ldlm_lock *lock) { #ifdef __KERNEL__ - RETURN(ldlm_bl_to_thread(ns, ld, lock, NULL, 0)); + RETURN(ldlm_bl_to_thread(ns, ld, lock, NULL, 0, LDLM_ASYNC)); #else RETURN(-ENOSYS); #endif } int ldlm_bl_to_thread_list(struct ldlm_namespace *ns, struct ldlm_lock_desc *ld, - struct list_head *cancels, int count) + cfs_list_t *cancels, int count, int mode) { #ifdef __KERNEL__ - RETURN(ldlm_bl_to_thread(ns, ld, NULL, cancels, count)); + RETURN(ldlm_bl_to_thread(ns, ld, NULL, cancels, count, mode)); #else RETURN(-ENOSYS); #endif } +/* Setinfo coming from Server (eg MDT) to Client (eg MDC)! */ +static int ldlm_handle_setinfo(struct ptlrpc_request *req) +{ + struct obd_device *obd = req->rq_export->exp_obd; + char *key; + void *val; + int keylen, vallen; + int rc = -ENOSYS; + ENTRY; + + DEBUG_REQ(D_HSM, req, "%s: handle setinfo\n", obd->obd_name); + + req_capsule_set(&req->rq_pill, &RQF_OBD_SET_INFO); + + key = req_capsule_client_get(&req->rq_pill, &RMF_SETINFO_KEY); + if (key == NULL) { + DEBUG_REQ(D_IOCTL, req, "no set_info key"); + RETURN(-EFAULT); + } + keylen = req_capsule_get_size(&req->rq_pill, &RMF_SETINFO_KEY, + RCL_CLIENT); + val = req_capsule_client_get(&req->rq_pill, &RMF_SETINFO_VAL); + if (val == NULL) { + DEBUG_REQ(D_IOCTL, req, "no set_info val"); + RETURN(-EFAULT); + } + vallen = req_capsule_get_size(&req->rq_pill, &RMF_SETINFO_VAL, + RCL_CLIENT); + + /* We are responsible for swabbing contents of val */ + + if (KEY_IS(KEY_HSM_COPYTOOL_SEND)) + /* Pass it on to mdc (the "export" in this case) */ + rc = obd_set_info_async(req->rq_export, + sizeof(KEY_HSM_COPYTOOL_SEND), + KEY_HSM_COPYTOOL_SEND, + vallen, val, NULL); + else + DEBUG_REQ(D_WARNING, req, "ignoring unknown key %s", key); + + return rc; +} + +static inline void ldlm_callback_errmsg(struct ptlrpc_request *req, + const char *msg, int rc, + struct lustre_handle *handle) +{ + DEBUG_REQ((req->rq_no_reply || rc) ? D_WARNING : D_DLMTRACE, req, + "%s: [nid %s] [rc %d] [lock "LPX64"]", + msg, libcfs_id2str(req->rq_peer), rc, + handle ? handle->cookie : 0); + if (req->rq_no_reply) + CWARN("No reply was sent, maybe cause bug 21636.\n"); + else if (rc) + CWARN("Send reply failed, maybe cause bug 21636.\n"); +} + /* TODO: handle requests in a similar way as MDT: see mdt_handle_common() */ static int ldlm_callback_handler(struct ptlrpc_request *req) { @@ -1574,22 +1812,9 @@ static int ldlm_callback_handler(struct ptlrpc_request *req) req_capsule_init(&req->rq_pill, req, RCL_SERVER); if (req->rq_export == NULL) { - struct ldlm_request *dlm_req; - - CDEBUG(D_RPCTRACE, "operation %d from %s with bad " - "export cookie "LPX64"; this is " - "normal if this node rebooted with a lock held\n", - lustre_msg_get_opc(req->rq_reqmsg), - libcfs_id2str(req->rq_peer), - lustre_msg_get_handle(req->rq_reqmsg)->cookie); - - req_capsule_set(&req->rq_pill, &RQF_LDLM_CALLBACK); - dlm_req = req_capsule_client_get(&req->rq_pill, &RMF_DLM_REQ); - if (dlm_req != NULL) - CDEBUG(D_RPCTRACE, "--> lock cookie: "LPX64"\n", - dlm_req->lock_handle[0].cookie); - - ldlm_callback_reply(req, -ENOTCONN); + rc = ldlm_callback_reply(req, -ENOTCONN); + ldlm_callback_errmsg(req, "Operate on unconnected server", + rc, NULL); RETURN(0); } @@ -1609,11 +1834,18 @@ static int ldlm_callback_handler(struct ptlrpc_request *req) if (OBD_FAIL_CHECK(OBD_FAIL_LDLM_GL_CALLBACK)) RETURN(0); break; + case LDLM_SET_INFO: + rc = ldlm_handle_setinfo(req); + ldlm_callback_reply(req, rc); + RETURN(0); case OBD_LOG_CANCEL: /* remove this eventually - for 1.4.0 compat */ + CERROR("shouldn't be handling OBD_LOG_CANCEL on DLM thread\n"); req_capsule_set(&req->rq_pill, &RQF_LOG_CANCEL); if (OBD_FAIL_CHECK(OBD_FAIL_OBD_LOG_CANCEL_NET)) RETURN(0); rc = llog_origin_handle_cancel(req); + if (OBD_FAIL_CHECK(OBD_FAIL_OBD_LOG_CANCEL_REP)) + RETURN(0); ldlm_callback_reply(req, rc); RETURN(0); case OBD_QC_CALLBACK: @@ -1672,7 +1904,9 @@ static int ldlm_callback_handler(struct ptlrpc_request *req) dlm_req = req_capsule_client_get(&req->rq_pill, &RMF_DLM_REQ); if (dlm_req == NULL) { - ldlm_callback_reply(req, -EPROTO); + rc = ldlm_callback_reply(req, -EPROTO); + ldlm_callback_errmsg(req, "Operate without parameter", rc, + NULL); RETURN(0); } @@ -1685,29 +1919,39 @@ static int ldlm_callback_handler(struct ptlrpc_request *req) CERROR("ldlm_cli_cancel: %d\n", rc); } - lock = ldlm_handle2lock_ns(ns, &dlm_req->lock_handle[0]); + lock = ldlm_handle2lock_long(&dlm_req->lock_handle[0], 0); if (!lock) { CDEBUG(D_DLMTRACE, "callback on lock "LPX64" - lock " "disappeared\n", dlm_req->lock_handle[0].cookie); - ldlm_callback_reply(req, -EINVAL); + rc = ldlm_callback_reply(req, -EINVAL); + ldlm_callback_errmsg(req, "Operate with invalid parameter", rc, + &dlm_req->lock_handle[0]); RETURN(0); } + if ((lock->l_flags & LDLM_FL_FAIL_LOC) && + lustre_msg_get_opc(req->rq_reqmsg) == LDLM_BL_CALLBACK) + OBD_RACE(OBD_FAIL_LDLM_CP_BL_RACE); + /* Copy hints/flags (e.g. LDLM_FL_DISCARD_DATA) from AST. */ lock_res_and_lock(lock); lock->l_flags |= (dlm_req->lock_flags & LDLM_AST_FLAGS); if (lustre_msg_get_opc(req->rq_reqmsg) == LDLM_BL_CALLBACK) { - /* If somebody cancels locks and cache is already droped, + /* If somebody cancels lock and cache is already dropped, + * or lock is failed before cp_ast received on client, * we can tell the server we have no lock. Otherwise, we * should send cancel after dropping the cache. */ - if ((lock->l_flags & LDLM_FL_CANCELING) && - (lock->l_flags & LDLM_FL_BL_DONE)) { + if (((lock->l_flags & LDLM_FL_CANCELING) && + (lock->l_flags & LDLM_FL_BL_DONE)) || + (lock->l_flags & LDLM_FL_FAILED)) { LDLM_DEBUG(lock, "callback on lock " LPX64" - lock disappeared\n", dlm_req->lock_handle[0].cookie); unlock_res_and_lock(lock); - LDLM_LOCK_PUT(lock); - ldlm_callback_reply(req, -EINVAL); + LDLM_LOCK_RELEASE(lock); + rc = ldlm_callback_reply(req, -EINVAL); + ldlm_callback_errmsg(req, "Operate on stale lock", rc, + &dlm_req->lock_handle[0]); RETURN(0); } /* BL_AST locks are not needed in lru. @@ -1730,8 +1974,12 @@ static int ldlm_callback_handler(struct ptlrpc_request *req) case LDLM_BL_CALLBACK: CDEBUG(D_INODE, "blocking ast\n"); req_capsule_extend(&req->rq_pill, &RQF_LDLM_BL_CALLBACK); - if (!(lock->l_flags & LDLM_FL_CANCEL_ON_BLOCK)) - ldlm_callback_reply(req, 0); + if (!(lock->l_flags & LDLM_FL_CANCEL_ON_BLOCK)) { + rc = ldlm_callback_reply(req, 0); + if (req->rq_no_reply || rc) + ldlm_callback_errmsg(req, "Normal process", rc, + &dlm_req->lock_handle[0]); + } if (ldlm_bl_to_thread_lock(ns, &dlm_req->lock_desc, lock)) ldlm_handle_bl_callback(ns, &dlm_req->lock_desc, lock); break; @@ -1768,16 +2016,21 @@ static int ldlm_cancel_handler(struct ptlrpc_request *req) if (req->rq_export == NULL) { struct ldlm_request *dlm_req; - CERROR("operation %d from %s with bad export cookie "LPU64"\n", - lustre_msg_get_opc(req->rq_reqmsg), - libcfs_id2str(req->rq_peer), + CERROR("%s from %s arrived at %lu with bad export cookie " + LPU64"\n", + ll_opcode2str(lustre_msg_get_opc(req->rq_reqmsg)), + libcfs_nid2str(req->rq_peer.nid), + req->rq_arrival_time.tv_sec, lustre_msg_get_handle(req->rq_reqmsg)->cookie); - req_capsule_set(&req->rq_pill, &RQF_LDLM_CALLBACK); - dlm_req = req_capsule_client_get(&req->rq_pill, &RMF_DLM_REQ); - if (dlm_req != NULL) - ldlm_lock_dump_handle(D_ERROR, - &dlm_req->lock_handle[0]); + if (lustre_msg_get_opc(req->rq_reqmsg) == LDLM_CANCEL) { + req_capsule_set(&req->rq_pill, &RQF_LDLM_CALLBACK); + dlm_req = req_capsule_client_get(&req->rq_pill, + &RMF_DLM_REQ); + if (dlm_req != NULL) + ldlm_lock_dump_handle(D_ERROR, + &dlm_req->lock_handle[0]); + } ldlm_callback_reply(req, -ENOTCONN); RETURN(0); } @@ -1799,6 +2052,8 @@ static int ldlm_cancel_handler(struct ptlrpc_request *req) if (OBD_FAIL_CHECK(OBD_FAIL_OBD_LOG_CANCEL_NET)) RETURN(0); rc = llog_origin_handle_cancel(req); + if (OBD_FAIL_CHECK(OBD_FAIL_OBD_LOG_CANCEL_REP)) + RETURN(0); ldlm_callback_reply(req, rc); RETURN(0); default: @@ -1811,51 +2066,55 @@ static int ldlm_cancel_handler(struct ptlrpc_request *req) RETURN(0); } -void ldlm_revoke_lock_cb(void *obj, void *data) +int ldlm_revoke_lock_cb(cfs_hash_t *hs, cfs_hash_bd_t *bd, + cfs_hlist_node_t *hnode, void *data) + { - struct list_head *rpc_list = data; - struct ldlm_lock *lock = obj; + cfs_list_t *rpc_list = data; + struct ldlm_lock *lock = cfs_hash_object(hs, hnode); lock_res_and_lock(lock); if (lock->l_req_mode != lock->l_granted_mode) { unlock_res_and_lock(lock); - return; + return 0; } LASSERT(lock->l_resource); if (lock->l_resource->lr_type != LDLM_IBITS && lock->l_resource->lr_type != LDLM_PLAIN) { unlock_res_and_lock(lock); - return; + return 0; } if (lock->l_flags & LDLM_FL_AST_SENT) { unlock_res_and_lock(lock); - return; + return 0; } LASSERT(lock->l_blocking_ast); LASSERT(!lock->l_blocking_lock); lock->l_flags |= LDLM_FL_AST_SENT; - if (lock->l_export && lock->l_export->exp_lock_hash) - lustre_hash_del(lock->l_export->exp_lock_hash, - &lock->l_remote_handle, &lock->l_exp_hash); - list_add_tail(&lock->l_rk_ast, rpc_list); + if (lock->l_export && lock->l_export->exp_lock_hash && + !cfs_hlist_unhashed(&lock->l_exp_hash)) + cfs_hash_del(lock->l_export->exp_lock_hash, + &lock->l_remote_handle, &lock->l_exp_hash); + cfs_list_add_tail(&lock->l_rk_ast, rpc_list); LDLM_LOCK_GET(lock); unlock_res_and_lock(lock); + return 0; } void ldlm_revoke_export_locks(struct obd_export *exp) { - struct list_head rpc_list; + cfs_list_t rpc_list; ENTRY; CFS_INIT_LIST_HEAD(&rpc_list); - lustre_hash_for_each_empty(exp->exp_lock_hash, - ldlm_revoke_lock_cb, &rpc_list); + cfs_hash_for_each_empty(exp->exp_lock_hash, + ldlm_revoke_lock_cb, &rpc_list); ldlm_run_ast_work(&rpc_list, LDLM_WORK_REVOKE_AST); EXIT; @@ -1867,23 +2126,24 @@ static struct ldlm_bl_work_item *ldlm_bl_get_work(struct ldlm_bl_pool *blp) struct ldlm_bl_work_item *blwi = NULL; static unsigned int num_bl = 0; - spin_lock(&blp->blp_lock); + cfs_spin_lock(&blp->blp_lock); /* process a request from the blp_list at least every blp_num_threads */ - if (!list_empty(&blp->blp_list) && - (list_empty(&blp->blp_prio_list) || num_bl == 0)) - blwi = list_entry(blp->blp_list.next, - struct ldlm_bl_work_item, blwi_entry); + if (!cfs_list_empty(&blp->blp_list) && + (cfs_list_empty(&blp->blp_prio_list) || num_bl == 0)) + blwi = cfs_list_entry(blp->blp_list.next, + struct ldlm_bl_work_item, blwi_entry); else - if (!list_empty(&blp->blp_prio_list)) - blwi = list_entry(blp->blp_prio_list.next, - struct ldlm_bl_work_item, blwi_entry); + if (!cfs_list_empty(&blp->blp_prio_list)) + blwi = cfs_list_entry(blp->blp_prio_list.next, + struct ldlm_bl_work_item, + blwi_entry); if (blwi) { - if (++num_bl >= atomic_read(&blp->blp_num_threads)) + if (++num_bl >= cfs_atomic_read(&blp->blp_num_threads)) num_bl = 0; - list_del(&blwi->blwi_entry); + cfs_list_del(&blwi->blwi_entry); } - spin_unlock(&blp->blp_lock); + cfs_spin_unlock(&blp->blp_lock); return blwi; } @@ -1892,7 +2152,7 @@ static struct ldlm_bl_work_item *ldlm_bl_get_work(struct ldlm_bl_pool *blp) struct ldlm_bl_thread_data { char bltd_name[CFS_CURPROC_COMM_MAX]; struct ldlm_bl_pool *bltd_blp; - struct completion bltd_comp; + cfs_completion_t bltd_comp; int bltd_num; }; @@ -1903,14 +2163,14 @@ static int ldlm_bl_thread_start(struct ldlm_bl_pool *blp) struct ldlm_bl_thread_data bltd = { .bltd_blp = blp }; int rc; - init_completion(&bltd.bltd_comp); + cfs_init_completion(&bltd.bltd_comp); rc = cfs_kernel_thread(ldlm_bl_thread_main, &bltd, 0); if (rc < 0) { CERROR("cannot start LDLM thread ldlm_bl_%02d: rc %d\n", - atomic_read(&blp->blp_num_threads), rc); + cfs_atomic_read(&blp->blp_num_threads), rc); return rc; } - wait_for_completion(&bltd.bltd_comp); + cfs_wait_for_completion(&bltd.bltd_comp); return 0; } @@ -1925,14 +2185,15 @@ static int ldlm_bl_thread_main(void *arg) blp = bltd->bltd_blp; - bltd->bltd_num = atomic_inc_return(&blp->blp_num_threads) - 1; - atomic_inc(&blp->blp_busy_threads); + bltd->bltd_num = + cfs_atomic_inc_return(&blp->blp_num_threads) - 1; + cfs_atomic_inc(&blp->blp_busy_threads); snprintf(bltd->bltd_name, sizeof(bltd->bltd_name) - 1, "ldlm_bl_%02d", bltd->bltd_num); cfs_daemonize(bltd->bltd_name); - complete(&bltd->bltd_comp); + cfs_complete(&bltd->bltd_comp); /* cannot use bltd after this, it is only on caller's stack */ } @@ -1945,11 +2206,11 @@ static int ldlm_bl_thread_main(void *arg) if (blwi == NULL) { int busy; - atomic_dec(&blp->blp_busy_threads); + cfs_atomic_dec(&blp->blp_busy_threads); l_wait_event_exclusive(blp->blp_waitq, (blwi = ldlm_bl_get_work(blp)) != NULL, &lwi); - busy = atomic_inc_return(&blp->blp_busy_threads); + busy = cfs_atomic_inc_return(&blp->blp_busy_threads); if (blwi->blwi_ns == NULL) /* added by ldlm_cleanup() */ @@ -1957,7 +2218,8 @@ static int ldlm_bl_thread_main(void *arg) /* Not fatal if racy and have a few too many threads */ if (unlikely(busy < blp->blp_max_threads && - busy >= atomic_read(&blp->blp_num_threads))) + busy >= cfs_atomic_read(&blp->blp_num_threads) && + !blwi->blwi_mem_pressure)) /* discard the return value, we tried */ ldlm_bl_thread_start(blp); } else { @@ -1965,24 +2227,35 @@ static int ldlm_bl_thread_main(void *arg) /* added by ldlm_cleanup() */ break; } + if (blwi->blwi_mem_pressure) + cfs_memory_pressure_set(); if (blwi->blwi_count) { + int count; /* The special case when we cancel locks in lru * asynchronously, we pass the list of locks here. - * Thus lock is marked LDLM_FL_CANCELING, and already - * canceled locally. */ - ldlm_cli_cancel_list(&blwi->blwi_head, - blwi->blwi_count, NULL, 0); + * Thus locks are marked LDLM_FL_CANCELING, but NOT + * canceled locally yet. */ + count = ldlm_cli_cancel_list_local(&blwi->blwi_head, + blwi->blwi_count, + LCF_BL_AST); + ldlm_cli_cancel_list(&blwi->blwi_head, count, NULL, 0); } else { ldlm_handle_bl_callback(blwi->blwi_ns, &blwi->blwi_ld, blwi->blwi_lock); } - OBD_FREE(blwi, sizeof(*blwi)); + if (blwi->blwi_mem_pressure) + cfs_memory_pressure_clr(); + + if (blwi->blwi_mode == LDLM_ASYNC) + OBD_FREE(blwi, sizeof(*blwi)); + else + cfs_complete(&blwi->blwi_comp); } - atomic_dec(&blp->blp_busy_threads); - atomic_dec(&blp->blp_num_threads); - complete(&blp->blp_comp); + cfs_atomic_dec(&blp->blp_busy_threads); + cfs_atomic_dec(&blp->blp_num_threads); + cfs_complete(&blp->blp_comp); RETURN(0); } @@ -1995,13 +2268,13 @@ int ldlm_get_ref(void) { int rc = 0; ENTRY; - mutex_down(&ldlm_ref_sem); + cfs_mutex_down(&ldlm_ref_sem); if (++ldlm_refcount == 1) { rc = ldlm_setup(); if (rc) ldlm_refcount--; } - mutex_up(&ldlm_ref_sem); + cfs_mutex_up(&ldlm_ref_sem); RETURN(rc); } @@ -2009,7 +2282,7 @@ int ldlm_get_ref(void) void ldlm_put_ref(void) { ENTRY; - mutex_down(&ldlm_ref_sem); + cfs_mutex_down(&ldlm_ref_sem); if (ldlm_refcount == 1) { int rc = ldlm_cleanup(); if (rc) @@ -2019,67 +2292,77 @@ void ldlm_put_ref(void) } else { ldlm_refcount--; } - mutex_up(&ldlm_ref_sem); + cfs_mutex_up(&ldlm_ref_sem); EXIT; } -/* - * Export handle<->lock hash operations. +/* + * Export handle<->lock hash operations. */ static unsigned -ldlm_export_lock_hash(lustre_hash_t *lh, void *key, unsigned mask) +ldlm_export_lock_hash(cfs_hash_t *hs, void *key, unsigned mask) { - return lh_u64_hash(((struct lustre_handle *)key)->cookie, mask); + return cfs_hash_u64_hash(((struct lustre_handle *)key)->cookie, mask); } static void * -ldlm_export_lock_key(struct hlist_node *hnode) +ldlm_export_lock_key(cfs_hlist_node_t *hnode) { struct ldlm_lock *lock; - ENTRY; - lock = hlist_entry(hnode, struct ldlm_lock, l_exp_hash); - RETURN(&lock->l_remote_handle); + lock = cfs_hlist_entry(hnode, struct ldlm_lock, l_exp_hash); + return &lock->l_remote_handle; +} + +static void +ldlm_export_lock_keycpy(cfs_hlist_node_t *hnode, void *key) +{ + struct ldlm_lock *lock; + + lock = cfs_hlist_entry(hnode, struct ldlm_lock, l_exp_hash); + lock->l_remote_handle = *(struct lustre_handle *)key; } static int -ldlm_export_lock_compare(void *key, struct hlist_node *hnode) +ldlm_export_lock_keycmp(void *key, cfs_hlist_node_t *hnode) { - ENTRY; - RETURN(lustre_handle_equal(ldlm_export_lock_key(hnode), key)); + return lustre_handle_equal(ldlm_export_lock_key(hnode), key); } static void * -ldlm_export_lock_get(struct hlist_node *hnode) +ldlm_export_lock_object(cfs_hlist_node_t *hnode) +{ + return cfs_hlist_entry(hnode, struct ldlm_lock, l_exp_hash); +} + +static void +ldlm_export_lock_get(cfs_hash_t *hs, cfs_hlist_node_t *hnode) { struct ldlm_lock *lock; - ENTRY; - lock = hlist_entry(hnode, struct ldlm_lock, l_exp_hash); + lock = cfs_hlist_entry(hnode, struct ldlm_lock, l_exp_hash); LDLM_LOCK_GET(lock); - - RETURN(lock); } -static void * -ldlm_export_lock_put(struct hlist_node *hnode) +static void +ldlm_export_lock_put(cfs_hash_t *hs, cfs_hlist_node_t *hnode) { struct ldlm_lock *lock; - ENTRY; - lock = hlist_entry(hnode, struct ldlm_lock, l_exp_hash); - LDLM_LOCK_PUT(lock); - - RETURN(lock); + lock = cfs_hlist_entry(hnode, struct ldlm_lock, l_exp_hash); + LDLM_LOCK_RELEASE(lock); } -static lustre_hash_ops_t ldlm_export_lock_ops = { - .lh_hash = ldlm_export_lock_hash, - .lh_key = ldlm_export_lock_key, - .lh_compare = ldlm_export_lock_compare, - .lh_get = ldlm_export_lock_get, - .lh_put = ldlm_export_lock_put +static cfs_hash_ops_t ldlm_export_lock_ops = { + .hs_hash = ldlm_export_lock_hash, + .hs_key = ldlm_export_lock_key, + .hs_keycmp = ldlm_export_lock_keycmp, + .hs_keycpy = ldlm_export_lock_keycpy, + .hs_object = ldlm_export_lock_object, + .hs_get = ldlm_export_lock_get, + .hs_put = ldlm_export_lock_put, + .hs_put_locked = ldlm_export_lock_put, }; int ldlm_init_export(struct obd_export *exp) @@ -2087,8 +2370,14 @@ int ldlm_init_export(struct obd_export *exp) ENTRY; exp->exp_lock_hash = - lustre_hash_init(obd_uuid2str(&exp->exp_client_uuid), - 128, 65536, &ldlm_export_lock_ops, LH_REHASH); + cfs_hash_create(obd_uuid2str(&exp->exp_client_uuid), + HASH_EXP_LOCK_CUR_BITS, + HASH_EXP_LOCK_MAX_BITS, + HASH_EXP_LOCK_BKT_BITS, 0, + CFS_HASH_MIN_THETA, CFS_HASH_MAX_THETA, + &ldlm_export_lock_ops, + CFS_HASH_DEFAULT | CFS_HASH_REHASH_KEY | + CFS_HASH_NBLK_CHANGE); if (!exp->exp_lock_hash) RETURN(-ENOMEM); @@ -2100,7 +2389,7 @@ EXPORT_SYMBOL(ldlm_init_export); void ldlm_destroy_export(struct obd_export *exp) { ENTRY; - lustre_hash_exit(exp->exp_lock_hash); + cfs_hash_putref(exp->exp_lock_hash); exp->exp_lock_hash = NULL; EXIT; } @@ -2144,12 +2433,12 @@ static int ldlm_setup(void) ldlm_state->ldlm_cb_service = ptlrpc_init_svc(LDLM_NBUFS, LDLM_BUFSIZE, LDLM_MAXREQSIZE, LDLM_MAXREPSIZE, LDLM_CB_REQUEST_PORTAL, - LDLM_CB_REPLY_PORTAL, 1800, + LDLM_CB_REPLY_PORTAL, 2, ldlm_callback_handler, "ldlm_cbd", ldlm_svc_proc_dir, NULL, ldlm_min_threads, ldlm_max_threads, "ldlm_cb", - LCT_MD_THREAD|LCT_DT_THREAD); + LCT_MD_THREAD|LCT_DT_THREAD, NULL); if (!ldlm_state->ldlm_cb_service) { CERROR("failed to start service\n"); @@ -2159,12 +2448,13 @@ static int ldlm_setup(void) ldlm_state->ldlm_cancel_service = ptlrpc_init_svc(LDLM_NBUFS, LDLM_BUFSIZE, LDLM_MAXREQSIZE, LDLM_MAXREPSIZE, LDLM_CANCEL_REQUEST_PORTAL, - LDLM_CANCEL_REPLY_PORTAL, 6000, + LDLM_CANCEL_REPLY_PORTAL, 6, ldlm_cancel_handler, "ldlm_canceld", ldlm_svc_proc_dir, NULL, ldlm_min_threads, ldlm_max_threads, "ldlm_cn", - LCT_MD_THREAD|LCT_DT_THREAD|LCT_CL_THREAD); + LCT_MD_THREAD|LCT_DT_THREAD|LCT_CL_THREAD, + NULL); if (!ldlm_state->ldlm_cancel_service) { CERROR("failed to start service\n"); @@ -2176,12 +2466,12 @@ static int ldlm_setup(void) GOTO(out_proc, rc = -ENOMEM); ldlm_state->ldlm_bl_pool = blp; - spin_lock_init(&blp->blp_lock); + cfs_spin_lock_init(&blp->blp_lock); CFS_INIT_LIST_HEAD(&blp->blp_list); CFS_INIT_LIST_HEAD(&blp->blp_prio_list); cfs_waitq_init(&blp->blp_waitq); - atomic_set(&blp->blp_num_threads, 0); - atomic_set(&blp->blp_busy_threads, 0); + cfs_atomic_set(&blp->blp_num_threads, 0); + cfs_atomic_set(&blp->blp_busy_threads, 0); blp->blp_min_threads = ldlm_min_threads; blp->blp_max_threads = ldlm_max_threads; @@ -2192,11 +2482,11 @@ static int ldlm_setup(void) GOTO(out_thread, rc); } - rc = ptlrpc_start_threads(NULL, ldlm_state->ldlm_cancel_service); + rc = ptlrpc_start_threads(ldlm_state->ldlm_cancel_service); if (rc) GOTO(out_thread, rc); - rc = ptlrpc_start_threads(NULL, ldlm_state->ldlm_cb_service); + rc = ptlrpc_start_threads(ldlm_state->ldlm_cb_service); if (rc) GOTO(out_thread, rc); @@ -2205,7 +2495,7 @@ static int ldlm_setup(void) cfs_waitq_init(&expired_lock_thread.elt_waitq); CFS_INIT_LIST_HEAD(&waiting_locks_list); - spin_lock_init(&waiting_locks_spinlock); + cfs_spin_lock_init(&waiting_locks_spinlock); cfs_timer_init(&waiting_locks_timer, waiting_locks_callback, 0); rc = cfs_kernel_thread(expired_lock_main, NULL, CLONE_VM | CLONE_FILES); @@ -2214,8 +2504,8 @@ static int ldlm_setup(void) GOTO(out_thread, rc); } - wait_event(expired_lock_thread.elt_waitq, - expired_lock_thread.elt_state == ELT_READY); + cfs_wait_event(expired_lock_thread.elt_waitq, + expired_lock_thread.elt_state == ELT_READY); #endif #ifdef __KERNEL__ @@ -2248,8 +2538,8 @@ static int ldlm_cleanup(void) #endif ENTRY; - if (!list_empty(ldlm_namespace_list(LDLM_NAMESPACE_SERVER)) || - !list_empty(ldlm_namespace_list(LDLM_NAMESPACE_CLIENT))) { + if (!cfs_list_empty(ldlm_namespace_list(LDLM_NAMESPACE_SERVER)) || + !cfs_list_empty(ldlm_namespace_list(LDLM_NAMESPACE_CLIENT))) { CERROR("ldlm still has namespaces; clean these up first.\n"); ldlm_dump_all_namespaces(LDLM_NAMESPACE_SERVER, D_DLMTRACE); ldlm_dump_all_namespaces(LDLM_NAMESPACE_CLIENT, D_DLMTRACE); @@ -2261,17 +2551,17 @@ static int ldlm_cleanup(void) #endif #ifdef __KERNEL__ - while (atomic_read(&blp->blp_num_threads) > 0) { + while (cfs_atomic_read(&blp->blp_num_threads) > 0) { struct ldlm_bl_work_item blwi = { .blwi_ns = NULL }; - init_completion(&blp->blp_comp); + cfs_init_completion(&blp->blp_comp); - spin_lock(&blp->blp_lock); - list_add_tail(&blwi.blwi_entry, &blp->blp_list); + cfs_spin_lock(&blp->blp_lock); + cfs_list_add_tail(&blwi.blwi_entry, &blp->blp_list); cfs_waitq_signal(&blp->blp_waitq); - spin_unlock(&blp->blp_lock); + cfs_spin_unlock(&blp->blp_lock); - wait_for_completion(&blp->blp_comp); + cfs_wait_for_completion(&blp->blp_comp); } OBD_FREE(blp, sizeof(*blp)); @@ -2281,8 +2571,8 @@ static int ldlm_cleanup(void) expired_lock_thread.elt_state = ELT_TERMINATE; cfs_waitq_signal(&expired_lock_thread.elt_waitq); - wait_event(expired_lock_thread.elt_waitq, - expired_lock_thread.elt_state == ELT_STOPPED); + cfs_wait_event(expired_lock_thread.elt_waitq, + expired_lock_thread.elt_state == ELT_STOPPED); #else ptlrpc_unregister_service(ldlm_state->ldlm_cb_service); ptlrpc_unregister_service(ldlm_state->ldlm_cancel_service); @@ -2296,18 +2586,18 @@ static int ldlm_cleanup(void) int __init ldlm_init(void) { - init_mutex(&ldlm_ref_sem); - init_mutex(ldlm_namespace_lock(LDLM_NAMESPACE_SERVER)); - init_mutex(ldlm_namespace_lock(LDLM_NAMESPACE_CLIENT)); + cfs_init_mutex(&ldlm_ref_sem); + cfs_init_mutex(ldlm_namespace_lock(LDLM_NAMESPACE_SERVER)); + cfs_init_mutex(ldlm_namespace_lock(LDLM_NAMESPACE_CLIENT)); ldlm_resource_slab = cfs_mem_cache_create("ldlm_resources", sizeof(struct ldlm_resource), 0, - SLAB_HWCACHE_ALIGN); + CFS_SLAB_HWCACHE_ALIGN); if (ldlm_resource_slab == NULL) return -ENOMEM; ldlm_lock_slab = cfs_mem_cache_create("ldlm_locks", - sizeof(struct ldlm_lock), 0, - SLAB_HWCACHE_ALIGN); + sizeof(struct ldlm_lock), 0, + CFS_SLAB_HWCACHE_ALIGN | CFS_SLAB_DESTROY_BY_RCU); if (ldlm_lock_slab == NULL) { cfs_mem_cache_destroy(ldlm_resource_slab); return -ENOMEM; @@ -2315,13 +2605,15 @@ int __init ldlm_init(void) ldlm_interval_slab = cfs_mem_cache_create("interval_node", sizeof(struct ldlm_interval), - 0, SLAB_HWCACHE_ALIGN); + 0, CFS_SLAB_HWCACHE_ALIGN); if (ldlm_interval_slab == NULL) { cfs_mem_cache_destroy(ldlm_resource_slab); cfs_mem_cache_destroy(ldlm_lock_slab); return -ENOMEM; } - +#if LUSTRE_TRACKS_LOCK_EXP_REFS + class_export_dump_hook = ldlm_dump_export_locks; +#endif return 0; } @@ -2332,6 +2624,12 @@ void __exit ldlm_exit(void) CERROR("ldlm_refcount is %d in ldlm_exit!\n", ldlm_refcount); rc = cfs_mem_cache_destroy(ldlm_resource_slab); LASSERTF(rc == 0, "couldn't free ldlm resource slab\n"); +#ifdef __KERNEL__ + /* ldlm_lock_put() use RCU to call ldlm_lock_free, so need call + * synchronize_rcu() to wait a grace period elapsed, so that + * ldlm_lock_free() get a chance to be called. */ + synchronize_rcu(); +#endif rc = cfs_mem_cache_destroy(ldlm_lock_slab); LASSERTF(rc == 0, "couldn't free ldlm lock slab\n"); rc = cfs_mem_cache_destroy(ldlm_interval_slab); @@ -2351,23 +2649,25 @@ EXPORT_SYMBOL(ldlm_lock2handle); EXPORT_SYMBOL(__ldlm_handle2lock); EXPORT_SYMBOL(ldlm_lock_get); EXPORT_SYMBOL(ldlm_lock_put); -EXPORT_SYMBOL(ldlm_lock_fast_match); -EXPORT_SYMBOL(ldlm_lock_fast_release); EXPORT_SYMBOL(ldlm_lock_match); EXPORT_SYMBOL(ldlm_lock_cancel); EXPORT_SYMBOL(ldlm_lock_addref); +EXPORT_SYMBOL(ldlm_lock_addref_try); EXPORT_SYMBOL(ldlm_lock_decref); EXPORT_SYMBOL(ldlm_lock_decref_and_cancel); EXPORT_SYMBOL(ldlm_lock_change_resource); -EXPORT_SYMBOL(ldlm_lock_set_data); EXPORT_SYMBOL(ldlm_it2str); EXPORT_SYMBOL(ldlm_lock_dump); EXPORT_SYMBOL(ldlm_lock_dump_handle); -EXPORT_SYMBOL(ldlm_cancel_locks_for_export); EXPORT_SYMBOL(ldlm_reprocess_all_ns); +EXPORT_SYMBOL(ldlm_lock_allow_match_locked); EXPORT_SYMBOL(ldlm_lock_allow_match); +EXPORT_SYMBOL(ldlm_lock_downgrade); +EXPORT_SYMBOL(ldlm_lock_convert); /* ldlm_request.c */ +EXPORT_SYMBOL(ldlm_completion_ast_async); +EXPORT_SYMBOL(ldlm_blocking_ast_nocheck); EXPORT_SYMBOL(ldlm_completion_ast); EXPORT_SYMBOL(ldlm_blocking_ast); EXPORT_SYMBOL(ldlm_glimpse_ast); @@ -2382,13 +2682,12 @@ EXPORT_SYMBOL(ldlm_cli_cancel); EXPORT_SYMBOL(ldlm_cli_cancel_unused); EXPORT_SYMBOL(ldlm_cli_cancel_unused_resource); EXPORT_SYMBOL(ldlm_cli_cancel_req); -EXPORT_SYMBOL(ldlm_cli_join_lru); EXPORT_SYMBOL(ldlm_replay_locks); EXPORT_SYMBOL(ldlm_resource_foreach); EXPORT_SYMBOL(ldlm_namespace_foreach); -EXPORT_SYMBOL(ldlm_namespace_foreach_res); EXPORT_SYMBOL(ldlm_resource_iterate); EXPORT_SYMBOL(ldlm_cancel_resource_local); +EXPORT_SYMBOL(ldlm_cli_cancel_list_local); EXPORT_SYMBOL(ldlm_cli_cancel_list); /* ldlm_lockd.c */ @@ -2424,7 +2723,7 @@ EXPORT_SYMBOL(client_obd_setup); EXPORT_SYMBOL(client_obd_cleanup); EXPORT_SYMBOL(client_connect_import); EXPORT_SYMBOL(client_disconnect_export); -EXPORT_SYMBOL(target_start_recovery_thread); +EXPORT_SYMBOL(server_disconnect_export); EXPORT_SYMBOL(target_stop_recovery_thread); EXPORT_SYMBOL(target_handle_connect); EXPORT_SYMBOL(target_cleanup_recovery);