X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmdd%2Fmdd_lproc.c;h=f04a2cbfe4be94b91373043f4733e97c519c1b76;hb=dfa318a29b8fe708468989d67ac6928a42bec72d;hp=b291ffdbdc76c1ea5e0cf53ce9b723c6d233ee38;hpb=2104ed0f0da3651f0cb4ab0c78a1037891d7cb4f;p=fs%2Flustre-release.git

diff --git a/lustre/mdd/mdd_lproc.c b/lustre/mdd/mdd_lproc.c
index b291ffd..f04a2cb 100644
--- a/lustre/mdd/mdd_lproc.c
+++ b/lustre/mdd/mdd_lproc.c
@@ -15,11 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
@@ -27,7 +23,7 @@
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, 2014, Intel Corporation.
+ * Copyright (c) 2012, 2017, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -55,20 +51,12 @@ mdd_atime_diff_seq_write(struct file *file, const char __user *buffer,
 {
 	struct seq_file *m = file->private_data;
 	struct mdd_device *mdd = m->private;
-	char kernbuf[20], *end;
-	unsigned long diff = 0;
-
-        if (count > (sizeof(kernbuf) - 1))
-                return -EINVAL;
-
-	if (copy_from_user(kernbuf, buffer, count))
-                return -EFAULT;
-
-        kernbuf[count] = '\0';
+	time64_t diff = 0;
+	int rc;
 
-        diff = simple_strtoul(kernbuf, &end, 0);
-        if (kernbuf == end)
-                return -EINVAL;
+	rc = kstrtoll_from_user(buffer, count, 0, &diff);
+	if (rc)
+		return rc;
 
         mdd->mdd_atime_diff = diff;
         return count;
@@ -78,7 +66,7 @@ static int mdd_atime_diff_seq_show(struct seq_file *m, void *data)
 {
 	struct mdd_device *mdd = m->private;
 
-	seq_printf(m, "%lu\n", mdd->mdd_atime_diff);
+	seq_printf(m, "%lld\n", mdd->mdd_atime_diff);
 	return 0;
 }
 LPROC_SEQ_FOPS(mdd_atime_diff);
@@ -94,6 +82,7 @@ static int mdd_changelog_mask_seq_show(struct seq_file *m, void *data)
 			seq_printf(m, "%s ", changelog_type2str(i));
 		i++;
 	}
+	seq_putc(m, '\n');
 	return 0;
 }
 
@@ -137,8 +126,9 @@ static int lprocfs_changelog_users_cb(const struct lu_env *env,
 
 	rec = (struct llog_changelog_user_rec *)hdr;
 
-	seq_printf(m, CHANGELOG_USER_PREFIX"%-3d "LPU64"\n",
-		   rec->cur_id, rec->cur_endrec);
+	seq_printf(m, CHANGELOG_USER_PREFIX"%-3d %llu (%u)\n",
+		   rec->cur_id, rec->cur_endrec, (__u32)get_seconds() -
+						 rec->cur_time);
 	return 0;
 }
 
@@ -166,8 +156,8 @@ static int mdd_changelog_users_seq_show(struct seq_file *m, void *data)
 	cur = mdd->mdd_cl.mc_index;
 	spin_unlock(&mdd->mdd_cl.mc_lock);
 
-	seq_printf(m, "current index: "LPU64"\n", cur);
-	seq_printf(m, "%-5s %s\n", "ID", "index");
+	seq_printf(m, "current index: %llu\n", cur);
+	seq_printf(m, "%-5s %s %s\n", "ID", "index", "(idle seconds)");
 
 	llog_cat_process(&env, ctxt->loc_handle, lprocfs_changelog_users_cb,
 			 m, 0, 0);
@@ -223,12 +213,215 @@ static int mdd_changelog_size_seq_show(struct seq_file *m, void *data)
 	rc = mdd_changelog_size_ctxt(&env, mdd, LLOG_CHANGELOG_USER_ORIG_CTXT,
 				     &tmp);
 
-	seq_printf(m, LPU64"\n", tmp);
+	seq_printf(m, "%llu\n", tmp);
 	lu_env_fini(&env);
 	return rc;
 }
 LPROC_SEQ_FOPS_RO(mdd_changelog_size);
 
+static int mdd_changelog_gc_seq_show(struct seq_file *m, void *data)
+{
+	struct mdd_device *mdd = m->private;
+
+	LASSERT(mdd != NULL);
+	seq_printf(m, "%u\n", mdd->mdd_changelog_gc);
+	return 0;
+}
+
+static ssize_t
+mdd_changelog_gc_seq_write(struct file *file, const char __user *buffer,
+			   size_t count, loff_t *off)
+{
+	struct seq_file *m = file->private_data;
+	struct mdd_device *mdd = m->private;
+	bool val;
+	int rc;
+
+	LASSERT(mdd != NULL);
+	rc = kstrtobool_from_user(buffer, count, &val);
+	if (rc)
+		return rc;
+
+	mdd->mdd_changelog_gc = val;
+
+	return count;
+}
+LPROC_SEQ_FOPS(mdd_changelog_gc);
+
+static int mdd_changelog_max_idle_time_seq_show(struct seq_file *m, void *data)
+{
+	struct mdd_device *mdd = m->private;
+
+	LASSERT(mdd != NULL);
+	seq_printf(m, "%lld\n", mdd->mdd_changelog_max_idle_time);
+	return 0;
+}
+
+static ssize_t
+mdd_changelog_max_idle_time_seq_write(struct file *file,
+				      const char __user *buffer, size_t count,
+				      loff_t *off)
+{
+	struct seq_file *m = file->private_data;
+	struct mdd_device *mdd = m->private;
+	time64_t val;
+	int rc;
+
+	LASSERT(mdd != NULL);
+
+	rc = kstrtoll_from_user(buffer, count, 0, &val);
+	if (rc)
+		return rc;
+
+	/* XXX may need to limit with reasonable elapsed/idle times */
+	if (val < 1)
+		return -ERANGE;
+
+	mdd->mdd_changelog_max_idle_time = val;
+
+	return count;
+}
+LPROC_SEQ_FOPS(mdd_changelog_max_idle_time);
+
+static int mdd_changelog_max_idle_indexes_seq_show(struct seq_file *m,
+						   void *data)
+{
+	struct mdd_device *mdd = m->private;
+
+	LASSERT(mdd != NULL);
+	seq_printf(m, "%lu\n", mdd->mdd_changelog_max_idle_indexes);
+	return 0;
+}
+
+static ssize_t
+mdd_changelog_max_idle_indexes_seq_write(struct file *file,
+					 const char __user *buffer,
+					 size_t count, loff_t *off)
+{
+	struct seq_file *m = file->private_data;
+	struct mdd_device *mdd = m->private;
+	unsigned long val;
+	int rc;
+
+	LASSERT(mdd != NULL);
+	rc = kstrtoul_from_user(buffer, count, 0, &val);
+	if (rc)
+		return rc;
+
+	/* XXX may need to limit/check with reasonable elapsed/idle indexes */
+	/* XXX may better allow to specify a % of full ChangeLogs */
+
+	mdd->mdd_changelog_max_idle_indexes = val;
+
+	return count;
+}
+LPROC_SEQ_FOPS(mdd_changelog_max_idle_indexes);
+
+static int mdd_changelog_min_gc_interval_seq_show(struct seq_file *m,
+						  void *data)
+{
+	struct mdd_device *mdd = m->private;
+
+	LASSERT(mdd != NULL);
+	seq_printf(m, "%lld\n", mdd->mdd_changelog_min_gc_interval);
+	return 0;
+}
+
+static ssize_t
+mdd_changelog_min_gc_interval_seq_write(struct file *file,
+					const char __user *buffer,
+					size_t count, loff_t *off)
+{
+	struct seq_file *m = file->private_data;
+	struct mdd_device *mdd = m->private;
+	time64_t val;
+	int rc;
+
+	LASSERT(mdd != NULL);
+	rc = kstrtoll_from_user(buffer, count, 0, &val);
+	if (rc)
+		return rc;
+
+	/* XXX may need to limit with reasonable elapsed/interval times */
+	if (val < 1)
+		return -ERANGE;
+
+	mdd->mdd_changelog_min_gc_interval = val;
+
+	return count;
+}
+LPROC_SEQ_FOPS(mdd_changelog_min_gc_interval);
+
+static int mdd_changelog_min_free_cat_entries_seq_show(struct seq_file *m,
+						       void *data)
+{
+	struct mdd_device *mdd = m->private;
+
+	LASSERT(mdd != NULL);
+	seq_printf(m, "%u\n", mdd->mdd_changelog_min_free_cat_entries);
+	return 0;
+}
+
+static ssize_t
+mdd_changelog_min_free_cat_entries_seq_write(struct file *file,
+					     const char __user *buffer,
+					     size_t count, loff_t *off)
+{
+	struct seq_file *m = file->private_data;
+	struct mdd_device *mdd = m->private;
+	unsigned int val;
+	int rc;
+
+	LASSERT(mdd != NULL);
+	rc = kstrtouint_from_user(buffer, count, 0, &val);
+	if (rc)
+		return rc;
+
+	/* XXX may need to limit with more reasonable number of free entries */
+	if (val < 1)
+		return -ERANGE;
+
+	mdd->mdd_changelog_min_free_cat_entries = val;
+
+	return count;
+}
+LPROC_SEQ_FOPS(mdd_changelog_min_free_cat_entries);
+
+static int mdd_changelog_deniednext_seq_show(struct seq_file *m, void *data)
+{
+	struct mdd_device *mdd = m->private;
+
+	seq_printf(m, "%u\n", mdd->mdd_cl.mc_deniednext);
+	return 0;
+}
+
+static ssize_t
+mdd_changelog_deniednext_seq_write(struct file *file, const char __user *buffer,
+				   size_t count, loff_t *off)
+{
+	struct seq_file *m = file->private_data;
+	struct mdd_device *mdd = m->private;
+	char kernbuf[11];
+	unsigned int time = 0;
+	int rc;
+
+	if (count > (sizeof(kernbuf) - 1))
+		return -EINVAL;
+
+	if (copy_from_user(kernbuf, buffer, count))
+		return -EFAULT;
+
+	kernbuf[count] = '\0';
+
+	rc = kstrtoul(kernbuf, 0, (unsigned long int *)&time);
+	if (rc)
+		return rc;
+
+	mdd->mdd_cl.mc_deniednext = time;
+	return count;
+}
+LPROC_SEQ_FOPS(mdd_changelog_deniednext);
+
 static int mdd_sync_perm_seq_show(struct seq_file *m, void *data)
 {
 	struct mdd_device *mdd = m->private;
@@ -244,15 +437,15 @@ mdd_sync_perm_seq_write(struct file *file, const char __user *buffer,
 {
 	struct seq_file *m = file->private_data;
 	struct mdd_device *mdd = m->private;
+	bool val;
 	int rc;
-	__s64 val;
 
 	LASSERT(mdd != NULL);
-	rc = lprocfs_str_to_s64(buffer, count, &val);
+	rc = kstrtobool_from_user(buffer, count, &val);
 	if (rc)
 		return rc;
 
-	mdd->mdd_sync_permission = !!val;
+	mdd->mdd_sync_permission = val;
 
 	return count;
 }
@@ -272,15 +465,13 @@ mdd_lfsck_speed_limit_seq_write(struct file *file, const char __user *buffer,
 {
 	struct seq_file *m = file->private_data;
 	struct mdd_device *mdd = m->private;
-	__s64 val;
+	unsigned int val;
 	int rc;
 
 	LASSERT(mdd != NULL);
-	rc = lprocfs_str_to_s64(buffer, count, &val);
+	rc = kstrtouint_from_user(buffer, count, 0, &val);
 	if (rc != 0)
 		return rc;
-	if (val < 0 || val > INT_MAX)
-		return -ERANGE;
 
 	rc = lfsck_set_speed(mdd->mdd_bottom, val);
 	return rc != 0 ? rc : count;
@@ -299,17 +490,15 @@ static ssize_t
 mdd_lfsck_async_windows_seq_write(struct file *file, const char __user *buffer,
 				  size_t count, loff_t *off)
 {
-	struct seq_file   *m = file->private_data;
+	struct seq_file *m = file->private_data;
 	struct mdd_device *mdd = m->private;
-	__s64		   val;
-	int		   rc;
+	unsigned int val;
+	int rc;
 
 	LASSERT(mdd != NULL);
-	rc = lprocfs_str_to_s64(buffer, count, &val);
+	rc = kstrtouint_from_user(buffer, count, 0, &val);
 	if (rc)
 		return rc;
-	if (val < 0 || val > INT_MAX)
-		return -ERANGE;
 
 	rc = lfsck_set_windows(mdd->mdd_bottom, val);
 
@@ -346,6 +535,18 @@ static struct lprocfs_vars lprocfs_mdd_obd_vars[] = {
 	  .fops =	&mdd_changelog_users_fops	},
 	{ .name =	"changelog_size",
 	  .fops =	&mdd_changelog_size_fops	},
+	{ .name =	"changelog_gc",
+	  .fops =	&mdd_changelog_gc_fops		},
+	{ .name =	"changelog_max_idle_time",
+	  .fops =	&mdd_changelog_max_idle_time_fops	},
+	{ .name =	"changelog_max_idle_indexes",
+	  .fops =	&mdd_changelog_max_idle_indexes_fops	},
+	{ .name =	"changelog_min_gc_interval",
+	  .fops =	&mdd_changelog_min_gc_interval_fops	},
+	{ .name =	"changelog_min_free_cat_entries",
+	  .fops =	&mdd_changelog_min_free_cat_entries_fops	},
+	{ .name =	"changelog_deniednext",
+	  .fops =	&mdd_changelog_deniednext_fops	},
 	{ .name =	"sync_permission",
 	  .fops =	&mdd_sync_perm_fops		},
 	{ .name =	"lfsck_speed_limit",