Whamcloud - gitweb
LU-3963 obdclass: convert to linux list api
[fs/lustre-release.git] / lustre / obdclass / lustre_handles.c
index c3013fd..e4dc355 100644 (file)
@@ -27,7 +27,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, 2013, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
 #include <lustre_lib.h>
 
 #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)
+# define list_add_rcu            list_add
+# define list_del_rcu            list_del
+# define list_for_each_rcu       list_for_each
+# define list_for_each_safe_rcu  list_for_each_safe
+# define list_for_each_entry_rcu list_for_each_entry
+# define rcu_read_lock()         spin_lock(&bucket->lock)
+# define rcu_read_unlock()       spin_unlock(&bucket->lock)
 #endif /* !__KERNEL__ */
 
 static __u64 handle_base;
 #define HANDLE_INCR 7
-static cfs_spinlock_t handle_base_lock;
+static spinlock_t 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,44 +80,45 @@ 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 "LPX64" 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)) {
+       if (list_empty(&h->h_link)) {
                 CERROR("removing an already-removed handle ("LPX64")\n",
                        h->h_cookie);
                 return;
@@ -135,42 +127,44 @@ static void class_handle_unhash_nolock(struct portals_handle *h)
         CDEBUG(D_INFO, "removing object %p with handle "LPX64" 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,27 +173,28 @@ 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)
 {
@@ -211,6 +206,7 @@ void class_handle_free_cb(cfs_rcu_head_t *rcu)
        else
                OBD_FREE(ptr, h->h_size);
 }
+EXPORT_SYMBOL(class_handle_free_cb);
 
 int class_handle_init(void)
 {
@@ -224,17 +220,17 @@ 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);
-        }
+       spin_lock_init(&handle_base_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));
+       do_gettimeofday(&tv);
+       cfs_srand(tv.tv_sec ^ seed[0], tv.tv_usec ^ seed[1]);
 
         cfs_get_random_bytes(&handle_base, sizeof(handle_base));
         LASSERT(handle_base != 0ULL);
@@ -244,24 +240,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) {
+               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",
                               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)