* by Cluster File Systems, Inc.
*/
-#define EXPORT_SYMTAB
-
-#include <linux/version.h>
-#include <linux/module.h>
-#include <linux/slab.h>
-#include <asm/unistd.h>
-
#define DEBUG_SUBSYSTEM S_LDLM
-#include <linux/obd_support.h>
+#include <linux/lustre_dlm.h>
#include <linux/obd_class.h>
-#include <linux/lustre_dlm.h>
+kmem_cache_t *ldlm_resource_slab, *ldlm_lock_slab;
-kmem_cache_t *ldlm_resource_slab;
-kmem_cache_t *ldlm_lock_slab;
+spinlock_t ldlm_namespace_lock = SPIN_LOCK_UNLOCKED;
+struct list_head ldlm_namespace_list = LIST_HEAD_INIT(ldlm_namespace_list);
+static struct proc_dir_entry *ldlm_ns_proc_dir = NULL;
-struct ldlm_namespace *ldlm_namespace_find(struct obd_device *obddev, __u32 id)
+int ldlm_proc_setup(struct obd_device *obd)
{
- struct list_head *tmp;
- struct ldlm_namespace *res;
-
- res = NULL;
- list_for_each(tmp, &obddev->u.ldlm.ldlm_namespaces) {
- struct ldlm_namespace *chk;
- chk = list_entry(tmp, struct ldlm_namespace, ns_link);
-
- if ( chk->ns_id == id ) {
- res = chk;
- break;
- }
+ ENTRY;
+
+ if (obd->obd_proc_entry == NULL)
+ RETURN(-EINVAL);
+
+ ldlm_ns_proc_dir = proc_mkdir("namespaces", obd->obd_proc_entry);
+ if (ldlm_ns_proc_dir == NULL) {
+ CERROR("Couldn't create /proc/lustre/ldlm/namespaces\n");
+ RETURN(-EPERM);
}
+ RETURN(0);
+}
- return res;
+void ldlm_proc_cleanup(struct obd_device *obd)
+{
+ proc_lustre_remove_obd_entry("namespaces", obd);
}
-/* this must be called with ldlm_lock(obddev) held */
-static void res_hash_init(struct ldlm_namespace *ns)
+struct ldlm_namespace *ldlm_namespace_new(char *name, __u32 client)
{
- struct list_head *res_hash;
+ struct ldlm_namespace *ns = NULL;
struct list_head *bucket;
- if (ns->ns_hash != NULL)
- return;
+ OBD_ALLOC(ns, sizeof(*ns));
+ if (!ns) {
+ LBUG();
+ GOTO(out, NULL);
+ }
- /* FIXME: this memory appears to be leaked */
- OBD_ALLOC(res_hash, sizeof(*res_hash) * RES_HASH_SIZE);
- if (!res_hash)
+ ns->ns_hash = vmalloc(sizeof(*ns->ns_hash) * RES_HASH_SIZE);
+ if (!ns->ns_hash) {
LBUG();
+ GOTO(out, ns);
+ }
+ obd_memory += sizeof(*ns->ns_hash) * RES_HASH_SIZE;
- for (bucket = res_hash + RES_HASH_SIZE - 1; bucket >= res_hash;
- bucket--)
- INIT_LIST_HEAD(bucket);
+ OBD_ALLOC(ns->ns_name, strlen(name) + 1);
+ if (!ns->ns_name) {
+ LBUG();
+ GOTO(out, ns);
+ }
+ strcpy(ns->ns_name, name);
- ns->ns_hash = res_hash;
-}
+ INIT_LIST_HEAD(&ns->ns_root_list);
+ l_lock_init(&ns->ns_lock);
+ ns->ns_refcount = 0;
+ ns->ns_client = client;
-ldlm_error_t ldlm_namespace_new(struct obd_device *obddev, __u32 id,
- struct ldlm_namespace **ns_out)
-{
- struct ldlm_namespace *ns;
+ for (bucket = ns->ns_hash + RES_HASH_SIZE - 1; bucket >= ns->ns_hash;
+ bucket--)
+ INIT_LIST_HEAD(bucket);
- if (ldlm_namespace_find(obddev, id))
- return -ELDLM_NAMESPACE_EXISTS;
+ spin_lock(&ldlm_namespace_lock);
+ list_add(&ns->ns_list_chain, &ldlm_namespace_list);
+ ns->ns_proc_dir = proc_mkdir(ns->ns_name, ldlm_ns_proc_dir);
+ if (ns->ns_proc_dir == NULL)
+ CERROR("Unable to create proc directory for namespace.\n");
+ spin_unlock(&ldlm_namespace_lock);
- OBD_ALLOC(ns, sizeof(*ns));
- if (!ns)
- LBUG();
+ RETURN(ns);
- ns->ns_id = id;
- ns->ns_obddev = obddev;
- INIT_LIST_HEAD(&ns->ns_root_list);
+ out:
+ if (ns && ns->ns_hash) {
+ vfree(ns->ns_hash);
+ obd_memory -= sizeof(*ns->ns_hash) * RES_HASH_SIZE;
+ }
+ if (ns && ns->ns_name)
+ OBD_FREE(ns->ns_name, strlen(name) + 1);
+ if (ns)
+ OBD_FREE(ns, sizeof(*ns));
+ return NULL;
+}
- list_add(&ns->ns_link, &obddev->u.ldlm.ldlm_namespaces);
+extern struct ldlm_lock *ldlm_lock_get(struct ldlm_lock *lock);
- res_hash_init(ns);
- atomic_set(&ns->ns_refcount, 0);
+static void cleanup_resource(struct ldlm_resource *res, struct list_head *q)
+{
+ struct list_head *tmp, *pos;
+ int rc = 0, client = res->lr_namespace->ns_client;
+ ENTRY;
- *ns_out = ns;
- return ELDLM_OK;
+ list_for_each_safe(tmp, pos, q) {
+ struct ldlm_lock *lock;
+ lock = list_entry(tmp, struct ldlm_lock, l_res_link);
+ LDLM_LOCK_GET(lock);
+
+ if (client) {
+ struct lustre_handle lockh;
+ ldlm_lock2handle(lock, &lockh);
+ /* can we get away without a connh here? */
+ rc = ldlm_cli_cancel(&lockh);
+ if (rc != ELDLM_OK) {
+ /* It failed remotely, but we'll force it to
+ * cleanup locally. */
+ CERROR("ldlm_cli_cancel: %d\n", rc);
+ ldlm_lock_cancel(lock);
+ }
+ } else {
+ LDLM_DEBUG(lock, "Freeing a lock still held by a "
+ "client node.\n");
+
+ ldlm_resource_unlink_lock(lock);
+ ldlm_lock_destroy(lock);
+ }
+ LDLM_LOCK_PUT(lock);
+ }
}
int ldlm_namespace_free(struct ldlm_namespace *ns)
{
- if (atomic_read(&ns->ns_refcount))
- return -EBUSY;
+ struct list_head *tmp, *pos;
+ int i;
+
+ if (!ns)
+ RETURN(ELDLM_OK);
+
+ spin_lock(&ldlm_namespace_lock);
+ list_del(&ns->ns_list_chain);
+ remove_proc_entry(ns->ns_name, ldlm_ns_proc_dir);
+ spin_unlock(&ldlm_namespace_lock);
+
+ l_lock(&ns->ns_lock);
+
+ for (i = 0; i < RES_HASH_SIZE; i++) {
+ list_for_each_safe(tmp, pos, &(ns->ns_hash[i])) {
+ struct ldlm_resource *res;
+ res = list_entry(tmp, struct ldlm_resource, lr_hash);
+ ldlm_resource_getref(res);
+
+ cleanup_resource(res, &res->lr_granted);
+ cleanup_resource(res, &res->lr_converting);
+ cleanup_resource(res, &res->lr_waiting);
+
+ if (!ldlm_resource_put(res)) {
+ CERROR("Resource refcount nonzero (%d) after "
+ "lock cleanup; forcing cleanup.\n",
+ atomic_read(&res->lr_refcount));
+ ldlm_resource_dump(res);
+ atomic_set(&res->lr_refcount, 1);
+ ldlm_resource_put(res);
+ }
+ }
+ }
- list_del(&ns->ns_link);
- OBD_FREE(ns->ns_hash, sizeof(struct list_head) * RES_HASH_SIZE);
+ vfree(ns->ns_hash /* , sizeof(*ns->ns_hash) * RES_HASH_SIZE */);
+ obd_memory -= sizeof(*ns->ns_hash) * RES_HASH_SIZE;
+ OBD_FREE(ns->ns_name, strlen(ns->ns_name) + 1);
OBD_FREE(ns, sizeof(*ns));
- return 0;
+ return ELDLM_OK;
+}
+
+int ldlm_client_free(struct obd_export *exp)
+{
+ struct ldlm_export_data *led = &exp->exp_ldlm_data;
+ ptlrpc_cleanup_client(&led->led_import);
+ RETURN(0);
}
static __u32 ldlm_hash_fn(struct ldlm_resource *parent, __u64 *name)
struct ldlm_resource *res;
res = kmem_cache_alloc(ldlm_resource_slab, SLAB_KERNEL);
- if (res == NULL)
+ if (res == NULL) {
LBUG();
+ return NULL;
+ }
memset(res, 0, sizeof(*res));
INIT_LIST_HEAD(&res->lr_children);
INIT_LIST_HEAD(&res->lr_converting);
INIT_LIST_HEAD(&res->lr_waiting);
- res->lr_lock = SPIN_LOCK_UNLOCKED;
-
atomic_set(&res->lr_refcount, 1);
return res;
}
-/* ldlm_lock(obddev) must be taken before calling resource_add */
+/* Args: locked namespace
+ * Returns: newly-allocated, referenced, unlocked resource */
static struct ldlm_resource *ldlm_resource_add(struct ldlm_namespace *ns,
struct ldlm_resource *parent,
__u64 *name, __u32 type)
{
struct list_head *bucket;
struct ldlm_resource *res;
+ ENTRY;
- bucket = ns->ns_hash + ldlm_hash_fn(parent, name);
+ if (type < LDLM_MIN_TYPE || type > LDLM_MAX_TYPE) {
+ LBUG();
+ RETURN(NULL);
+ }
res = ldlm_resource_new();
- if (!res)
+ if (!res) {
LBUG();
+ RETURN(NULL);
+ }
memcpy(res->lr_name, name, sizeof(res->lr_name));
res->lr_namespace = ns;
- if (type < 0 || type > LDLM_MAX_TYPE)
- LBUG();
+ ns->ns_refcount++;
- res->lr_type = type;
+ res->lr_type = type;
res->lr_most_restr = LCK_NL;
+
+ bucket = ns->ns_hash + ldlm_hash_fn(parent, name);
list_add(&res->lr_hash, bucket);
- atomic_inc(&ns->ns_refcount);
- if (parent == NULL) {
- res->lr_parent = res;
- list_add(&res->lr_rootlink, &ns->ns_root_list);
- } else {
+
+ if (parent == NULL)
+ list_add(&res->lr_childof, &ns->ns_root_list);
+ else {
res->lr_parent = parent;
list_add(&res->lr_childof, &parent->lr_children);
}
- return res;
+ RETURN(res);
}
+/* Args: unlocked namespace
+ * Locks: takes and releases ns->ns_lock and res->lr_lock
+ * Returns: referenced, unlocked ldlm_resource or NULL */
struct ldlm_resource *ldlm_resource_get(struct ldlm_namespace *ns,
struct ldlm_resource *parent,
__u64 *name, __u32 type, int create)
{
struct list_head *bucket;
struct list_head *tmp = bucket;
- struct ldlm_resource *res;
-
+ struct ldlm_resource *res = NULL;
ENTRY;
- if (ns->ns_hash == NULL)
+ if (ns == NULL || ns->ns_hash == NULL) {
+ LBUG();
RETURN(NULL);
+ }
+
+ l_lock(&ns->ns_lock);
bucket = ns->ns_hash + ldlm_hash_fn(parent, name);
- res = NULL;
list_for_each(tmp, bucket) {
struct ldlm_resource *chk;
chk = list_entry(tmp, struct ldlm_resource, lr_hash);
if (memcmp(chk->lr_name, name, sizeof(chk->lr_name)) == 0) {
res = chk;
atomic_inc(&res->lr_refcount);
+ EXIT;
break;
}
}
if (res == NULL && create)
res = ldlm_resource_add(ns, parent, name, type);
+ l_unlock(&ns->ns_lock);
RETURN(res);
}
-int ldlm_resource_put(struct ldlm_resource *res)
+struct ldlm_resource *ldlm_resource_getref(struct ldlm_resource *res)
{
- int rc = 0;
+ atomic_inc(&res->lr_refcount);
+ return res;
+}
- if (atomic_read(&res->lr_refcount) <= 0)
- LBUG();
+/* Returns 1 if the resource was freed, 0 if it remains. */
+int ldlm_resource_put(struct ldlm_resource *res)
+{
+ int rc = 0;
if (atomic_dec_and_test(&res->lr_refcount)) {
+ struct ldlm_namespace *ns = res->lr_namespace;
+ ENTRY;
+
+ l_lock(&ns->ns_lock);
+
+ if (atomic_read(&res->lr_refcount) != 0) {
+ /* We lost the race. */
+ l_unlock(&ns->ns_lock);
+ goto out;
+ }
+
if (!list_empty(&res->lr_granted))
LBUG();
if (!list_empty(&res->lr_waiting))
LBUG();
- atomic_dec(&res->lr_namespace->ns_refcount);
+ if (!list_empty(&res->lr_children))
+ LBUG();
+
+ ns->ns_refcount--;
list_del(&res->lr_hash);
- list_del(&res->lr_rootlink);
list_del(&res->lr_childof);
kmem_cache_free(ldlm_resource_slab, res);
+ l_unlock(&ns->ns_lock);
rc = 1;
+ } else {
+ ENTRY;
+ out:
+ if (atomic_read(&res->lr_refcount) < 0)
+ LBUG();
}
- return rc;
+ RETURN(rc);
}
void ldlm_resource_add_lock(struct ldlm_resource *res, struct list_head *head,
struct ldlm_lock *lock)
{
- list_add(&lock->l_res_link, head);
- atomic_inc(&res->lr_refcount);
-}
+ l_lock(&res->lr_namespace->ns_lock);
-void ldlm_resource_del_lock(struct ldlm_lock *lock)
-{
- list_del(&lock->l_res_link);
- atomic_dec(&lock->l_resource->lr_refcount);
+ ldlm_resource_dump(res);
+ ldlm_lock_dump(lock);
+
+ if (!list_empty(&lock->l_res_link))
+ LBUG();
+
+ list_add(&lock->l_res_link, head);
+ l_unlock(&res->lr_namespace->ns_lock);
}
-int ldlm_get_resource_handle(struct ldlm_resource *res, struct ldlm_handle *h)
+void ldlm_resource_unlink_lock(struct ldlm_lock *lock)
{
- LBUG();
- return 0;
+ l_lock(&lock->l_resource->lr_namespace->ns_lock);
+ list_del_init(&lock->l_res_link);
+ l_unlock(&lock->l_resource->lr_namespace->ns_lock);
}
void ldlm_res2desc(struct ldlm_resource *res, struct ldlm_resource_desc *desc)
{
- desc->lr_ns_id = res->lr_namespace->ns_id;
desc->lr_type = res->lr_type;
memcpy(desc->lr_name, res->lr_name, sizeof(desc->lr_name));
memcpy(desc->lr_version, res->lr_version, sizeof(desc->lr_version));
}
+void ldlm_dump_all_namespaces(void)
+{
+ struct list_head *tmp;
+
+ spin_lock(&ldlm_namespace_lock);
+
+ list_for_each(tmp, &ldlm_namespace_list) {
+ struct ldlm_namespace *ns;
+ ns = list_entry(tmp, struct ldlm_namespace, ns_list_chain);
+ ldlm_namespace_dump(ns);
+ }
+
+ spin_unlock(&ldlm_namespace_lock);
+}
+
+void ldlm_namespace_dump(struct ldlm_namespace *ns)
+{
+ struct list_head *tmp;
+
+ l_lock(&ns->ns_lock);
+ CDEBUG(D_OTHER, "--- Namespace: %s (rc: %d, client: %d)\n", ns->ns_name,
+ ns->ns_refcount, ns->ns_client);
+
+ list_for_each(tmp, &ns->ns_root_list) {
+ struct ldlm_resource *res;
+ res = list_entry(tmp, struct ldlm_resource, lr_childof);
+
+ /* Once we have resources with children, this should really dump
+ * them recursively. */
+ ldlm_resource_dump(res);
+ }
+ l_unlock(&ns->ns_lock);
+}
+
void ldlm_resource_dump(struct ldlm_resource *res)
{
struct list_head *tmp;
LBUG();
snprintf(name, sizeof(name), "%Lx %Lx %Lx",
- res->lr_name[0], res->lr_name[1], res->lr_name[2]);
-
- CDEBUG(D_OTHER, "--- Resource: %p (%s)\n", res, name);
- CDEBUG(D_OTHER, "Namespace: %p (%u)\n", res->lr_namespace,
- res->lr_namespace->ns_id);
+ (unsigned long long)res->lr_name[0],
+ (unsigned long long)res->lr_name[1],
+ (unsigned long long)res->lr_name[2]);
+
+ CDEBUG(D_OTHER, "--- Resource: %p (%s) (rc: %d)\n", res, name,
+ atomic_read(&res->lr_refcount));
+ CDEBUG(D_OTHER, "Namespace: %p (%s)\n", res->lr_namespace,
+ res->lr_namespace->ns_name);
CDEBUG(D_OTHER, "Parent: %p, root: %p\n", res->lr_parent, res->lr_root);
CDEBUG(D_OTHER, "Granted locks:\n");
ldlm_lock_dump(lock);
}
}
-
git://git.whamcloud.com / fs / lustre-release.git / blobdiff