Whamcloud - gitweb
LU-2622 obdclass: Remove the global cl_env list
[fs/lustre-release.git] / lustre / obdclass / cl_object.c
index 248ccce..1eb8e76 100644 (file)
@@ -27,7 +27,7 @@
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2012, Whamcloud, Inc.
+ * Copyright (c) 2011, 2012, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -58,9 +58,6 @@
 #include <lustre_fid.h>
 #include <libcfs/list.h>
 #include <libcfs/libcfs_hash.h> /* for cfs_hash stuff */
-/* lu_time_global_{init,fini}() */
-#include <lu_time.h>
-
 #include <cl_object.h>
 #include "cl_internal.h"
 
@@ -95,6 +92,7 @@ int cl_object_header_init(struct cl_object_header *h)
                 /* XXX hard coded GFP_* mask. */
                 INIT_RADIX_TREE(&h->coh_tree, GFP_ATOMIC);
                 CFS_INIT_LIST_HEAD(&h->coh_locks);
+               h->coh_page_bufsize = ALIGN(sizeof(struct cl_page), 8);
         }
         RETURN(result);
 }
@@ -389,34 +387,37 @@ EXPORT_SYMBOL(cl_object_has_locks);
 
 void cache_stats_init(struct cache_stats *cs, const char *name)
 {
+       int i;
+
         cs->cs_name = name;
-        cfs_atomic_set(&cs->cs_lookup, 0);
-        cfs_atomic_set(&cs->cs_hit,    0);
-        cfs_atomic_set(&cs->cs_total,  0);
-        cfs_atomic_set(&cs->cs_busy,   0);
+       for (i = 0; i < CS_NR; i++)
+               cfs_atomic_set(&cs->cs_stats[i], 0);
 }
 
 int cache_stats_print(const struct cache_stats *cs,
                       char *page, int count, int h)
 {
-        int nob = 0;
-/*
-       lookup    hit  total cached create
-  env: ...... ...... ...... ...... ......
-*/
-        if (h)
-                nob += snprintf(page, count,
-                                "       lookup    hit  total   busy create\n");
-
-        nob += snprintf(page + nob, count - nob,
-                        "%5.5s: %6u %6u %6u %6u %6u",
-                        cs->cs_name,
-                        cfs_atomic_read(&cs->cs_lookup),
-                        cfs_atomic_read(&cs->cs_hit),
-                        cfs_atomic_read(&cs->cs_total),
-                        cfs_atomic_read(&cs->cs_busy),
-                        cfs_atomic_read(&cs->cs_created));
-        return nob;
+       int nob = 0;
+       int i;
+       /*
+        *   lookup    hit    total  cached create
+        * env: ...... ...... ...... ...... ......
+        */
+       if (h) {
+               const char *names[CS_NR] = CS_NAMES;
+
+               nob += snprintf(page + nob, count - nob, "%6s", " ");
+               for (i = 0; i < CS_NR; i++)
+                       nob += snprintf(page + nob, count - nob,
+                                       "%8s", names[i]);
+               nob += snprintf(page + nob, count - nob, "\n");
+       }
+
+       nob += snprintf(page + nob, count - nob, "%5.5s:", cs->cs_name);
+       for (i = 0; i < CS_NR; i++)
+               nob += snprintf(page + nob, count - nob, "%8u",
+                               cfs_atomic_read(&cs->cs_stats[i]));
+       return nob;
 }
 
 /**
@@ -454,11 +455,7 @@ EXPORT_SYMBOL(cl_site_fini);
 
 static struct cache_stats cl_env_stats = {
         .cs_name    = "envs",
-        .cs_created = CFS_ATOMIC_INIT(0),
-        .cs_lookup  = CFS_ATOMIC_INIT(0),
-        .cs_hit     = CFS_ATOMIC_INIT(0),
-        .cs_total   = CFS_ATOMIC_INIT(0),
-        .cs_busy    = CFS_ATOMIC_INIT(0)
+       .cs_stats = { CFS_ATOMIC_INIT(0), }
 };
 
 /**
@@ -536,12 +533,6 @@ EXPORT_SYMBOL(cl_site_stats_print);
  * bz20044, bz22683.
  */
 
-static CFS_LIST_HEAD(cl_envs);
-static unsigned cl_envs_cached_nr  = 0;
-static unsigned cl_envs_cached_max = 128; /* XXX: prototype: arbitrary limit
-                                           * for now. */
-static DEFINE_SPINLOCK(cl_envs_guard);
-
 struct cl_env {
         void             *ce_magic;
         struct lu_env     ce_lu;
@@ -585,13 +576,17 @@ struct cl_env {
         void             *ce_debug;
 };
 
-#define CL_ENV_INC(counter) cfs_atomic_inc(&cl_env_stats.counter)
+#ifdef CONFIG_DEBUG_PAGESTATE_TRACKING
+#define CL_ENV_INC(counter) cfs_atomic_inc(&cl_env_stats.cs_stats[CS_##counter])
 
-#define CL_ENV_DEC(counter)                                             \
-        do {                                                            \
-                LASSERT(cfs_atomic_read(&cl_env_stats.counter) > 0);    \
-                cfs_atomic_dec(&cl_env_stats.counter);                  \
-        } while (0)
+#define CL_ENV_DEC(counter) do {                                              \
+       LASSERT(cfs_atomic_read(&cl_env_stats.cs_stats[CS_##counter]) > 0);   \
+       cfs_atomic_dec(&cl_env_stats.cs_stats[CS_##counter]);                 \
+} while (0)
+#else
+#define CL_ENV_INC(counter)
+#define CL_ENV_DEC(counter)
+#endif
 
 static void cl_env_init0(struct cl_env *cle, void *debug)
 {
@@ -601,7 +596,7 @@ static void cl_env_init0(struct cl_env *cle, void *debug)
 
         cle->ce_ref = 1;
         cle->ce_debug = debug;
-        CL_ENV_INC(cs_busy);
+        CL_ENV_INC(busy);
 }
 
 
@@ -776,8 +771,8 @@ static struct lu_env *cl_env_new(__u32 ctx_tags, __u32 ses_tags, void *debug)
                         OBD_SLAB_FREE_PTR(cle, cl_env_kmem);
                         env = ERR_PTR(rc);
                 } else {
-                        CL_ENV_INC(cs_created);
-                        CL_ENV_INC(cs_total);
+                        CL_ENV_INC(create);
+                        CL_ENV_INC(total);
                 }
         } else
                 env = ERR_PTR(-ENOMEM);
@@ -786,46 +781,12 @@ static struct lu_env *cl_env_new(__u32 ctx_tags, __u32 ses_tags, void *debug)
 
 static void cl_env_fini(struct cl_env *cle)
 {
-        CL_ENV_DEC(cs_total);
+        CL_ENV_DEC(total);
         lu_context_fini(&cle->ce_lu.le_ctx);
         lu_context_fini(&cle->ce_ses);
         OBD_SLAB_FREE_PTR(cle, cl_env_kmem);
 }
 
-static struct lu_env *cl_env_obtain(void *debug)
-{
-       struct cl_env *cle;
-       struct lu_env *env;
-
-       ENTRY;
-       spin_lock(&cl_envs_guard);
-       LASSERT(equi(cl_envs_cached_nr == 0, cfs_list_empty(&cl_envs)));
-       if (cl_envs_cached_nr > 0) {
-               int rc;
-
-               cle = container_of(cl_envs.next, struct cl_env, ce_linkage);
-               cfs_list_del_init(&cle->ce_linkage);
-               cl_envs_cached_nr--;
-               spin_unlock(&cl_envs_guard);
-
-                env = &cle->ce_lu;
-                rc = lu_env_refill(env);
-                if (rc == 0) {
-                        cl_env_init0(cle, debug);
-                        lu_context_enter(&env->le_ctx);
-                        lu_context_enter(&cle->ce_ses);
-                } else {
-                        cl_env_fini(cle);
-                        env = ERR_PTR(rc);
-                }
-        } else {
-               spin_unlock(&cl_envs_guard);
-               env = cl_env_new(lu_context_tags_default,
-                                lu_session_tags_default, debug);
-       }
-       RETURN(env);
-}
-
 static inline struct cl_env *cl_env_container(struct lu_env *env)
 {
         return container_of(env, struct cl_env, ce_lu);
@@ -836,7 +797,7 @@ struct lu_env *cl_env_peek(int *refcheck)
         struct lu_env *env;
         struct cl_env *cle;
 
-        CL_ENV_INC(cs_lookup);
+        CL_ENV_INC(lookup);
 
         /* check that we don't go far from untrusted pointer */
         CLASSERT(offsetof(struct cl_env, ce_magic) == 0);
@@ -844,7 +805,7 @@ struct lu_env *cl_env_peek(int *refcheck)
         env = NULL;
         cle = cl_env_fetch();
         if (cle != NULL) {
-                CL_ENV_INC(cs_hit);
+                CL_ENV_INC(hit);
                 env = &cle->ce_lu;
                 *refcheck = ++cle->ce_ref;
         }
@@ -857,8 +818,6 @@ EXPORT_SYMBOL(cl_env_peek);
  * Returns lu_env: if there already is an environment associated with the
  * current thread, it is returned, otherwise, new environment is allocated.
  *
- * Allocations are amortized through the global cache of environments.
- *
  * \param refcheck pointer to a counter used to detect environment leaks. In
  * the usual case cl_env_get() and cl_env_put() are called in the same lexical
  * scope and pointer to the same integer is passed as \a refcheck. This is
@@ -872,7 +831,10 @@ struct lu_env *cl_env_get(int *refcheck)
 
         env = cl_env_peek(refcheck);
         if (env == NULL) {
-                env = cl_env_obtain(__builtin_return_address(0));
+               env = cl_env_new(lu_context_tags_default,
+                                lu_session_tags_default,
+                                __builtin_return_address(0));
+
                 if (!IS_ERR(env)) {
                         struct cl_env *cle;
 
@@ -916,33 +878,6 @@ static void cl_env_exit(struct cl_env *cle)
 }
 
 /**
- * Finalizes and frees a given number of cached environments. This is done to
- * (1) free some memory (not currently hooked into VM), or (2) release
- * references to modules.
- */
-unsigned cl_env_cache_purge(unsigned nr)
-{
-       struct cl_env *cle;
-
-       ENTRY;
-       spin_lock(&cl_envs_guard);
-       for (; !cfs_list_empty(&cl_envs) && nr > 0; --nr) {
-               cle = container_of(cl_envs.next, struct cl_env, ce_linkage);
-               cfs_list_del_init(&cle->ce_linkage);
-               LASSERT(cl_envs_cached_nr > 0);
-               cl_envs_cached_nr--;
-               spin_unlock(&cl_envs_guard);
-
-               cl_env_fini(cle);
-               spin_lock(&cl_envs_guard);
-       }
-       LASSERT(equi(cl_envs_cached_nr == 0, cfs_list_empty(&cl_envs)));
-       spin_unlock(&cl_envs_guard);
-       RETURN(nr);
-}
-EXPORT_SYMBOL(cl_env_cache_purge);
-
-/**
  * Release an environment.
  *
  * Decrement \a env reference counter. When counter drops to 0, nothing in
@@ -960,25 +895,11 @@ void cl_env_put(struct lu_env *env, int *refcheck)
 
         CDEBUG(D_OTHER, "%d@%p\n", cle->ce_ref, cle);
         if (--cle->ce_ref == 0) {
-                CL_ENV_DEC(cs_busy);
+                CL_ENV_DEC(busy);
                 cl_env_detach(cle);
                 cle->ce_debug = NULL;
                 cl_env_exit(cle);
-                /*
-                 * Don't bother to take a lock here.
-                 *
-                 * Return environment to the cache only when it was allocated
-                 * with the standard tags.
-                 */
-                if (cl_envs_cached_nr < cl_envs_cached_max &&
-                    (env->le_ctx.lc_tags & ~LCT_HAS_EXIT) == LCT_CL_THREAD &&
-                    (env->le_ses->lc_tags & ~LCT_HAS_EXIT) == LCT_SESSION) {
-                       spin_lock(&cl_envs_guard);
-                       cfs_list_add(&cle->ce_linkage, &cl_envs);
-                       cl_envs_cached_nr++;
-                       spin_unlock(&cl_envs_guard);
-               } else
-                       cl_env_fini(cle);
+               cl_env_fini(cle);
        }
 }
 EXPORT_SYMBOL(cl_env_put);