X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fldlm%2Fldlm_lockd.c;h=b56a42cd9e8470b2e506dc5eee4dbed785053817;hp=88afb3f7caff87c67d454e07282036fcf2a3196b;hb=e6ba48a08c9fe831b3f60985a72bb31b9806bb34;hpb=6c211e71be98732f8aea0df7a57c872fec2fd3c2 diff --git a/lustre/ldlm/ldlm_lockd.c b/lustre/ldlm/ldlm_lockd.c index 88afb3f..b56a42c 100644 --- a/lustre/ldlm/ldlm_lockd.c +++ b/lustre/ldlm/ldlm_lockd.c @@ -202,11 +202,19 @@ static int expired_lock_main(void *arg) 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); + /* release extra ref grabbed by ldlm_add_waiting_lock() + * or ldlm_failed_ast() */ + LDLM_LOCK_RELEASE(lock); + do_dump++; class_fail_export(export); class_export_put(export); @@ -230,6 +238,31 @@ 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; + + spin_lock(&lock->l_export->exp_lock); + 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; + } + } + spin_unlock(&lock->l_export->exp_lock); + RETURN(match); +} + /* This is called from within a timer interrupt and cannot schedule */ static void waiting_locks_callback(unsigned long unused) { @@ -240,7 +273,6 @@ repeat: 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()) || (lock->l_req_mode == LCK_GROUP)) break; @@ -278,14 +310,41 @@ repeat: 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); + spin_unlock_bh(&waiting_locks_spinlock); + LDLM_DEBUG(lock, "prolong the busy lock"); + ldlm_refresh_waiting_lock(lock, + ldlm_get_enq_timeout(lock)); + spin_lock_bh(&waiting_locks_spinlock); + + if (!cont) { + LDLM_LOCK_PUT(lock); + break; + } + + LDLM_LOCK_PUT(lock); + continue; + } + lock->l_resource->lr_namespace->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; + /* 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 */ list_del(&lock->l_pending_chain); list_add(&lock->l_pending_chain, &expired_lock_thread.elt_expired_locks); @@ -317,20 +376,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)) 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); @@ -363,7 +428,11 @@ static int ldlm_add_waiting_lock(struct ldlm_lock *lock) return 0; } - ret = __ldlm_add_waiting_lock(lock); + ret = __ldlm_add_waiting_lock(lock, ldlm_get_enq_timeout(lock)); + if (ret) + /* grab ref on the lock if it has been added to the + * waiting list */ + LDLM_LOCK_GET(lock); spin_unlock_bh(&waiting_locks_spinlock); LDLM_DEBUG(lock, "%sadding to wait list", @@ -375,10 +444,12 @@ 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; @@ -417,6 +488,10 @@ int ldlm_del_waiting_lock(struct ldlm_lock *lock) spin_lock_bh(&waiting_locks_spinlock); ret = __ldlm_del_waiting_lock(lock); 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 +502,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. */ @@ -443,14 +518,15 @@ int ldlm_refresh_waiting_lock(struct ldlm_lock *lock) 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); + __ldlm_add_waiting_lock(lock, timeout); 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 +540,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 +549,25 @@ 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__ + 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); + list_add(&lock->l_pending_chain, &expired_lock_thread.elt_expired_locks); + cfs_waitq_signal(&expired_lock_thread.elt_waitq); + spin_unlock_bh(&waiting_locks_spinlock); +#else class_fail_export(lock->l_export); +#endif } static int ldlm_handle_ast_error(struct ldlm_lock *lock, @@ -536,7 +617,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,18 +630,18 @@ 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 + /* 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, + 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); @@ -585,11 +667,35 @@ static inline int ldlm_bl_and_cp_ast_fini(struct ptlrpc_request *req, } 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; + } + + spin_lock(&lock->l_export->exp_lock); + 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); + } + spin_unlock(&lock->l_export->exp_lock); + EXIT; +} + /* * ->l_blocking_ast() method for server-side locks. This is invoked when newly * enqueued server lock conflicts with given one. @@ -619,6 +725,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); @@ -672,8 +780,9 @@ int ldlm_server_blocking_ast(struct ldlm_lock *lock, 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 +795,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,19 +803,18 @@ 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); + total_enqueue_wait = cfs_time_sub(cfs_time_current_sec(), + lock->l_last_activity); - if (total_enqueue_wait / ONE_MILLION > obd_timeout) + if (total_enqueue_wait > 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); + LDLM_WARN(lock, "enqueue wait took %lus from "CFS_TIME_T, + total_enqueue_wait, 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) @@ -739,13 +846,13 @@ int ldlm_server_completion_ast(struct ldlm_lock *lock, int flags, void *data) unlock_res_and_lock(lock); } - 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); + total_enqueue_wait); ptlrpc_request_set_replen(req); @@ -758,6 +865,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 +886,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); @@ -820,8 +930,9 @@ int ldlm_server_glimpse_ast(struct ldlm_lock *lock, void *data) 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); @@ -839,26 +950,6 @@ int ldlm_server_glimpse_ast(struct ldlm_lock *lock, void *data) RETURN(rc); } -static struct ldlm_lock * -find_existing_lock(struct obd_export *exp, - const struct lustre_handle *remote_hdl) -{ - struct list_head *iter; - - spin_lock(&exp->exp_ldlm_data.led_lock); - list_for_each(iter, &exp->exp_ldlm_data.led_held_locks) { - struct ldlm_lock *lock; - lock = list_entry(iter, struct ldlm_lock, l_export_chain); - if (lock->l_remote_handle.cookie == remote_hdl->cookie) { - LDLM_LOCK_GET(lock); - spin_unlock(&exp->exp_ldlm_data.led_lock); - return lock; - } - } - spin_unlock(&exp->exp_ldlm_data.led_lock); - return NULL; -} - #ifdef __KERNEL__ extern unsigned long long lu_time_stamp_get(void); #else @@ -896,7 +987,7 @@ static void ldlm_svc_get_eopc(const struct ldlm_request *dlm_req, if (op) lprocfs_counter_incr(srv_stats, op); - return ; + return; } /* @@ -927,8 +1018,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 || @@ -979,8 +1071,9 @@ int ldlm_handle_enqueue0(struct ldlm_namespace *ns, #endif if (unlikely(flags & LDLM_FL_REPLAY)) { - lock = find_existing_lock(req->rq_export, - &dlm_req->lock_handle[0]); + /* 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]); if (lock != NULL) { DEBUG_REQ(D_DLMTRACE, req, "found existing lock cookie " LPX64, lock->l_handle.h_cookie); @@ -992,13 +1085,12 @@ 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"); @@ -1010,10 +1102,11 @@ int ldlm_handle_enqueue0(struct ldlm_namespace *ns, GOTO(out, rc = -ENOTCONN); } lock->l_export = class_export_get(req->rq_export); - spin_lock(&lock->l_export->exp_ldlm_data.led_lock); - list_add(&lock->l_export_chain, - &lock->l_export->exp_ldlm_data.led_held_locks); - spin_unlock(&lock->l_export->exp_ldlm_data.led_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); existing_lock: @@ -1094,7 +1187,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"); @@ -1150,7 +1243,7 @@ existing_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)", @@ -1190,8 +1283,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); @@ -1209,7 +1303,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) { @@ -1283,10 +1377,12 @@ 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_RESOURCE_ADDREF(res); ldlm_res_lvbo_update(res, NULL, 0, 1); } pres = res; @@ -1296,6 +1392,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"); @@ -1314,8 +1411,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); @@ -1360,7 +1458,7 @@ void ldlm_handle_bl_callback(struct ldlm_namespace *ns, } LDLM_DEBUG(lock, "client blocking callback handler END"); - LDLM_LOCK_PUT(lock); + LDLM_LOCK_RELEASE(lock); EXIT; } @@ -1390,7 +1488,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; } @@ -1412,10 +1510,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; } @@ -1454,7 +1552,7 @@ static void ldlm_handle_cp_callback(struct ptlrpc_request *req, LDLM_DEBUG_NOLOCK("client completion callback handler END (lock %p)", lock); - LDLM_LOCK_PUT(lock); + LDLM_LOCK_RELEASE(lock); EXIT; } @@ -1492,7 +1590,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; } @@ -1628,10 +1726,13 @@ static int ldlm_callback_handler(struct ptlrpc_request *req) RETURN(0); break; 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: @@ -1703,7 +1804,7 @@ 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); @@ -1711,20 +1812,26 @@ static int ldlm_callback_handler(struct ptlrpc_request *req) 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 droped, + * 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_LOCK_RELEASE(lock); ldlm_callback_reply(req, -EINVAL); RETURN(0); } @@ -1817,6 +1924,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: @@ -1829,47 +1938,52 @@ static int ldlm_cancel_handler(struct ptlrpc_request *req) RETURN(0); } -void ldlm_revoke_export_locks(struct obd_export *exp) +void ldlm_revoke_lock_cb(void *obj, void *data) { - struct list_head *locklist = &exp->exp_ldlm_data.led_held_locks; - struct list_head rpc_list; - struct ldlm_lock *lock, *next; + struct list_head *rpc_list = data; + struct ldlm_lock *lock = obj; - ENTRY; - CFS_INIT_LIST_HEAD(&rpc_list); + lock_res_and_lock(lock); - spin_lock(&exp->exp_ldlm_data.led_lock); - list_for_each_entry_safe(lock, next, locklist, l_export_chain) { - lock_res_and_lock(lock); + if (lock->l_req_mode != lock->l_granted_mode) { + unlock_res_and_lock(lock); + return; + } - if (lock->l_req_mode != lock->l_granted_mode) { - unlock_res_and_lock(lock); - continue; - } + 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; + } - LASSERT(lock->l_resource); - if (lock->l_resource->lr_type != LDLM_IBITS && - lock->l_resource->lr_type != LDLM_PLAIN) { - unlock_res_and_lock(lock); - continue; - } + if (lock->l_flags & LDLM_FL_AST_SENT) { + unlock_res_and_lock(lock); + return; + } - if (lock->l_flags & LDLM_FL_AST_SENT) { - unlock_res_and_lock(lock); - continue; - } + LASSERT(lock->l_blocking_ast); + LASSERT(!lock->l_blocking_lock); - 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 && + !hlist_unhashed(&lock->l_exp_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); + LDLM_LOCK_GET(lock); - lock->l_flags |= LDLM_FL_AST_SENT; - list_move(&lock->l_export_chain, &rpc_list); - LDLM_LOCK_GET(lock); + unlock_res_and_lock(lock); +} - unlock_res_and_lock(lock); - } - spin_unlock(&exp->exp_ldlm_data.led_lock); +void ldlm_revoke_export_locks(struct obd_export *exp) +{ + struct list_head rpc_list; + ENTRY; + CFS_INIT_LIST_HEAD(&rpc_list); + lustre_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; @@ -2038,6 +2152,88 @@ void ldlm_put_ref(void) EXIT; } +/* + * Export handle<->lock hash operations. + */ +static unsigned +ldlm_export_lock_hash(lustre_hash_t *lh, void *key, unsigned mask) +{ + return lh_u64_hash(((struct lustre_handle *)key)->cookie, mask); +} + +static void * +ldlm_export_lock_key(struct hlist_node *hnode) +{ + struct ldlm_lock *lock; + ENTRY; + + lock = hlist_entry(hnode, struct ldlm_lock, l_exp_hash); + RETURN(&lock->l_remote_handle); +} + +static int +ldlm_export_lock_compare(void *key, struct hlist_node *hnode) +{ + ENTRY; + RETURN(lustre_handle_equal(ldlm_export_lock_key(hnode), key)); +} + +static void * +ldlm_export_lock_get(struct hlist_node *hnode) +{ + struct ldlm_lock *lock; + ENTRY; + + lock = 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) +{ + struct ldlm_lock *lock; + ENTRY; + + lock = hlist_entry(hnode, struct ldlm_lock, l_exp_hash); + LDLM_LOCK_RELEASE(lock); + + RETURN(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 +}; + +int ldlm_init_export(struct obd_export *exp) +{ + ENTRY; + + exp->exp_lock_hash = + lustre_hash_init(obd_uuid2str(&exp->exp_client_uuid), + 7, 16, &ldlm_export_lock_ops, LH_REHASH); + + if (!exp->exp_lock_hash) + RETURN(-ENOMEM); + + RETURN(0); +} +EXPORT_SYMBOL(ldlm_init_export); + +void ldlm_destroy_export(struct obd_export *exp) +{ + ENTRY; + lustre_hash_exit(exp->exp_lock_hash); + exp->exp_lock_hash = NULL; + EXIT; +} +EXPORT_SYMBOL(ldlm_destroy_export); + static int ldlm_setup(void) { struct ldlm_bl_pool *blp; @@ -2081,7 +2277,7 @@ static int ldlm_setup(void) 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"); @@ -2096,7 +2292,8 @@ static int ldlm_setup(void) 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"); @@ -2180,7 +2377,7 @@ static int ldlm_cleanup(void) #endif ENTRY; - if (!list_empty(ldlm_namespace_list(LDLM_NAMESPACE_SERVER)) || + if (!list_empty(ldlm_namespace_list(LDLM_NAMESPACE_SERVER)) || !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); @@ -2283,23 +2480,26 @@ 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); @@ -2314,7 +2514,6 @@ 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);