Whamcloud - gitweb
LU-2275: obdclass: Proper error cleaup for class_newdev
[fs/lustre-release.git] / lustre / obdclass / genops.c
index d41576c..316c9f9 100644 (file)
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,6 +26,8 @@
 /*
  * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2011, 2012, Whamcloud, Inc.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -65,6 +65,7 @@ static void print_export_data(struct obd_export *exp,
                               const char *status, int locks);
 
 int (*ptlrpc_put_connection_superhack)(struct ptlrpc_connection *c);
+EXPORT_SYMBOL(ptlrpc_put_connection_superhack);
 
 /*
  * support functions: we could use inter-module communication, but this
@@ -80,7 +81,6 @@ static struct obd_device *obd_device_alloc(void)
         }
         return obd;
 }
-EXPORT_SYMBOL(obd_device_alloc);
 
 static void obd_device_free(struct obd_device *obd)
 {
@@ -112,6 +112,7 @@ struct obd_type *class_search_type(const char *name)
         cfs_spin_unlock(&obd_types_lock);
         return NULL;
 }
+EXPORT_SYMBOL(class_search_type);
 
 struct obd_type *class_get_type(const char *name)
 {
@@ -120,6 +121,10 @@ struct obd_type *class_get_type(const char *name)
 #ifdef HAVE_MODULE_LOADING_SUPPORT
         if (!type) {
                 const char *modname = name;
+
+               if (strcmp(modname, "obdfilter") == 0)
+                       modname = "ofd";
+
                 if (!cfs_request_module("%s", modname)) {
                         CDEBUG(D_INFO, "Loaded module '%s'\n", modname);
                         type = class_search_type(name);
@@ -137,6 +142,7 @@ struct obd_type *class_get_type(const char *name)
         }
         return type;
 }
+EXPORT_SYMBOL(class_get_type);
 
 void class_put_type(struct obd_type *type)
 {
@@ -146,6 +152,7 @@ void class_put_type(struct obd_type *type)
         cfs_module_put(type->typ_dt_ops->o_owner);
         cfs_spin_unlock(&type->obd_type_lock);
 }
+EXPORT_SYMBOL(class_put_type);
 
 #define CLASS_MAX_NAME 1024
 
@@ -218,6 +225,7 @@ int class_register_type(struct obd_ops *dt_ops, struct md_ops *md_ops,
         OBD_FREE(type, sizeof(*type));
         RETURN(rc);
 }
+EXPORT_SYMBOL(class_register_type);
 
 int class_unregister_type(const char *name)
 {
@@ -238,9 +246,11 @@ int class_unregister_type(const char *name)
                 RETURN(-EBUSY);
         }
 
-        if (type->typ_procroot) {
-                lprocfs_remove(&type->typ_procroot);
-        }
+       /* we do not use type->typ_procroot as for compatibility purposes
+        * other modules can share names (i.e. lod can use lov entry). so
+        * we can't reference pointer as it can get invalided when another
+        * module removes the entry */
+       lprocfs_try_remove_proc_entry(type->typ_name, proc_lustre_root);
 
         if (type->typ_lu)
                 lu_device_type_fini(type->typ_lu);
@@ -256,6 +266,7 @@ int class_unregister_type(const char *name)
         OBD_FREE(type, sizeof(*type));
         RETURN(0);
 } /* class_unregister_type */
+EXPORT_SYMBOL(class_unregister_type);
 
 /**
  * Create a new obd device.
@@ -275,6 +286,7 @@ struct obd_device *class_newdev(const char *type_name, const char *name)
         struct obd_type *type = NULL;
         int i;
         int new_obd_minor = 0;
+        ENTRY;
 
         if (strlen(name) >= MAX_OBD_NAME) {
                 CERROR("name/uuid must be < %u bytes long\n", MAX_OBD_NAME);
@@ -288,18 +300,19 @@ struct obd_device *class_newdev(const char *type_name, const char *name)
         }
 
         newdev = obd_device_alloc();
-        if (newdev == NULL) {
-                class_put_type(type);
-                RETURN(ERR_PTR(-ENOMEM));
-        }
+       if (newdev == NULL)
+               GOTO(out_type, result = ERR_PTR(-ENOMEM));
+
         LASSERT(newdev->obd_magic == OBD_DEVICE_MAGIC);
 
-        cfs_spin_lock(&obd_dev_lock);
+        cfs_write_lock(&obd_dev_lock);
         for (i = 0; i < class_devno_max(); i++) {
                 struct obd_device *obd = class_num2obd(i);
+
                 if (obd && obd->obd_name &&
                     (strcmp(name, obd->obd_name) == 0)) {
-                        CERROR("Device %s already exists, won't add\n", name);
+                        CERROR("Device %s already exists at %d, won't add\n",
+                               name, i);
                         if (result) {
                                 LASSERTF(result->obd_magic == OBD_DEVICE_MAGIC,
                                          "%p obd_magic %08x != %08x\n", result,
@@ -324,22 +337,26 @@ struct obd_device *class_newdev(const char *type_name, const char *name)
                         obd_devs[i] = result;
                 }
         }
-        cfs_spin_unlock(&obd_dev_lock);
+        cfs_write_unlock(&obd_dev_lock);
 
         if (result == NULL && i >= class_devno_max()) {
                 CERROR("all %u OBD devices used, increase MAX_OBD_DEVICES\n",
                        class_devno_max());
-                result = ERR_PTR(-EOVERFLOW);
+               GOTO(out, result = ERR_PTR(-EOVERFLOW));
         }
 
-        if (IS_ERR(result)) {
-                obd_device_free(newdev);
-                class_put_type(type);
-        } else {
-                CDEBUG(D_IOCTL, "Adding new device %s (%p)\n",
-                       result->obd_name, result);
-        }
-        return result;
+       if (IS_ERR(result))
+               GOTO(out, result);
+
+       CDEBUG(D_IOCTL, "Adding new device %s (%p)\n",
+              result->obd_name, result);
+
+       RETURN(result);
+out:
+       obd_device_free(newdev);
+out_type:
+       class_put_type(type);
+       return result;
 }
 
 void class_release_dev(struct obd_device *obd)
@@ -352,12 +369,12 @@ void class_release_dev(struct obd_device *obd)
                  obd, obd->obd_minor, obd_devs[obd->obd_minor]);
         LASSERT(obd_type != NULL);
 
-        CDEBUG(D_INFO, "Release obd device %s obd_type name =%s\n",
-               obd->obd_name,obd->obd_type->typ_name);
+        CDEBUG(D_INFO, "Release obd device %s at %d obd_type name =%s\n",
+               obd->obd_name, obd->obd_minor, obd->obd_type->typ_name);
 
-        cfs_spin_lock(&obd_dev_lock);
+        cfs_write_lock(&obd_dev_lock);
         obd_devs[obd->obd_minor] = NULL;
-        cfs_spin_unlock(&obd_dev_lock);
+        cfs_write_unlock(&obd_dev_lock);
         obd_device_free(obd);
 
         class_put_type(obd_type);
@@ -370,24 +387,26 @@ int class_name2dev(const char *name)
         if (!name)
                 return -1;
 
-        cfs_spin_lock(&obd_dev_lock);
+        cfs_read_lock(&obd_dev_lock);
         for (i = 0; i < class_devno_max(); i++) {
                 struct obd_device *obd = class_num2obd(i);
+
                 if (obd && obd->obd_name && strcmp(name, obd->obd_name) == 0) {
                         /* Make sure we finished attaching before we give
                            out any references */
                         LASSERT(obd->obd_magic == OBD_DEVICE_MAGIC);
                         if (obd->obd_attached) {
-                                cfs_spin_unlock(&obd_dev_lock);
+                                cfs_read_unlock(&obd_dev_lock);
                                 return i;
                         }
                         break;
                 }
         }
-        cfs_spin_unlock(&obd_dev_lock);
+        cfs_read_unlock(&obd_dev_lock);
 
         return -1;
 }
+EXPORT_SYMBOL(class_name2dev);
 
 struct obd_device *class_name2obd(const char *name)
 {
@@ -397,24 +416,27 @@ struct obd_device *class_name2obd(const char *name)
                 return NULL;
         return class_num2obd(dev);
 }
+EXPORT_SYMBOL(class_name2obd);
 
 int class_uuid2dev(struct obd_uuid *uuid)
 {
         int i;
 
-        cfs_spin_lock(&obd_dev_lock);
+        cfs_read_lock(&obd_dev_lock);
         for (i = 0; i < class_devno_max(); i++) {
                 struct obd_device *obd = class_num2obd(i);
+
                 if (obd && obd_uuid_equals(uuid, &obd->obd_uuid)) {
                         LASSERT(obd->obd_magic == OBD_DEVICE_MAGIC);
-                        cfs_spin_unlock(&obd_dev_lock);
+                        cfs_read_unlock(&obd_dev_lock);
                         return i;
                 }
         }
-        cfs_spin_unlock(&obd_dev_lock);
+        cfs_read_unlock(&obd_dev_lock);
 
         return -1;
 }
+EXPORT_SYMBOL(class_uuid2dev);
 
 struct obd_device *class_uuid2obd(struct obd_uuid *uuid)
 {
@@ -423,6 +445,7 @@ struct obd_device *class_uuid2obd(struct obd_uuid *uuid)
                 return NULL;
         return class_num2obd(dev);
 }
+EXPORT_SYMBOL(class_uuid2obd);
 
 /**
  * Get obd device from ::obd_devs[]
@@ -451,15 +474,17 @@ struct obd_device *class_num2obd(int num)
 
         return obd;
 }
+EXPORT_SYMBOL(class_num2obd);
 
 void class_obd_list(void)
 {
         char *status;
         int i;
 
-        cfs_spin_lock(&obd_dev_lock);
+        cfs_read_lock(&obd_dev_lock);
         for (i = 0; i < class_devno_max(); i++) {
                 struct obd_device *obd = class_num2obd(i);
+
                 if (obd == NULL)
                         continue;
                 if (obd->obd_stopping)
@@ -475,7 +500,7 @@ void class_obd_list(void)
                          obd->obd_name, obd->obd_uuid.uuid,
                          cfs_atomic_read(&obd->obd_refcount));
         }
-        cfs_spin_unlock(&obd_dev_lock);
+        cfs_read_unlock(&obd_dev_lock);
         return;
 }
 
@@ -488,9 +513,10 @@ struct obd_device * class_find_client_obd(struct obd_uuid *tgt_uuid,
 {
         int i;
 
-        cfs_spin_lock(&obd_dev_lock);
+        cfs_read_lock(&obd_dev_lock);
         for (i = 0; i < class_devno_max(); i++) {
                 struct obd_device *obd = class_num2obd(i);
+
                 if (obd == NULL)
                         continue;
                 if ((strncmp(obd->obd_type->typ_name, typ_name,
@@ -499,15 +525,16 @@ struct obd_device * class_find_client_obd(struct obd_uuid *tgt_uuid,
                                             &obd->u.cli.cl_target_uuid) &&
                             ((grp_uuid)? obd_uuid_equals(grp_uuid,
                                                          &obd->obd_uuid) : 1)) {
-                                cfs_spin_unlock(&obd_dev_lock);
+                                cfs_read_unlock(&obd_dev_lock);
                                 return obd;
                         }
                 }
         }
-        cfs_spin_unlock(&obd_dev_lock);
+        cfs_read_unlock(&obd_dev_lock);
 
         return NULL;
 }
+EXPORT_SYMBOL(class_find_client_obd);
 
 /* Iterate the obd_device list looking devices have grp_uuid. Start
    searching at *next, and if a device is found, the next index to look
@@ -524,22 +551,24 @@ struct obd_device * class_devices_in_group(struct obd_uuid *grp_uuid, int *next)
         else
                 return NULL;
 
-        cfs_spin_lock(&obd_dev_lock);
+        cfs_read_lock(&obd_dev_lock);
         for (; i < class_devno_max(); i++) {
                 struct obd_device *obd = class_num2obd(i);
+
                 if (obd == NULL)
                         continue;
                 if (obd_uuid_equals(grp_uuid, &obd->obd_uuid)) {
                         if (next != NULL)
                                 *next = i+1;
-                        cfs_spin_unlock(&obd_dev_lock);
+                        cfs_read_unlock(&obd_dev_lock);
                         return obd;
                 }
         }
-        cfs_spin_unlock(&obd_dev_lock);
+        cfs_read_unlock(&obd_dev_lock);
 
         return NULL;
 }
+EXPORT_SYMBOL(class_devices_in_group);
 
 /**
  * to notify sptlrpc log for \a fsname has changed, let every relevant OBD
@@ -553,7 +582,7 @@ int class_notify_sptlrpc_conf(const char *fsname, int namelen)
 
         LASSERT(namelen > 0);
 
-        cfs_spin_lock(&obd_dev_lock);
+        cfs_read_lock(&obd_dev_lock);
         for (i = 0; i < class_devno_max(); i++) {
                 obd = class_num2obd(i);
 
@@ -572,15 +601,15 @@ int class_notify_sptlrpc_conf(const char *fsname, int namelen)
                         continue;
 
                 class_incref(obd, __FUNCTION__, obd);
-                cfs_spin_unlock(&obd_dev_lock);
-                rc2 = obd_set_info_async(obd->obd_self_export,
+                cfs_read_unlock(&obd_dev_lock);
+                rc2 = obd_set_info_async(NULL, obd->obd_self_export,
                                          sizeof(KEY_SPTLRPC_CONF),
                                          KEY_SPTLRPC_CONF, 0, NULL, NULL);
                 rc = rc ? rc : rc2;
                 class_decref(obd, __FUNCTION__, obd);
-                cfs_spin_lock(&obd_dev_lock);
+                cfs_read_lock(&obd_dev_lock);
         }
-        cfs_spin_unlock(&obd_dev_lock);
+        cfs_read_unlock(&obd_dev_lock);
         return rc;
 }
 EXPORT_SYMBOL(class_notify_sptlrpc_conf);
@@ -670,6 +699,7 @@ struct obd_export *class_conn2export(struct lustre_handle *conn)
         export = class_handle2object(conn->cookie);
         RETURN(export);
 }
+EXPORT_SYMBOL(class_conn2export);
 
 struct obd_device *class_exp2obd(struct obd_export *exp)
 {
@@ -677,6 +707,7 @@ struct obd_device *class_exp2obd(struct obd_export *exp)
                 return exp->exp_obd;
         return NULL;
 }
+EXPORT_SYMBOL(class_exp2obd);
 
 struct obd_device *class_conn2obd(struct lustre_handle *conn)
 {
@@ -689,6 +720,7 @@ struct obd_device *class_conn2obd(struct lustre_handle *conn)
         }
         return NULL;
 }
+EXPORT_SYMBOL(class_conn2obd);
 
 struct obd_import *class_exp2cliimp(struct obd_export *exp)
 {
@@ -697,6 +729,7 @@ struct obd_import *class_exp2cliimp(struct obd_export *exp)
                 return NULL;
         return obd->u.cli.cl_import;
 }
+EXPORT_SYMBOL(class_exp2cliimp);
 
 struct obd_import *class_conn2cliimp(struct lustre_handle *conn)
 {
@@ -705,6 +738,7 @@ struct obd_import *class_conn2cliimp(struct lustre_handle *conn)
                 return NULL;
         return obd->u.cli.cl_import;
 }
+EXPORT_SYMBOL(class_conn2cliimp);
 
 /* Export management functions */
 static void class_export_destroy(struct obd_export *exp)
@@ -712,13 +746,12 @@ static void class_export_destroy(struct obd_export *exp)
         struct obd_device *obd = exp->exp_obd;
         ENTRY;
 
-        LASSERT (cfs_atomic_read(&exp->exp_refcount) == 0);
+        LASSERT_ATOMIC_ZERO(&exp->exp_refcount);
+       LASSERT(obd != NULL);
 
         CDEBUG(D_IOCTL, "destroying export %p/%s for %s\n", exp,
                exp->exp_client_uuid.uuid, obd->obd_name);
 
-        LASSERT(obd != NULL);
-
         /* "Local" exports (lctl, LOV->{mdc,osc}) have no connection. */
         if (exp->exp_connection)
                 ptlrpc_put_connection_superhack(exp->exp_connection);
@@ -726,7 +759,7 @@ static void class_export_destroy(struct obd_export *exp)
         LASSERT(cfs_list_empty(&exp->exp_outstanding_replies));
         LASSERT(cfs_list_empty(&exp->exp_uncommitted_replies));
         LASSERT(cfs_list_empty(&exp->exp_req_replay_queue));
-        LASSERT(cfs_list_empty(&exp->exp_queued_rpc));
+        LASSERT(cfs_list_empty(&exp->exp_hp_rpcs));
         obd_destroy_export(exp);
         class_decref(obd, "export", exp);
 
@@ -739,6 +772,11 @@ static void export_handle_addref(void *export)
         class_export_get(export);
 }
 
+static struct portals_handle_ops export_handle_ops = {
+       .hop_addref = export_handle_addref,
+       .hop_free   = NULL,
+};
+
 struct obd_export *class_export_get(struct obd_export *exp)
 {
         cfs_atomic_inc(&exp->exp_refcount);
@@ -751,15 +789,18 @@ EXPORT_SYMBOL(class_export_get);
 void class_export_put(struct obd_export *exp)
 {
         LASSERT(exp != NULL);
+        LASSERT_ATOMIC_GT_LT(&exp->exp_refcount, 0, LI_POISON);
         CDEBUG(D_INFO, "PUTting export %p : new refcount %d\n", exp,
                cfs_atomic_read(&exp->exp_refcount) - 1);
-        LASSERT(cfs_atomic_read(&exp->exp_refcount) > 0);
-        LASSERT(cfs_atomic_read(&exp->exp_refcount) < 0x5a5a5a);
 
         if (cfs_atomic_dec_and_test(&exp->exp_refcount)) {
                 LASSERT(!cfs_list_empty(&exp->exp_obd_chain));
                 CDEBUG(D_IOCTL, "final put %p/%s\n",
                        exp, exp->exp_client_uuid.uuid);
+
+                /* release nid stat refererence */
+                lprocfs_exp_cleanup(exp);
+
                 obd_zombie_export_add(exp);
         }
 }
@@ -782,6 +823,7 @@ struct obd_export *class_new_export(struct obd_device *obd,
 
         export->exp_conn_cnt = 0;
         export->exp_lock_hash = NULL;
+       export->exp_flock_hash = NULL;
         cfs_atomic_set(&export->exp_refcount, 2);
         cfs_atomic_set(&export->exp_rpc_count, 0);
         cfs_atomic_set(&export->exp_cb_count, 0);
@@ -797,13 +839,15 @@ struct obd_export *class_new_export(struct obd_device *obd,
         CFS_INIT_LIST_HEAD(&export->exp_uncommitted_replies);
         CFS_INIT_LIST_HEAD(&export->exp_req_replay_queue);
         CFS_INIT_LIST_HEAD(&export->exp_handle.h_link);
-        CFS_INIT_LIST_HEAD(&export->exp_queued_rpc);
-        class_handle_hash(&export->exp_handle, export_handle_addref);
-        export->exp_last_request_time = cfs_time_current_sec();
+        CFS_INIT_LIST_HEAD(&export->exp_hp_rpcs);
+       class_handle_hash(&export->exp_handle, &export_handle_ops);
+       export->exp_last_request_time = cfs_time_current_sec();
         cfs_spin_lock_init(&export->exp_lock);
         cfs_spin_lock_init(&export->exp_rpc_lock);
         CFS_INIT_HLIST_NODE(&export->exp_uuid_hash);
         CFS_INIT_HLIST_NODE(&export->exp_nid_hash);
+        cfs_spin_lock_init(&export->exp_bl_list_lock);
+        CFS_INIT_LIST_HEAD(&export->exp_bl_list);
 
         export->exp_sp_peer = LUSTRE_SP_ANY;
         export->exp_flvr.sf_rpc = SPTLRPC_FLVR_INVALID;
@@ -884,7 +928,7 @@ void class_import_destroy(struct obd_import *imp)
         CDEBUG(D_IOCTL, "destroying import %p for %s\n", imp,
                 imp->imp_obd->obd_name);
 
-        LASSERT(cfs_atomic_read(&imp->imp_refcount) == 0);
+        LASSERT_ATOMIC_ZERO(&imp->imp_refcount);
 
         ptlrpc_put_connection_superhack(imp->imp_connection);
 
@@ -909,10 +953,13 @@ static void import_handle_addref(void *import)
         class_import_get(import);
 }
 
+static struct portals_handle_ops import_handle_ops = {
+       .hop_addref = import_handle_addref,
+       .hop_free   = NULL,
+};
+
 struct obd_import *class_import_get(struct obd_import *import)
 {
-        LASSERT(cfs_atomic_read(&import->imp_refcount) >= 0);
-        LASSERT(cfs_atomic_read(&import->imp_refcount) < 0x5a5a5a);
         cfs_atomic_inc(&import->imp_refcount);
         CDEBUG(D_INFO, "import %p refcount=%d obd=%s\n", import,
                cfs_atomic_read(&import->imp_refcount),
@@ -925,9 +972,8 @@ void class_import_put(struct obd_import *imp)
 {
         ENTRY;
 
-        LASSERT(cfs_atomic_read(&imp->imp_refcount) > 0);
-        LASSERT(cfs_atomic_read(&imp->imp_refcount) < 0x5a5a5a);
         LASSERT(cfs_list_empty(&imp->imp_zombie_chain));
+        LASSERT_ATOMIC_GT_LT(&imp->imp_refcount, 0, LI_POISON);
 
         CDEBUG(D_INFO, "import %p refcount=%d obd=%s\n", imp,
                cfs_atomic_read(&imp->imp_refcount) - 1,
@@ -938,7 +984,9 @@ void class_import_put(struct obd_import *imp)
                 obd_zombie_import_add(imp);
         }
 
-        EXIT;
+       /* catch possible import put race */
+       LASSERT_ATOMIC_GE_LT(&imp->imp_refcount, 0, LI_POISON);
+       EXIT;
 }
 EXPORT_SYMBOL(class_import_put);
 
@@ -970,7 +1018,7 @@ struct obd_import *class_new_import(struct obd_device *obd)
         imp->imp_last_success_conn = 0;
         imp->imp_state = LUSTRE_IMP_NEW;
         imp->imp_obd = class_incref(obd, "import", imp);
-        cfs_sema_init(&imp->imp_sec_mutex, 1);
+        cfs_mutex_init(&imp->imp_sec_mutex);
         cfs_waitq_init(&imp->imp_recovery_waitq);
 
         cfs_atomic_set(&imp->imp_refcount, 2);
@@ -980,7 +1028,7 @@ struct obd_import *class_new_import(struct obd_device *obd)
         cfs_atomic_set(&imp->imp_inval_count, 0);
         CFS_INIT_LIST_HEAD(&imp->imp_conn_list);
         CFS_INIT_LIST_HEAD(&imp->imp_handle.h_link);
-        class_handle_hash(&imp->imp_handle, import_handle_addref);
+       class_handle_hash(&imp->imp_handle, &import_handle_ops);
         init_imp_at(&imp->imp_at);
 
         /* the default magic is V2, will be used in connect RPC, and
@@ -1086,8 +1134,8 @@ void class_export_recovery_cleanup(struct obd_export *exp)
                 cfs_spin_lock(&exp->exp_lock);
                 exp->exp_in_recovery = 0;
                 cfs_spin_unlock(&exp->exp_lock);
-                LASSERT(obd->obd_connected_clients);
-                obd->obd_connected_clients--;
+                LASSERT_ATOMIC_POS(&obd->obd_connected_clients);
+                cfs_atomic_dec(&obd->obd_connected_clients);
         }
         cfs_spin_unlock(&obd->obd_recovery_task_lock);
         /** Cleanup req replay fields */
@@ -1120,8 +1168,7 @@ int class_disconnect(struct obd_export *export)
         ENTRY;
 
         if (export == NULL) {
-                fixme();
-                CDEBUG(D_IOCTL, "attempting to free NULL export %p\n", export);
+                CWARN("attempting to free NULL export %p\n", export);
                 RETURN(-EINVAL);
         }
 
@@ -1152,6 +1199,7 @@ no_disconn:
         class_export_put(export);
         RETURN(0);
 }
+EXPORT_SYMBOL(class_disconnect);
 
 /* Return non-zero for a fully connected export */
 int class_connected_export(struct obd_export *exp)
@@ -1243,26 +1291,35 @@ void class_disconnect_stale_exports(struct obd_device *obd,
                                     int (*test_export)(struct obd_export *))
 {
         cfs_list_t work_list;
-        cfs_list_t *pos, *n;
-        struct obd_export *exp;
+       struct obd_export *exp, *n;
         int evicted = 0;
         ENTRY;
 
         CFS_INIT_LIST_HEAD(&work_list);
         cfs_spin_lock(&obd->obd_dev_lock);
-        cfs_list_for_each_safe(pos, n, &obd->obd_exports) {
-                exp = cfs_list_entry(pos, struct obd_export, exp_obd_chain);
-                if (test_export(exp))
-                        continue;
-
+       cfs_list_for_each_entry_safe(exp, n, &obd->obd_exports,
+                                    exp_obd_chain) {
                 /* don't count self-export as client */
                 if (obd_uuid_equals(&exp->exp_client_uuid,
                                     &exp->exp_obd->obd_uuid))
                         continue;
 
+               /* don't evict clients which have no slot in last_rcvd
+                * (e.g. lightweight connection) */
+               if (exp->exp_target_data.ted_lr_idx == -1)
+                       continue;
+
+               cfs_spin_lock(&exp->exp_lock);
+               if (test_export(exp)) {
+                       cfs_spin_unlock(&exp->exp_lock);
+                       continue;
+               }
+               exp->exp_failed = 1;
+               cfs_spin_unlock(&exp->exp_lock);
+
                 cfs_list_move(&exp->exp_obd_chain, &work_list);
                 evicted++;
-                CDEBUG(D_ERROR, "%s: disconnect stale client %s@%s\n",
+                CDEBUG(D_HA, "%s: disconnect stale client %s@%s\n",
                        obd->obd_name, exp->exp_client_uuid.uuid,
                        exp->exp_connection == NULL ? "<unknown>" :
                        libcfs_nid2str(exp->exp_connection->c_peer.nid));
@@ -1271,8 +1328,8 @@ void class_disconnect_stale_exports(struct obd_device *obd,
         cfs_spin_unlock(&obd->obd_dev_lock);
 
         if (evicted) {
-                CDEBUG(D_HA, "%s: disconnecting %d stale clients\n",
-                       obd->obd_name, evicted);
+                LCONSOLE_WARN("%s: disconnecting %d stale clients\n",
+                              obd->obd_name, evicted);
                 obd->obd_stale_clients += evicted;
         }
         class_disconnect_export_list(&work_list, exp_flags_from_obd(obd) |
@@ -1302,6 +1359,9 @@ void class_fail_export(struct obd_export *exp)
         if (obd_dump_on_timeout)
                 libcfs_debug_dumplog();
 
+       /* need for safe call CDEBUG after obd_disconnect */
+       class_export_get(exp);
+
         /* Most callers into obd_disconnect are removing their own reference
          * (request, for example) in addition to the one from the hash table.
          * We don't have such a reference here, so make one. */
@@ -1312,6 +1372,7 @@ void class_fail_export(struct obd_export *exp)
         else
                 CDEBUG(D_HA, "disconnected export %p/%s\n",
                        exp, exp->exp_client_uuid.uuid);
+       class_export_put(exp);
 }
 EXPORT_SYMBOL(class_fail_export);
 
@@ -1465,6 +1526,9 @@ void obd_exports_barrier(struct obd_device *obd)
 }
 EXPORT_SYMBOL(obd_exports_barrier);
 
+/* Total amount of zombies to be destroyed */
+static int zombies_count = 0;
+
 /**
  * kill zombie imports and exports
  */
@@ -1495,11 +1559,19 @@ void obd_zombie_impexp_cull(void)
 
                 cfs_spin_unlock(&obd_zombie_impexp_lock);
 
-                if (import != NULL)
+                if (import != NULL) {
                         class_import_destroy(import);
+                        cfs_spin_lock(&obd_zombie_impexp_lock);
+                        zombies_count--;
+                        cfs_spin_unlock(&obd_zombie_impexp_lock);
+                }
 
-                if (export != NULL)
+                if (export != NULL) {
                         class_export_destroy(export);
+                        cfs_spin_lock(&obd_zombie_impexp_lock);
+                        zombies_count--;
+                        cfs_spin_unlock(&obd_zombie_impexp_lock);
+                }
 
                 cfs_cond_resched();
         } while (import != NULL || export != NULL);
@@ -1524,10 +1596,8 @@ static int obd_zombie_impexp_check(void *arg)
         int rc;
 
         cfs_spin_lock(&obd_zombie_impexp_lock);
-        rc = cfs_list_empty(&obd_zombie_imports) &&
-             cfs_list_empty(&obd_zombie_exports) &&
+        rc = (zombies_count == 0) &&
              !cfs_test_bit(OBD_ZOMBIE_STOP, &obd_zombie_flags);
-
         cfs_spin_unlock(&obd_zombie_impexp_lock);
 
         RETURN(rc);
@@ -1542,11 +1612,11 @@ static void obd_zombie_export_add(struct obd_export *exp) {
         cfs_list_del_init(&exp->exp_obd_chain);
         cfs_spin_unlock(&exp->exp_obd->obd_dev_lock);
         cfs_spin_lock(&obd_zombie_impexp_lock);
+        zombies_count++;
         cfs_list_add(&exp->exp_obd_chain, &obd_zombie_exports);
         cfs_spin_unlock(&obd_zombie_impexp_lock);
 
-        if (obd_zombie_impexp_notify != NULL)
-                obd_zombie_impexp_notify();
+        obd_zombie_impexp_notify();
 }
 
 /**
@@ -1554,13 +1624,14 @@ static void obd_zombie_export_add(struct obd_export *exp) {
  */
 static void obd_zombie_import_add(struct obd_import *imp) {
         LASSERT(imp->imp_sec == NULL);
+        LASSERT(imp->imp_rq_pool == NULL);
         cfs_spin_lock(&obd_zombie_impexp_lock);
         LASSERT(cfs_list_empty(&imp->imp_zombie_chain));
+        zombies_count++;
         cfs_list_add(&imp->imp_zombie_chain, &obd_zombie_imports);
         cfs_spin_unlock(&obd_zombie_impexp_lock);
 
-        if (obd_zombie_impexp_notify != NULL)
-                obd_zombie_impexp_notify();
+        obd_zombie_impexp_notify();
 }
 
 /**
@@ -1568,7 +1639,12 @@ static void obd_zombie_import_add(struct obd_import *imp) {
  */
 static void obd_zombie_impexp_notify(void)
 {
-        cfs_waitq_signal(&obd_zombie_waitq);
+        /*
+         * Make sure obd_zomebie_impexp_thread get this notification.
+         * It is possible this signal only get by obd_zombie_barrier, and
+         * barrier gulps this notification and sleeps away and hangs ensues
+         */
+        cfs_waitq_broadcast(&obd_zombie_waitq);
 }
 
 /**
@@ -1580,8 +1656,7 @@ static int obd_zombie_is_idle(void)
 
         LASSERT(!cfs_test_bit(OBD_ZOMBIE_STOP, &obd_zombie_flags));
         cfs_spin_lock(&obd_zombie_impexp_lock);
-        rc = cfs_list_empty(&obd_zombie_imports) &&
-             cfs_list_empty(&obd_zombie_exports);
+        rc = (zombies_count == 0);
         cfs_spin_unlock(&obd_zombie_impexp_lock);
         return rc;
 }
@@ -1673,7 +1748,7 @@ int obd_zombie_impexp_init(void)
         obd_zombie_pid = 0;
 
 #ifdef __KERNEL__
-        rc = cfs_kernel_thread(obd_zombie_impexp_thread, NULL, 0);
+        rc = cfs_create_thread(obd_zombie_impexp_thread, NULL, 0);
         if (rc < 0)
                 RETURN(rc);
 
@@ -1706,3 +1781,70 @@ void obd_zombie_impexp_stop(void)
 #endif
 }
 
+/***** Kernel-userspace comm helpers *******/
+
+/* Get length of entire message, including header */
+int kuc_len(int payload_len)
+{
+        return sizeof(struct kuc_hdr) + payload_len;
+}
+EXPORT_SYMBOL(kuc_len);
+
+/* Get a pointer to kuc header, given a ptr to the payload
+ * @param p Pointer to payload area
+ * @returns Pointer to kuc header
+ */
+struct kuc_hdr * kuc_ptr(void *p)
+{
+        struct kuc_hdr *lh = ((struct kuc_hdr *)p) - 1;
+        LASSERT(lh->kuc_magic == KUC_MAGIC);
+        return lh;
+}
+EXPORT_SYMBOL(kuc_ptr);
+
+/* Test if payload is part of kuc message
+ * @param p Pointer to payload area
+ * @returns boolean
+ */
+int kuc_ispayload(void *p)
+{
+        struct kuc_hdr *kh = ((struct kuc_hdr *)p) - 1;
+
+        if (kh->kuc_magic == KUC_MAGIC)
+                return 1;
+        else
+                return 0;
+}
+EXPORT_SYMBOL(kuc_ispayload);
+
+/* Alloc space for a message, and fill in header
+ * @return Pointer to payload area
+ */
+void *kuc_alloc(int payload_len, int transport, int type)
+{
+        struct kuc_hdr *lh;
+        int len = kuc_len(payload_len);
+
+        OBD_ALLOC(lh, len);
+        if (lh == NULL)
+                return ERR_PTR(-ENOMEM);
+
+        lh->kuc_magic = KUC_MAGIC;
+        lh->kuc_transport = transport;
+        lh->kuc_msgtype = type;
+        lh->kuc_msglen = len;
+
+        return (void *)(lh + 1);
+}
+EXPORT_SYMBOL(kuc_alloc);
+
+/* Takes pointer to payload area */
+inline void kuc_free(void *p, int payload_len)
+{
+        struct kuc_hdr *lh = kuc_ptr(p);
+        OBD_FREE(lh, kuc_len(payload_len));
+}
+EXPORT_SYMBOL(kuc_free);
+
+
+