* Author: Peter Braam <braam@clusterfs.com>
* Author: Phil Schwan <phil@clusterfs.com>
*
- * This file is part of Lustre, http://www.lustre.org.
+ * This file is part of the Lustre file system, http://www.lustre.org
+ * Lustre is a trademark of Cluster File Systems, Inc.
*
- * Lustre is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * You may have signed or agreed to another license before downloading
+ * this software. If so, you are bound by the terms and conditions
+ * of that agreement, and the following does not apply to you. See the
+ * LICENSE file included with this distribution for more information.
*
- * Lustre is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * If you did not agree to a different license, then this copy of Lustre
+ * is open source software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
*
- * You should have received a copy of the GNU General Public License
- * along with Lustre; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * In either case, Lustre is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * license text for more details.
*/
#define DEBUG_SUBSYSTEM S_LDLM
#ifdef __KERNEL__
-# include <linux/slab.h>
-# include <linux/dcache.h>
-# include <linux/namei.h>
-# include <linux/module.h>
-# include <linux/lustre_dlm.h>
+# include <libcfs/libcfs.h>
+# include <linux/lustre_intent.h>
#else
# include <liblustre.h>
# include <libcfs/kp30.h>
#endif
-#include <linux/obd_class.h>
+#include <obd_class.h>
#include "ldlm_internal.h"
-//struct lustre_lock ldlm_everything_lock;
+/* lock's skip list pointers fix mode */
+#define LDLM_JOIN_NONE 0
+#define LDLM_MODE_JOIN_RIGHT 1
+#define LDLM_MODE_JOIN_LEFT (1 << 1)
+#define LDLM_POLICY_JOIN_RIGHT (1 << 2)
+#define LDLM_POLICY_JOIN_LEFT (1 << 3)
/* lock types */
char *ldlm_lockname[] = {
[LCK_NL] "NL",
[LCK_GROUP] "GROUP"
};
+
char *ldlm_typename[] = {
[LDLM_PLAIN] "PLN",
[LDLM_EXTENT] "EXT",
return "unlink";
case IT_GETXATTR:
return "getxattr";
- case IT_CHDIR:
- return "chdir";
default:
CERROR("Unknown intent %d\n", it);
return "UNKNOWN";
}
}
-extern kmem_cache_t *ldlm_lock_slab;
+extern cfs_mem_cache_t *ldlm_lock_slab;
static ldlm_processing_policy ldlm_processing_policy_table[] = {
[LDLM_PLAIN] ldlm_process_plain_lock,
return lock;
}
+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));
+}
+
void ldlm_lock_put(struct ldlm_lock *lock)
{
ENTRY;
if (atomic_dec_and_test(&lock->l_refc)) {
struct ldlm_resource *res;
- LDLM_DEBUG(lock, "final lock_put on destroyed lock, freeing");
+ LDLM_DEBUG(lock,
+ "final lock_put on destroyed lock, freeing it.");
- lock_res_and_lock(lock);
res = lock->l_resource;
LASSERT(lock->l_destroyed);
LASSERT(list_empty(&lock->l_res_link));
-
- if (lock->l_parent)
- LDLM_LOCK_PUT(lock->l_parent);
- unlock_res_and_lock(lock);
+ LASSERT(list_empty(&lock->l_pending_chain));
atomic_dec(&res->lr_namespace->ns_locks);
ldlm_resource_putref(res);
lock->l_resource = NULL;
- if (lock->l_export)
+ if (lock->l_export) {
class_export_put(lock->l_export);
+ lock->l_export = NULL;
+ }
if (lock->l_lvb_data != NULL)
OBD_FREE(lock->l_lvb_data, lock->l_lvb_len);
- OBD_SLAB_FREE(lock, ldlm_lock_slab, sizeof(*lock));
+ OBD_FREE_RCU_CB(lock, sizeof(*lock), &lock->l_handle,
+ ldlm_lock_free);
}
EXIT;
}
-void ldlm_lock_remove_from_lru(struct ldlm_lock *lock)
+int ldlm_lock_remove_from_lru_nolock(struct ldlm_lock *lock)
{
- ENTRY;
- spin_lock(&lock->l_resource->lr_namespace->ns_unused_lock);
+ int rc = 0;
if (!list_empty(&lock->l_lru)) {
+ struct ldlm_namespace *ns = lock->l_resource->lr_namespace;
LASSERT(lock->l_resource->lr_type != LDLM_FLOCK);
list_del_init(&lock->l_lru);
- lock->l_resource->lr_namespace->ns_nr_unused--;
- LASSERT(lock->l_resource->lr_namespace->ns_nr_unused >= 0);
+ ns->ns_nr_unused--;
+ LASSERT(ns->ns_nr_unused >= 0);
+ rc = 1;
+ }
+ return rc;
+}
+
+int ldlm_lock_remove_from_lru(struct ldlm_lock *lock)
+{
+ struct ldlm_namespace *ns = lock->l_resource->lr_namespace;
+ int rc;
+ ENTRY;
+ spin_lock(&ns->ns_unused_lock);
+ rc = ldlm_lock_remove_from_lru_nolock(lock);
+ spin_unlock(&ns->ns_unused_lock);
+ EXIT;
+ return rc;
+}
+
+void ldlm_lock_add_to_lru_nolock(struct ldlm_lock *lock)
+{
+ struct ldlm_namespace *ns = lock->l_resource->lr_namespace;
+ lock->l_last_used = cfs_time_current();
+ LASSERT(list_empty(&lock->l_lru));
+ list_add_tail(&lock->l_lru, &ns->ns_unused_list);
+ LASSERT(ns->ns_nr_unused >= 0);
+ ns->ns_nr_unused++;
+}
+
+void ldlm_lock_add_to_lru(struct ldlm_lock *lock)
+{
+ struct ldlm_namespace *ns = lock->l_resource->lr_namespace;
+ ENTRY;
+ spin_lock(&ns->ns_unused_lock);
+ ldlm_lock_add_to_lru_nolock(lock);
+ spin_unlock(&ns->ns_unused_lock);
+ EXIT;
+}
+
+void ldlm_lock_touch_in_lru(struct ldlm_lock *lock)
+{
+ struct ldlm_namespace *ns = lock->l_resource->lr_namespace;
+ ENTRY;
+ spin_lock(&ns->ns_unused_lock);
+ if (!list_empty(&lock->l_lru)) {
+ ldlm_lock_remove_from_lru_nolock(lock);
+ ldlm_lock_add_to_lru_nolock(lock);
}
- spin_unlock(&lock->l_resource->lr_namespace->ns_unused_lock);
+ spin_unlock(&ns->ns_unused_lock);
EXIT;
}
-/* This used to have a 'strict' flact, which recovery would use to mark an
+/* 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 */
-void ldlm_lock_destroy(struct ldlm_lock *lock)
+int ldlm_lock_destroy_internal(struct ldlm_lock *lock)
{
ENTRY;
- lock_res_and_lock(lock);
-
- if (!list_empty(&lock->l_children)) {
- LDLM_ERROR(lock, "still has children (%p)!",
- lock->l_children.next);
- ldlm_lock_dump(D_ERROR, lock, 0);
- LBUG();
- }
if (lock->l_readers || lock->l_writers) {
LDLM_ERROR(lock, "lock still has references");
ldlm_lock_dump(D_ERROR, lock, 0);
if (lock->l_destroyed) {
LASSERT(list_empty(&lock->l_lru));
- unlock_res_and_lock(lock);
EXIT;
- return;
+ return 0;
}
lock->l_destroyed = 1;
- if (lock->l_export) {
+ if (lock->l_export)
spin_lock(&lock->l_export->exp_ldlm_data.led_lock);
- if (!list_empty(&lock->l_export_chain))
- list_del_init(&lock->l_export_chain);
+ list_del_init(&lock->l_export_chain);
+ if (lock->l_export)
spin_unlock(&lock->l_export->exp_ldlm_data.led_lock);
- } else {
- LASSERT(list_empty(&lock->l_export_chain));
- }
ldlm_lock_remove_from_lru(lock);
class_handle_unhash(&lock->l_handle);
if (lock->l_export && lock->l_completion_ast)
lock->l_completion_ast(lock, 0);
#endif
+ EXIT;
+ return 1;
+}
+void ldlm_lock_destroy(struct ldlm_lock *lock)
+{
+ int first;
+ ENTRY;
+ lock_res_and_lock(lock);
+ first = ldlm_lock_destroy_internal(lock);
unlock_res_and_lock(lock);
- LDLM_LOCK_PUT(lock);
+
+ /* drop reference from hashtable only for first destroy */
+ if (first)
+ LDLM_LOCK_PUT(lock);
+ EXIT;
+}
+
+void ldlm_lock_destroy_nolock(struct ldlm_lock *lock)
+{
+ int first;
+ ENTRY;
+ first = ldlm_lock_destroy_internal(lock);
+ /* drop reference from hashtable only for first destroy */
+ if (first)
+ LDLM_LOCK_PUT(lock);
EXIT;
}
* after return, ldlm_*_put the resource and parent
* returns: lock with refcount 2 - one for current caller and one for remote
*/
-static struct ldlm_lock *ldlm_lock_new(struct ldlm_lock *parent,
- struct ldlm_resource *resource)
+static struct ldlm_lock *ldlm_lock_new(struct ldlm_resource *resource)
{
struct ldlm_lock *lock;
ENTRY;
if (resource == NULL)
LBUG();
- OBD_SLAB_ALLOC(lock, ldlm_lock_slab, SLAB_NOFS, sizeof(*lock));
+ OBD_SLAB_ALLOC(lock, ldlm_lock_slab, CFS_ALLOC_IO, sizeof(*lock));
if (lock == NULL)
RETURN(NULL);
+ spin_lock_init(&lock->l_lock);
lock->l_resource = ldlm_resource_getref(resource);
atomic_set(&lock->l_refc, 2);
- INIT_LIST_HEAD(&lock->l_children);
- INIT_LIST_HEAD(&lock->l_res_link);
- INIT_LIST_HEAD(&lock->l_lru);
- INIT_LIST_HEAD(&lock->l_export_chain);
- INIT_LIST_HEAD(&lock->l_pending_chain);
- INIT_LIST_HEAD(&lock->l_tmp);
- INIT_LIST_HEAD(&lock->l_bl_ast);
- INIT_LIST_HEAD(&lock->l_cp_ast);
- init_waitqueue_head(&lock->l_waitq);
+ CFS_INIT_LIST_HEAD(&lock->l_res_link);
+ CFS_INIT_LIST_HEAD(&lock->l_lru);
+ CFS_INIT_LIST_HEAD(&lock->l_export_chain);
+ CFS_INIT_LIST_HEAD(&lock->l_pending_chain);
+ CFS_INIT_LIST_HEAD(&lock->l_bl_ast);
+ CFS_INIT_LIST_HEAD(&lock->l_cp_ast);
+ cfs_waitq_init(&lock->l_waitq);
lock->l_blocking_lock = NULL;
- lock->l_pidb = 0;
+ lock->l_sl_mode.prev = NULL;
+ lock->l_sl_mode.next = NULL;
+ lock->l_sl_policy.prev = NULL;
+ lock->l_sl_policy.next = NULL;
atomic_inc(&resource->lr_namespace->ns_locks);
-
- if (parent != NULL) {
- spin_lock(&resource->lr_namespace->ns_hash_lock);
- lock->l_parent = LDLM_LOCK_GET(parent);
- list_add(&lock->l_childof, &parent->l_children);
- spin_unlock(&resource->lr_namespace->ns_hash_lock);
- }
-
- INIT_LIST_HEAD(&lock->l_handle.h_link);
+ CFS_INIT_LIST_HEAD(&lock->l_handle.h_link);
class_handle_hash(&lock->l_handle, lock_handle_addref);
RETURN(lock);
}
-void unlock_bitlock(struct ldlm_lock *lock);
-
int ldlm_lock_change_resource(struct ldlm_namespace *ns, struct ldlm_lock *lock,
- struct ldlm_res_id new_resid)
+ const struct ldlm_res_id *new_resid)
{
struct ldlm_resource *oldres = lock->l_resource;
struct ldlm_resource *newres;
LASSERT(ns->ns_client != 0);
lock_res_and_lock(lock);
- if (memcmp(&new_resid, &lock->l_resource->lr_name,
+ if (memcmp(new_resid, &lock->l_resource->lr_name,
sizeof(lock->l_resource->lr_name)) == 0) {
/* Nothing to do */
unlock_res_and_lock(lock);
RETURN(0);
}
- LASSERT(new_resid.name[0] != 0);
+ LASSERT(new_resid->name[0] != 0);
/* This function assumes that the lock isn't on any lists */
LASSERT(list_empty(&lock->l_res_link));
type = oldres->lr_type;
+ unlock_res_and_lock(lock);
+
newres = ldlm_resource_get(ns, NULL, new_resid, type, 1);
if (newres == NULL) {
LBUG();
RETURN(-ENOMEM);
}
+ lock_res_and_lock(lock);
+ LASSERT(memcmp(new_resid, &lock->l_resource->lr_name,
+ sizeof(lock->l_resource->lr_name)) != 0);
lock_res(newres);
lock->l_resource = newres;
- unlock_res(newres);
unlock_res(oldres);
- unlock_bitlock(lock);
+ unlock_res_and_lock(lock);
/* ...and the flowers are still standing! */
ldlm_resource_putref(oldres);
* HANDLES
*/
-void ldlm_lock2handle(struct ldlm_lock *lock, struct lustre_handle *lockh)
+void ldlm_lock2handle(const struct ldlm_lock *lock, struct lustre_handle *lockh)
{
lockh->cookie = lock->l_handle.h_cookie;
}
* Return NULL if flag already set
*/
-struct ldlm_lock *__ldlm_handle2lock(struct lustre_handle *handle, int flags)
+struct ldlm_lock *__ldlm_handle2lock(const struct lustre_handle *handle,
+ int flags)
{
struct ldlm_namespace *ns;
- struct ldlm_lock *lock = NULL, *retval = NULL;
+ struct ldlm_lock *lock, *retval = NULL;
ENTRY;
LASSERT(handle);
}
struct ldlm_lock *ldlm_handle2lock_ns(struct ldlm_namespace *ns,
- struct lustre_handle *handle)
+ const struct lustre_handle *handle)
{
struct ldlm_lock *retval = NULL;
retval = __ldlm_handle2lock(handle, 0);
void ldlm_lock2desc(struct ldlm_lock *lock, struct ldlm_lock_desc *desc)
{
- ldlm_res2desc(lock->l_resource, &desc->l_resource);
- desc->l_req_mode = lock->l_req_mode;
- desc->l_granted_mode = lock->l_granted_mode;
- memcpy(&desc->l_policy_data, &lock->l_policy_data,
- sizeof(desc->l_policy_data));
+ 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 ldlm_resource res = *lock->l_resource;
+
+ /* 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 ==
+ (MDS_INODELOCK_LOOKUP|MDS_INODELOCK_UPDATE),
+ "Inappropriate inode lock bits during "
+ "conversion " LPU64 "\n",
+ lock->l_policy_data.l_inodebits.bits);
+ res.lr_type = LDLM_PLAIN;
+ ldlm_res2desc(&res, &desc->l_resource);
+ /* Convert "new" lock mode to something old client can
+ understand */
+ if ((lock->l_req_mode == LCK_CR) ||
+ (lock->l_req_mode == LCK_CW))
+ desc->l_req_mode = LCK_PR;
+ else
+ desc->l_req_mode = lock->l_req_mode;
+ if ((lock->l_granted_mode == LCK_CR) ||
+ (lock->l_granted_mode == LCK_CW)) {
+ desc->l_granted_mode = LCK_PR;
+ } else {
+ /* We never grant PW/EX locks to clients */
+ LASSERT((lock->l_granted_mode != LCK_PW) &&
+ (lock->l_granted_mode != LCK_EX));
+ desc->l_granted_mode = lock->l_granted_mode;
+ }
+
+ /* We do not copy policy here, because there is no
+ policy for plain locks */
+ } else {
+ ldlm_res2desc(lock->l_resource, &desc->l_resource);
+ desc->l_req_mode = lock->l_req_mode;
+ desc->l_granted_mode = lock->l_granted_mode;
+ desc->l_policy_data = lock->l_policy_data;
+ }
}
void ldlm_add_bl_work_item(struct ldlm_lock *lock, struct ldlm_lock *new,
void ldlm_add_cp_work_item(struct ldlm_lock *lock, struct list_head *work_list)
{
if ((lock->l_flags & LDLM_FL_CP_REQD) == 0) {
- LDLM_DEBUG(lock, "lock granted; sending completion AST.");
lock->l_flags |= LDLM_FL_CP_REQD;
+ LDLM_DEBUG(lock, "lock granted; sending completion AST.");
LASSERT(list_empty(&lock->l_cp_ast));
list_add(&lock->l_cp_ast, work_list);
LDLM_LOCK_GET(lock);
check_res_locked(lock->l_resource);
if (new)
ldlm_add_bl_work_item(lock, new, work_list);
- else
+ else
ldlm_add_cp_work_item(lock, work_list);
EXIT;
}
struct ldlm_lock *lock;
lock = ldlm_handle2lock(lockh);
+ LASSERT(lock != NULL);
ldlm_lock_addref_internal(lock, mode);
LDLM_LOCK_PUT(lock);
}
lock->l_readers++;
if (mode & (LCK_EX | LCK_CW | LCK_PW | LCK_GROUP))
lock->l_writers++;
- lock->l_last_used = jiffies;
LDLM_LOCK_GET(lock);
LDLM_DEBUG(lock, "ldlm_lock_addref(%s)", ldlm_lockname[mode]);
}
ldlm_lock_remove_from_lru(lock);
unlock_res_and_lock(lock);
if ((lock->l_flags & LDLM_FL_ATOMIC_CB) ||
- ldlm_bl_to_thread(ns, NULL, lock) != 0)
+ ldlm_bl_to_thread_lock(ns, NULL, lock) != 0)
ldlm_handle_bl_callback(ns, NULL, lock);
} else if (ns->ns_client == LDLM_NAMESPACE_CLIENT &&
- !lock->l_readers && !lock->l_writers) {
+ !lock->l_readers && !lock->l_writers &&
+ !(lock->l_flags & LDLM_FL_NO_LRU)) {
/* If this is a client-side namespace and this was the last
* reference, put it on the LRU. */
- LASSERT(list_empty(&lock->l_lru));
- LASSERT(ns->ns_nr_unused >= 0);
- spin_lock(&ns->ns_unused_lock);
- list_add_tail(&lock->l_lru, &ns->ns_unused_list);
- ns->ns_nr_unused++;
- spin_unlock(&ns->ns_unused_lock);
+ ldlm_lock_add_to_lru(lock);
unlock_res_and_lock(lock);
- ldlm_cancel_lru(ns, LDLM_ASYNC);
+ /* Call ldlm_cancel_lru() only if EARLY_CANCEL and LRU RESIZE
+ * are not supported by the server, otherwise, it is done on
+ * enqueue. */
+ if (!exp_connect_cancelset(lock->l_conn_export) &&
+ !exp_connect_lru_resize(lock->l_conn_export))
+ ldlm_cancel_lru(ns, 0, LDLM_ASYNC);
} else {
unlock_res_and_lock(lock);
}
void ldlm_lock_decref(struct lustre_handle *lockh, __u32 mode)
{
struct ldlm_lock *lock = __ldlm_handle2lock(lockh, 0);
- LASSERTF(lock != NULL, "can't find lockh "LPX64"\n", lockh->cookie);
+ LASSERTF(lock != NULL, "Non-existing lock: "LPX64"\n", lockh->cookie);
ldlm_lock_decref_internal(lock, mode);
LDLM_LOCK_PUT(lock);
}
LDLM_LOCK_PUT(lock);
}
+/*
+ * search_granted_lock
+ *
+ * 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;
+ * lockp [output]: the position where the lock should be inserted before, or
+ * NULL indicating @req should be appended to @queue.
+ * Return Values:
+ * Bit-masks combination of following values indicating in which way the
+ * lock need to be inserted.
+ * - LDLM_JOIN_NONE: noting about skip list needs to be fixed;
+ * - LDLM_MODE_JOIN_RIGHT: @req needs join right becoming the head of a
+ * mode group;
+ * - LDLM_POLICY_JOIN_RIGHT: @req needs join right becoming the head of
+ * a policy group.
+ * NOTE: called by
+ * - ldlm_grant_lock_with_skiplist
+ */
+static int search_granted_lock(struct list_head *queue,
+ struct ldlm_lock *req,
+ struct ldlm_lock **lockp)
+{
+ struct list_head *tmp, *tmp_tail;
+ struct ldlm_lock *lock, *mode_head_lock;
+ int rc = LDLM_JOIN_NONE;
+ ENTRY;
+
+ list_for_each(tmp, queue) {
+ lock = list_entry(tmp, struct ldlm_lock, l_res_link);
+
+ if (lock->l_req_mode != req->l_req_mode) {
+ if (LDLM_SL_HEAD(&lock->l_sl_mode))
+ tmp = &list_entry(lock->l_sl_mode.next,
+ struct ldlm_lock,
+ l_sl_mode)->l_res_link;
+ continue;
+ }
+
+ /* found the same mode group */
+ if (lock->l_resource->lr_type == LDLM_PLAIN) {
+ *lockp = lock;
+ rc = LDLM_MODE_JOIN_RIGHT;
+ GOTO(out, rc);
+ } else if (lock->l_resource->lr_type == LDLM_IBITS) {
+ tmp_tail = tmp;
+ if (LDLM_SL_HEAD(&lock->l_sl_mode))
+ tmp_tail = &list_entry(lock->l_sl_mode.next,
+ struct ldlm_lock,
+ l_sl_mode)->l_res_link;
+ mode_head_lock = lock;
+ for (;;) {
+ if (lock->l_policy_data.l_inodebits.bits ==
+ req->l_policy_data.l_inodebits.bits) {
+ /* matched policy lock is found */
+ *lockp = lock;
+ rc |= LDLM_POLICY_JOIN_RIGHT;
+
+ /* if the policy group head is also a
+ * mode group head or a single mode
+ * group lock */
+ if (LDLM_SL_HEAD(&lock->l_sl_mode) ||
+ (tmp == tmp_tail &&
+ LDLM_SL_EMPTY(&lock->l_sl_mode)))
+ rc |= LDLM_MODE_JOIN_RIGHT;
+ GOTO(out, rc);
+ }
+
+ if (LDLM_SL_HEAD(&lock->l_sl_policy))
+ tmp = &list_entry(lock->l_sl_policy.next,
+ struct ldlm_lock,
+ l_sl_policy)->l_res_link;
+
+ if (tmp == tmp_tail)
+ break;
+ else
+ tmp = tmp->next;
+ lock = list_entry(tmp, struct ldlm_lock,
+ l_res_link);
+ } /* for all locks in the matched mode group */
+
+ /* no matched policy group is found, insert before
+ * the mode group head lock */
+ *lockp = mode_head_lock;
+ rc = LDLM_MODE_JOIN_RIGHT;
+ GOTO(out, rc);
+ } else {
+ LDLM_ERROR(lock, "is not LDLM_PLAIN or LDLM_IBITS lock");
+ LBUG();
+ }
+ }
+
+ /* no matched mode group is found, append to the end */
+ *lockp = NULL;
+ rc = LDLM_JOIN_NONE;
+ EXIT;
+out:
+ return rc;
+}
+
+static void ldlm_granted_list_add_lock(struct ldlm_lock *lock,
+ struct ldlm_lock *lockp,
+ int join)
+{
+ struct ldlm_resource *res = lock->l_resource;
+ ENTRY;
+
+ LASSERT(lockp || join == LDLM_JOIN_NONE);
+
+ check_res_locked(res);
+
+ ldlm_resource_dump(D_OTHER, res);
+ CDEBUG(D_OTHER, "About to add this lock:\n");
+ ldlm_lock_dump(D_OTHER, lock, 0);
+
+ if (lock->l_destroyed) {
+ CDEBUG(D_OTHER, "Lock destroyed, not adding to resource\n");
+ return;
+ }
+
+ LASSERT(list_empty(&lock->l_res_link));
+
+ if (!lockp)
+ list_add_tail(&lock->l_res_link, &lock->l_resource->lr_granted);
+ else if ((join & LDLM_MODE_JOIN_LEFT) || (join & LDLM_POLICY_JOIN_LEFT))
+ list_add(&lock->l_res_link, &lockp->l_res_link);
+ else
+ list_add_tail(&lock->l_res_link, &lockp->l_res_link);
+
+ /* fix skip lists */
+ if (join & LDLM_MODE_JOIN_RIGHT) {
+ LASSERT(! LDLM_SL_TAIL(&lockp->l_sl_mode));
+ if (LDLM_SL_EMPTY(&lockp->l_sl_mode)) {
+ lock->l_sl_mode.next = &lockp->l_sl_mode;
+ lockp->l_sl_mode.prev = &lock->l_sl_mode;
+ } else if (LDLM_SL_HEAD(&lockp->l_sl_mode)) {
+ lock->l_sl_mode.next = lockp->l_sl_mode.next;
+ lockp->l_sl_mode.next = NULL;
+ lock->l_sl_mode.next->prev = &lock->l_sl_mode;
+ }
+ } else if (join & LDLM_MODE_JOIN_LEFT) {
+ LASSERT(! LDLM_SL_HEAD(&lockp->l_sl_mode));
+ if (LDLM_SL_EMPTY(&lockp->l_sl_mode)) {
+ lock->l_sl_mode.prev = &lockp->l_sl_mode;
+ lockp->l_sl_mode.next = &lock->l_sl_mode;
+ } else if (LDLM_SL_TAIL(&lockp->l_sl_mode)) {
+ lock->l_sl_mode.prev = lockp->l_sl_mode.prev;
+ lockp->l_sl_mode.prev = NULL;
+ lock->l_sl_mode.prev->next = &lock->l_sl_mode;
+ }
+ }
+
+ if (join & LDLM_POLICY_JOIN_RIGHT) {
+ LASSERT(! LDLM_SL_TAIL(&lockp->l_sl_policy));
+ if (LDLM_SL_EMPTY(&lockp->l_sl_policy)) {
+ lock->l_sl_policy.next = &lockp->l_sl_policy;
+ lockp->l_sl_policy.prev = &lock->l_sl_policy;
+ } else if (LDLM_SL_HEAD(&lockp->l_sl_policy)) {
+ lock->l_sl_policy.next = lockp->l_sl_policy.next;
+ lockp->l_sl_policy.next = NULL;
+ lock->l_sl_policy.next->prev = &lock->l_sl_policy;
+ }
+ } else if (join & LDLM_POLICY_JOIN_LEFT) {
+ LASSERT(! LDLM_SL_HEAD(&lockp->l_sl_policy));
+ if (LDLM_SL_EMPTY(&lockp->l_sl_policy)) {
+ lock->l_sl_policy.prev = &lockp->l_sl_policy;
+ lockp->l_sl_policy.next = &lock->l_sl_policy;
+ } else if (LDLM_SL_TAIL(&lockp->l_sl_policy)) {
+ lock->l_sl_policy.prev = lockp->l_sl_policy.prev;
+ lockp->l_sl_policy.prev = NULL;
+ lock->l_sl_policy.prev->next = &lock->l_sl_policy;
+ }
+ }
+
+ EXIT;
+}
+
+static void ldlm_grant_lock_with_skiplist(struct ldlm_lock *lock)
+{
+ int join = LDLM_JOIN_NONE;
+ struct ldlm_lock *lockp = NULL;
+ ENTRY;
+
+ LASSERT(lock->l_req_mode == lock->l_granted_mode);
+
+ join = search_granted_lock(&lock->l_resource->lr_granted, lock, &lockp);
+ ldlm_granted_list_add_lock(lock, lockp, join);
+ EXIT;
+}
+
/* NOTE: called by
* - ldlm_lock_enqueue
* - ldlm_reprocess_queue
check_res_locked(res);
lock->l_granted_mode = lock->l_req_mode;
- ldlm_resource_add_lock(res, &res->lr_granted, lock);
+ if (res->lr_type == LDLM_PLAIN || res->lr_type == LDLM_IBITS)
+ ldlm_grant_lock_with_skiplist(lock);
+ else
+ ldlm_resource_add_lock(res, &res->lr_granted, lock);
if (lock->l_granted_mode < res->lr_most_restr)
res->lr_most_restr = lock->l_granted_mode;
if (work_list && lock->l_completion_ast != NULL)
ldlm_add_ast_work_item(lock, NULL, work_list);
+ ldlm_pool_add(&res->lr_namespace->ns_pool, lock);
EXIT;
}
/* returns a referenced lock or NULL. See the flag descriptions below, in the
* comment above ldlm_lock_match */
-static struct ldlm_lock *search_queue(struct list_head *queue, ldlm_mode_t mode,
+static struct ldlm_lock *search_queue(struct list_head *queue,
+ ldlm_mode_t *mode,
ldlm_policy_data_t *policy,
struct ldlm_lock *old_lock, int flags)
{
struct list_head *tmp;
list_for_each(tmp, queue) {
+ ldlm_mode_t match;
+
lock = list_entry(tmp, struct ldlm_lock, l_res_link);
if (lock == old_lock)
/* llite sometimes wants to match locks that will be
* canceled when their users drop, but we allow it to match
* if it passes in CBPENDING and the lock still has users.
- * this is generally only going to be used by children
+ * this is generally only going to be used by children
* whose parents already hold a lock so forward progress
* can still happen. */
if (lock->l_flags & LDLM_FL_CBPENDING &&
lock->l_readers == 0 && lock->l_writers == 0)
continue;
- if (!(lock->l_req_mode & mode))
+ if (!(lock->l_req_mode & *mode))
continue;
+ match = lock->l_req_mode;
if (lock->l_resource->lr_type == LDLM_EXTENT &&
(lock->l_policy_data.l_extent.start >
lock->l_policy_data.l_extent.end < policy->l_extent.end))
continue;
- if (lock->l_resource->lr_type == LDLM_EXTENT &&
- mode == LCK_GROUP &&
+ if (unlikely(match == LCK_GROUP) &&
+ lock->l_resource->lr_type == LDLM_EXTENT &&
lock->l_policy_data.l_extent.gid != policy->l_extent.gid)
continue;
!(lock->l_flags & LDLM_FL_LOCAL))
continue;
- if (flags & LDLM_FL_TEST_LOCK)
+ if (flags & LDLM_FL_TEST_LOCK) {
LDLM_LOCK_GET(lock);
- else
- ldlm_lock_addref_internal_nolock(lock, mode);
+ ldlm_lock_touch_in_lru(lock);
+ } else {
+ ldlm_lock_addref_internal_nolock(lock, match);
+ }
+ *mode = match;
return lock;
}
void ldlm_lock_allow_match(struct ldlm_lock *lock)
{
lock_res_and_lock(lock);
- lock->l_flags |= LDLM_FL_CAN_MATCH;
- wake_up(&lock->l_waitq);
+ lock->l_flags |= LDLM_FL_LVB_READY;
+ cfs_waitq_signal(&lock->l_waitq);
unlock_res_and_lock(lock);
}
*
* Returns 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.
*/
-int ldlm_lock_match(struct ldlm_namespace *ns, int flags,
- struct ldlm_res_id *res_id, __u32 type,
- ldlm_policy_data_t *policy, ldlm_mode_t mode,
- struct lustre_handle *lockh)
+ldlm_mode_t ldlm_lock_match(struct ldlm_namespace *ns, int 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)
{
struct ldlm_resource *res;
struct ldlm_lock *lock, *old_lock = NULL;
mode = old_lock->l_req_mode;
}
- res = ldlm_resource_get(ns, NULL, *res_id, type, 0);
+ res = ldlm_resource_get(ns, NULL, res_id, type, 0);
if (res == NULL) {
LASSERT(old_lock == NULL);
RETURN(0);
lock_res(res);
- lock = search_queue(&res->lr_granted, mode, policy, old_lock, flags);
+ lock = search_queue(&res->lr_granted, &mode, policy, old_lock, flags);
if (lock != NULL)
GOTO(out, rc = 1);
if (flags & LDLM_FL_BLOCK_GRANTED)
GOTO(out, rc = 0);
- lock = search_queue(&res->lr_converting, mode, policy, old_lock, flags);
+ lock = search_queue(&res->lr_converting, &mode, policy, old_lock, flags);
if (lock != NULL)
GOTO(out, rc = 1);
- lock = search_queue(&res->lr_waiting, mode, policy, old_lock, flags);
+ lock = search_queue(&res->lr_waiting, &mode, policy, old_lock, flags);
if (lock != NULL)
GOTO(out, rc = 1);
if (lock) {
ldlm_lock2handle(lock, lockh);
- if (!(lock->l_flags & LDLM_FL_CAN_MATCH)) {
+ if ((flags & LDLM_FL_LVB_READY) &&
+ (!(lock->l_flags & LDLM_FL_LVB_READY))) {
struct l_wait_info lwi;
if (lock->l_completion_ast) {
int err = lock->l_completion_ast(lock,
- LDLM_FL_WAIT_NOREPROC,
+ LDLM_FL_WAIT_NOREPROC,
NULL);
if (err) {
+ if (flags & LDLM_FL_TEST_LOCK)
+ LDLM_LOCK_PUT(lock);
+ else
+ ldlm_lock_decref_internal(lock, mode);
rc = 0;
goto out2;
}
}
- lwi = LWI_TIMEOUT_INTR(obd_timeout*HZ, NULL,NULL,NULL);
+ 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_CAN_MATCH), &lwi);
+ (lock->l_flags & LDLM_FL_LVB_READY), &lwi);
}
}
-
-out2:
+ out2:
if (rc) {
LDLM_DEBUG(lock, "matched ("LPU64" "LPU64")",
- type == LDLM_PLAIN ? res_id->name[2] :
- policy->l_extent.start,
- type == LDLM_PLAIN ? res_id->name[3] :
- policy->l_extent.end);
- } else if (!(flags & LDLM_FL_TEST_LOCK)) {/* less verbose for test-only */
+ (type == LDLM_PLAIN || type == LDLM_IBITS) ?
+ res_id->name[2] : policy->l_extent.start,
+ (type == LDLM_PLAIN || type == LDLM_IBITS) ?
+ res_id->name[3] : policy->l_extent.end);
+
+ /* check user's security context */
+ if (lock->l_conn_export &&
+ sptlrpc_import_check_ctx(
+ class_exp2cliimp(lock->l_conn_export))) {
+ if (!(flags & LDLM_FL_TEST_LOCK))
+ ldlm_lock_decref_internal(lock, mode);
+ rc = 0;
+ }
+
+ if (flags & LDLM_FL_TEST_LOCK)
+ LDLM_LOCK_PUT(lock);
+
+ } else if (!(flags & LDLM_FL_TEST_LOCK)) {/*less verbose for test-only*/
LDLM_DEBUG_NOLOCK("not matched ns %p type %u mode %u res "
LPU64"/"LPU64" ("LPU64" "LPU64")", ns,
type, mode, res_id->name[0], res_id->name[1],
- type == LDLM_PLAIN ? res_id->name[2] :
- policy->l_extent.start,
- type == LDLM_PLAIN ? res_id->name[3] :
- policy->l_extent.end);
+ (type == LDLM_PLAIN || type == LDLM_IBITS) ?
+ res_id->name[2] :policy->l_extent.start,
+ (type == LDLM_PLAIN || type == LDLM_IBITS) ?
+ res_id->name[3] : policy->l_extent.end);
}
-
if (old_lock)
LDLM_LOCK_PUT(old_lock);
- if (flags & LDLM_FL_TEST_LOCK && rc)
- LDLM_LOCK_PUT(lock);
- return rc;
+ return rc ? mode : 0;
}
/* Returns a referenced lock */
struct ldlm_lock *ldlm_lock_create(struct ldlm_namespace *ns,
- struct lustre_handle *parent_lock_handle,
- struct ldlm_res_id res_id, __u32 type,
+ const struct ldlm_res_id *res_id,
+ ldlm_type_t type,
ldlm_mode_t mode,
ldlm_blocking_callback blocking,
ldlm_completion_callback completion,
ldlm_glimpse_callback glimpse,
void *data, __u32 lvb_len)
{
- struct ldlm_resource *res, *parent_res = NULL;
- struct ldlm_lock *lock, *parent_lock = NULL;
+ struct ldlm_lock *lock;
+ struct ldlm_resource *res;
ENTRY;
- if (parent_lock_handle) {
- parent_lock = ldlm_handle2lock(parent_lock_handle);
- if (parent_lock)
- parent_res = parent_lock->l_resource;
- }
-
- res = ldlm_resource_get(ns, parent_res, res_id,
- type, 1);
+ res = ldlm_resource_get(ns, NULL, res_id, type, 1);
if (res == NULL)
RETURN(NULL);
- lock = ldlm_lock_new(parent_lock, res);
+ lock = ldlm_lock_new(res);
ldlm_resource_putref(res);
- if (parent_lock != NULL)
- LDLM_LOCK_PUT(parent_lock);
if (lock == NULL)
RETURN(NULL);
lock->l_blocking_ast = blocking;
lock->l_completion_ast = completion;
lock->l_glimpse_ast = glimpse;
- lock->l_pid = current->pid;
+ lock->l_pid = cfs_curproc_pid();
if (lvb_len) {
lock->l_lvb_len = lvb_len;
ldlm_error_t rc = ELDLM_OK;
ENTRY;
+ do_gettimeofday(&lock->l_enqueued_time);
/* policies are not executed on the client or during replay */
if ((*flags & (LDLM_FL_HAS_INTENT|LDLM_FL_REPLAY)) == LDLM_FL_HAS_INTENT
&& !local && ns->ns_policy) {
}
*flags |= LDLM_FL_LOCK_CHANGED;
RETURN(0);
- } else if (rc == ELDLM_LOCK_ABORTED ||
- (rc == 0 && (*flags & LDLM_FL_INTENT_ONLY))) {
+ } else if (rc != ELDLM_OK ||
+ (rc == ELDLM_OK && (*flags & LDLM_FL_INTENT_ONLY))) {
ldlm_lock_destroy(lock);
RETURN(rc);
}
- LASSERT(rc == ELDLM_OK);
}
lock_res_and_lock(lock);
/* 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);
+ 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
policy = ldlm_processing_policy_table[res->lr_type];
policy(lock, flags, 1, &rc, NULL);
- EXIT;
+ GOTO(out, rc);
out:
unlock_res_and_lock(lock);
return rc;
* 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. */
-
+
list_for_each_safe(tmp, pos, rpc_list) {
struct ldlm_lock *lock =
list_entry(tmp, struct ldlm_lock, l_cp_ast);
if (lock->l_completion_ast != NULL)
rc = lock->l_completion_ast(lock, 0, 0);
-
if (rc == -ERESTART)
retval = rc;
else if (rc)
struct list_head *tmp;
int i, rc;
+ if (ns == NULL)
+ return;
+
+ ENTRY;
spin_lock(&ns->ns_hash_lock);
for (i = 0; i < RES_HASH_SIZE; i++) {
tmp = ns->ns_hash[i].next;
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);
unlock_res_and_lock(lock);
lock->l_blocking_ast(lock, NULL, lock->l_ast_data,
LDLM_CB_CANCELING);
LDLM_DEBUG(lock, "no blocking ast");
}
}
+ lock->l_flags |= LDLM_FL_BL_DONE;
+}
+
+void ldlm_unlink_lock_skiplist(struct ldlm_lock *req)
+{
+ struct ldlm_lock *lock;
+
+ if (req->l_resource->lr_type != LDLM_PLAIN &&
+ req->l_resource->lr_type != LDLM_IBITS)
+ return;
+
+ if (LDLM_SL_HEAD(&req->l_sl_mode)) {
+ lock = list_entry(req->l_res_link.next, struct ldlm_lock,
+ l_res_link);
+ if (req->l_sl_mode.next == &lock->l_sl_mode) {
+ lock->l_sl_mode.prev = NULL;
+ } else {
+ lock->l_sl_mode.next = req->l_sl_mode.next;
+ lock->l_sl_mode.next->prev = &lock->l_sl_mode;
+ }
+ req->l_sl_mode.next = NULL;
+ } else if (LDLM_SL_TAIL(&req->l_sl_mode)) {
+ lock = list_entry(req->l_res_link.prev, struct ldlm_lock,
+ l_res_link);
+ if (req->l_sl_mode.prev == &lock->l_sl_mode) {
+ lock->l_sl_mode.next = NULL;
+ } else {
+ lock->l_sl_mode.prev = req->l_sl_mode.prev;
+ lock->l_sl_mode.prev->next = &lock->l_sl_mode;
+ }
+ req->l_sl_mode.prev = NULL;
+ }
+
+ if (LDLM_SL_HEAD(&req->l_sl_policy)) {
+ lock = list_entry(req->l_res_link.next, struct ldlm_lock,
+ l_res_link);
+ if (req->l_sl_policy.next == &lock->l_sl_policy) {
+ lock->l_sl_policy.prev = NULL;
+ } else {
+ lock->l_sl_policy.next = req->l_sl_policy.next;
+ lock->l_sl_policy.next->prev = &lock->l_sl_policy;
+ }
+ req->l_sl_policy.next = NULL;
+ } else if (LDLM_SL_TAIL(&req->l_sl_policy)) {
+ lock = list_entry(req->l_res_link.prev, struct ldlm_lock,
+ l_res_link);
+ if (req->l_sl_policy.prev == &lock->l_sl_policy) {
+ lock->l_sl_policy.next = NULL;
+ } else {
+ lock->l_sl_policy.prev = req->l_sl_policy.prev;
+ lock->l_sl_policy.prev->next = &lock->l_sl_policy;
+ }
+ req->l_sl_policy.prev = NULL;
+ }
}
void ldlm_lock_cancel(struct ldlm_lock *lock)
struct ldlm_namespace *ns;
ENTRY;
- ldlm_del_waiting_lock(lock);
lock_res_and_lock(lock);
-
+
res = lock->l_resource;
ns = res->lr_namespace;
LBUG();
}
+ 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);
ldlm_resource_unlink_lock(lock);
+ ldlm_lock_destroy_nolock(lock);
+
+ if (lock->l_granted_mode == lock->l_req_mode)
+ ldlm_pool_del(&ns->ns_pool, lock);
+
+ /* Make sure we will not be called again for same lock what is possible
+ * if not to zero out lock->l_granted_mode */
+ lock->l_granted_mode = 0;
unlock_res_and_lock(lock);
-
- ldlm_lock_destroy(lock);
EXIT;
}
struct ldlm_resource *res;
spin_lock(&exp->exp_ldlm_data.led_lock);
- while(!list_empty(&exp->exp_ldlm_data.led_held_locks)) {
+ while(!list_empty(&exp->exp_ldlm_data.led_held_locks)) {
lock = list_entry(exp->exp_ldlm_data.led_held_locks.next,
struct ldlm_lock, l_export_chain);
res = ldlm_resource_getref(lock->l_resource);
spin_unlock(&exp->exp_ldlm_data.led_lock);
LDLM_DEBUG(lock, "export %p", exp);
+ ldlm_res_lvbo_update(res, NULL, 0, 1);
+
ldlm_lock_cancel(lock);
ldlm_reprocess_all(res);
struct ldlm_namespace *ns;
int granted = 0;
int old_mode, rc;
+ struct ldlm_lock *mark_lock = NULL;
+ int join = LDLM_JOIN_NONE;
ldlm_error_t err;
ENTRY;
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. */
+ if (LDLM_SL_HEAD(&lock->l_sl_mode))
+ join = LDLM_MODE_JOIN_RIGHT;
+ else if (LDLM_SL_TAIL(&lock->l_sl_mode))
+ join = LDLM_MODE_JOIN_LEFT;
+ if (LDLM_SL_HEAD(&lock->l_sl_policy))
+ join |= LDLM_POLICY_JOIN_RIGHT;
+ else if (LDLM_SL_TAIL(&lock->l_sl_policy))
+ join |= LDLM_POLICY_JOIN_LEFT;
+
+ LASSERT(!((join & LDLM_MODE_JOIN_RIGHT) &&
+ (join & LDLM_POLICY_JOIN_LEFT)));
+ LASSERT(!((join & LDLM_MODE_JOIN_LEFT) &&
+ (join & LDLM_POLICY_JOIN_RIGHT)));
+
+ if ((join & LDLM_MODE_JOIN_LEFT) ||
+ (join & LDLM_POLICY_JOIN_LEFT))
+ mark_lock = list_entry(lock->l_res_link.prev,
+ struct ldlm_lock, l_res_link);
+ else if (lock->l_res_link.next != &res->lr_granted)
+ mark_lock = list_entry(lock->l_res_link.next,
+ struct ldlm_lock, l_res_link);
+ }
ldlm_resource_unlink_lock(lock);
/* If this is a local resource, put it on the appropriate list. */
rc = policy(lock, &pflags, 0, &err, &rpc_list);
if (rc == LDLM_ITER_STOP) {
lock->l_req_mode = old_mode;
- ldlm_resource_add_lock(res, &res->lr_granted, lock);
+ ldlm_granted_list_add_lock(lock, mark_lock, join);
res = NULL;
} else {
*flags |= LDLM_FL_BLOCK_GRANTED;
void ldlm_lock_dump(int level, struct ldlm_lock *lock, int pos)
{
- char str[PTL_NALFMT_SIZE];
struct obd_device *obd = NULL;
- if (!((portal_debug | D_ERROR) & level))
+ if (!((libcfs_debug | D_ERROR) & level))
return;
if (!lock) {
return;
}
- CDEBUG(level, " -- Lock dump: %p/"LPX64" (rc: %d) (pos: %d) (pid: %d)\n",
+ CDEBUG(level," -- Lock dump: %p/"LPX64" (rc: %d) (pos: %d) (pid: %d)\n",
lock, lock->l_handle.h_cookie, 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 on %s (rhandle: "LPX64")\n",
- ptlrpc_peernid2str(&lock->l_export->exp_connection->c_peer, str),
- lock->l_export->exp_connection->c_peer.peer_ni->pni_name,
- lock->l_remote_handle.cookie);
+ 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 on %s (rhandle: "LPX64")\n",
- ptlrpc_peernid2str(&imp->imp_connection->c_peer, str),
- imp->imp_connection->c_peer.peer_ni->pni_name,
+ 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")\n", lock->l_resource,
- lock->l_resource->lr_name.name[0],
- lock->l_resource->lr_name.name[1]);
+ 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\n", ldlm_lockname[lock->l_req_mode],
+ "write: %d flags: %#x\n", ldlm_lockname[lock->l_req_mode],
ldlm_lockname[lock->l_granted_mode],
- atomic_read(&lock->l_refc), lock->l_readers, lock->l_writers);
+ 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.end,
lock->l_req_extent.start, lock->l_req_extent.end);
else if (lock->l_resource->lr_type == LDLM_FLOCK)
- CDEBUG(level, " Pid: "LPU64" Extent: "LPU64" -> "LPU64"\n",
+ 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",
+ else if (lock->l_resource->lr_type == LDLM_IBITS)
+ CDEBUG(level, " Bits: "LPX64"\n",
lock->l_policy_data.l_inodebits.bits);
}
{
struct ldlm_lock *lock;
+ if (!((libcfs_debug | D_ERROR) & level))
+ return;
+
lock = ldlm_handle2lock(lockh);
if (lock == NULL)
return;
LDLM_LOCK_PUT(lock);
}
+
+void _ldlm_lock_debug(struct ldlm_lock *lock, __u32 level,
+ struct libcfs_debug_msg_data *data, const char *fmt,
+ ...)
+{
+ va_list args;
+ cfs_debug_limit_state_t *cdls = data->msg_cdls;
+
+ 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,
+ " ns: \?\? lock: %p/"LPX64" lrc: %d/%d,%d mode: %s/%s "
+ "res: \?\? rrc=\?\? type: \?\?\? flags: %x remote: "
+ LPX64" expref: %d pid: %u\n", lock,
+ lock->l_handle.h_cookie, 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 ?
+ atomic_read(&lock->l_export->exp_refcount) : -99,
+ lock->l_pid);
+ 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: %x remote: "LPX64
+ " expref: %d pid: %u\n",
+ lock->l_resource->lr_namespace->ns_name, lock,
+ lock->l_handle.h_cookie, 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],
+ 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 ?
+ atomic_read(&lock->l_export->exp_refcount) : -99,
+ lock->l_pid);
+ 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: %x remote: "LPX64
+ " expref: %d pid: %u\n",
+ lock->l_resource->lr_namespace->ns_name, lock,
+ lock->l_handle.h_cookie, 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],
+ 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 ?
+ atomic_read(&lock->l_export->exp_refcount) : -99,
+ lock->l_pid);
+ 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: %x remote: "LPX64" expref: %d "
+ "pid %u\n",
+ lock->l_resource->lr_namespace->ns_name,
+ lock, lock->l_handle.h_cookie,
+ 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,
+ 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 ?
+ atomic_read(&lock->l_export->exp_refcount) : -99,
+ lock->l_pid);
+ 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: %x "
+ "remote: "LPX64" expref: %d pid: %u\n",
+ lock->l_resource->lr_namespace->ns_name,
+ lock, lock->l_handle.h_cookie,
+ 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],
+ 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 ?
+ atomic_read(&lock->l_export->exp_refcount) : -99,
+ lock->l_pid);
+ break;
+ }
+ va_end(args);
+}
+EXPORT_SYMBOL(_ldlm_lock_debug);
git://git.whamcloud.com / fs / lustre-release.git / blobdiff