X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fldlm%2Fldlm_lock.c;h=49d0034de90160691d5cd14fea9f8df1548b2067;hp=fe7aac9728284acab9c49a72ed6e624d77d29f6f;hb=a35113b690e39dcd39e126efc9085b3bc160b4ff;hpb=34cf5628b02ba7f68ce539bcaa7f8bba46fe047c diff --git a/lustre/ldlm/ldlm_lock.c b/lustre/ldlm/ldlm_lock.c index fe7aac9..49d0034 100644 --- a/lustre/ldlm/ldlm_lock.c +++ b/lustre/ldlm/ldlm_lock.c @@ -1,6 +1,4 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: - * +/* * GPL HEADER START * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,8 +27,7 @@ * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2011 Whamcloud, Inc. - * + * Copyright (c) 2010, 2013, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -66,6 +63,7 @@ char *ldlm_lockname[] = { [LCK_GROUP] "GROUP", [LCK_COS] "COS" }; +EXPORT_SYMBOL(ldlm_lockname); char *ldlm_typename[] = { [LDLM_PLAIN] "PLN", @@ -73,11 +71,19 @@ char *ldlm_typename[] = { [LDLM_FLOCK] "FLK", [LDLM_IBITS] "IBT", }; +EXPORT_SYMBOL(ldlm_typename); -static ldlm_policy_wire_to_local_t ldlm_policy_wire_to_local[] = { +static ldlm_policy_wire_to_local_t ldlm_policy_wire18_to_local[] = { [LDLM_PLAIN - LDLM_MIN_TYPE] ldlm_plain_policy_wire_to_local, [LDLM_EXTENT - LDLM_MIN_TYPE] ldlm_extent_policy_wire_to_local, - [LDLM_FLOCK - LDLM_MIN_TYPE] ldlm_flock_policy_wire_to_local, + [LDLM_FLOCK - LDLM_MIN_TYPE] ldlm_flock_policy_wire18_to_local, + [LDLM_IBITS - LDLM_MIN_TYPE] ldlm_ibits_policy_wire_to_local, +}; + +static ldlm_policy_wire_to_local_t ldlm_policy_wire21_to_local[] = { + [LDLM_PLAIN - LDLM_MIN_TYPE] ldlm_plain_policy_wire_to_local, + [LDLM_EXTENT - LDLM_MIN_TYPE] ldlm_extent_policy_wire_to_local, + [LDLM_FLOCK - LDLM_MIN_TYPE] ldlm_flock_policy_wire21_to_local, [LDLM_IBITS - LDLM_MIN_TYPE] ldlm_ibits_policy_wire_to_local, }; @@ -105,15 +111,21 @@ void ldlm_convert_policy_to_wire(ldlm_type_t type, /** * Converts lock policy from on the wire lock_desc format to local format */ -void ldlm_convert_policy_to_local(ldlm_type_t type, - const ldlm_wire_policy_data_t *wpolicy, - ldlm_policy_data_t *lpolicy) +void ldlm_convert_policy_to_local(struct obd_export *exp, ldlm_type_t type, + const ldlm_wire_policy_data_t *wpolicy, + ldlm_policy_data_t *lpolicy) { - ldlm_policy_wire_to_local_t convert; + ldlm_policy_wire_to_local_t convert; + int new_client; - convert = ldlm_policy_wire_to_local[type - LDLM_MIN_TYPE]; + /** some badness for 2.0.0 clients, but 2.0.0 isn't supported */ + new_client = (exp_connect_flags(exp) & OBD_CONNECT_FULL20) != 0; + if (new_client) + convert = ldlm_policy_wire21_to_local[type - LDLM_MIN_TYPE]; + else + convert = ldlm_policy_wire18_to_local[type - LDLM_MIN_TYPE]; - convert(wpolicy, lpolicy); + convert(wpolicy, lpolicy); } char *ldlm_it2str(int it) @@ -142,15 +154,17 @@ char *ldlm_it2str(int it) return "UNKNOWN"; } } +EXPORT_SYMBOL(ldlm_it2str); extern cfs_mem_cache_t *ldlm_lock_slab; +#ifdef HAVE_SERVER_SUPPORT static ldlm_processing_policy ldlm_processing_policy_table[] = { [LDLM_PLAIN] ldlm_process_plain_lock, [LDLM_EXTENT] ldlm_process_extent_lock, -#ifdef __KERNEL__ +# ifdef __KERNEL__ [LDLM_FLOCK] ldlm_process_flock_lock, -#endif +# endif [LDLM_IBITS] ldlm_process_inodebits_lock, }; @@ -158,18 +172,23 @@ ldlm_processing_policy ldlm_get_processing_policy(struct ldlm_resource *res) { return ldlm_processing_policy_table[res->lr_type]; } +EXPORT_SYMBOL(ldlm_get_processing_policy); +#endif /* HAVE_SERVER_SUPPORT */ void ldlm_register_intent(struct ldlm_namespace *ns, ldlm_res_policy arg) { ns->ns_policy = arg; } +EXPORT_SYMBOL(ldlm_register_intent); /* * REFCOUNTED LOCK OBJECTS */ -/* +/** + * Get a reference on a lock. + * * Lock refcounts, during creation: * - one special one for allocation, dec'd only once in destroy * - one for being a lock that's in-use @@ -180,13 +199,13 @@ struct ldlm_lock *ldlm_lock_get(struct ldlm_lock *lock) cfs_atomic_inc(&lock->l_refc); return lock; } +EXPORT_SYMBOL(ldlm_lock_get); -static void ldlm_lock_free(struct ldlm_lock *lock, size_t size) -{ - LASSERT(size == sizeof(*lock)); - OBD_SLAB_FREE(lock, ldlm_lock_slab, sizeof(*lock)); -} - +/** + * Release lock reference. + * + * Also frees the lock if it was last reference. + */ void ldlm_lock_put(struct ldlm_lock *lock) { ENTRY; @@ -200,7 +219,7 @@ void ldlm_lock_put(struct ldlm_lock *lock) "final lock_put on destroyed lock, freeing it."); res = lock->l_resource; - LASSERT(lock->l_destroyed); + LASSERT(lock->l_flags & LDLM_FL_DESTROYED); LASSERT(cfs_list_empty(&lock->l_res_link)); LASSERT(cfs_list_empty(&lock->l_pending_chain)); @@ -219,13 +238,16 @@ void ldlm_lock_put(struct ldlm_lock *lock) ldlm_interval_free(ldlm_interval_detach(lock)); lu_ref_fini(&lock->l_reference); - OBD_FREE_RCU_CB(lock, sizeof(*lock), &lock->l_handle, - ldlm_lock_free); + OBD_FREE_RCU(lock, sizeof(*lock), &lock->l_handle); } EXIT; } +EXPORT_SYMBOL(ldlm_lock_put); +/** + * Removes LDLM lock \a lock from LRU. Assumes LRU is already locked. + */ int ldlm_lock_remove_from_lru_nolock(struct ldlm_lock *lock) { int rc = 0; @@ -243,24 +265,30 @@ int ldlm_lock_remove_from_lru_nolock(struct ldlm_lock *lock) return rc; } +/** + * Removes LDLM lock \a lock from LRU. Obtains the LRU lock first. + */ int ldlm_lock_remove_from_lru(struct ldlm_lock *lock) { - struct ldlm_namespace *ns = ldlm_lock_to_ns(lock); - int rc; + struct ldlm_namespace *ns = ldlm_lock_to_ns(lock); + int rc; - ENTRY; - if (lock->l_ns_srv) { - LASSERT(cfs_list_empty(&lock->l_lru)); - RETURN(0); - } + ENTRY; + if (lock->l_flags & LDLM_FL_NS_SRV) { + LASSERT(cfs_list_empty(&lock->l_lru)); + RETURN(0); + } - cfs_spin_lock(&ns->ns_lock); - rc = ldlm_lock_remove_from_lru_nolock(lock); - cfs_spin_unlock(&ns->ns_lock); - EXIT; - return rc; + spin_lock(&ns->ns_lock); + rc = ldlm_lock_remove_from_lru_nolock(lock); + spin_unlock(&ns->ns_lock); + EXIT; + return rc; } +/** + * Adds LDLM lock \a lock to namespace LRU. Assumes LRU is already locked. + */ void ldlm_lock_add_to_lru_nolock(struct ldlm_lock *lock) { struct ldlm_namespace *ns = ldlm_lock_to_ns(lock); @@ -273,69 +301,94 @@ void ldlm_lock_add_to_lru_nolock(struct ldlm_lock *lock) ns->ns_nr_unused++; } +/** + * Adds LDLM lock \a lock to namespace LRU. Obtains necessary LRU locks + * first. + */ void ldlm_lock_add_to_lru(struct ldlm_lock *lock) { - struct ldlm_namespace *ns = ldlm_lock_to_ns(lock); + struct ldlm_namespace *ns = ldlm_lock_to_ns(lock); - ENTRY; - cfs_spin_lock(&ns->ns_lock); - ldlm_lock_add_to_lru_nolock(lock); - cfs_spin_unlock(&ns->ns_lock); - EXIT; + ENTRY; + spin_lock(&ns->ns_lock); + ldlm_lock_add_to_lru_nolock(lock); + spin_unlock(&ns->ns_lock); + EXIT; } +/** + * Moves LDLM lock \a lock that is already in namespace LRU to the tail of + * the LRU. Performs necessary LRU locking + */ void ldlm_lock_touch_in_lru(struct ldlm_lock *lock) { - struct ldlm_namespace *ns = ldlm_lock_to_ns(lock); + struct ldlm_namespace *ns = ldlm_lock_to_ns(lock); - ENTRY; - if (lock->l_ns_srv) { - LASSERT(cfs_list_empty(&lock->l_lru)); - EXIT; - return; - } + ENTRY; + if (lock->l_flags & LDLM_FL_NS_SRV) { + LASSERT(cfs_list_empty(&lock->l_lru)); + EXIT; + return; + } - cfs_spin_lock(&ns->ns_lock); - if (!cfs_list_empty(&lock->l_lru)) { - ldlm_lock_remove_from_lru_nolock(lock); - ldlm_lock_add_to_lru_nolock(lock); - } - cfs_spin_unlock(&ns->ns_lock); - EXIT; + spin_lock(&ns->ns_lock); + if (!cfs_list_empty(&lock->l_lru)) { + ldlm_lock_remove_from_lru_nolock(lock); + ldlm_lock_add_to_lru_nolock(lock); + } + spin_unlock(&ns->ns_lock); + EXIT; } -/* This used to have a 'strict' flag, which recovery would use to mark an +/** + * Helper to destroy a locked lock. + * + * Used by ldlm_lock_destroy and ldlm_lock_destroy_nolock + * Must be called with l_lock and lr_lock held. + * + * Does not actually free the lock data, but rather marks the lock as + * destroyed by setting l_destroyed field in the lock to 1. Destroys a + * handle->lock association too, so that the lock can no longer be found + * and removes the lock from LRU list. Actual lock freeing occurs when + * last lock reference goes away. + * + * Original comment (of some historical value): + * This used to have a 'strict' flag, which recovery would use to mark an * in-use lock as needing-to-die. Lest I am ever tempted to put it back, I * shall explain why it's gone: with the new hash table scheme, once you call * ldlm_lock_destroy, you can never drop your final references on this lock. - * Because it's not in the hash table anymore. -phil */ + * Because it's not in the hash table anymore. -phil + */ int ldlm_lock_destroy_internal(struct ldlm_lock *lock) { ENTRY; if (lock->l_readers || lock->l_writers) { LDLM_ERROR(lock, "lock still has references"); - ldlm_lock_dump(D_ERROR, lock, 0); LBUG(); } if (!cfs_list_empty(&lock->l_res_link)) { LDLM_ERROR(lock, "lock still on resource"); - ldlm_lock_dump(D_ERROR, lock, 0); LBUG(); } - if (lock->l_destroyed) { - LASSERT(cfs_list_empty(&lock->l_lru)); - EXIT; - return 0; - } - lock->l_destroyed = 1; - - 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); + if (lock->l_flags & LDLM_FL_DESTROYED) { + LASSERT(cfs_list_empty(&lock->l_lru)); + EXIT; + return 0; + } + lock->l_flags |= LDLM_FL_DESTROYED; + + if (lock->l_export && lock->l_export->exp_lock_hash) { + /* NB: it's safe to call cfs_hash_del() even lock isn't + * in exp_lock_hash. */ + /* In the function below, .hs_keycmp resolves to + * ldlm_export_lock_keycmp() */ + /* coverity[overrun-buffer-val] */ + cfs_hash_del(lock->l_export->exp_lock_hash, + &lock->l_remote_handle, &lock->l_exp_hash); + } ldlm_lock_remove_from_lru(lock); class_handle_unhash(&lock->l_handle); @@ -354,6 +407,9 @@ int ldlm_lock_destroy_internal(struct ldlm_lock *lock) return 1; } +/** + * Destroys a LDLM lock \a lock. Performs necessary locking first. + */ void ldlm_lock_destroy(struct ldlm_lock *lock) { int first; @@ -370,6 +426,9 @@ void ldlm_lock_destroy(struct ldlm_lock *lock) EXIT; } +/** + * Destroys a LDLM lock \a lock that is already locked. + */ void ldlm_lock_destroy_nolock(struct ldlm_lock *lock) { int first; @@ -389,7 +448,21 @@ static void lock_handle_addref(void *lock) LDLM_LOCK_GET((struct ldlm_lock *)lock); } -/* +static void lock_handle_free(void *lock, int size) +{ + LASSERT(size == sizeof(struct ldlm_lock)); + OBD_SLAB_FREE(lock, ldlm_lock_slab, size); +} + +struct portals_handle_ops lock_handle_ops = { + .hop_addref = lock_handle_addref, + .hop_free = lock_handle_free, +}; + +/** + * + * Allocate and initialize new lock structure. + * * usage: pass in a resource on which you have done ldlm_resource_get * new lock will take over the refcount. * returns: lock with refcount 2 - one for current caller and one for remote @@ -406,7 +479,7 @@ static struct ldlm_lock *ldlm_lock_new(struct ldlm_resource *resource) if (lock == NULL) RETURN(NULL); - cfs_spin_lock_init(&lock->l_lock); + spin_lock_init(&lock->l_lock); lock->l_resource = resource; lu_ref_add(&resource->lr_reference, "lock", lock); @@ -422,11 +495,12 @@ static struct ldlm_lock *ldlm_lock_new(struct ldlm_resource *resource) CFS_INIT_LIST_HEAD(&lock->l_sl_mode); CFS_INIT_LIST_HEAD(&lock->l_sl_policy); CFS_INIT_HLIST_NODE(&lock->l_exp_hash); + CFS_INIT_HLIST_NODE(&lock->l_exp_flock_hash); lprocfs_counter_incr(ldlm_res_to_ns(resource)->ns_stats, LDLM_NSS_LOCKS); CFS_INIT_LIST_HEAD(&lock->l_handle.h_link); - class_handle_hash(&lock->l_handle, lock_handle_addref); + class_handle_hash(&lock->l_handle, &lock_handle_ops); lu_ref_init(&lock->l_reference); lu_ref_add(&lock->l_reference, "hash", lock); @@ -437,10 +511,16 @@ static struct ldlm_lock *ldlm_lock_new(struct ldlm_resource *resource) lock->l_exp_refs_nr = 0; lock->l_exp_refs_target = NULL; #endif + CFS_INIT_LIST_HEAD(&lock->l_exp_list); RETURN(lock); } +/** + * Moves LDLM lock \a lock to another resource. + * This is used on client when server returns some other lock than requested + * (typically as a result of intent operation) + */ int ldlm_lock_change_resource(struct ldlm_namespace *ns, struct ldlm_lock *lock, const struct ldlm_res_id *new_resid) { @@ -478,7 +558,7 @@ int ldlm_lock_change_resource(struct ldlm_namespace *ns, struct ldlm_lock *lock, * lock->l_lock, and are taken in the memory address order to avoid * dead-locks. */ - cfs_spin_lock(&lock->l_lock); + spin_lock(&lock->l_lock); oldres = lock->l_resource; if (oldres < newres) { lock_res(oldres); @@ -499,22 +579,31 @@ int ldlm_lock_change_resource(struct ldlm_namespace *ns, struct ldlm_lock *lock, RETURN(0); } +EXPORT_SYMBOL(ldlm_lock_change_resource); -/* - * HANDLES +/** \defgroup ldlm_handles LDLM HANDLES + * Ways to get hold of locks without any addresses. + * @{ */ +/** + * Fills in handle for LDLM lock \a lock into supplied \a lockh + * Does not take any references. + */ void ldlm_lock2handle(const struct ldlm_lock *lock, struct lustre_handle *lockh) { - lockh->cookie = lock->l_handle.h_cookie; + lockh->cookie = lock->l_handle.h_cookie; } +EXPORT_SYMBOL(ldlm_lock2handle); -/* if flags: atomically get the lock and set the flags. - * Return NULL if flag already set +/** + * Obtain a lock reference by handle. + * + * if \a flags: atomically get the lock and set the flags. + * Return NULL if flag already set */ - struct ldlm_lock *__ldlm_handle2lock(const struct lustre_handle *handle, - int flags) + __u64 flags) { struct ldlm_lock *lock; ENTRY; @@ -527,7 +616,7 @@ struct ldlm_lock *__ldlm_handle2lock(const struct lustre_handle *handle, /* It's unlikely but possible that someone marked the lock as * destroyed after we did handle2object on it */ - if (flags == 0 && !lock->l_destroyed) { + if (flags == 0 && ((lock->l_flags & LDLM_FL_DESTROYED)== 0)) { lu_ref_add(&lock->l_reference, "handle", cfs_current()); RETURN(lock); } @@ -537,7 +626,7 @@ struct ldlm_lock *__ldlm_handle2lock(const struct lustre_handle *handle, LASSERT(lock->l_resource != NULL); lu_ref_add_atomic(&lock->l_reference, "handle", cfs_current()); - if (unlikely(lock->l_destroyed)) { + if (unlikely(lock->l_flags & LDLM_FL_DESTROYED)) { unlock_res_and_lock(lock); CDEBUG(D_INFO, "lock already destroyed: lock %p\n", lock); LDLM_LOCK_PUT(lock); @@ -556,15 +645,21 @@ struct ldlm_lock *__ldlm_handle2lock(const struct lustre_handle *handle, unlock_res_and_lock(lock); RETURN(lock); } +EXPORT_SYMBOL(__ldlm_handle2lock); +/** @} ldlm_handles */ +/** + * Fill in "on the wire" representation for given LDLM lock into supplied + * lock descriptor \a desc structure. + */ void ldlm_lock2desc(struct ldlm_lock *lock, struct ldlm_lock_desc *desc) { - struct obd_export *exp = lock->l_export?:lock->l_conn_export; - /* INODEBITS_INTEROP: If the other side does not support - * inodebits, reply with a plain lock descriptor. - */ - if ((lock->l_resource->lr_type == LDLM_IBITS) && - (exp && !(exp->exp_connect_flags & OBD_CONNECT_IBITS))) { + struct obd_export *exp = lock->l_export ?: lock->l_conn_export; + + /* INODEBITS_INTEROP: If the other side does not support + * inodebits, reply with a plain lock descriptor. */ + if ((lock->l_resource->lr_type == LDLM_IBITS) && + (exp && !(exp_connect_flags(exp) & OBD_CONNECT_IBITS))) { /* Make sure all the right bits are set in this lock we are going to pass to client */ LASSERTF(lock->l_policy_data.l_inodebits.bits == @@ -605,7 +700,13 @@ void ldlm_lock2desc(struct ldlm_lock *lock, struct ldlm_lock_desc *desc) &desc->l_policy_data); } } +EXPORT_SYMBOL(ldlm_lock2desc); +/** + * Add a lock to list of conflicting locks to send AST to. + * + * Only add if we have not sent a blocking AST to the lock yet. + */ void ldlm_add_bl_work_item(struct ldlm_lock *lock, struct ldlm_lock *new, cfs_list_t *work_list) { @@ -614,7 +715,7 @@ void ldlm_add_bl_work_item(struct ldlm_lock *lock, struct ldlm_lock *new, lock->l_flags |= LDLM_FL_AST_SENT; /* If the enqueuing client said so, tell the AST recipient to * discard dirty data, rather than writing back. */ - if (new->l_flags & LDLM_AST_DISCARD_DATA) + if (new->l_flags & LDLM_FL_AST_DISCARD_DATA) lock->l_flags |= LDLM_FL_DISCARD_DATA; LASSERT(cfs_list_empty(&lock->l_bl_ast)); cfs_list_add(&lock->l_bl_ast, work_list); @@ -624,6 +725,9 @@ void ldlm_add_bl_work_item(struct ldlm_lock *lock, struct ldlm_lock *new, } } +/** + * Add a lock to list of just granted locks to send completion AST to. + */ void ldlm_add_cp_work_item(struct ldlm_lock *lock, cfs_list_t *work_list) { if ((lock->l_flags & LDLM_FL_CP_REQD) == 0) { @@ -635,7 +739,12 @@ void ldlm_add_cp_work_item(struct ldlm_lock *lock, cfs_list_t *work_list) } } -/* must be called with lr_lock held */ +/** + * Aggregator function to add AST work items into a list. Determines + * what sort of an AST work needs to be done and calls the proper + * adding function. + * Must be called with lr_lock held. + */ void ldlm_add_ast_work_item(struct ldlm_lock *lock, struct ldlm_lock *new, cfs_list_t *work_list) { @@ -648,6 +757,11 @@ void ldlm_add_ast_work_item(struct ldlm_lock *lock, struct ldlm_lock *new, EXIT; } +/** + * Add specified reader/writer reference to LDLM lock with handle \a lockh. + * r/w reference type is determined by \a mode + * Calls ldlm_lock_addref_internal. + */ void ldlm_lock_addref(struct lustre_handle *lockh, __u32 mode) { struct ldlm_lock *lock; @@ -657,7 +771,15 @@ void ldlm_lock_addref(struct lustre_handle *lockh, __u32 mode) ldlm_lock_addref_internal(lock, mode); LDLM_LOCK_PUT(lock); } +EXPORT_SYMBOL(ldlm_lock_addref); +/** + * Helper function. + * Add specified reader/writer reference to LDLM lock \a lock. + * r/w reference type is determined by \a mode + * Removes lock from LRU if it is there. + * Assumes the LDLM lock is already locked. + */ void ldlm_lock_addref_internal_nolock(struct ldlm_lock *lock, __u32 mode) { ldlm_lock_remove_from_lru(lock); @@ -675,8 +797,8 @@ void ldlm_lock_addref_internal_nolock(struct ldlm_lock *lock, __u32 mode) } /** - * Attempts to addref a lock, and fails if lock is already LDLM_FL_CBPENDING - * or destroyed. + * Attempts to add reader/writer reference to a lock with handle \a lockh, and + * fails if lock is already LDLM_FL_CBPENDING or destroyed. * * \retval 0 success, lock was addref-ed * @@ -701,8 +823,13 @@ int ldlm_lock_addref_try(struct lustre_handle *lockh, __u32 mode) } return result; } +EXPORT_SYMBOL(ldlm_lock_addref_try); -/* only called for local locks */ +/** + * Add specified reader/writer reference to LDLM lock \a lock. + * Locks LDLM lock and calls ldlm_lock_addref_internal_nolock to do the work. + * Only called for local locks. + */ void ldlm_lock_addref_internal(struct ldlm_lock *lock, __u32 mode) { lock_res_and_lock(lock); @@ -710,10 +837,13 @@ void ldlm_lock_addref_internal(struct ldlm_lock *lock, __u32 mode) unlock_res_and_lock(lock); } -/* only called in ldlm_flock_destroy and for local locks. - * * for LDLM_FLOCK type locks, l_blocking_ast is null, and - * * ldlm_lock_remove_from_lru() does nothing, it is safe - * * for ldlm_flock_destroy usage by dropping some code */ +/** + * Removes reader/writer reference for LDLM lock \a lock. + * Assumes LDLM lock is already locked. + * only called in ldlm_flock_destroy and for local locks. + * Does NOT add lock to LRU if no r/w references left to accomodate flock locks + * that cannot be placed in LRU. + */ void ldlm_lock_decref_internal_nolock(struct ldlm_lock *lock, __u32 mode) { LDLM_DEBUG(lock, "ldlm_lock_decref(%s)", ldlm_lockname[mode]); @@ -732,6 +862,14 @@ void ldlm_lock_decref_internal_nolock(struct ldlm_lock *lock, __u32 mode) LDLM_LOCK_RELEASE(lock); /* matches the LDLM_LOCK_GET() in addref */ } +/** + * Removes reader/writer reference for LDLM lock \a lock. + * Locks LDLM lock first. + * If the lock is determined to be client lock on a client and r/w refcount + * drops to zero and the lock is not blocked, the lock is added to LRU lock + * on the namespace. + * For blocked LDLM locks if r/w count drops to zero, blocking_ast is called. + */ void ldlm_lock_decref_internal(struct ldlm_lock *lock, __u32 mode) { struct ldlm_namespace *ns; @@ -755,7 +893,7 @@ void ldlm_lock_decref_internal(struct ldlm_lock *lock, __u32 mode) (lock->l_flags & LDLM_FL_CBPENDING)) { /* If we received a blocked AST and this was the last reference, * run the callback. */ - if (lock->l_ns_srv && lock->l_export) + if ((lock->l_flags & LDLM_FL_NS_SRV) && lock->l_export) CERROR("FL_CBPENDING set on non-local lock--just a " "warning\n"); @@ -791,7 +929,7 @@ void ldlm_lock_decref_internal(struct ldlm_lock *lock, __u32 mode) * enqueue. */ if (!exp_connect_cancelset(lock->l_conn_export) && !ns_connect_lru_resize(ns)) - ldlm_cancel_lru(ns, 0, LDLM_ASYNC, 0); + ldlm_cancel_lru(ns, 0, LCF_ASYNC, 0); } else { LDLM_DEBUG(lock, "do not add lock into lru list"); unlock_res_and_lock(lock); @@ -800,6 +938,9 @@ void ldlm_lock_decref_internal(struct ldlm_lock *lock, __u32 mode) EXIT; } +/** + * Decrease reader/writer refcount for LDLM lock with handle \a lockh + */ void ldlm_lock_decref(struct lustre_handle *lockh, __u32 mode) { struct ldlm_lock *lock = __ldlm_handle2lock(lockh, 0); @@ -807,9 +948,15 @@ void ldlm_lock_decref(struct lustre_handle *lockh, __u32 mode) ldlm_lock_decref_internal(lock, mode); LDLM_LOCK_PUT(lock); } +EXPORT_SYMBOL(ldlm_lock_decref); -/* This will drop a lock reference and mark it for destruction, but will not - * necessarily cancel the lock before returning. */ +/** + * Decrease reader/writer refcount for LDLM lock with handle + * \a lockh and mark it for subsequent cancellation once r/w refcount + * drops to zero instead of putting into LRU. + * + * Typical usage is for GROUP locks which we cannot allow to be cached. + */ void ldlm_lock_decref_and_cancel(struct lustre_handle *lockh, __u32 mode) { struct ldlm_lock *lock = __ldlm_handle2lock(lockh, 0); @@ -824,6 +971,7 @@ void ldlm_lock_decref_and_cancel(struct lustre_handle *lockh, __u32 mode) ldlm_lock_decref_internal(lock, mode); LDLM_LOCK_PUT(lock); } +EXPORT_SYMBOL(ldlm_lock_decref_and_cancel); struct sl_insert_point { cfs_list_t *res_link; @@ -831,11 +979,11 @@ struct sl_insert_point { cfs_list_t *policy_link; }; -/* - * search_granted_lock +/** + * Finds a position to insert the new lock into granted lock list. + * + * Used for locks eligible for skiplist optimization. * - * Description: - * Finds a position to insert the new lock. * Parameters: * queue [input]: the granted list where search acts on; * req [input]: the lock whose position to be located; @@ -926,6 +1074,10 @@ static void search_granted_lock(cfs_list_t *queue, return; } +/** + * Add a lock into resource granted list after a position described by + * \a prev. + */ static void ldlm_granted_list_add_lock(struct ldlm_lock *lock, struct sl_insert_point *prev) { @@ -935,10 +1087,9 @@ static void ldlm_granted_list_add_lock(struct ldlm_lock *lock, check_res_locked(res); ldlm_resource_dump(D_INFO, res); - CDEBUG(D_OTHER, "About to add this lock:\n"); - ldlm_lock_dump(D_OTHER, lock, 0); + LDLM_DEBUG(lock, "About to add lock:"); - if (lock->l_destroyed) { + if (lock->l_flags & LDLM_FL_DESTROYED) { CDEBUG(D_OTHER, "Lock destroyed, not adding to resource\n"); return; } @@ -947,13 +1098,24 @@ static void ldlm_granted_list_add_lock(struct ldlm_lock *lock, LASSERT(cfs_list_empty(&lock->l_sl_mode)); LASSERT(cfs_list_empty(&lock->l_sl_policy)); - cfs_list_add(&lock->l_res_link, prev->res_link); - cfs_list_add(&lock->l_sl_mode, prev->mode_link); - cfs_list_add(&lock->l_sl_policy, prev->policy_link); + /* + * lock->link == prev->link means lock is first starting the group. + * Don't re-add to itself to suppress kernel warnings. + */ + if (&lock->l_res_link != prev->res_link) + cfs_list_add(&lock->l_res_link, prev->res_link); + if (&lock->l_sl_mode != prev->mode_link) + cfs_list_add(&lock->l_sl_mode, prev->mode_link); + if (&lock->l_sl_policy != prev->policy_link) + cfs_list_add(&lock->l_sl_policy, prev->policy_link); EXIT; } +/** + * Add a lock to granted list on a resource maintaining skiplist + * correctness. + */ static void ldlm_grant_lock_with_skiplist(struct ldlm_lock *lock) { struct sl_insert_point prev; @@ -966,7 +1128,11 @@ static void ldlm_grant_lock_with_skiplist(struct ldlm_lock *lock) EXIT; } -/* NOTE: called by +/** + * Perform lock granting bookkeeping. + * + * Includes putting the lock into granted list and updating lock mode. + * NOTE: called by * - ldlm_lock_enqueue * - ldlm_reprocess_queue * - ldlm_lock_convert @@ -998,13 +1164,17 @@ void ldlm_grant_lock(struct ldlm_lock *lock, cfs_list_t *work_list) EXIT; } -/* returns a referenced lock or NULL. See the flag descriptions below, in the - * comment above ldlm_lock_match */ +/** + * Search for a lock with given properties in a queue. + * + * \retval a referenced lock or NULL. See the flag descriptions below, in the + * comment above ldlm_lock_match + */ static struct ldlm_lock *search_queue(cfs_list_t *queue, ldlm_mode_t *mode, ldlm_policy_data_t *policy, struct ldlm_lock *old_lock, - int flags, int unref) + __u64 flags, int unref) { struct ldlm_lock *lock; cfs_list_t *tmp; @@ -1053,9 +1223,7 @@ static struct ldlm_lock *search_queue(cfs_list_t *queue, policy->l_inodebits.bits)) continue; - if (!unref && - (lock->l_destroyed || lock->l_flags & LDLM_FL_FAILED || - lock->l_fail_value != 0)) + if (!unref && (lock->l_flags & LDLM_FL_GONE_MASK)) continue; if ((flags & LDLM_FL_LOCAL_ONLY) && @@ -1075,37 +1243,56 @@ static struct ldlm_lock *search_queue(cfs_list_t *queue, return NULL; } -void ldlm_lock_fail_match_locked(struct ldlm_lock *lock, int rc) +void ldlm_lock_fail_match_locked(struct ldlm_lock *lock) { - if (lock->l_fail_value == 0) { - lock->l_fail_value = rc; - cfs_waitq_signal(&lock->l_waitq); - } + if ((lock->l_flags & LDLM_FL_FAIL_NOTIFIED) == 0) { + lock->l_flags |= LDLM_FL_FAIL_NOTIFIED; + cfs_waitq_broadcast(&lock->l_waitq); + } } EXPORT_SYMBOL(ldlm_lock_fail_match_locked); -void ldlm_lock_fail_match(struct ldlm_lock *lock, int rc) +void ldlm_lock_fail_match(struct ldlm_lock *lock) { lock_res_and_lock(lock); - ldlm_lock_fail_match_locked(lock, rc); + ldlm_lock_fail_match_locked(lock); unlock_res_and_lock(lock); } EXPORT_SYMBOL(ldlm_lock_fail_match); +/** + * Mark lock as "matchable" by OST. + * + * Used to prevent certain races in LOV/OSC where the lock is granted, but LVB + * is not yet valid. + * Assumes LDLM lock is already locked. + */ void ldlm_lock_allow_match_locked(struct ldlm_lock *lock) { - lock->l_flags |= LDLM_FL_LVB_READY; - cfs_waitq_signal(&lock->l_waitq); + lock->l_flags |= LDLM_FL_LVB_READY; + cfs_waitq_broadcast(&lock->l_waitq); } +EXPORT_SYMBOL(ldlm_lock_allow_match_locked); +/** + * Mark lock as "matchable" by OST. + * Locks the lock and then \see ldlm_lock_allow_match_locked + */ void ldlm_lock_allow_match(struct ldlm_lock *lock) { lock_res_and_lock(lock); ldlm_lock_allow_match_locked(lock); unlock_res_and_lock(lock); } +EXPORT_SYMBOL(ldlm_lock_allow_match); -/* Can be called in two ways: +/** + * Attempt to find a lock with specified properties. + * + * Typically returns a reference to matched lock unless LDLM_FL_TEST_LOCK is + * set in \a flags + * + * Can be called in two ways: * * If 'ns' is NULL, then lockh describes an existing lock that we want to look * for a duplicate of. @@ -1122,14 +1309,14 @@ void ldlm_lock_allow_match(struct ldlm_lock *lock) * If 'flags' contains LDLM_FL_TEST_LOCK, then don't actually reference a lock, * just tell us if we would have matched. * - * Returns 1 if it finds an already-existing lock that is compatible; in this + * \retval 1 if it finds an already-existing lock that is compatible; in this * case, lockh is filled in with a addref()ed lock * - * we also check security context, if that failed we simply return 0 (to keep - * caller code unchanged), the context failure will be discovered by caller - * sometime later. + * We also check security context, and if that fails we simply return 0 (to + * keep caller code unchanged), the context failure will be discovered by + * caller sometime later. */ -ldlm_mode_t ldlm_lock_match(struct ldlm_namespace *ns, int flags, +ldlm_mode_t ldlm_lock_match(struct ldlm_namespace *ns, __u64 flags, const struct ldlm_res_id *res_id, ldlm_type_t type, ldlm_policy_data_t *policy, ldlm_mode_t mode, struct lustre_handle *lockh, int unref) @@ -1183,6 +1370,8 @@ ldlm_mode_t ldlm_lock_match(struct ldlm_namespace *ns, int flags, ldlm_lock2handle(lock, lockh); if ((flags & LDLM_FL_LVB_READY) && (!(lock->l_flags & LDLM_FL_LVB_READY))) { + __u64 wait_flags = LDLM_FL_LVB_READY | + LDLM_FL_DESTROYED | LDLM_FL_FAIL_NOTIFIED; struct l_wait_info lwi; if (lock->l_completion_ast) { int err = lock->l_completion_ast(lock, @@ -1202,11 +1391,10 @@ ldlm_mode_t ldlm_lock_match(struct ldlm_namespace *ns, int flags, lwi = LWI_TIMEOUT_INTR(cfs_time_seconds(obd_timeout), NULL, LWI_ON_SIGNAL_NOOP, NULL); - /* XXX FIXME see comment on CAN_MATCH in lustre_dlm.h */ - l_wait_event(lock->l_waitq, - lock->l_flags & LDLM_FL_LVB_READY || - lock->l_fail_value != 0, - &lwi); + /* XXX FIXME see comment on CAN_MATCH in lustre_dlm.h */ + l_wait_event(lock->l_waitq, + lock->l_flags & wait_flags, + &lwi); if (!(lock->l_flags & LDLM_FL_LVB_READY)) { if (flags & LDLM_FL_TEST_LOCK) LDLM_LOCK_RELEASE(lock); @@ -1250,6 +1438,7 @@ ldlm_mode_t ldlm_lock_match(struct ldlm_namespace *ns, int flags, return rc ? mode : 0; } +EXPORT_SYMBOL(ldlm_lock_match); ldlm_mode_t ldlm_revalidate_lock_handle(struct lustre_handle *lockh, __u64 *bits) @@ -1261,8 +1450,7 @@ ldlm_mode_t ldlm_revalidate_lock_handle(struct lustre_handle *lockh, lock = ldlm_handle2lock(lockh); if (lock != NULL) { lock_res_and_lock(lock); - if (lock->l_destroyed || lock->l_flags & LDLM_FL_FAILED || - lock->l_fail_value != 0) + if (lock->l_flags & LDLM_FL_GONE_MASK) GOTO(out, mode); if (lock->l_flags & LDLM_FL_CBPENDING && @@ -1286,13 +1474,116 @@ out: } EXPORT_SYMBOL(ldlm_revalidate_lock_handle); -/* Returns a referenced lock */ +/** The caller must guarantee that the buffer is large enough. */ +int ldlm_fill_lvb(struct ldlm_lock *lock, struct req_capsule *pill, + enum req_location loc, void *data, int size) +{ + void *lvb; + ENTRY; + + LASSERT(data != NULL); + LASSERT(size >= 0); + + switch (lock->l_lvb_type) { + case LVB_T_OST: + if (size == sizeof(struct ost_lvb)) { + if (loc == RCL_CLIENT) + lvb = req_capsule_client_swab_get(pill, + &RMF_DLM_LVB, + lustre_swab_ost_lvb); + else + lvb = req_capsule_server_swab_get(pill, + &RMF_DLM_LVB, + lustre_swab_ost_lvb); + if (unlikely(lvb == NULL)) { + LDLM_ERROR(lock, "no LVB"); + RETURN(-EPROTO); + } + + memcpy(data, lvb, size); + } else if (size == sizeof(struct ost_lvb_v1)) { + struct ost_lvb *olvb = data; + + if (loc == RCL_CLIENT) + lvb = req_capsule_client_swab_get(pill, + &RMF_DLM_LVB, + lustre_swab_ost_lvb_v1); + else + lvb = req_capsule_server_sized_swab_get(pill, + &RMF_DLM_LVB, size, + lustre_swab_ost_lvb_v1); + if (unlikely(lvb == NULL)) { + LDLM_ERROR(lock, "no LVB"); + RETURN(-EPROTO); + } + + memcpy(data, lvb, size); + olvb->lvb_mtime_ns = 0; + olvb->lvb_atime_ns = 0; + olvb->lvb_ctime_ns = 0; + } else { + LDLM_ERROR(lock, "Replied unexpected ost LVB size %d", + size); + RETURN(-EINVAL); + } + break; + case LVB_T_LQUOTA: + if (size == sizeof(struct lquota_lvb)) { + if (loc == RCL_CLIENT) + lvb = req_capsule_client_swab_get(pill, + &RMF_DLM_LVB, + lustre_swab_lquota_lvb); + else + lvb = req_capsule_server_swab_get(pill, + &RMF_DLM_LVB, + lustre_swab_lquota_lvb); + if (unlikely(lvb == NULL)) { + LDLM_ERROR(lock, "no LVB"); + RETURN(-EPROTO); + } + + memcpy(data, lvb, size); + } else { + LDLM_ERROR(lock, "Replied unexpected lquota LVB size %d", + size); + RETURN(-EINVAL); + } + break; + case LVB_T_LAYOUT: + if (size == 0) + break; + + if (loc == RCL_CLIENT) + lvb = req_capsule_client_get(pill, &RMF_DLM_LVB); + else + lvb = req_capsule_server_get(pill, &RMF_DLM_LVB); + if (unlikely(lvb == NULL)) { + LDLM_ERROR(lock, "no LVB"); + RETURN(-EPROTO); + } + + memcpy(data, lvb, size); + break; + default: + LDLM_ERROR(lock, "Unknown LVB type: %d\n", lock->l_lvb_type); + libcfs_debug_dumpstack(NULL); + RETURN(-EINVAL); + } + + RETURN(0); +} + +/** + * Create and fill in new LDLM lock with specified properties. + * Returns a referenced lock + */ struct ldlm_lock *ldlm_lock_create(struct ldlm_namespace *ns, const struct ldlm_res_id *res_id, ldlm_type_t type, ldlm_mode_t mode, const struct ldlm_callback_suite *cbs, - void *data, __u32 lvb_len) + void *data, __u32 lvb_len, + enum lvb_type lvb_type) { struct ldlm_lock *lock; struct ldlm_resource *res; @@ -1310,12 +1601,12 @@ struct ldlm_lock *ldlm_lock_create(struct ldlm_namespace *ns, lock->l_req_mode = mode; lock->l_ast_data = data; lock->l_pid = cfs_curproc_pid(); - lock->l_ns_srv = ns_is_server(ns); + if (ns_is_server(ns)) + lock->l_flags |= LDLM_FL_NS_SRV; if (cbs) { lock->l_blocking_ast = cbs->lcs_blocking; lock->l_completion_ast = cbs->lcs_completion; lock->l_glimpse_ast = cbs->lcs_glimpse; - lock->l_weigh_ast = cbs->lcs_weigh; } lock->l_tree_node = NULL; @@ -1332,6 +1623,7 @@ struct ldlm_lock *ldlm_lock_create(struct ldlm_namespace *ns, GOTO(out, 0); } + lock->l_lvb_type = lvb_type; if (OBD_FAIL_CHECK(OBD_FAIL_LDLM_NEW_LOCK)) GOTO(out, 0); @@ -1343,14 +1635,26 @@ out: return NULL; } +/** + * Enqueue (request) a lock. + * + * Does not block. As a result of enqueue the lock would be put + * into granted or waiting list. + * + * If namespace has intent policy sent and the lock has LDLM_FL_HAS_INTENT flag + * set, skip all the enqueueing and delegate lock processing to intent policy + * function. + */ ldlm_error_t ldlm_lock_enqueue(struct ldlm_namespace *ns, struct ldlm_lock **lockp, - void *cookie, int *flags) + void *cookie, __u64 *flags) { struct ldlm_lock *lock = *lockp; struct ldlm_resource *res = lock->l_resource; int local = ns_is_client(ldlm_res_to_ns(res)); +#ifdef HAVE_SERVER_SUPPORT ldlm_processing_policy policy; +#endif ldlm_error_t rc = ELDLM_OK; struct ldlm_interval *node = NULL; ENTRY; @@ -1408,21 +1712,21 @@ ldlm_error_t ldlm_lock_enqueue(struct ldlm_namespace *ns, node = NULL; } - /* Some flags from the enqueue want to make it into the AST, via the - * lock's l_flags. */ - lock->l_flags |= *flags & LDLM_AST_DISCARD_DATA; - - /* This distinction between local lock trees is very important; a client - * namespace only has information about locks taken by that client, and - * thus doesn't have enough information to decide for itself if it can - * be granted (below). In this case, we do exactly what the server - * tells us to do, as dictated by the 'flags'. - * - * We do exactly the same thing during recovery, when the server is - * more or less trusting the clients not to lie. - * - * FIXME (bug 268): Detect obvious lies by checking compatibility in - * granted/converting queues. */ + /* Some flags from the enqueue want to make it into the AST, via the + * lock's l_flags. */ + lock->l_flags |= *flags & LDLM_FL_AST_DISCARD_DATA; + + /* This distinction between local lock trees is very important; a client + * namespace only has information about locks taken by that client, and + * thus doesn't have enough information to decide for itself if it can + * be granted (below). In this case, we do exactly what the server + * tells us to do, as dictated by the 'flags'. + * + * We do exactly the same thing during recovery, when the server is + * more or less trusting the clients not to lie. + * + * FIXME (bug 268): Detect obvious lies by checking compatibility in + * granted/converting queues. */ if (local) { if (*flags & LDLM_FL_BLOCK_CONV) ldlm_resource_add_lock(res, &res->lr_converting, lock); @@ -1431,6 +1735,7 @@ ldlm_error_t ldlm_lock_enqueue(struct ldlm_namespace *ns, else ldlm_grant_lock(lock, NULL); GOTO(out, ELDLM_OK); +#ifdef HAVE_SERVER_SUPPORT } else if (*flags & LDLM_FL_REPLAY) { if (*flags & LDLM_FL_BLOCK_CONV) { ldlm_resource_add_lock(res, &res->lr_converting, lock); @@ -1448,6 +1753,14 @@ ldlm_error_t ldlm_lock_enqueue(struct ldlm_namespace *ns, policy = ldlm_processing_policy_table[res->lr_type]; policy(lock, flags, 1, &rc, NULL); GOTO(out, rc); +#else + } else { + CERROR("This is client-side-only module, cannot handle " + "LDLM_NAMESPACE_SERVER resource type lock.\n"); + LBUG(); + } +#endif + out: unlock_res_and_lock(lock); if (node) @@ -1455,13 +1768,19 @@ out: return rc; } -/* Must be called with namespace taken: queue is waiting or converting. */ +#ifdef HAVE_SERVER_SUPPORT +/** + * Iterate through all waiting locks on a given resource queue and attempt to + * grant them. + * + * Must be called with resource lock held. + */ int ldlm_reprocess_queue(struct ldlm_resource *res, cfs_list_t *queue, cfs_list_t *work_list) { cfs_list_t *tmp, *pos; ldlm_processing_policy policy; - int flags; + __u64 flags; int rc = LDLM_ITER_CONTINUE; ldlm_error_t err; ENTRY; @@ -1485,146 +1804,215 @@ int ldlm_reprocess_queue(struct ldlm_resource *res, cfs_list_t *queue, RETURN(rc); } +#endif +/** + * Process a call to blocking AST callback for a lock in ast_work list + */ static int -ldlm_work_bl_ast_lock(cfs_list_t *tmp, struct ldlm_cb_set_arg *arg) +ldlm_work_bl_ast_lock(struct ptlrpc_request_set *rqset, void *opaq) { - struct ldlm_lock_desc d; - struct ldlm_lock *lock = cfs_list_entry(tmp, struct ldlm_lock, - l_bl_ast); - int rc; - ENTRY; + struct ldlm_cb_set_arg *arg = opaq; + struct ldlm_lock_desc d; + int rc; + struct ldlm_lock *lock; + ENTRY; - /* nobody should touch l_bl_ast */ - lock_res_and_lock(lock); - cfs_list_del_init(&lock->l_bl_ast); + if (cfs_list_empty(arg->list)) + RETURN(-ENOENT); - LASSERT(lock->l_flags & LDLM_FL_AST_SENT); - LASSERT(lock->l_bl_ast_run == 0); - LASSERT(lock->l_blocking_lock); - lock->l_bl_ast_run++; - unlock_res_and_lock(lock); + lock = cfs_list_entry(arg->list->next, struct ldlm_lock, l_bl_ast); - ldlm_lock2desc(lock->l_blocking_lock, &d); + /* nobody should touch l_bl_ast */ + lock_res_and_lock(lock); + cfs_list_del_init(&lock->l_bl_ast); - rc = lock->l_blocking_ast(lock, &d, (void *)arg, - LDLM_CB_BLOCKING); - LDLM_LOCK_RELEASE(lock->l_blocking_lock); - lock->l_blocking_lock = NULL; - LDLM_LOCK_RELEASE(lock); + LASSERT(lock->l_flags & LDLM_FL_AST_SENT); + LASSERT(lock->l_bl_ast_run == 0); + LASSERT(lock->l_blocking_lock); + lock->l_bl_ast_run++; + unlock_res_and_lock(lock); - RETURN(rc); -} + ldlm_lock2desc(lock->l_blocking_lock, &d); -static int -ldlm_work_cp_ast_lock(cfs_list_t *tmp, struct ldlm_cb_set_arg *arg) -{ - struct ldlm_lock *lock = cfs_list_entry(tmp, struct ldlm_lock, l_cp_ast); - ldlm_completion_callback completion_callback; - int rc = 0; - ENTRY; + rc = lock->l_blocking_ast(lock, &d, (void *)arg, LDLM_CB_BLOCKING); + LDLM_LOCK_RELEASE(lock->l_blocking_lock); + lock->l_blocking_lock = NULL; + LDLM_LOCK_RELEASE(lock); - /* It's possible to receive a completion AST before we've set - * the l_completion_ast pointer: either because the AST arrived - * before the reply, or simply because there's a small race - * window between receiving the reply and finishing the local - * enqueue. (bug 842) - * - * This can't happen with the blocking_ast, however, because we - * will never call the local blocking_ast until we drop our - * reader/writer reference, which we won't do until we get the - * reply and finish enqueueing. */ - - /* nobody should touch l_cp_ast */ - lock_res_and_lock(lock); - cfs_list_del_init(&lock->l_cp_ast); - LASSERT(lock->l_flags & LDLM_FL_CP_REQD); - /* save l_completion_ast since it can be changed by - * mds_intent_policy(), see bug 14225 */ - completion_callback = lock->l_completion_ast; - lock->l_flags &= ~LDLM_FL_CP_REQD; - unlock_res_and_lock(lock); - - if (completion_callback != NULL) - rc = completion_callback(lock, 0, (void *)arg); - LDLM_LOCK_RELEASE(lock); + RETURN(rc); +} - RETURN(rc); +/** + * Process a call to completion AST callback for a lock in ast_work list + */ +static int +ldlm_work_cp_ast_lock(struct ptlrpc_request_set *rqset, void *opaq) +{ + struct ldlm_cb_set_arg *arg = opaq; + int rc = 0; + struct ldlm_lock *lock; + ldlm_completion_callback completion_callback; + ENTRY; + + if (cfs_list_empty(arg->list)) + RETURN(-ENOENT); + + lock = cfs_list_entry(arg->list->next, struct ldlm_lock, l_cp_ast); + + /* It's possible to receive a completion AST before we've set + * the l_completion_ast pointer: either because the AST arrived + * before the reply, or simply because there's a small race + * window between receiving the reply and finishing the local + * enqueue. (bug 842) + * + * This can't happen with the blocking_ast, however, because we + * will never call the local blocking_ast until we drop our + * reader/writer reference, which we won't do until we get the + * reply and finish enqueueing. */ + + /* nobody should touch l_cp_ast */ + lock_res_and_lock(lock); + cfs_list_del_init(&lock->l_cp_ast); + LASSERT(lock->l_flags & LDLM_FL_CP_REQD); + /* save l_completion_ast since it can be changed by + * mds_intent_policy(), see bug 14225 */ + completion_callback = lock->l_completion_ast; + lock->l_flags &= ~LDLM_FL_CP_REQD; + unlock_res_and_lock(lock); + + if (completion_callback != NULL) + rc = completion_callback(lock, 0, (void *)arg); + LDLM_LOCK_RELEASE(lock); + + RETURN(rc); } +/** + * Process a call to revocation AST callback for a lock in ast_work list + */ static int -ldlm_work_revoke_ast_lock(cfs_list_t *tmp, struct ldlm_cb_set_arg *arg) +ldlm_work_revoke_ast_lock(struct ptlrpc_request_set *rqset, void *opaq) { - struct ldlm_lock_desc desc; - struct ldlm_lock *lock = cfs_list_entry(tmp, struct ldlm_lock, - l_rk_ast); - int rc; - ENTRY; + struct ldlm_cb_set_arg *arg = opaq; + struct ldlm_lock_desc desc; + int rc; + struct ldlm_lock *lock; + ENTRY; - cfs_list_del_init(&lock->l_rk_ast); + if (cfs_list_empty(arg->list)) + RETURN(-ENOENT); - /* the desc just pretend to exclusive */ - ldlm_lock2desc(lock, &desc); - desc.l_req_mode = LCK_EX; - desc.l_granted_mode = 0; + lock = cfs_list_entry(arg->list->next, struct ldlm_lock, l_rk_ast); + cfs_list_del_init(&lock->l_rk_ast); - rc = lock->l_blocking_ast(lock, &desc, (void*)arg, LDLM_CB_BLOCKING); - LDLM_LOCK_RELEASE(lock); + /* the desc just pretend to exclusive */ + ldlm_lock2desc(lock, &desc); + desc.l_req_mode = LCK_EX; + desc.l_granted_mode = 0; - RETURN(rc); + rc = lock->l_blocking_ast(lock, &desc, (void*)arg, LDLM_CB_BLOCKING); + LDLM_LOCK_RELEASE(lock); + + RETURN(rc); } -int ldlm_run_ast_work(struct ldlm_namespace *ns, cfs_list_t *rpc_list, - ldlm_desc_ast_t ast_type) +/** + * Process a call to glimpse AST callback for a lock in ast_work list + */ +int ldlm_work_gl_ast_lock(struct ptlrpc_request_set *rqset, void *opaq) { - struct ldlm_cb_set_arg arg = { 0 }; - struct l_wait_info lwi = { 0 }; - cfs_list_t *tmp, *pos; - int (*work_ast_lock)(cfs_list_t *tmp, struct ldlm_cb_set_arg *arg); - unsigned int max_ast_count; - ENTRY; + struct ldlm_cb_set_arg *arg = opaq; + struct ldlm_glimpse_work *gl_work; + struct ldlm_lock *lock; + int rc = 0; + ENTRY; - if (cfs_list_empty(rpc_list)) - RETURN(0); + if (cfs_list_empty(arg->list)) + RETURN(-ENOENT); - cfs_atomic_set(&arg.restart, 0); - cfs_atomic_set(&arg.rpcs, 0); - cfs_waitq_init(&arg.waitq); - - switch (ast_type) { - case LDLM_WORK_BL_AST: - arg.type = LDLM_BL_CALLBACK; - work_ast_lock = ldlm_work_bl_ast_lock; - break; - case LDLM_WORK_CP_AST: - arg.type = LDLM_CP_CALLBACK; - work_ast_lock = ldlm_work_cp_ast_lock; - break; - case LDLM_WORK_REVOKE_AST: - arg.type = LDLM_BL_CALLBACK; - work_ast_lock = ldlm_work_revoke_ast_lock; - break; - default: - LBUG(); - } + gl_work = cfs_list_entry(arg->list->next, struct ldlm_glimpse_work, + gl_list); + cfs_list_del_init(&gl_work->gl_list); - max_ast_count = ns->ns_max_parallel_ast ? : UINT_MAX; - arg.threshold = max_ast_count; + lock = gl_work->gl_lock; - cfs_list_for_each_safe(tmp, pos, rpc_list) { - (void)work_ast_lock(tmp, &arg); - if (cfs_atomic_read(&arg.rpcs) < max_ast_count) - continue; + /* transfer the glimpse descriptor to ldlm_cb_set_arg */ + arg->gl_desc = gl_work->gl_desc; - l_wait_event(arg.waitq, - cfs_atomic_read(&arg.rpcs) < arg.threshold, - &lwi); - } + /* invoke the actual glimpse callback */ + if (lock->l_glimpse_ast(lock, (void*)arg) == 0) + rc = 1; + + LDLM_LOCK_RELEASE(lock); - arg.threshold = 1; - l_wait_event(arg.waitq, cfs_atomic_read(&arg.rpcs) == 0, &lwi); + if ((gl_work->gl_flags & LDLM_GL_WORK_NOFREE) == 0) + OBD_FREE_PTR(gl_work); - RETURN(cfs_atomic_read(&arg.restart) ? -ERESTART : 0); + RETURN(rc); +} + +/** + * Process list of locks in need of ASTs being sent. + * + * Used on server to send multiple ASTs together instead of sending one by + * one. + */ +int ldlm_run_ast_work(struct ldlm_namespace *ns, cfs_list_t *rpc_list, + ldlm_desc_ast_t ast_type) +{ + struct ldlm_cb_set_arg *arg; + set_producer_func work_ast_lock; + int rc; + + if (cfs_list_empty(rpc_list)) + RETURN(0); + + OBD_ALLOC_PTR(arg); + if (arg == NULL) + RETURN(-ENOMEM); + + cfs_atomic_set(&arg->restart, 0); + arg->list = rpc_list; + + switch (ast_type) { + case LDLM_WORK_BL_AST: + arg->type = LDLM_BL_CALLBACK; + work_ast_lock = ldlm_work_bl_ast_lock; + break; + case LDLM_WORK_CP_AST: + arg->type = LDLM_CP_CALLBACK; + work_ast_lock = ldlm_work_cp_ast_lock; + break; + case LDLM_WORK_REVOKE_AST: + arg->type = LDLM_BL_CALLBACK; + work_ast_lock = ldlm_work_revoke_ast_lock; + break; + case LDLM_WORK_GL_AST: + arg->type = LDLM_GL_CALLBACK; + work_ast_lock = ldlm_work_gl_ast_lock; + break; + default: + LBUG(); + } + + /* We create a ptlrpc request set with flow control extension. + * This request set will use the work_ast_lock function to produce new + * requests and will send a new request each time one completes in order + * to keep the number of requests in flight to ns_max_parallel_ast */ + arg->set = ptlrpc_prep_fcset(ns->ns_max_parallel_ast ? : UINT_MAX, + work_ast_lock, arg); + if (arg->set == NULL) + GOTO(out, rc = -ENOMEM); + + ptlrpc_set_wait(arg->set); + ptlrpc_set_destroy(arg->set); + + rc = cfs_atomic_read(&arg->restart) ? -ERESTART : 0; + GOTO(out, rc); +out: + OBD_FREE_PTR(arg); + return rc; } static int reprocess_one_queue(struct ldlm_resource *res, void *closure) @@ -1644,6 +2032,10 @@ static int ldlm_reprocess_res(cfs_hash_t *hs, cfs_hash_bd_t *bd, return rc == LDLM_ITER_STOP; } +/** + * Iterate through all resources on a namespace attempting to grant waiting + * locks. + */ void ldlm_reprocess_all_ns(struct ldlm_namespace *ns) { ENTRY; @@ -1654,20 +2046,30 @@ void ldlm_reprocess_all_ns(struct ldlm_namespace *ns) } EXIT; } +EXPORT_SYMBOL(ldlm_reprocess_all_ns); +/** + * Try to grant all waiting locks on a resource. + * + * Calls ldlm_reprocess_queue on converting and waiting queues. + * + * Typically called after some resource locks are cancelled to see + * if anything could be granted as a result of the cancellation. + */ void ldlm_reprocess_all(struct ldlm_resource *res) { CFS_LIST_HEAD(rpc_list); + +#ifdef HAVE_SERVER_SUPPORT int rc; ENTRY; - /* Local lock trees don't get reprocessed. */ if (ns_is_client(ldlm_res_to_ns(res))) { EXIT; return; } - restart: +restart: lock_res(res); rc = ldlm_reprocess_queue(res, &res->lr_converting, &rpc_list); if (rc == LDLM_ITER_CONTINUE) @@ -1680,16 +2082,27 @@ void ldlm_reprocess_all(struct ldlm_resource *res) LASSERT(cfs_list_empty(&rpc_list)); goto restart; } +#else + ENTRY; + if (!ns_is_client(ldlm_res_to_ns(res))) { + CERROR("This is client-side-only module, cannot handle " + "LDLM_NAMESPACE_SERVER resource type lock.\n"); + LBUG(); + } +#endif EXIT; } +/** + * Helper function to call blocking AST for LDLM lock \a lock in a + * "cancelling" mode. + */ void ldlm_cancel_callback(struct ldlm_lock *lock) { - check_res_locked(lock->l_resource); - if (!(lock->l_flags & LDLM_FL_CANCEL)) { - lock->l_flags |= LDLM_FL_CANCEL; - if (lock->l_blocking_ast) { - // l_check_no_ns_lock(ns); + check_res_locked(lock->l_resource); + if (!(lock->l_flags & LDLM_FL_CANCEL)) { + lock->l_flags |= LDLM_FL_CANCEL; + if (lock->l_blocking_ast) { unlock_res_and_lock(lock); lock->l_blocking_ast(lock, NULL, lock->l_ast_data, LDLM_CB_CANCELING); @@ -1701,6 +2114,9 @@ void ldlm_cancel_callback(struct ldlm_lock *lock) lock->l_flags |= LDLM_FL_BL_DONE; } +/** + * Remove skiplist-enabled LDLM lock \a req from granted list + */ void ldlm_unlink_lock_skiplist(struct ldlm_lock *req) { if (req->l_resource->lr_type != LDLM_PLAIN && @@ -1711,6 +2127,9 @@ void ldlm_unlink_lock_skiplist(struct ldlm_lock *req) cfs_list_del_init(&req->l_sl_mode); } +/** + * Attempts to cancel LDLM lock \a lock that has no reader/writer references. + */ void ldlm_lock_cancel(struct ldlm_lock *lock) { struct ldlm_resource *res; @@ -1729,14 +2148,17 @@ void ldlm_lock_cancel(struct ldlm_lock *lock) LBUG(); } - ldlm_del_waiting_lock(lock); + if (lock->l_flags & LDLM_FL_WAITED) + ldlm_del_waiting_lock(lock); /* Releases cancel callback. */ ldlm_cancel_callback(lock); - /* Yes, second time, just in case it was added again while we were - running with no res lock in ldlm_cancel_callback */ - ldlm_del_waiting_lock(lock); + /* Yes, second time, just in case it was added again while we were + * running with no res lock in ldlm_cancel_callback */ + if (lock->l_flags & LDLM_FL_WAITED) + ldlm_del_waiting_lock(lock); + ldlm_resource_unlink_lock(lock); ldlm_lock_destroy_nolock(lock); @@ -1750,7 +2172,11 @@ void ldlm_lock_cancel(struct ldlm_lock *lock) EXIT; } +EXPORT_SYMBOL(ldlm_lock_cancel); +/** + * Set opaque data into the lock that only makes sense to upper layer. + */ int ldlm_lock_set_data(struct lustre_handle *lockh, void *data) { struct ldlm_lock *lock = ldlm_handle2lock(lockh); @@ -1768,11 +2194,21 @@ int ldlm_lock_set_data(struct lustre_handle *lockh, void *data) } EXPORT_SYMBOL(ldlm_lock_set_data); +struct export_cl_data { + struct obd_export *ecl_exp; + int ecl_loop; +}; + +/** + * Iterator function for ldlm_cancel_locks_for_export. + * Cancels passed locks. + */ int ldlm_cancel_locks_for_export_cb(cfs_hash_t *hs, cfs_hash_bd_t *bd, cfs_hlist_node_t *hnode, void *data) { - struct obd_export *exp = data; + struct export_cl_data *ecl = (struct export_cl_data *)data; + struct obd_export *exp = ecl->ecl_exp; struct ldlm_lock *lock = cfs_hash_object(hs, hnode); struct ldlm_resource *res; @@ -1785,13 +2221,33 @@ int ldlm_cancel_locks_for_export_cb(cfs_hash_t *hs, cfs_hash_bd_t *bd, ldlm_reprocess_all(res); ldlm_resource_putref(res); LDLM_LOCK_RELEASE(lock); - return 0; + + ecl->ecl_loop++; + if ((ecl->ecl_loop & -ecl->ecl_loop) == ecl->ecl_loop) { + CDEBUG(D_INFO, + "Cancel lock %p for export %p (loop %d), still have " + "%d locks left on hash table.\n", + lock, exp, ecl->ecl_loop, + cfs_atomic_read(&hs->hs_count)); + } + + return 0; } +/** + * Cancel all locks for given export. + * + * Typically called on client disconnection/eviction + */ void ldlm_cancel_locks_for_export(struct obd_export *exp) { - cfs_hash_for_each_empty(exp->exp_lock_hash, - ldlm_cancel_locks_for_export_cb, exp); + struct export_cl_data ecl = { + .ecl_exp = exp, + .ecl_loop = 0, + }; + + cfs_hash_for_each_empty(exp->exp_lock_hash, + ldlm_cancel_locks_for_export_cb, &ecl); } /** @@ -1799,6 +2255,7 @@ void ldlm_cancel_locks_for_export(struct obd_export *exp) * * A fast variant of ldlm_lock_convert for convertion of exclusive * locks. The convertion is always successful. + * Used by Commit on Sharing (COS) code. * * \param lock A lock to convert * \param new_mode new lock mode @@ -1825,7 +2282,15 @@ void ldlm_lock_downgrade(struct ldlm_lock *lock, int new_mode) EXIT; } +EXPORT_SYMBOL(ldlm_lock_downgrade); +/** + * Attempt to convert already granted lock to a different mode. + * + * While lock conversion is not currently used, future client-side + * optimizations could take advantage of it to avoid discarding cached + * pages on a file. + */ struct ldlm_resource *ldlm_lock_convert(struct ldlm_lock *lock, int new_mode, __u32 *flags) { @@ -1833,13 +2298,15 @@ struct ldlm_resource *ldlm_lock_convert(struct ldlm_lock *lock, int new_mode, struct ldlm_resource *res; struct ldlm_namespace *ns; int granted = 0; - int old_mode, rc; - struct sl_insert_point prev; - ldlm_error_t err; +#ifdef HAVE_SERVER_SUPPORT + int old_mode; + struct sl_insert_point prev; +#endif struct ldlm_interval *node; ENTRY; - if (new_mode == lock->l_granted_mode) { // No changes? Just return. + /* Just return if mode is unchanged. */ + if (new_mode == lock->l_granted_mode) { *flags |= LDLM_FL_BLOCK_GRANTED; RETURN(lock->l_resource); } @@ -1847,7 +2314,8 @@ struct ldlm_resource *ldlm_lock_convert(struct ldlm_lock *lock, int new_mode, /* I can't check the type of lock here because the bitlock of lock * is not held here, so do the allocation blindly. -jay */ OBD_SLAB_ALLOC_PTR_GFP(node, ldlm_interval_slab, CFS_ALLOC_IO); - if (node == NULL) /* Actually, this causes EDEADLOCK to be returned */ + if (node == NULL) + /* Actually, this causes LUSTRE_EDEADLK to be returned */ RETURN(NULL); LASSERTF((new_mode == LCK_PW && lock->l_granted_mode == LCK_PR), @@ -1858,15 +2326,19 @@ struct ldlm_resource *ldlm_lock_convert(struct ldlm_lock *lock, int new_mode, res = lock->l_resource; ns = ldlm_res_to_ns(res); - old_mode = lock->l_req_mode; - lock->l_req_mode = new_mode; - if (res->lr_type == LDLM_PLAIN || res->lr_type == LDLM_IBITS) { - /* remember the lock position where the lock might be - * added back to the granted list later and also - * remember the join mode for skiplist fixing. */ - prev.res_link = lock->l_res_link.prev; - prev.mode_link = lock->l_sl_mode.prev; - prev.policy_link = lock->l_sl_policy.prev; +#ifdef HAVE_SERVER_SUPPORT + old_mode = lock->l_req_mode; +#endif + lock->l_req_mode = new_mode; + if (res->lr_type == LDLM_PLAIN || res->lr_type == LDLM_IBITS) { +#ifdef HAVE_SERVER_SUPPORT + /* remember the lock position where the lock might be + * added back to the granted list later and also + * remember the join mode for skiplist fixing. */ + prev.res_link = lock->l_res_link.prev; + prev.mode_link = lock->l_sl_mode.prev; + prev.policy_link = lock->l_sl_policy.prev; +#endif ldlm_resource_unlink_lock(lock); } else { ldlm_resource_unlink_lock(lock); @@ -1893,7 +2365,7 @@ struct ldlm_resource *ldlm_lock_convert(struct ldlm_lock *lock, int new_mode, } else { /* This should never happen, because of the way the * server handles conversions. */ - LDLM_ERROR(lock, "Erroneous flags %d on local lock\n", + LDLM_ERROR(lock, "Erroneous flags %x on local lock\n", *flags); LBUG(); @@ -1903,8 +2375,11 @@ struct ldlm_resource *ldlm_lock_convert(struct ldlm_lock *lock, int new_mode, if (lock->l_completion_ast) lock->l_completion_ast(lock, 0, NULL); } +#ifdef HAVE_SERVER_SUPPORT } else { - int pflags = 0; + int rc; + ldlm_error_t err; + __u64 pflags = 0; ldlm_processing_policy policy; policy = ldlm_processing_policy_table[res->lr_type]; rc = policy(lock, &pflags, 0, &err, &rpc_list); @@ -1921,6 +2396,13 @@ struct ldlm_resource *ldlm_lock_convert(struct ldlm_lock *lock, int new_mode, granted = 1; } } +#else + } else { + CERROR("This is client-side-only module, cannot handle " + "LDLM_NAMESPACE_SERVER resource type lock.\n"); + LBUG(); + } +#endif unlock_res_and_lock(lock); if (granted) @@ -1929,62 +2411,13 @@ struct ldlm_resource *ldlm_lock_convert(struct ldlm_lock *lock, int new_mode, OBD_SLAB_FREE(node, ldlm_interval_slab, sizeof(*node)); RETURN(res); } +EXPORT_SYMBOL(ldlm_lock_convert); -void ldlm_lock_dump(int level, struct ldlm_lock *lock, int pos) -{ - struct obd_device *obd = NULL; - - if (!((libcfs_debug | D_ERROR) & level)) - return; - - if (!lock) { - CDEBUG(level, " NULL LDLM lock\n"); - return; - } - - CDEBUG(level," -- Lock dump: %p/"LPX64" (rc: %d) (pos: %d) (pid: %d)\n", - lock, lock->l_handle.h_cookie, cfs_atomic_read(&lock->l_refc), - pos, lock->l_pid); - if (lock->l_conn_export != NULL) - obd = lock->l_conn_export->exp_obd; - if (lock->l_export && lock->l_export->exp_connection) { - CDEBUG(level, " Node: NID %s (rhandle: "LPX64")\n", - libcfs_nid2str(lock->l_export->exp_connection->c_peer.nid), - lock->l_remote_handle.cookie); - } else if (obd == NULL) { - CDEBUG(level, " Node: local\n"); - } else { - struct obd_import *imp = obd->u.cli.cl_import; - CDEBUG(level, " Node: NID %s (rhandle: "LPX64")\n", - libcfs_nid2str(imp->imp_connection->c_peer.nid), - lock->l_remote_handle.cookie); - } - CDEBUG(level, " Resource: %p ("LPU64"/"LPU64"/"LPU64")\n", - lock->l_resource, - lock->l_resource->lr_name.name[0], - lock->l_resource->lr_name.name[1], - lock->l_resource->lr_name.name[2]); - CDEBUG(level, " Req mode: %s, grant mode: %s, rc: %u, read: %d, " - "write: %d flags: "LPX64"\n", ldlm_lockname[lock->l_req_mode], - ldlm_lockname[lock->l_granted_mode], - cfs_atomic_read(&lock->l_refc), lock->l_readers, lock->l_writers, - lock->l_flags); - if (lock->l_resource->lr_type == LDLM_EXTENT) - CDEBUG(level, " Extent: "LPU64" -> "LPU64 - " (req "LPU64"-"LPU64")\n", - lock->l_policy_data.l_extent.start, - lock->l_policy_data.l_extent.end, - lock->l_req_extent.start, lock->l_req_extent.end); - else if (lock->l_resource->lr_type == LDLM_FLOCK) - CDEBUG(level, " Pid: %d Extent: "LPU64" -> "LPU64"\n", - lock->l_policy_data.l_flock.pid, - lock->l_policy_data.l_flock.start, - lock->l_policy_data.l_flock.end); - else if (lock->l_resource->lr_type == LDLM_IBITS) - CDEBUG(level, " Bits: "LPX64"\n", - lock->l_policy_data.l_inodebits.bits); -} - +/** + * Print lock with lock handle \a lockh description into debug log. + * + * Used when printing all locks on a resource for debug purposes. + */ void ldlm_lock_dump_handle(int level, struct lustre_handle *lockh) { struct ldlm_lock *lock; @@ -1996,135 +2429,141 @@ void ldlm_lock_dump_handle(int level, struct lustre_handle *lockh) if (lock == NULL) return; - ldlm_lock_dump(D_OTHER, lock, 0); + LDLM_DEBUG_LIMIT(level, lock, "###"); LDLM_LOCK_PUT(lock); } +EXPORT_SYMBOL(ldlm_lock_dump_handle); -void _ldlm_lock_debug(struct ldlm_lock *lock, __u32 level, - struct libcfs_debug_msg_data *data, const char *fmt, - ...) +/** + * Print lock information with custom message into debug log. + * Helper function. + */ +void _ldlm_lock_debug(struct ldlm_lock *lock, + struct libcfs_debug_msg_data *msgdata, + const char *fmt, ...) { va_list args; - cfs_debug_limit_state_t *cdls = data->msg_cdls; + struct obd_export *exp = lock->l_export; + struct ldlm_resource *resource = lock->l_resource; + char *nid = "local"; va_start(args, fmt); - if (lock->l_resource == NULL) { - libcfs_debug_vmsg2(cdls, data->msg_subsys, level,data->msg_file, - data->msg_fn, data->msg_line, fmt, args, + if (exp && exp->exp_connection) { + nid = libcfs_nid2str(exp->exp_connection->c_peer.nid); + } else if (exp && exp->exp_obd != NULL) { + struct obd_import *imp = exp->exp_obd->u.cli.cl_import; + nid = libcfs_nid2str(imp->imp_connection->c_peer.nid); + } + + if (resource == NULL) { + libcfs_debug_vmsg2(msgdata, fmt, args, " ns: \?\? lock: %p/"LPX64" lrc: %d/%d,%d mode: %s/%s " - "res: \?\? rrc=\?\? type: \?\?\? flags: "LPX64" remote: " - LPX64" expref: %d pid: %u timeout: %lu\n", lock, + "res: \?\? rrc=\?\? type: \?\?\? flags: "LPX64" nid: %s " + "remote: "LPX64" expref: %d pid: %u timeout: %lu " + "lvb_type: %d\n", + lock, lock->l_handle.h_cookie, cfs_atomic_read(&lock->l_refc), lock->l_readers, lock->l_writers, ldlm_lockname[lock->l_granted_mode], ldlm_lockname[lock->l_req_mode], - lock->l_flags, lock->l_remote_handle.cookie, - lock->l_export ? - cfs_atomic_read(&lock->l_export->exp_refcount) : -99, - lock->l_pid, lock->l_callback_timeout); + lock->l_flags, nid, lock->l_remote_handle.cookie, + exp ? cfs_atomic_read(&exp->exp_refcount) : -99, + lock->l_pid, lock->l_callback_timeout, lock->l_lvb_type); va_end(args); return; } - switch (lock->l_resource->lr_type) { - case LDLM_EXTENT: - libcfs_debug_vmsg2(cdls, data->msg_subsys, level,data->msg_file, - data->msg_fn, data->msg_line, fmt, args, - " ns: %s lock: %p/"LPX64" lrc: %d/%d,%d mode: %s/%s " - "res: "LPU64"/"LPU64" rrc: %d type: %s ["LPU64"->"LPU64 - "] (req "LPU64"->"LPU64") flags: "LPX64" remote: "LPX64 - " expref: %d pid: %u timeout %lu\n", - ldlm_lock_to_ns_name(lock), lock, - lock->l_handle.h_cookie, cfs_atomic_read(&lock->l_refc), - lock->l_readers, lock->l_writers, - ldlm_lockname[lock->l_granted_mode], - ldlm_lockname[lock->l_req_mode], - lock->l_resource->lr_name.name[0], - lock->l_resource->lr_name.name[1], - cfs_atomic_read(&lock->l_resource->lr_refcount), - ldlm_typename[lock->l_resource->lr_type], - lock->l_policy_data.l_extent.start, - lock->l_policy_data.l_extent.end, - lock->l_req_extent.start, lock->l_req_extent.end, - lock->l_flags, lock->l_remote_handle.cookie, - lock->l_export ? - cfs_atomic_read(&lock->l_export->exp_refcount) : -99, - lock->l_pid, lock->l_callback_timeout); - break; - - case LDLM_FLOCK: - libcfs_debug_vmsg2(cdls, data->msg_subsys, level,data->msg_file, - data->msg_fn, data->msg_line, fmt, args, - " ns: %s lock: %p/"LPX64" lrc: %d/%d,%d mode: %s/%s " - "res: "LPU64"/"LPU64" rrc: %d type: %s pid: %d " - "["LPU64"->"LPU64"] flags: "LPX64" remote: "LPX64 - " expref: %d pid: %u timeout: %lu\n", - ldlm_lock_to_ns_name(lock), lock, - lock->l_handle.h_cookie, cfs_atomic_read(&lock->l_refc), - lock->l_readers, lock->l_writers, - ldlm_lockname[lock->l_granted_mode], - ldlm_lockname[lock->l_req_mode], - lock->l_resource->lr_name.name[0], - lock->l_resource->lr_name.name[1], - cfs_atomic_read(&lock->l_resource->lr_refcount), - ldlm_typename[lock->l_resource->lr_type], - lock->l_policy_data.l_flock.pid, - lock->l_policy_data.l_flock.start, - lock->l_policy_data.l_flock.end, - lock->l_flags, lock->l_remote_handle.cookie, - lock->l_export ? - cfs_atomic_read(&lock->l_export->exp_refcount) : -99, - lock->l_pid, lock->l_callback_timeout); - break; - - case LDLM_IBITS: - libcfs_debug_vmsg2(cdls, data->msg_subsys, level,data->msg_file, - data->msg_fn, data->msg_line, fmt, args, - " ns: %s lock: %p/"LPX64" lrc: %d/%d,%d mode: %s/%s " - "res: "LPU64"/"LPU64" bits "LPX64" rrc: %d type: %s " - "flags: "LPX64" remote: "LPX64" expref: %d " - "pid: %u timeout: %lu\n", - ldlm_lock_to_ns_name(lock), - lock, lock->l_handle.h_cookie, - cfs_atomic_read (&lock->l_refc), - lock->l_readers, lock->l_writers, - ldlm_lockname[lock->l_granted_mode], - ldlm_lockname[lock->l_req_mode], - lock->l_resource->lr_name.name[0], - lock->l_resource->lr_name.name[1], - lock->l_policy_data.l_inodebits.bits, - cfs_atomic_read(&lock->l_resource->lr_refcount), - ldlm_typename[lock->l_resource->lr_type], - lock->l_flags, lock->l_remote_handle.cookie, - lock->l_export ? - cfs_atomic_read(&lock->l_export->exp_refcount) : -99, - lock->l_pid, lock->l_callback_timeout); - break; - - default: - libcfs_debug_vmsg2(cdls, data->msg_subsys, level,data->msg_file, - data->msg_fn, data->msg_line, fmt, args, - " ns: %s lock: %p/"LPX64" lrc: %d/%d,%d mode: %s/%s " - "res: "LPU64"/"LPU64" rrc: %d type: %s flags: "LPX64" " - "remote: "LPX64" expref: %d pid: %u timeout %lu\n", - ldlm_lock_to_ns_name(lock), - lock, lock->l_handle.h_cookie, - cfs_atomic_read (&lock->l_refc), - lock->l_readers, lock->l_writers, - ldlm_lockname[lock->l_granted_mode], - ldlm_lockname[lock->l_req_mode], - lock->l_resource->lr_name.name[0], - lock->l_resource->lr_name.name[1], - cfs_atomic_read(&lock->l_resource->lr_refcount), - ldlm_typename[lock->l_resource->lr_type], - lock->l_flags, lock->l_remote_handle.cookie, - lock->l_export ? - cfs_atomic_read(&lock->l_export->exp_refcount) : -99, - lock->l_pid, lock->l_callback_timeout); - break; - } - va_end(args); + switch (resource->lr_type) { + case LDLM_EXTENT: + libcfs_debug_vmsg2(msgdata, fmt, args, + " ns: %s lock: %p/"LPX64" lrc: %d/%d,%d mode: %s/%s " + "res: "DLDLMRES" rrc: %d type: %s ["LPU64"->"LPU64"] " + "(req "LPU64"->"LPU64") flags: "LPX64" nid: %s remote: " + LPX64" expref: %d pid: %u timeout: %lu lvb_type: %d\n", + ldlm_lock_to_ns_name(lock), lock, + lock->l_handle.h_cookie, cfs_atomic_read(&lock->l_refc), + lock->l_readers, lock->l_writers, + ldlm_lockname[lock->l_granted_mode], + ldlm_lockname[lock->l_req_mode], + PLDLMRES(resource), + cfs_atomic_read(&resource->lr_refcount), + ldlm_typename[resource->lr_type], + lock->l_policy_data.l_extent.start, + lock->l_policy_data.l_extent.end, + lock->l_req_extent.start, lock->l_req_extent.end, + lock->l_flags, nid, lock->l_remote_handle.cookie, + exp ? cfs_atomic_read(&exp->exp_refcount) : -99, + lock->l_pid, lock->l_callback_timeout, + lock->l_lvb_type); + break; + + case LDLM_FLOCK: + libcfs_debug_vmsg2(msgdata, fmt, args, + " ns: %s lock: %p/"LPX64" lrc: %d/%d,%d mode: %s/%s " + "res: "DLDLMRES" rrc: %d type: %s pid: %d " + "["LPU64"->"LPU64"] flags: "LPX64" nid: %s " + "remote: "LPX64" expref: %d pid: %u timeout: %lu\n", + ldlm_lock_to_ns_name(lock), lock, + lock->l_handle.h_cookie, cfs_atomic_read(&lock->l_refc), + lock->l_readers, lock->l_writers, + ldlm_lockname[lock->l_granted_mode], + ldlm_lockname[lock->l_req_mode], + PLDLMRES(resource), + cfs_atomic_read(&resource->lr_refcount), + ldlm_typename[resource->lr_type], + lock->l_policy_data.l_flock.pid, + lock->l_policy_data.l_flock.start, + lock->l_policy_data.l_flock.end, + lock->l_flags, nid, lock->l_remote_handle.cookie, + exp ? cfs_atomic_read(&exp->exp_refcount) : -99, + lock->l_pid, lock->l_callback_timeout); + break; + + case LDLM_IBITS: + libcfs_debug_vmsg2(msgdata, fmt, args, + " ns: %s lock: %p/"LPX64" lrc: %d/%d,%d mode: %s/%s " + "res: "DLDLMRES" bits "LPX64" rrc: %d type: %s " + "flags: "LPX64" nid: %s remote: "LPX64" expref: %d " + "pid: %u timeout: %lu lvb_type: %d\n", + ldlm_lock_to_ns_name(lock), + lock, lock->l_handle.h_cookie, + cfs_atomic_read(&lock->l_refc), + lock->l_readers, lock->l_writers, + ldlm_lockname[lock->l_granted_mode], + ldlm_lockname[lock->l_req_mode], + PLDLMRES(resource), + lock->l_policy_data.l_inodebits.bits, + cfs_atomic_read(&resource->lr_refcount), + ldlm_typename[resource->lr_type], + lock->l_flags, nid, lock->l_remote_handle.cookie, + exp ? cfs_atomic_read(&exp->exp_refcount) : -99, + lock->l_pid, lock->l_callback_timeout, + lock->l_lvb_type); + break; + + default: + libcfs_debug_vmsg2(msgdata, fmt, args, + " ns: %s lock: %p/"LPX64" lrc: %d/%d,%d mode: %s/%s " + "res: "DLDLMRES" rrc: %d type: %s flags: "LPX64" " + "nid: %s remote: "LPX64" expref: %d pid: %u " + "timeout: %lu lvb_type: %d\n", + ldlm_lock_to_ns_name(lock), + lock, lock->l_handle.h_cookie, + cfs_atomic_read(&lock->l_refc), + lock->l_readers, lock->l_writers, + ldlm_lockname[lock->l_granted_mode], + ldlm_lockname[lock->l_req_mode], + PLDLMRES(resource), + cfs_atomic_read(&resource->lr_refcount), + ldlm_typename[resource->lr_type], + lock->l_flags, nid, lock->l_remote_handle.cookie, + exp ? cfs_atomic_read(&exp->exp_refcount) : -99, + lock->l_pid, lock->l_callback_timeout, + lock->l_lvb_type); + break; + } + va_end(args); } EXPORT_SYMBOL(_ldlm_lock_debug);