X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftarget%2Ftgt_main.c;h=b767d1d3931940551b97a83a8c0c8c7892c80db2;hb=e763467ebe00913e8d03f855dc4b918b95099931;hp=4d3923723b2f19d3f9cbf0b6aa939461be79c4f0;hpb=5963af745b3aa14410d5ceb66f8a7b7d6aaf576a;p=fs%2Flustre-release.git

diff --git a/lustre/target/tgt_main.c b/lustre/target/tgt_main.c
index 4d39237..b767d1d 100644
--- a/lustre/target/tgt_main.c
+++ b/lustre/target/tgt_main.c
@@ -21,7 +21,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright (c) 2012, 2016, Intel Corporation.
+ * Copyright (c) 2012, 2017, Intel Corporation.
  */
 /*
  * lustre/target/tgt_main.c
@@ -152,6 +152,8 @@ int tgt_init(const struct lu_env *env, struct lu_target *lut,
 	struct lu_attr		 attr;
 	struct lu_fid		 fid;
 	struct dt_object	*o;
+	struct tg_grants_data	*tgd = &lut->lut_tgd;
+	struct obd_statfs	*osfs;
 	int i, rc = 0;
 
 	ENTRY;
@@ -188,6 +190,38 @@ int tgt_init(const struct lu_env *env, struct lu_target *lut,
 	if (!obd->obd_replayable)
 		RETURN(0);
 
+	/* initialize grant and statfs data in target */
+	dt_conf_get(env, lut->lut_bottom, &lut->lut_dt_conf);
+
+	/* statfs data */
+	spin_lock_init(&tgd->tgd_osfs_lock);
+	tgd->tgd_osfs_age = ktime_get_seconds() - 1000;
+	tgd->tgd_osfs_unstable = 0;
+	tgd->tgd_statfs_inflight = 0;
+	tgd->tgd_osfs_inflight = 0;
+
+	/* grant data */
+	spin_lock_init(&tgd->tgd_grant_lock);
+	tgd->tgd_tot_dirty = 0;
+	tgd->tgd_tot_granted = 0;
+	tgd->tgd_tot_pending = 0;
+	tgd->tgd_grant_compat_disable = 0;
+
+	/* populate cached statfs data */
+	osfs = &tgt_th_info(env)->tti_u.osfs;
+	rc = tgt_statfs_internal(env, lut, osfs, 0, NULL);
+	if (rc != 0) {
+		CERROR("%s: can't get statfs data, rc %d\n", tgt_name(lut),
+			rc);
+		GOTO(out, rc);
+	}
+	if (!is_power_of_2(osfs->os_bsize)) {
+		CERROR("%s: blocksize (%d) is not a power of 2\n",
+			tgt_name(lut), osfs->os_bsize);
+		GOTO(out, rc = -EPROTO);
+	}
+	tgd->tgd_blockbits = fls(osfs->os_bsize) - 1;
+
 	spin_lock_init(&lut->lut_translock);
 	spin_lock_init(&lut->lut_client_bitmap_lock);
 
@@ -218,7 +252,6 @@ int tgt_init(const struct lu_env *env, struct lu_target *lut,
 	/* prepare transactions callbacks */
 	lut->lut_txn_cb.dtc_txn_start = tgt_txn_start_cb;
 	lut->lut_txn_cb.dtc_txn_stop = tgt_txn_stop_cb;
-	lut->lut_txn_cb.dtc_txn_commit = NULL;
 	lut->lut_txn_cb.dtc_cookie = lut;
 	lut->lut_txn_cb.dtc_tag = LCT_DT_THREAD | LCT_MD_THREAD;
 	INIT_LIST_HEAD(&lut->lut_txn_cb.dtc_linkage);
@@ -338,8 +371,37 @@ void tgt_fini(const struct lu_env *env, struct lu_target *lut)
 }
 EXPORT_SYMBOL(tgt_fini);
 
+static struct kmem_cache *tgt_thread_kmem;
+static struct kmem_cache *tgt_session_kmem;
+static struct lu_kmem_descr tgt_caches[] = {
+	{
+		.ckd_cache = &tgt_thread_kmem,
+		.ckd_name  = "tgt_thread_kmem",
+		.ckd_size  = sizeof(struct tgt_thread_info),
+	},
+	{
+		.ckd_cache = &tgt_session_kmem,
+		.ckd_name  = "tgt_session_kmem",
+		.ckd_size  = sizeof(struct tgt_session_info)
+	},
+	{
+		.ckd_cache = NULL
+	}
+};
+
+
 /* context key constructor/destructor: tg_key_init, tg_key_fini */
-LU_KEY_INIT(tgt, struct tgt_thread_info);
+static void *tgt_key_init(const struct lu_context *ctx,
+				  struct lu_context_key *key)
+{
+	struct tgt_thread_info *thread;
+
+	OBD_SLAB_ALLOC_PTR_GFP(thread, tgt_thread_kmem, GFP_NOFS);
+	if (thread == NULL)
+		return ERR_PTR(-ENOMEM);
+
+	return thread;
+}
 
 static void tgt_key_fini(const struct lu_context *ctx,
 			 struct lu_context_key *key, void *data)
@@ -356,7 +418,7 @@ static void tgt_key_fini(const struct lu_context *ctx,
 	if (args->ta_args != NULL)
 		OBD_FREE(args->ta_args, sizeof(args->ta_args[0]) *
 					args->ta_alloc_args);
-	OBD_FREE_PTR(info);
+	OBD_SLAB_FREE_PTR(info, tgt_thread_kmem);
 }
 
 static void tgt_key_exit(const struct lu_context *ctx,
@@ -378,8 +440,25 @@ struct lu_context_key tgt_thread_key = {
 
 LU_KEY_INIT_GENERIC(tgt);
 
-/* context key constructor/destructor: tgt_ses_key_init, tgt_ses_key_fini */
-LU_KEY_INIT_FINI(tgt_ses, struct tgt_session_info);
+static void *tgt_ses_key_init(const struct lu_context *ctx,
+			      struct lu_context_key *key)
+{
+	struct tgt_session_info *session;
+
+	OBD_SLAB_ALLOC_PTR_GFP(session, tgt_session_kmem, GFP_NOFS);
+	if (session == NULL)
+		return ERR_PTR(-ENOMEM);
+
+	return session;
+}
+
+static void tgt_ses_key_fini(const struct lu_context *ctx,
+			     struct lu_context_key *key, void *data)
+{
+	struct tgt_session_info *session = data;
+
+	OBD_SLAB_FREE_PTR(session, tgt_session_kmem);
+}
 
 /* context key: tgt_session_key */
 struct lu_context_key tgt_session_key = {
@@ -402,8 +481,13 @@ struct page *tgt_page_to_corrupt;
 
 int tgt_mod_init(void)
 {
+	int	result;
 	ENTRY;
 
+	result = lu_kmem_init(tgt_caches);
+	if (result != 0)
+		RETURN(result);
+
 	tgt_page_to_corrupt = alloc_page(GFP_KERNEL);
 
 	tgt_key_init_generic(&tgt_thread_key, NULL);
@@ -427,5 +511,7 @@ void tgt_mod_exit(void)
 	lu_context_key_degister(&tgt_thread_key);
 	lu_context_key_degister(&tgt_session_key);
 	update_info_fini();
+
+	lu_kmem_fini(tgt_caches);
 }