From 675dd06e429ee9551d0f874f3461ac3e5091c039 Mon Sep 17 00:00:00 2001 From: Vitaly Fertman Date: Thu, 20 May 2010 19:45:43 +0400 Subject: [PATCH] b=22244 delegate lock cancel to blocking thread i=adilger i=green instead of cancelling locks locally in the shrinking thread, deletate it to a separate blocking thread. --- lustre/include/lustre_dlm.h | 2 ++ lustre/ldlm/ldlm_lockd.c | 7 +++++-- lustre/ldlm/ldlm_request.c | 29 ++++++++++++++++++++--------- 3 files changed, 27 insertions(+), 11 deletions(-) diff --git a/lustre/include/lustre_dlm.h b/lustre/include/lustre_dlm.h index 27feb6f..362abdf 100644 --- a/lustre/include/lustre_dlm.h +++ b/lustre/include/lustre_dlm.h @@ -1120,6 +1120,8 @@ int ldlm_cancel_resource_local(struct ldlm_resource *res, ldlm_policy_data_t *policy, ldlm_mode_t mode, int lock_flags, ldlm_cancel_flags_t cancel_flags, void *opaque); +int ldlm_cli_cancel_list_local(cfs_list_t *cancels, int count, + ldlm_cancel_flags_t flags); int ldlm_cli_cancel_list(cfs_list_t *head, int count, struct ptlrpc_request *req, ldlm_cancel_flags_t flags); diff --git a/lustre/ldlm/ldlm_lockd.c b/lustre/ldlm/ldlm_lockd.c index 6702685..3de44bb 100644 --- a/lustre/ldlm/ldlm_lockd.c +++ b/lustre/ldlm/ldlm_lockd.c @@ -2222,8 +2222,10 @@ static int ldlm_bl_thread_main(void *arg) if (blwi->blwi_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. */ + * Thus locks are marked LDLM_FL_CANCELING, but NOT + * canceled locally yet. */ + ldlm_cli_cancel_list_local(&blwi->blwi_head, + blwi->blwi_count, 0); ldlm_cli_cancel_list(&blwi->blwi_head, blwi->blwi_count, NULL, 0); } else { @@ -2654,6 +2656,7 @@ 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 */ diff --git a/lustre/ldlm/ldlm_request.c b/lustre/ldlm/ldlm_request.c index f8a5b7a..f808843 100644 --- a/lustre/ldlm/ldlm_request.c +++ b/lustre/ldlm/ldlm_request.c @@ -1269,8 +1269,8 @@ int ldlm_cli_cancel(struct lustre_handle *lockh) /* XXX until we will have compound requests and can cut cancels from generic rpc * we need send cancels with LDLM_FL_BL_AST flag as separate rpc */ -static int ldlm_cancel_list(cfs_list_t *cancels, int count, - ldlm_cancel_flags_t flags) +int ldlm_cli_cancel_list_local(cfs_list_t *cancels, int count, + ldlm_cancel_flags_t flags) { CFS_LIST_HEAD(head); struct ldlm_lock *lock, *next; @@ -1473,9 +1473,8 @@ ldlm_cancel_lru_policy(struct ldlm_namespace *ns, int flags) * * flags & LDLM_CANCEL_AGED - cancel alocks according to "aged policy". */ -int ldlm_cancel_lru_local(struct ldlm_namespace *ns, cfs_list_t *cancels, - int count, int max, ldlm_cancel_flags_t cancel_flags, - int flags) +static int ldlm_prepare_lru_list(struct ldlm_namespace *ns, cfs_list_t *cancels, + int count, int max, int flags) { ldlm_cancel_lru_policy_t pf; struct ldlm_lock *lock, *next; @@ -1585,7 +1584,18 @@ int ldlm_cancel_lru_local(struct ldlm_namespace *ns, cfs_list_t *cancels, unused--; } cfs_spin_unlock(&ns->ns_unused_lock); - RETURN(ldlm_cancel_list(cancels, added, cancel_flags)); + RETURN(added); +} + +int ldlm_cancel_lru_local(struct ldlm_namespace *ns, cfs_list_t *cancels, + int count, int max, ldlm_cancel_flags_t cancel_flags, + int flags) +{ + int added; + added = ldlm_prepare_lru_list(ns, cancels, count, max, flags); + if (added <= 0) + return added; + return ldlm_cli_cancel_list_local(cancels, added, cancel_flags); } /* when called with LDLM_ASYNC the blocking callback will be handled @@ -1602,8 +1612,9 @@ int ldlm_cancel_lru(struct ldlm_namespace *ns, int nr, ldlm_sync_t mode, #ifndef __KERNEL__ mode = LDLM_SYNC; /* force to be sync in user space */ #endif - count = ldlm_cancel_lru_local(ns, &cancels, nr, 0, 0, flags); - + /* Just prepare the list of locks, do not actually cancel them yet. + * Locks are cancelled later in a separate thread. */ + count = ldlm_prepare_lru_list(ns, &cancels, nr, 0, flags); rc = ldlm_bl_to_thread_list(ns, NULL, &cancels, count, mode); if (rc == 0) RETURN(count); @@ -1663,7 +1674,7 @@ int ldlm_cancel_resource_local(struct ldlm_resource *res, } unlock_res(res); - RETURN(ldlm_cancel_list(cancels, count, cancel_flags)); + RETURN(ldlm_cli_cancel_list_local(cancels, count, cancel_flags)); } /* If @req is NULL, send CANCEL request to server with handles of locks -- 1.8.3.1