LU-3556 osd-ldiskfs: remove dependency on mdd module

[fs/lustre-release.git] / lustre / obdclass / class_obd.c

diff --git a/lustre/obdclass/class_obd.c b/lustre/obdclass/class_obd.c
index d7f6050..af29d35 100644 (file)
--- a/lustre/obdclass/class_obd.c
+++ b/lustre/obdclass/class_obd.c
@@ -27,7 +27,7 @@
  * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, Whamcloud, Inc.
+ * Copyright (c) 2011, 2012, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -48,6 +48,11 @@
 #include <lprocfs_status.h>
 #include <lustre/lustre_build_version.h>
 #include <libcfs/list.h>
+#include <cl_object.h>
+#ifdef HAVE_SERVER_SUPPORT
+# include <dt_object.h>
+# include <md_object.h>
+#endif /* HAVE_SERVER_SUPPORT */
 #include "llog_internal.h"
 
 #ifndef __KERNEL__
@@ -60,14 +65,17 @@ EXPORT_SYMBOL(obd_devs);
 cfs_list_t obd_types;
 DEFINE_RWLOCK(obd_dev_lock);
 
-#ifndef __KERNEL__
 __u64 obd_max_pages = 0;
 __u64 obd_max_alloc = 0;
+#ifndef __KERNEL__
 __u64 obd_alloc;
 __u64 obd_pages;
 #endif
+DEFINE_SPINLOCK(obd_updatemax_lock);
 
 /* The following are visible and mutable through /proc/sys/lustre/. */
+unsigned int obd_alloc_fail_rate = 0;
+EXPORT_SYMBOL(obd_alloc_fail_rate);
 unsigned int obd_debug_peer_on_timeout;
 EXPORT_SYMBOL(obd_debug_peer_on_timeout);
 unsigned int obd_dump_on_timeout;
@@ -162,6 +170,27 @@ int lustre_get_jobid(char *jobid)
 }
 EXPORT_SYMBOL(lustre_get_jobid);
 
+int obd_alloc_fail(const void *ptr, const char *name, const char *type,
+                  size_t size, const char *file, int line)
+{
+       if (ptr == NULL ||
+           (cfs_rand() & OBD_ALLOC_FAIL_MASK) < obd_alloc_fail_rate) {
+               CERROR("%s%salloc of %s ("LPU64" bytes) failed at %s:%d\n",
+                      ptr ? "force " :"", type, name, (__u64)size, file,
+                      line);
+               CERROR(LPU64" total bytes and "LPU64" total pages "
+                      "("LPU64" bytes) allocated by Lustre, "
+                      "%d total bytes by LNET\n",
+                      obd_memory_sum(),
+                      obd_pages_sum() << PAGE_CACHE_SHIFT,
+                      obd_pages_sum(),
+                       cfs_atomic_read(&libcfs_kmemory));
+               return 1;
+       }
+       return 0;
+}
+EXPORT_SYMBOL(obd_alloc_fail);
+
 static inline void obd_data2conn(struct lustre_handle *conn,
                                  struct obd_ioctl_data *data)
 {
@@ -239,7 +268,7 @@ int class_handle_ioctl(unsigned int cmd, unsigned long arg)
                 OBD_ALLOC(lcfg, data->ioc_plen1);
                 if (lcfg == NULL)
                         GOTO(out, err = -ENOMEM);
-                err = cfs_copy_from_user(lcfg, data->ioc_pbuf1,
+               err = copy_from_user(lcfg, data->ioc_pbuf1,
                                          data->ioc_plen1);
                 if (!err)
                         err = lustre_cfg_sanity_check(lcfg, data->ioc_plen1);
@@ -485,9 +514,9 @@ int obd_init_checks(void)
                 CWARN("LPD64 wrong length! strlen(%s)=%d != 2\n", buf, len);
                 ret = -EINVAL;
         }
-        if ((u64val & ~CFS_PAGE_MASK) >= CFS_PAGE_SIZE) {
+       if ((u64val & ~CFS_PAGE_MASK) >= PAGE_CACHE_SIZE) {
                 CWARN("mask failed: u64val "LPU64" >= "LPU64"\n", u64val,
-                      (__u64)CFS_PAGE_SIZE);
+                     (__u64)PAGE_CACHE_SIZE);
                 ret = -EINVAL;
         }
 
@@ -559,10 +588,10 @@ int init_obdclass(void)
         /* Default the dirty page cache cap to 1/2 of system memory.
          * For clients with less memory, a larger fraction is needed
          * for other purposes (mostly for BGL). */
-        if (cfs_num_physpages <= 512 << (20 - CFS_PAGE_SHIFT))
-                obd_max_dirty_pages = cfs_num_physpages / 4;
-        else
-                obd_max_dirty_pages = cfs_num_physpages / 2;
+       if (num_physpages <= 512 << (20 - PAGE_CACHE_SHIFT))
+               obd_max_dirty_pages = num_physpages / 4;
+       else
+               obd_max_dirty_pages = num_physpages / 2;
 
         err = obd_init_caches();
         if (err)
@@ -573,9 +602,27 @@ int init_obdclass(void)
                 return err;
 #endif
 
-        err = lu_global_init();
-        if (err)
-                return err;
+       err = lu_global_init();
+       if (err)
+               return err;
+
+       err = lu_capainfo_init();
+       if (err)
+               return err;
+
+       err = cl_global_init();
+       if (err != 0)
+               return err;
+
+#if defined(__KERNEL__) && defined(HAVE_SERVER_SUPPORT)
+       err = dt_global_init();
+       if (err != 0)
+               return err;
+
+       err = lu_ucred_global_init();
+       if (err != 0)
+               return err;
+#endif
 
        err = llog_info_init();
        if (err)
@@ -588,6 +635,48 @@ int init_obdclass(void)
         return err;
 }
 
+void obd_update_maxusage(void)
+{
+       __u64 max1, max2;
+
+       max1 = obd_pages_sum();
+       max2 = obd_memory_sum();
+
+       spin_lock(&obd_updatemax_lock);
+       if (max1 > obd_max_pages)
+               obd_max_pages = max1;
+       if (max2 > obd_max_alloc)
+               obd_max_alloc = max2;
+       spin_unlock(&obd_updatemax_lock);
+}
+EXPORT_SYMBOL(obd_update_maxusage);
+
+#ifdef LPROCFS
+__u64 obd_memory_max(void)
+{
+       __u64 ret;
+
+       spin_lock(&obd_updatemax_lock);
+       ret = obd_max_alloc;
+       spin_unlock(&obd_updatemax_lock);
+
+       return ret;
+}
+EXPORT_SYMBOL(obd_memory_max);
+
+__u64 obd_pages_max(void)
+{
+       __u64 ret;
+
+       spin_lock(&obd_updatemax_lock);
+       ret = obd_max_pages;
+       spin_unlock(&obd_updatemax_lock);
+
+       return ret;
+}
+EXPORT_SYMBOL(obd_pages_max);
+#endif
+
 /* liblustre doesn't call cleanup_obdclass, apparently.  we carry on in this
  * ifdef to the end of the file to cover module and versioning goo.*/
 #ifdef __KERNEL__
@@ -612,7 +701,13 @@ static void cleanup_obdclass(void)
                 }
         }
        llog_info_fini();
-        lu_global_fini();
+#ifdef HAVE_SERVER_SUPPORT
+       lu_ucred_global_fini();
+       dt_global_fini();
+#endif
+       cl_global_fini();
+       lu_capainfo_fini();
+       lu_global_fini();
 
         obd_cleanup_caches();
         obd_sysctl_clean();