X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=lustre%2Fobdclass%2Flustre_handles.c;h=386931b07d4b554c941d33e26770ce7657a803a2;hb=e0cdde123c14729a340cf937cf9580be7c9dd9c1;hp=c3013fd5ec373b686905e4b3a74d28dd639e973b;hpb=9c71dacaf0b16c10952b4d788016e70b667cd77b;p=fs%2Flustre-release.git diff --git a/lustre/obdclass/lustre_handles.c b/lustre/obdclass/lustre_handles.c index c3013fd..386931b 100644 --- a/lustre/obdclass/lustre_handles.c +++ b/lustre/obdclass/lustre_handles.c @@ -15,11 +15,7 @@ * * 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. + * http://www.gnu.org/licenses/gpl-2.0.html * * GPL HEADER END */ @@ -27,7 +23,7 @@ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2011, Whamcloud, Inc. + * Copyright (c) 2011, 2017, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -39,43 +35,22 @@ */ #define DEBUG_SUBSYSTEM S_CLASS -#ifndef __KERNEL__ -# include -#endif #include #include #include -#ifndef __KERNEL__ -# define list_add_rcu cfs_list_add -# define list_del_rcu cfs_list_del -# define list_for_each_rcu cfs_list_for_each -# define list_for_each_safe_rcu cfs_list_for_each_safe -# define list_for_each_entry_rcu cfs_list_for_each_entry -# define rcu_read_lock() cfs_spin_lock(&bucket->lock) -# define rcu_read_unlock() cfs_spin_unlock(&bucket->lock) -#endif /* !__KERNEL__ */ static __u64 handle_base; #define HANDLE_INCR 7 -static cfs_spinlock_t handle_base_lock; +static DEFINE_SPINLOCK(handle_base_lock); static struct handle_bucket { - cfs_spinlock_t lock; - cfs_list_t head; + spinlock_t lock; + struct list_head head; } *handle_hash; -#ifdef __arch_um__ -/* For unknown reason, UML uses kmalloc rather than vmalloc to allocate - * memory(OBD_VMALLOC). Therefore, we have to redefine the - * HANDLE_HASH_SIZE to make the hash heads don't exceed 128K. - */ -#define HANDLE_HASH_SIZE 4096 -#else #define HANDLE_HASH_SIZE (1 << 16) -#endif /* ifdef __arch_um__ */ - #define HANDLE_HASH_MASK (HANDLE_HASH_SIZE - 1) /* @@ -89,88 +64,91 @@ void class_handle_hash(struct portals_handle *h, ENTRY; LASSERT(h != NULL); - LASSERT(cfs_list_empty(&h->h_link)); + LASSERT(list_empty(&h->h_link)); /* * This is fast, but simplistic cookie generation algorithm, it will * need a re-do at some point in the future for security. */ - cfs_spin_lock(&handle_base_lock); - handle_base += HANDLE_INCR; - - h->h_cookie = handle_base; - if (unlikely(handle_base == 0)) { - /* - * Cookie of zero is "dangerous", because in many places it's - * assumed that 0 means "unassigned" handle, not bound to any - * object. - */ - CWARN("The universe has been exhausted: cookie wrap-around.\n"); - handle_base += HANDLE_INCR; - } - cfs_spin_unlock(&handle_base_lock); + spin_lock(&handle_base_lock); + handle_base += HANDLE_INCR; + + if (unlikely(handle_base == 0)) { + /* + * Cookie of zero is "dangerous", because in many places it's + * assumed that 0 means "unassigned" handle, not bound to any + * object. + */ + CWARN("The universe has been exhausted: cookie wrap-around.\n"); + handle_base += HANDLE_INCR; + } + h->h_cookie = handle_base; + spin_unlock(&handle_base_lock); h->h_ops = ops; - cfs_spin_lock_init(&h->h_lock); + spin_lock_init(&h->h_lock); - bucket = &handle_hash[h->h_cookie & HANDLE_HASH_MASK]; - cfs_spin_lock(&bucket->lock); - list_add_rcu(&h->h_link, &bucket->head); - h->h_in = 1; - cfs_spin_unlock(&bucket->lock); + bucket = &handle_hash[h->h_cookie & HANDLE_HASH_MASK]; + spin_lock(&bucket->lock); + list_add_rcu(&h->h_link, &bucket->head); + h->h_in = 1; + spin_unlock(&bucket->lock); - CDEBUG(D_INFO, "added object %p with handle "LPX64" to hash\n", - h, h->h_cookie); - EXIT; + CDEBUG(D_INFO, "added object %p with handle %#llx to hash\n", + h, h->h_cookie); + EXIT; } +EXPORT_SYMBOL(class_handle_hash); static void class_handle_unhash_nolock(struct portals_handle *h) { - if (cfs_list_empty(&h->h_link)) { - CERROR("removing an already-removed handle ("LPX64")\n", + if (list_empty(&h->h_link)) { + CERROR("removing an already-removed handle (%#llx)\n", h->h_cookie); return; } - CDEBUG(D_INFO, "removing object %p with handle "LPX64" from hash\n", + CDEBUG(D_INFO, "removing object %p with handle %#llx from hash\n", h, h->h_cookie); - cfs_spin_lock(&h->h_lock); - if (h->h_in == 0) { - cfs_spin_unlock(&h->h_lock); - return; - } - h->h_in = 0; - cfs_spin_unlock(&h->h_lock); - list_del_rcu(&h->h_link); + spin_lock(&h->h_lock); + if (h->h_in == 0) { + spin_unlock(&h->h_lock); + return; + } + h->h_in = 0; + spin_unlock(&h->h_lock); + list_del_rcu(&h->h_link); } void class_handle_unhash(struct portals_handle *h) { - struct handle_bucket *bucket; - bucket = handle_hash + (h->h_cookie & HANDLE_HASH_MASK); + struct handle_bucket *bucket; + bucket = handle_hash + (h->h_cookie & HANDLE_HASH_MASK); - cfs_spin_lock(&bucket->lock); - class_handle_unhash_nolock(h); - cfs_spin_unlock(&bucket->lock); + spin_lock(&bucket->lock); + class_handle_unhash_nolock(h); + spin_unlock(&bucket->lock); } +EXPORT_SYMBOL(class_handle_unhash); void class_handle_hash_back(struct portals_handle *h) { - struct handle_bucket *bucket; - ENTRY; + struct handle_bucket *bucket; + ENTRY; - bucket = handle_hash + (h->h_cookie & HANDLE_HASH_MASK); + bucket = handle_hash + (h->h_cookie & HANDLE_HASH_MASK); - cfs_spin_lock(&bucket->lock); - list_add_rcu(&h->h_link, &bucket->head); - h->h_in = 1; - cfs_spin_unlock(&bucket->lock); + spin_lock(&bucket->lock); + list_add_rcu(&h->h_link, &bucket->head); + h->h_in = 1; + spin_unlock(&bucket->lock); - EXIT; + EXIT; } +EXPORT_SYMBOL(class_handle_hash_back); -void *class_handle2object(__u64 cookie) +void *class_handle2object(__u64 cookie, const void *owner) { struct handle_bucket *bucket; struct portals_handle *h; @@ -179,43 +157,48 @@ void *class_handle2object(__u64 cookie) LASSERT(handle_hash != NULL); - /* Be careful when you want to change this code. See the - * rcu_read_lock() definition on top this file. - jxiong */ + /* Be careful when you want to change this code. See the + * rcu_read_lock() definition on top this file. - jxiong */ bucket = handle_hash + (cookie & HANDLE_HASH_MASK); rcu_read_lock(); list_for_each_entry_rcu(h, &bucket->head, h_link) { - if (h->h_cookie != cookie) + if (h->h_cookie != cookie || h->h_owner != owner) continue; - cfs_spin_lock(&h->h_lock); - if (likely(h->h_in != 0)) { + spin_lock(&h->h_lock); + if (likely(h->h_in != 0)) { h->h_ops->hop_addref(h); - retval = h; - } - cfs_spin_unlock(&h->h_lock); - break; - } - rcu_read_unlock(); - - RETURN(retval); + retval = h; + } + spin_unlock(&h->h_lock); + break; + } + rcu_read_unlock(); + + RETURN(retval); } +EXPORT_SYMBOL(class_handle2object); -void class_handle_free_cb(cfs_rcu_head_t *rcu) +void class_handle_free_cb(struct rcu_head *rcu) { - struct portals_handle *h = RCU2HANDLE(rcu); - void *ptr = (void *)(unsigned long)h->h_cookie; + struct portals_handle *h; + void *ptr; + + h = container_of(rcu, struct portals_handle, h_rcu); + ptr = (void *)(unsigned long)h->h_cookie; if (h->h_ops->hop_free != NULL) h->h_ops->hop_free(ptr, h->h_size); else OBD_FREE(ptr, h->h_size); } +EXPORT_SYMBOL(class_handle_free_cb); int class_handle_init(void) { struct handle_bucket *bucket; - struct timeval tv; + struct timespec64 ts; int seed[2]; LASSERT(handle_hash == NULL); @@ -224,17 +207,16 @@ int class_handle_init(void) if (handle_hash == NULL) return -ENOMEM; - cfs_spin_lock_init(&handle_base_lock); - for (bucket = handle_hash + HANDLE_HASH_SIZE - 1; bucket >= handle_hash; - bucket--) { - CFS_INIT_LIST_HEAD(&bucket->head); - cfs_spin_lock_init(&bucket->lock); - } + for (bucket = handle_hash + HANDLE_HASH_SIZE - 1; bucket >= handle_hash; + bucket--) { + INIT_LIST_HEAD(&bucket->head); + spin_lock_init(&bucket->lock); + } - /** bug 21430: add randomness to the initial base */ - cfs_get_random_bytes(seed, sizeof(seed)); - cfs_gettimeofday(&tv); - cfs_srand(tv.tv_sec ^ seed[0], tv.tv_usec ^ seed[1]); + /** bug 21430: add randomness to the initial base */ + cfs_get_random_bytes(seed, sizeof(seed)); + ktime_get_ts64(&ts); + cfs_srand(ts.tv_sec ^ seed[0], ts.tv_nsec ^ seed[1]); cfs_get_random_bytes(&handle_base, sizeof(handle_base)); LASSERT(handle_base != 0ULL); @@ -244,24 +226,24 @@ int class_handle_init(void) static int cleanup_all_handles(void) { - int rc; - int i; + int rc; + int i; - for (rc = i = 0; i < HANDLE_HASH_SIZE; i++) { - struct portals_handle *h; + for (rc = i = 0; i < HANDLE_HASH_SIZE; i++) { + struct portals_handle *h; - cfs_spin_lock(&handle_hash[i].lock); - list_for_each_entry_rcu(h, &(handle_hash[i].head), h_link) { - CERROR("force clean handle "LPX64" addr %p ops %p\n", + spin_lock(&handle_hash[i].lock); + list_for_each_entry_rcu(h, &(handle_hash[i].head), h_link) { + CERROR("force clean handle %#llx addr %p ops %p\n", h->h_cookie, h, h->h_ops); - class_handle_unhash_nolock(h); - rc++; - } - cfs_spin_unlock(&handle_hash[i].lock); - } + class_handle_unhash_nolock(h); + rc++; + } + spin_unlock(&handle_hash[i].lock); + } - return rc; + return rc; } void class_handle_cleanup(void)