X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fldlm%2Fldlm_resource.c;h=3fa5d264e80250dfe3fa934299d8e3ba2dde6c50;hb=9566c76a2827865f2c348fe303a2a2b5cd3d2653;hp=2c9314277a5c94ebe457895643135b5edccb74c0;hpb=3a5f6514b545a377b36c9e2ac27277a9bfbbb614;p=fs%2Flustre-release.git diff --git a/lustre/ldlm/ldlm_resource.c b/lustre/ldlm/ldlm_resource.c index 2c93142..3fa5d26 100644 --- a/lustre/ldlm/ldlm_resource.c +++ b/lustre/ldlm/ldlm_resource.c @@ -1,27 +1,42 @@ /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- * vim:expandtab:shiftwidth=8:tabstop=8: * - * Copyright (C) 2002, 2003 Cluster File Systems, Inc. - * Author: Phil Schwan - * Author: Peter Braam + * GPL HEADER START * - * This file is part of the Lustre file system, http://www.lustre.org - * Lustre is a trademark of Cluster File Systems, Inc. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * 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. + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 only, + * as published by the Free Software Foundation. * - * 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. + * This program 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 version 2 for more details (a copy is included + * in the LICENSE file that accompanied this code). * - * 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. + * You should have received a copy of the GNU General Public License + * version 2 along with this program; If not, see + * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf + * + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + * + * GPL HEADER END + */ +/* + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. + * Use is subject to license terms. + */ +/* + * This file is part of Lustre, http://www.lustre.org/ + * Lustre is a trademark of Sun Microsystems, Inc. + * + * lustre/ldlm/ldlm_resource.c + * + * Author: Phil Schwan + * Author: Peter Braam */ #define DEBUG_SUBSYSTEM S_LDLM @@ -36,13 +51,13 @@ cfs_mem_cache_t *ldlm_resource_slab, *ldlm_lock_slab; -atomic_t ldlm_srv_namespace_nr = ATOMIC_INIT(0); -atomic_t ldlm_cli_namespace_nr = ATOMIC_INIT(0); +cfs_atomic_t ldlm_srv_namespace_nr = CFS_ATOMIC_INIT(0); +cfs_atomic_t ldlm_cli_namespace_nr = CFS_ATOMIC_INIT(0); -struct semaphore ldlm_srv_namespace_lock; +cfs_semaphore_t ldlm_srv_namespace_lock; CFS_LIST_HEAD(ldlm_srv_namespace_list); -struct semaphore ldlm_cli_namespace_lock; +cfs_semaphore_t ldlm_cli_namespace_lock; CFS_LIST_HEAD(ldlm_cli_namespace_list); cfs_proc_dir_entry_t *ldlm_type_proc_dir = NULL; @@ -139,22 +154,23 @@ static int lprocfs_wr_lru_size(struct file *file, const char *buffer, int lru_resize; dummy[MAX_STRING_SIZE] = '\0'; - if (copy_from_user(dummy, buffer, MAX_STRING_SIZE)) + if (cfs_copy_from_user(dummy, buffer, MAX_STRING_SIZE)) return -EFAULT; - if (count == 6 && memcmp(dummy, "clear", 5) == 0) { + if (strncmp(dummy, "clear", 5) == 0) { CDEBUG(D_DLMTRACE, "dropping all unused locks from namespace %s\n", ns->ns_name); if (ns_connect_lru_resize(ns)) { int canceled, unused = ns->ns_nr_unused; - + /* Try to cancel all @ns_nr_unused locks. */ - canceled = ldlm_cancel_lru(ns, unused, LDLM_SYNC, + canceled = ldlm_cancel_lru(ns, unused, LDLM_SYNC, LDLM_CANCEL_PASSED); if (canceled < unused) { - CERROR("not all requested locks are canceled, " - "requested: %d, canceled: %d\n", unused, + CDEBUG(D_DLMTRACE, + "not all requested locks are canceled, " + "requested: %d, canceled: %d\n", unused, canceled); return -EINVAL; } @@ -173,35 +189,39 @@ static int lprocfs_wr_lru_size(struct file *file, const char *buffer, return -EINVAL; } lru_resize = (tmp == 0); - + if (ns_connect_lru_resize(ns)) { if (!lru_resize) ns->ns_max_unused = (unsigned int)tmp; - + if (tmp > ns->ns_nr_unused) tmp = ns->ns_nr_unused; tmp = ns->ns_nr_unused - tmp; - - CDEBUG(D_DLMTRACE, "changing namespace %s unused locks from %u to %u\n", + + CDEBUG(D_DLMTRACE, + "changing namespace %s unused locks from %u to %u\n", ns->ns_name, ns->ns_nr_unused, (unsigned int)tmp); - ldlm_cancel_lru(ns, (unsigned int)tmp, LDLM_ASYNC, LDLM_CANCEL_PASSED); - + ldlm_cancel_lru(ns, tmp, LDLM_ASYNC, LDLM_CANCEL_PASSED); + if (!lru_resize) { - CDEBUG(D_DLMTRACE, "disable lru_resize for namespace %s\n", + CDEBUG(D_DLMTRACE, + "disable lru_resize for namespace %s\n", ns->ns_name); ns->ns_connect_flags &= ~OBD_CONNECT_LRU_RESIZE; } } else { - CDEBUG(D_DLMTRACE, "changing namespace %s max_unused from %u to %u\n", + CDEBUG(D_DLMTRACE, + "changing namespace %s max_unused from %u to %u\n", ns->ns_name, ns->ns_max_unused, (unsigned int)tmp); ns->ns_max_unused = (unsigned int)tmp; ldlm_cancel_lru(ns, 0, LDLM_ASYNC, LDLM_CANCEL_PASSED); - - /* Make sure that originally lru resize was supported before + + /* Make sure that originally lru resize was supported before * turning it on here. */ - if (lru_resize && + if (lru_resize && (ns->ns_orig_connect_flags & OBD_CONNECT_LRU_RESIZE)) { - CDEBUG(D_DLMTRACE, "enable lru_resize for namespace %s\n", + CDEBUG(D_DLMTRACE, + "enable lru_resize for namespace %s\n", ns->ns_name); ns->ns_connect_flags |= OBD_CONNECT_LRU_RESIZE; } @@ -247,13 +267,6 @@ void ldlm_proc_namespace(struct ldlm_namespace *ns) lock_vars[0].write_fptr = lprocfs_wr_lru_size; lprocfs_add_vars(ldlm_ns_proc_dir, lock_vars, 0); - snprintf(lock_name, MAX_STRING_SIZE, "%s/shrink_thumb", - ns->ns_name); - lock_vars[0].data = ns; - lock_vars[0].read_fptr = lprocfs_rd_uint; - lock_vars[0].write_fptr = lprocfs_wr_uint; - lprocfs_add_vars(ldlm_ns_proc_dir, lock_vars, 0); - snprintf(lock_name, MAX_STRING_SIZE, "%s/lru_max_age", ns->ns_name); lock_vars[0].data = &ns->ns_max_age; @@ -268,6 +281,12 @@ void ldlm_proc_namespace(struct ldlm_namespace *ns) lock_vars[0].write_fptr = lprocfs_wr_uint; lprocfs_add_vars(ldlm_ns_proc_dir, lock_vars, 0); + snprintf(lock_name, MAX_STRING_SIZE, "%s/lock_timeouts", + ns->ns_name); + lock_vars[0].data = &ns->ns_timeouts; + lock_vars[0].read_fptr = lprocfs_rd_uint; + lprocfs_add_vars(ldlm_ns_proc_dir, lock_vars, 0); + snprintf(lock_name, MAX_STRING_SIZE, "%s/max_nolock_bytes", ns->ns_name); lock_vars[0].data = &ns->ns_max_nolock_size; @@ -295,11 +314,11 @@ void ldlm_proc_namespace(struct ldlm_namespace *ns) #define ldlm_proc_namespace(ns) do {} while (0) #endif /* LPROCFS */ -struct ldlm_namespace *ldlm_namespace_new(char *name, ldlm_side_t client, - ldlm_appetite_t apt) +struct ldlm_namespace *ldlm_namespace_new(struct obd_device *obd, char *name, + ldlm_side_t client, ldlm_appetite_t apt) { struct ldlm_namespace *ns = NULL; - struct list_head *bucket; + cfs_list_t *bucket; int rc, idx, namelen; ENTRY; @@ -317,8 +336,11 @@ struct ldlm_namespace *ldlm_namespace_new(char *name, ldlm_side_t client, if (!ns->ns_hash) GOTO(out_ns, NULL); - ns->ns_shrink_thumb = LDLM_LOCK_SHRINK_THUMB; ns->ns_appetite = apt; + + LASSERT(obd != NULL); + ns->ns_obd = obd; + namelen = strlen(name); OBD_ALLOC(ns->ns_name, namelen + 1); if (!ns->ns_name) @@ -327,10 +349,11 @@ struct ldlm_namespace *ldlm_namespace_new(char *name, ldlm_side_t client, strcpy(ns->ns_name, name); CFS_INIT_LIST_HEAD(&ns->ns_root_list); + CFS_INIT_LIST_HEAD(&ns->ns_list_chain); ns->ns_refcount = 0; ns->ns_client = client; - spin_lock_init(&ns->ns_hash_lock); - atomic_set(&ns->ns_locks, 0); + cfs_spin_lock_init(&ns->ns_hash_lock); + cfs_atomic_set(&ns->ns_locks, 0); ns->ns_resources = 0; cfs_waitq_init(&ns->ns_waitq); ns->ns_max_nolock_size = NS_DEFAULT_MAX_NOLOCK_BYTES; @@ -346,23 +369,22 @@ struct ldlm_namespace *ldlm_namespace_new(char *name, ldlm_side_t client, ns->ns_max_unused = LDLM_DEFAULT_LRU_SIZE; ns->ns_max_age = LDLM_DEFAULT_MAX_ALIVE; ns->ns_ctime_age_limit = LDLM_CTIME_AGE_LIMIT; - spin_lock_init(&ns->ns_unused_lock); + ns->ns_timeouts = 0; + cfs_spin_lock_init(&ns->ns_unused_lock); ns->ns_orig_connect_flags = 0; ns->ns_connect_flags = 0; ldlm_proc_namespace(ns); - idx = atomic_read(ldlm_namespace_nr(client)); + idx = cfs_atomic_read(ldlm_namespace_nr(client)); rc = ldlm_pool_init(&ns->ns_pool, ns, idx, client); if (rc) { CERROR("Can't initialize lock pool, rc %d\n", rc); GOTO(out_proc, rc); } - mutex_down(ldlm_namespace_lock(client)); - list_add(&ns->ns_list_chain, ldlm_namespace_list(client)); - atomic_inc(ldlm_namespace_nr(client)); - mutex_up(ldlm_namespace_lock(client)); + at_init(&ns->ns_at_estimate, ldlm_enqueue_min, 0); + ldlm_namespace_register(ns, client); RETURN(ns); out_proc: ldlm_namespace_cleanup(ns, 0); @@ -383,10 +405,10 @@ extern struct ldlm_lock *ldlm_lock_get(struct ldlm_lock *lock); * as a result--notably, that we shouldn't cancel locks with refs. -phil * * Called with the ns_lock held. */ -static void cleanup_resource(struct ldlm_resource *res, struct list_head *q, +static void cleanup_resource(struct ldlm_resource *res, cfs_list_t *q, int flags) { - struct list_head *tmp; + cfs_list_t *tmp; int rc = 0, client = ns_is_client(res->lr_namespace); int local_only = (flags & LDLM_FL_LOCAL_ONLY); ENTRY; @@ -398,8 +420,9 @@ static void cleanup_resource(struct ldlm_resource *res, struct list_head *q, /* first, we look for non-cleaned-yet lock * all cleaned locks are marked by CLEANED flag */ lock_res(res); - list_for_each(tmp, q) { - lock = list_entry(tmp, struct ldlm_lock, l_res_link); + cfs_list_for_each(tmp, q) { + lock = cfs_list_entry(tmp, struct ldlm_lock, + l_res_link); if (lock->l_flags & LDLM_FL_CLEANED) { lock = NULL; continue; @@ -433,7 +456,7 @@ static void cleanup_resource(struct ldlm_resource *res, struct list_head *q, LDLM_DEBUG(lock, "setting FL_LOCAL_ONLY"); if (lock->l_completion_ast) lock->l_completion_ast(lock, 0, NULL); - LDLM_LOCK_PUT(lock); + LDLM_LOCK_RELEASE(lock); continue; } @@ -452,7 +475,7 @@ static void cleanup_resource(struct ldlm_resource *res, struct list_head *q, "client node"); ldlm_lock_destroy(lock); } - LDLM_LOCK_PUT(lock); + LDLM_LOCK_RELEASE(lock); } while (1); EXIT; @@ -460,7 +483,7 @@ static void cleanup_resource(struct ldlm_resource *res, struct list_head *q, int ldlm_namespace_cleanup(struct ldlm_namespace *ns, int flags) { - struct list_head *tmp; + cfs_list_t *tmp; int i; if (ns == NULL) { @@ -469,33 +492,45 @@ int ldlm_namespace_cleanup(struct ldlm_namespace *ns, int flags) } for (i = 0; i < RES_HASH_SIZE; i++) { - spin_lock(&ns->ns_hash_lock); + cfs_spin_lock(&ns->ns_hash_lock); tmp = ns->ns_hash[i].next; while (tmp != &(ns->ns_hash[i])) { struct ldlm_resource *res; - res = list_entry(tmp, struct ldlm_resource, lr_hash); + res = cfs_list_entry(tmp, struct ldlm_resource, + lr_hash); ldlm_resource_getref(res); - spin_unlock(&ns->ns_hash_lock); + cfs_spin_unlock(&ns->ns_hash_lock); + LDLM_RESOURCE_ADDREF(res); cleanup_resource(res, &res->lr_granted, flags); cleanup_resource(res, &res->lr_converting, flags); cleanup_resource(res, &res->lr_waiting, flags); - spin_lock(&ns->ns_hash_lock); - tmp = tmp->next; + cfs_spin_lock(&ns->ns_hash_lock); + tmp = tmp->next; /* XXX: former stuff caused issues in case of race * between ldlm_namespace_cleanup() and lockd() when * client gets blocking ast when lock gets distracted by * server. This is 1_4 branch solution, let's see how * will it behave. */ - if (!ldlm_resource_putref_locked(res)) - CDEBUG(D_INFO, - "Namespace %s resource refcount nonzero " - "(%d) after lock cleanup; forcing cleanup.\n", - ns->ns_name, atomic_read(&res->lr_refcount)); + LDLM_RESOURCE_DELREF(res); + if (!ldlm_resource_putref_locked(res)) { + CERROR("Namespace %s resource refcount nonzero " + "(%d) after lock cleanup; forcing " + "cleanup.\n", + ns->ns_name, + cfs_atomic_read(&res->lr_refcount)); + CERROR("Resource: %p ("LPU64"/"LPU64"/"LPU64"/" + LPU64") (rc: %d)\n", res, + res->lr_name.name[0], + res->lr_name.name[1], + res->lr_name.name[2], + res->lr_name.name[3], + cfs_atomic_read(&res->lr_refcount)); + } } - spin_unlock(&ns->ns_hash_lock); + cfs_spin_unlock(&ns->ns_hash_lock); } return ELDLM_OK; @@ -516,7 +551,7 @@ static int __ldlm_namespace_free(struct ldlm_namespace *ns, int force) ns->ns_name, ns->ns_refcount); force_wait: if (force) - lwi = LWI_TIMEOUT(obd_timeout * HZ / 4, NULL, NULL); + lwi = LWI_TIMEOUT(obd_timeout * CFS_HZ / 4, NULL, NULL); rc = l_wait_event(ns->ns_waitq, ns->ns_refcount == 0, &lwi); @@ -545,8 +580,17 @@ force_wait: RETURN(ELDLM_OK); } -void ldlm_namespace_free_prior(struct ldlm_namespace *ns, - struct obd_import *imp, +/** + * Performs various cleanups for passed \a ns to make it drop refc and be ready + * for freeing. Waits for refc == 0. + * + * The following is done: + * (0) Unregister \a ns from its list to make inaccessible for potential users + * like pools thread and others; + * (1) Clear all locks in \a ns. + */ +void ldlm_namespace_free_prior(struct ldlm_namespace *ns, + struct obd_import *imp, int force) { int rc; @@ -556,7 +600,10 @@ void ldlm_namespace_free_prior(struct ldlm_namespace *ns, return; } - /* Can fail with -EINTR when force == 0 in which case try harder */ + + /* + * Can fail with -EINTR when force == 0 in which case try harder. + */ rc = __ldlm_namespace_free(ns, force); if (rc != ELDLM_OK) { if (imp) { @@ -564,14 +611,21 @@ void ldlm_namespace_free_prior(struct ldlm_namespace *ns, ptlrpc_invalidate_import(imp); } - /* With all requests dropped and the import inactive - * we are gaurenteed all reference will be dropped. */ + /* + * With all requests dropped and the import inactive + * we are gaurenteed all reference will be dropped. + */ rc = __ldlm_namespace_free(ns, 1); LASSERT(rc == 0); } EXIT; } +/** + * Performs freeing memory structures related to \a ns. This is only done when + * ldlm_namespce_free_prior() successfully removed all resources referencing + * \a ns and its refc == 0. + */ void ldlm_namespace_free_post(struct ldlm_namespace *ns) { ENTRY; @@ -580,16 +634,18 @@ void ldlm_namespace_free_post(struct ldlm_namespace *ns) return; } - mutex_down(ldlm_namespace_lock(ns->ns_client)); + /* - * Some asserts and possibly other parts of code still using - * list_empty(&ns->ns_list_chain). This is why it is important - * to use list_del_init() here. + * Make sure that nobody can find this ns in its list. + */ + ldlm_namespace_unregister(ns, ns->ns_client); + /* + * Fini pool _before_ parent proc dir is removed. This is important as + * ldlm_pool_fini() removes own proc dir which is child to @dir. Removing + * it after @dir may cause oops. */ - list_del_init(&ns->ns_list_chain); - atomic_dec(ldlm_namespace_nr(ns->ns_client)); ldlm_pool_fini(&ns->ns_pool); - mutex_up(ldlm_namespace_lock(ns->ns_client)); + #ifdef LPROCFS { struct proc_dir_entry *dir; @@ -605,11 +661,12 @@ void ldlm_namespace_free_post(struct ldlm_namespace *ns) OBD_VFREE(ns->ns_hash, sizeof(*ns->ns_hash) * RES_HASH_SIZE); OBD_FREE(ns->ns_name, strlen(ns->ns_name) + 1); - /* - * @ns should be not on list in this time, otherwise this will cause - * issues realted to using freed @ns in pools thread. + + /* + * Namespace \a ns should be not on list in this time, otherwise this + * will cause issues realted to using freed \a ns in pools thread. */ - LASSERT(list_empty(&ns->ns_list_chain)); + LASSERT(cfs_list_empty(&ns->ns_list_chain)); OBD_FREE_PTR(ns); ldlm_put_ref(); EXIT; @@ -633,7 +690,7 @@ void ldlm_namespace_free_post(struct ldlm_namespace *ns) * lprocfs entries, and then free memory. It will be called w/o cli->cl_sem * held. */ -void ldlm_namespace_free(struct ldlm_namespace *ns, +void ldlm_namespace_free(struct ldlm_namespace *ns, struct obd_import *imp, int force) { @@ -642,48 +699,72 @@ void ldlm_namespace_free(struct ldlm_namespace *ns, } -void ldlm_namespace_get_nolock(struct ldlm_namespace *ns) +void ldlm_namespace_get_locked(struct ldlm_namespace *ns) { - LASSERT(ns->ns_refcount >= 0); ns->ns_refcount++; } void ldlm_namespace_get(struct ldlm_namespace *ns) { - spin_lock(&ns->ns_hash_lock); - ldlm_namespace_get_nolock(ns); - spin_unlock(&ns->ns_hash_lock); + cfs_spin_lock(&ns->ns_hash_lock); + ldlm_namespace_get_locked(ns); + cfs_spin_unlock(&ns->ns_hash_lock); } -void ldlm_namespace_put_nolock(struct ldlm_namespace *ns, int wakeup) +void ldlm_namespace_put_locked(struct ldlm_namespace *ns, int wakeup) { LASSERT(ns->ns_refcount > 0); ns->ns_refcount--; if (ns->ns_refcount == 0 && wakeup) - wake_up(&ns->ns_waitq); + cfs_waitq_signal(&ns->ns_waitq); } void ldlm_namespace_put(struct ldlm_namespace *ns, int wakeup) { - spin_lock(&ns->ns_hash_lock); - ldlm_namespace_put_nolock(ns, wakeup); - spin_unlock(&ns->ns_hash_lock); + cfs_spin_lock(&ns->ns_hash_lock); + ldlm_namespace_put_locked(ns, wakeup); + cfs_spin_unlock(&ns->ns_hash_lock); +} + +/* Register @ns in the list of namespaces */ +void ldlm_namespace_register(struct ldlm_namespace *ns, ldlm_side_t client) +{ + cfs_mutex_down(ldlm_namespace_lock(client)); + LASSERT(cfs_list_empty(&ns->ns_list_chain)); + cfs_list_add(&ns->ns_list_chain, ldlm_namespace_list(client)); + cfs_atomic_inc(ldlm_namespace_nr(client)); + cfs_mutex_up(ldlm_namespace_lock(client)); +} + +/* Unregister @ns from the list of namespaces */ +void ldlm_namespace_unregister(struct ldlm_namespace *ns, ldlm_side_t client) +{ + cfs_mutex_down(ldlm_namespace_lock(client)); + LASSERT(!cfs_list_empty(&ns->ns_list_chain)); + /* + * Some asserts and possibly other parts of code still using + * list_empty(&ns->ns_list_chain). This is why it is important + * to use list_del_init() here. + */ + cfs_list_del_init(&ns->ns_list_chain); + cfs_atomic_dec(ldlm_namespace_nr(client)); + cfs_mutex_up(ldlm_namespace_lock(client)); } /* Should be called under ldlm_namespace_lock(client) taken */ -void ldlm_namespace_move(struct ldlm_namespace *ns, ldlm_side_t client) +void ldlm_namespace_move_locked(struct ldlm_namespace *ns, ldlm_side_t client) { - LASSERT(!list_empty(&ns->ns_list_chain)); + LASSERT(!cfs_list_empty(&ns->ns_list_chain)); LASSERT_SEM_LOCKED(ldlm_namespace_lock(client)); - list_move_tail(&ns->ns_list_chain, ldlm_namespace_list(client)); + cfs_list_move_tail(&ns->ns_list_chain, ldlm_namespace_list(client)); } /* Should be called under ldlm_namespace_lock(client) taken */ -struct ldlm_namespace *ldlm_namespace_first(ldlm_side_t client) +struct ldlm_namespace *ldlm_namespace_first_locked(ldlm_side_t client) { LASSERT_SEM_LOCKED(ldlm_namespace_lock(client)); - LASSERT(!list_empty(ldlm_namespace_list(client))); - return container_of(ldlm_namespace_list(client)->next, + LASSERT(!cfs_list_empty(ldlm_namespace_list(client))); + return container_of(ldlm_namespace_list(client)->next, struct ldlm_namespace, ns_list_chain); } static __u32 ldlm_hash_fn(struct ldlm_resource *parent, @@ -705,7 +786,7 @@ static struct ldlm_resource *ldlm_resource_new(void) struct ldlm_resource *res; int idx; - OBD_SLAB_ALLOC(res, ldlm_resource_slab, CFS_ALLOC_IO, sizeof *res); + OBD_SLAB_ALLOC_PTR_GFP(res, ldlm_resource_slab, CFS_ALLOC_IO); if (res == NULL) return NULL; @@ -724,12 +805,13 @@ static struct ldlm_resource *ldlm_resource_new(void) res->lr_itree[idx].lit_root = NULL; } - atomic_set(&res->lr_refcount, 1); - spin_lock_init(&res->lr_lock); + cfs_atomic_set(&res->lr_refcount, 1); + cfs_spin_lock_init(&res->lr_lock); + lu_ref_init(&res->lr_reference); /* one who creates the resource must unlock * the semaphore after lvb initialization */ - init_MUTEX_LOCKED(&res->lr_lvb_sem); + cfs_init_mutex_locked(&res->lr_lvb_sem); return res; } @@ -739,14 +821,14 @@ static struct ldlm_resource * ldlm_resource_find(struct ldlm_namespace *ns, const struct ldlm_res_id *name, __u32 hash) { - struct list_head *bucket, *tmp; + cfs_list_t *bucket, *tmp; struct ldlm_resource *res; LASSERT_SPIN_LOCKED(&ns->ns_hash_lock); bucket = ns->ns_hash + hash; - list_for_each(tmp, bucket) { - res = list_entry(tmp, struct ldlm_resource, lr_hash); + cfs_list_for_each(tmp, bucket) { + res = cfs_list_entry(tmp, struct ldlm_resource, lr_hash); if (memcmp(&res->lr_name, name, sizeof(res->lr_name)) == 0) return res; } @@ -760,7 +842,7 @@ static struct ldlm_resource * ldlm_resource_add(struct ldlm_namespace *ns, struct ldlm_resource *parent, const struct ldlm_res_id *name, __u32 hash, ldlm_type_t type) { - struct list_head *bucket; + cfs_list_t *bucket; struct ldlm_resource *res, *old_res; ENTRY; @@ -776,34 +858,34 @@ ldlm_resource_add(struct ldlm_namespace *ns, struct ldlm_resource *parent, res->lr_type = type; res->lr_most_restr = LCK_NL; - spin_lock(&ns->ns_hash_lock); + cfs_spin_lock(&ns->ns_hash_lock); old_res = ldlm_resource_find(ns, name, hash); if (old_res) { /* someone won the race and added the resource before */ ldlm_resource_getref(old_res); - spin_unlock(&ns->ns_hash_lock); + cfs_spin_unlock(&ns->ns_hash_lock); OBD_SLAB_FREE(res, ldlm_resource_slab, sizeof *res); /* synchronize WRT resource creation */ if (ns->ns_lvbo && ns->ns_lvbo->lvbo_init) { - down(&old_res->lr_lvb_sem); - up(&old_res->lr_lvb_sem); + cfs_down(&old_res->lr_lvb_sem); + cfs_up(&old_res->lr_lvb_sem); } RETURN(old_res); } /* we won! let's add the resource */ bucket = ns->ns_hash + hash; - list_add(&res->lr_hash, bucket); + cfs_list_add(&res->lr_hash, bucket); ns->ns_resources++; - ldlm_namespace_get_nolock(ns); + ldlm_namespace_get_locked(ns); if (parent == NULL) { - list_add(&res->lr_childof, &ns->ns_root_list); + cfs_list_add(&res->lr_childof, &ns->ns_root_list); } else { res->lr_parent = parent; - list_add(&res->lr_childof, &parent->lr_children); + cfs_list_add(&res->lr_childof, &parent->lr_children); } - spin_unlock(&ns->ns_hash_lock); + cfs_spin_unlock(&ns->ns_hash_lock); if (ns->ns_lvbo && ns->ns_lvbo->lvbo_init) { int rc; @@ -814,7 +896,7 @@ ldlm_resource_add(struct ldlm_namespace *ns, struct ldlm_resource *parent, CERROR("lvbo_init failed for resource " LPU64": rc %d\n", name->name[0], rc); /* we create resource with locked lr_lvb_sem */ - up(&res->lr_lvb_sem); + cfs_up(&res->lr_lvb_sem); } RETURN(res); @@ -835,19 +917,19 @@ ldlm_resource_get(struct ldlm_namespace *ns, struct ldlm_resource *parent, LASSERT(ns->ns_hash != NULL); LASSERT(name->name[0] != 0); - spin_lock(&ns->ns_hash_lock); + cfs_spin_lock(&ns->ns_hash_lock); res = ldlm_resource_find(ns, name, hash); if (res) { ldlm_resource_getref(res); - spin_unlock(&ns->ns_hash_lock); + cfs_spin_unlock(&ns->ns_hash_lock); /* synchronize WRT resource creation */ if (ns->ns_lvbo && ns->ns_lvbo->lvbo_init) { - down(&res->lr_lvb_sem); - up(&res->lr_lvb_sem); + cfs_down(&res->lr_lvb_sem); + cfs_up(&res->lr_lvb_sem); } RETURN(res); } - spin_unlock(&ns->ns_hash_lock); + cfs_spin_unlock(&ns->ns_hash_lock); if (create == 0) RETURN(NULL); @@ -860,9 +942,9 @@ struct ldlm_resource *ldlm_resource_getref(struct ldlm_resource *res) { LASSERT(res != NULL); LASSERT(res != LP_POISON); - atomic_inc(&res->lr_refcount); + cfs_atomic_inc(&res->lr_refcount); CDEBUG(D_INFO, "getref res: %p count: %d\n", res, - atomic_read(&res->lr_refcount)); + cfs_atomic_read(&res->lr_refcount)); return res; } @@ -872,35 +954,36 @@ void __ldlm_resource_putref_final(struct ldlm_resource *res) LASSERT_SPIN_LOCKED(&ns->ns_hash_lock); - if (!list_empty(&res->lr_granted)) { + if (!cfs_list_empty(&res->lr_granted)) { ldlm_resource_dump(D_ERROR, res); LBUG(); } - if (!list_empty(&res->lr_converting)) { + if (!cfs_list_empty(&res->lr_converting)) { ldlm_resource_dump(D_ERROR, res); LBUG(); } - if (!list_empty(&res->lr_waiting)) { + if (!cfs_list_empty(&res->lr_waiting)) { ldlm_resource_dump(D_ERROR, res); LBUG(); } - if (!list_empty(&res->lr_children)) { + if (!cfs_list_empty(&res->lr_children)) { ldlm_resource_dump(D_ERROR, res); LBUG(); } - /* Pass 0 here to not wake ->ns_waitq up yet, we will do it few + /* Pass 0 here to not wake ->ns_waitq up yet, we will do it few * lines below when all children are freed. */ - ldlm_namespace_put_nolock(ns, 0); - list_del_init(&res->lr_hash); - list_del_init(&res->lr_childof); + ldlm_namespace_put_locked(ns, 0); + cfs_list_del_init(&res->lr_hash); + cfs_list_del_init(&res->lr_childof); + lu_ref_fini(&res->lr_reference); ns->ns_resources--; if (ns->ns_resources == 0) - wake_up(&ns->ns_waitq); + cfs_waitq_signal(&ns->ns_waitq); } /* Returns 1 if the resource was freed, 0 if it remains. */ @@ -911,15 +994,15 @@ int ldlm_resource_putref(struct ldlm_resource *res) ENTRY; CDEBUG(D_INFO, "putref res: %p count: %d\n", res, - atomic_read(&res->lr_refcount) - 1); - LASSERTF(atomic_read(&res->lr_refcount) > 0, "%d", - atomic_read(&res->lr_refcount)); - LASSERTF(atomic_read(&res->lr_refcount) < LI_POISON, "%d", - atomic_read(&res->lr_refcount)); + cfs_atomic_read(&res->lr_refcount) - 1); + LASSERTF(cfs_atomic_read(&res->lr_refcount) > 0, "%d", + cfs_atomic_read(&res->lr_refcount)); + LASSERTF(cfs_atomic_read(&res->lr_refcount) < LI_POISON, "%d", + cfs_atomic_read(&res->lr_refcount)); - if (atomic_dec_and_lock(&res->lr_refcount, &ns->ns_hash_lock)) { + if (cfs_atomic_dec_and_lock(&res->lr_refcount, &ns->ns_hash_lock)) { __ldlm_resource_putref_final(res); - spin_unlock(&ns->ns_hash_lock); + cfs_spin_unlock(&ns->ns_hash_lock); if (res->lr_lvb_data) OBD_FREE(res->lr_lvb_data, res->lr_lvb_len); OBD_SLAB_FREE(res, ldlm_resource_slab, sizeof *res); @@ -936,12 +1019,12 @@ int ldlm_resource_putref_locked(struct ldlm_resource *res) ENTRY; CDEBUG(D_INFO, "putref res: %p count: %d\n", res, - atomic_read(&res->lr_refcount) - 1); - LASSERT(atomic_read(&res->lr_refcount) > 0); - LASSERT(atomic_read(&res->lr_refcount) < LI_POISON); + cfs_atomic_read(&res->lr_refcount) - 1); + LASSERT(cfs_atomic_read(&res->lr_refcount) > 0); + LASSERT(cfs_atomic_read(&res->lr_refcount) < LI_POISON); - LASSERT(atomic_read(&res->lr_refcount) >= 0); - if (atomic_dec_and_test(&res->lr_refcount)) { + LASSERT(cfs_atomic_read(&res->lr_refcount) >= 0); + if (cfs_atomic_dec_and_test(&res->lr_refcount)) { __ldlm_resource_putref_final(res); if (res->lr_lvb_data) OBD_FREE(res->lr_lvb_data, res->lr_lvb_len); @@ -952,12 +1035,12 @@ int ldlm_resource_putref_locked(struct ldlm_resource *res) RETURN(rc); } -void ldlm_resource_add_lock(struct ldlm_resource *res, struct list_head *head, +void ldlm_resource_add_lock(struct ldlm_resource *res, cfs_list_t *head, struct ldlm_lock *lock) { check_res_locked(res); - ldlm_resource_dump(D_OTHER, res); + ldlm_resource_dump(D_INFO, res); CDEBUG(D_OTHER, "About to add this lock:\n"); ldlm_lock_dump(D_OTHER, lock, 0); @@ -966,9 +1049,9 @@ void ldlm_resource_add_lock(struct ldlm_resource *res, struct list_head *head, return; } - LASSERT(list_empty(&lock->l_res_link)); + LASSERT(cfs_list_empty(&lock->l_res_link)); - list_add_tail(&lock->l_res_link, head); + cfs_list_add_tail(&lock->l_res_link, head); } void ldlm_resource_insert_lock_after(struct ldlm_lock *original, @@ -978,7 +1061,7 @@ void ldlm_resource_insert_lock_after(struct ldlm_lock *original, check_res_locked(res); - ldlm_resource_dump(D_OTHER, res); + ldlm_resource_dump(D_INFO, res); CDEBUG(D_OTHER, "About to insert this lock after %p:\n", original); ldlm_lock_dump(D_OTHER, new, 0); @@ -987,9 +1070,9 @@ void ldlm_resource_insert_lock_after(struct ldlm_lock *original, goto out; } - LASSERT(list_empty(&new->l_res_link)); + LASSERT(cfs_list_empty(&new->l_res_link)); - list_add(&new->l_res_link, &original->l_res_link); + cfs_list_add(&new->l_res_link, &original->l_res_link); out:; } @@ -1002,7 +1085,7 @@ void ldlm_resource_unlink_lock(struct ldlm_lock *lock) ldlm_unlink_lock_skiplist(lock); else if (type == LDLM_EXTENT) ldlm_extent_unlink_lock(lock); - list_del_init(&lock->l_res_link); + cfs_list_del_init(&lock->l_res_link); } void ldlm_res2desc(struct ldlm_resource *res, struct ldlm_resource_desc *desc) @@ -1013,60 +1096,62 @@ void ldlm_res2desc(struct ldlm_resource *res, struct ldlm_resource_desc *desc) void ldlm_dump_all_namespaces(ldlm_side_t client, int level) { - struct list_head *tmp; + cfs_list_t *tmp; if (!((libcfs_debug | D_ERROR) & level)) return; - mutex_down(ldlm_namespace_lock(client)); + cfs_mutex_down(ldlm_namespace_lock(client)); - list_for_each(tmp, ldlm_namespace_list(client)) { + cfs_list_for_each(tmp, ldlm_namespace_list(client)) { struct ldlm_namespace *ns; - ns = list_entry(tmp, struct ldlm_namespace, ns_list_chain); + ns = cfs_list_entry(tmp, struct ldlm_namespace, ns_list_chain); ldlm_namespace_dump(level, ns); } - mutex_up(ldlm_namespace_lock(client)); + cfs_mutex_up(ldlm_namespace_lock(client)); } void ldlm_namespace_dump(int level, struct ldlm_namespace *ns) { - struct list_head *tmp; + cfs_list_t *tmp; if (!((libcfs_debug | D_ERROR) & level)) return; - CDEBUG(level, "--- Namespace: %s (rc: %d, side: %s)\n", - ns->ns_name, ns->ns_refcount, + CDEBUG(level, "--- Namespace: %s (rc: %d, side: %s)\n", + ns->ns_name, ns->ns_refcount, ns_is_client(ns) ? "client" : "server"); if (cfs_time_before(cfs_time_current(), ns->ns_next_dump)) return; - spin_lock(&ns->ns_hash_lock); + cfs_spin_lock(&ns->ns_hash_lock); tmp = ns->ns_root_list.next; while (tmp != &ns->ns_root_list) { struct ldlm_resource *res; - res = list_entry(tmp, struct ldlm_resource, lr_childof); + res = cfs_list_entry(tmp, struct ldlm_resource, lr_childof); ldlm_resource_getref(res); - spin_unlock(&ns->ns_hash_lock); + cfs_spin_unlock(&ns->ns_hash_lock); + LDLM_RESOURCE_ADDREF(res); lock_res(res); ldlm_resource_dump(level, res); unlock_res(res); - spin_lock(&ns->ns_hash_lock); + LDLM_RESOURCE_DELREF(res); + cfs_spin_lock(&ns->ns_hash_lock); tmp = tmp->next; ldlm_resource_putref_locked(res); } ns->ns_next_dump = cfs_time_shift(10); - spin_unlock(&ns->ns_hash_lock); + cfs_spin_unlock(&ns->ns_hash_lock); } void ldlm_resource_dump(int level, struct ldlm_resource *res) { - struct list_head *tmp; + cfs_list_t *tmp; int pos; CLASSERT(RES_NAME_SIZE == 4); @@ -1077,32 +1162,35 @@ void ldlm_resource_dump(int level, struct ldlm_resource *res) CDEBUG(level, "--- Resource: %p ("LPU64"/"LPU64"/"LPU64"/"LPU64 ") (rc: %d)\n", res, res->lr_name.name[0], res->lr_name.name[1], res->lr_name.name[2], res->lr_name.name[3], - atomic_read(&res->lr_refcount)); + cfs_atomic_read(&res->lr_refcount)); - if (!list_empty(&res->lr_granted)) { + if (!cfs_list_empty(&res->lr_granted)) { pos = 0; CDEBUG(level, "Granted locks:\n"); - list_for_each(tmp, &res->lr_granted) { + cfs_list_for_each(tmp, &res->lr_granted) { struct ldlm_lock *lock; - lock = list_entry(tmp, struct ldlm_lock, l_res_link); + lock = cfs_list_entry(tmp, struct ldlm_lock, + l_res_link); ldlm_lock_dump(level, lock, ++pos); } } - if (!list_empty(&res->lr_converting)) { + if (!cfs_list_empty(&res->lr_converting)) { pos = 0; CDEBUG(level, "Converting locks:\n"); - list_for_each(tmp, &res->lr_converting) { + cfs_list_for_each(tmp, &res->lr_converting) { struct ldlm_lock *lock; - lock = list_entry(tmp, struct ldlm_lock, l_res_link); + lock = cfs_list_entry(tmp, struct ldlm_lock, + l_res_link); ldlm_lock_dump(level, lock, ++pos); } } - if (!list_empty(&res->lr_waiting)) { + if (!cfs_list_empty(&res->lr_waiting)) { pos = 0; CDEBUG(level, "Waiting locks:\n"); - list_for_each(tmp, &res->lr_waiting) { + cfs_list_for_each(tmp, &res->lr_waiting) { struct ldlm_lock *lock; - lock = list_entry(tmp, struct ldlm_lock, l_res_link); + lock = cfs_list_entry(tmp, struct ldlm_lock, + l_res_link); ldlm_lock_dump(level, lock, ++pos); } }