X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fofd%2Flproc_ofd.c;h=089271abe9d63ffeee2b3352788d67ae698c313c;hb=1e8f6cf5131bedcd44bf4f7bd2c10c7e23069cc1;hp=e806a61d0aec0f6322fa4d3b327c36dbe360765b;hpb=0aae1984fb496449d6011ad09f967d71a0af0279;p=fs%2Flustre-release.git

diff --git a/lustre/ofd/lproc_ofd.c b/lustre/ofd/lproc_ofd.c
index e806a61..089271a 100644
--- a/lustre/ofd/lproc_ofd.c
+++ b/lustre/ofd/lproc_ofd.c
@@ -27,7 +27,7 @@
  * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2012, Whamcloud, Inc.
+ * Copyright (c) 2012, 2013, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -46,28 +46,159 @@
 
 #ifdef LPROCFS
 
-static int lprocfs_ofd_rd_groups(char *page, char **start, off_t off,
-				 int count, int *eof, void *data)
+static int lprocfs_ofd_rd_seqs(char *page, char **start, off_t off,
+				int count, int *eof, void *data)
 {
 	struct obd_device *obd = (struct obd_device *)data;
 	struct ofd_device *ofd = ofd_dev(obd->obd_lu_dev);
 
 	*eof = 1;
-	return snprintf(page, count, "%u\n", ofd->ofd_max_group);
+	return snprintf(page, count, "%u\n", ofd->ofd_seq_count);
+}
+
+static int lprocfs_ofd_rd_tot_dirty(char *page, char **start, off_t off,
+				    int count, int *eof, void *data)
+{
+	struct obd_device *obd = (struct obd_device *)data;
+	struct ofd_device *ofd;
+
+	LASSERT(obd != NULL);
+	ofd = ofd_dev(obd->obd_lu_dev);
+	*eof = 1;
+	return snprintf(page, count, LPU64"\n", ofd->ofd_tot_dirty);
+}
+
+static int lprocfs_ofd_rd_tot_granted(char *page, char **start, off_t off,
+				      int count, int *eof, void *data)
+{
+	struct obd_device *obd = (struct obd_device *)data;
+	struct ofd_device *ofd;
+
+	LASSERT(obd != NULL);
+	ofd = ofd_dev(obd->obd_lu_dev);
+	*eof = 1;
+	return snprintf(page, count, LPU64"\n", ofd->ofd_tot_granted);
+}
+
+static int lprocfs_ofd_rd_tot_pending(char *page, char **start, off_t off,
+				      int count, int *eof, void *data)
+{
+	struct obd_device *obd = (struct obd_device *)data;
+	struct ofd_device *ofd;
+
+	LASSERT(obd != NULL);
+	ofd = ofd_dev(obd->obd_lu_dev);
+	*eof = 1;
+	return snprintf(page, count, LPU64"\n", ofd->ofd_tot_pending);
+}
+
+static int lprocfs_ofd_rd_grant_precreate(char *page, char **start, off_t off,
+					  int count, int *eof, void *data)
+{
+	struct obd_device *obd = (struct obd_device *)data;
+
+	LASSERT(obd != NULL);
+	*eof = 1;
+	return snprintf(page, count, "%ld\n",
+			obd->obd_self_export->exp_filter_data.fed_grant);
+}
+
+static int lprocfs_ofd_rd_grant_ratio(char *page, char **start, off_t off,
+				      int count, int *eof, void *data)
+{
+	struct obd_device *obd = (struct obd_device *)data;
+	struct ofd_device *ofd;
+
+	LASSERT(obd != NULL);
+	ofd = ofd_dev(obd->obd_lu_dev);
+	*eof = 1;
+	return snprintf(page, count, "%d%%\n",
+			(int) ofd_grant_reserved(ofd, 100));
+}
+
+static int lprocfs_ofd_wr_grant_ratio(struct file *file, const char *buffer,
+				      unsigned long count, void *data)
+{
+	struct obd_device	*obd = (struct obd_device *)data;
+	struct ofd_device	*ofd = ofd_dev(obd->obd_lu_dev);
+	int			 val;
+	int			 rc;
+
+	rc = lprocfs_write_helper(buffer, count, &val);
+	if (rc)
+		return rc;
+
+	if (val > 100 || val < 0)
+		return -EINVAL;
+
+	if (val == 0)
+		CWARN("%s: disabling grant error margin\n", obd->obd_name);
+	if (val > 50)
+		CWARN("%s: setting grant error margin >50%%, be warned that "
+		      "a huge part of the free space is now reserved for "
+		      "grants\n", obd->obd_name);
+
+	spin_lock(&ofd->ofd_grant_lock);
+	ofd->ofd_grant_ratio = ofd_grant_ratio_conv(val);
+	spin_unlock(&ofd->ofd_grant_lock);
+	return count;
+}
+
+static int lprocfs_ofd_rd_precreate_batch(char *page, char **start, off_t off,
+					  int count, int *eof, void *data)
+{
+	struct obd_device *obd = (struct obd_device *)data;
+	struct ofd_device *ofd = ofd_dev(obd->obd_lu_dev);
+
+	LASSERT(obd != NULL);
+	*eof = 1;
+	return snprintf(page, count, "%d\n", ofd->ofd_precreate_batch);
+}
+
+static int lprocfs_ofd_wr_precreate_batch(struct file *file, const char *buffer,
+					  unsigned long count, void *data)
+{
+	struct obd_device *obd = (struct obd_device *)data;
+	struct ofd_device *ofd = ofd_dev(obd->obd_lu_dev);
+	int val;
+	int rc;
+
+	rc = lprocfs_write_helper(buffer, count, &val);
+	if (rc)
+		return rc;
+
+	if (val < 1)
+		return -EINVAL;
+
+	spin_lock(&ofd->ofd_batch_lock);
+	ofd->ofd_precreate_batch = val;
+	spin_unlock(&ofd->ofd_batch_lock);
+	return count;
 }
 
 static int lprocfs_ofd_rd_last_id(char *page, char **start, off_t off,
 				  int count, int *eof, void *data)
 {
 	struct obd_device	*obd = data;
-	struct ofd_device	*ofd = ofd_dev(obd->obd_lu_dev);
-	int			 retval = 0, rc, i;
+	struct ofd_device	*ofd;
+	struct ofd_seq		*oseq = NULL;
+	int			retval = 0, rc;
 
 	if (obd == NULL)
 		return 0;
 
-	for (i = FID_SEQ_OST_MDT0; i <= ofd->ofd_max_group; i++) {
-		rc = snprintf(page, count, LPU64"\n", ofd_last_id(ofd, i));
+	ofd = ofd_dev(obd->obd_lu_dev);
+
+	read_lock(&ofd->ofd_seq_list_lock);
+	cfs_list_for_each_entry(oseq, &ofd->ofd_seq_list, os_list) {
+		__u64 seq;
+
+		seq = ostid_seq(&oseq->os_oi) == 0 ?
+		      fid_idif_seq(ostid_id(&oseq->os_oi),
+				   ofd->ofd_lut.lut_lsd.lsd_osd_index) :
+		      ostid_seq(&oseq->os_oi);
+		rc = snprintf(page, count, DOSTID"\n", seq,
+			      ostid_id(&oseq->os_oi));
 		if (rc < 0) {
 			retval = rc;
 			break;
@@ -76,9 +207,70 @@ static int lprocfs_ofd_rd_last_id(char *page, char **start, off_t off,
 		count -= rc;
 		retval += rc;
 	}
+	read_unlock(&ofd->ofd_seq_list_lock);
 	return retval;
 }
 
+int lprocfs_ofd_rd_fmd_max_num(char *page, char **start, off_t off,
+			       int count, int *eof, void *data)
+{
+	struct obd_device	*obd = data;
+	struct ofd_device	*ofd = ofd_dev(obd->obd_lu_dev);
+	int			 rc;
+
+	rc = snprintf(page, count, "%u\n", ofd->ofd_fmd_max_num);
+	return rc;
+}
+
+int lprocfs_ofd_wr_fmd_max_num(struct file *file, const char *buffer,
+			       unsigned long count, void *data)
+{
+	struct obd_device	*obd = data;
+	struct ofd_device	*ofd = ofd_dev(obd->obd_lu_dev);
+	int			 val;
+	int			 rc;
+
+	rc = lprocfs_write_helper(buffer, count, &val);
+	if (rc)
+		return rc;
+
+	if (val > 65536 || val < 1)
+		return -EINVAL;
+
+	ofd->ofd_fmd_max_num = val;
+	return count;
+}
+
+int lprocfs_ofd_rd_fmd_max_age(char *page, char **start, off_t off,
+			       int count, int *eof, void *data)
+{
+	struct obd_device	*obd = data;
+	struct ofd_device	*ofd = ofd_dev(obd->obd_lu_dev);
+	int			 rc;
+
+	rc = snprintf(page, count, "%ld\n", ofd->ofd_fmd_max_age / HZ);
+	return rc;
+}
+
+int lprocfs_ofd_wr_fmd_max_age(struct file *file, const char *buffer,
+			       unsigned long count, void *data)
+{
+	struct obd_device	*obd = data;
+	struct ofd_device	*ofd = ofd_dev(obd->obd_lu_dev);
+	int			 val;
+	int			 rc;
+
+	rc = lprocfs_write_helper(buffer, count, &val);
+	if (rc)
+		return rc;
+
+	if (val > 65536 || val < 1)
+		return -EINVAL;
+
+	ofd->ofd_fmd_max_age = val * HZ;
+	return count;
+}
+
 static int lprocfs_ofd_rd_capa(char *page, char **start, off_t off,
 			       int count, int *eof, void *data)
 {
@@ -141,9 +333,9 @@ int lprocfs_ofd_wr_degraded(struct file *file, const char *buffer,
 	if (rc)
 		return rc;
 
-	cfs_spin_lock(&ofd->ofd_flags_lock);
+	spin_lock(&ofd->ofd_flags_lock);
 	ofd->ofd_raid_degraded = !!val;
-	cfs_spin_unlock(&ofd->ofd_flags_lock);
+	spin_unlock(&ofd->ofd_flags_lock);
 
 	return count;
 }
@@ -187,10 +379,10 @@ int lprocfs_ofd_wr_syncjournal(struct file *file, const char *buffer,
 	if (val < 0)
 		return -EINVAL;
 
-	cfs_spin_lock(&ofd->ofd_flags_lock);
+	spin_lock(&ofd->ofd_flags_lock);
 	ofd->ofd_syncjournal = !!val;
 	ofd_slc_set(ofd);
-	cfs_spin_unlock(&ofd->ofd_flags_lock);
+	spin_unlock(&ofd->ofd_flags_lock);
 
 	return count;
 }
@@ -237,9 +429,42 @@ int lprocfs_ofd_wr_sync_lock_cancel(struct file *file, const char *buffer,
 	if (val < 0 || val > 2)
 		return -EINVAL;
 
-	cfs_spin_lock(&ofd->ofd_flags_lock);
+	spin_lock(&ofd->ofd_flags_lock);
 	ofd->ofd_sync_lock_cancel = val;
-	cfs_spin_unlock(&ofd->ofd_flags_lock);
+	spin_unlock(&ofd->ofd_flags_lock);
+	return count;
+}
+
+int lprocfs_ofd_rd_grant_compat_disable(char *page, char **start, off_t off,
+					int count, int *eof, void *data)
+{
+	struct obd_device	*obd = data;
+	struct ofd_device	*ofd = ofd_dev(obd->obd_lu_dev);
+	int			 rc;
+
+	rc = snprintf(page, count, "%u\n", ofd->ofd_grant_compat_disable);
+	return rc;
+}
+
+int lprocfs_ofd_wr_grant_compat_disable(struct file *file, const char *buffer,
+					unsigned long count, void *data)
+{
+	struct obd_device	*obd = data;
+	struct ofd_device	*ofd = ofd_dev(obd->obd_lu_dev);
+	int			 val;
+	int			 rc;
+
+	rc = lprocfs_write_helper(buffer, count, &val);
+	if (rc)
+		return rc;
+
+	if (val < 0)
+		return -EINVAL;
+
+	spin_lock(&ofd->ofd_flags_lock);
+	ofd->ofd_grant_compat_disable = !!val;
+	spin_unlock(&ofd->ofd_flags_lock);
+
 	return count;
 }
 
@@ -251,9 +476,17 @@ static struct lprocfs_vars lprocfs_ofd_obd_vars[] = {
 	{ "kbytesavail",	 lprocfs_rd_kbytesavail, 0, 0 },
 	{ "filestotal",		 lprocfs_rd_filestotal, 0, 0 },
 	{ "filesfree",		 lprocfs_rd_filesfree, 0, 0 },
-	{ "filegroups",		 lprocfs_ofd_rd_groups, 0, 0 },
+	{ "seqs_allocated",	 lprocfs_ofd_rd_seqs, 0, 0 },
 	{ "fstype",		 lprocfs_ofd_rd_fstype, 0, 0 },
 	{ "last_id",		 lprocfs_ofd_rd_last_id, 0, 0 },
+	{ "tot_dirty",		 lprocfs_ofd_rd_tot_dirty,   0, 0 },
+	{ "tot_pending",	 lprocfs_ofd_rd_tot_pending, 0, 0 },
+	{ "tot_granted",	 lprocfs_ofd_rd_tot_granted, 0, 0 },
+	{ "grant_precreate",	 lprocfs_ofd_rd_grant_precreate, 0, 0 },
+	{ "grant_ratio",	 lprocfs_ofd_rd_grant_ratio,
+				 lprocfs_ofd_wr_grant_ratio, 0, 0 },
+	{ "precreate_batch",	 lprocfs_ofd_rd_precreate_batch,
+				 lprocfs_ofd_wr_precreate_batch, 0 },
 	{ "recovery_status",	 lprocfs_obd_rd_recovery_status, 0, 0 },
 	{ "recovery_time_soft",	 lprocfs_obd_rd_recovery_time_soft,
 				 lprocfs_obd_wr_recovery_time_soft, 0},
@@ -271,9 +504,17 @@ static struct lprocfs_vars lprocfs_ofd_obd_vars[] = {
 	{ "instance",		 lprocfs_target_rd_instance, 0 },
 	{ "ir_factor",		 lprocfs_obd_rd_ir_factor,
 				 lprocfs_obd_wr_ir_factor, 0},
+	{ "grant_compat_disable", lprocfs_ofd_rd_grant_compat_disable,
+				  lprocfs_ofd_wr_grant_compat_disable, 0 },
+	{ "client_cache_count",	 lprocfs_ofd_rd_fmd_max_num,
+				 lprocfs_ofd_wr_fmd_max_num, 0 },
+	{ "client_cache_seconds", lprocfs_ofd_rd_fmd_max_age,
+				  lprocfs_ofd_wr_fmd_max_age, 0 },
 	{ "capa",		 lprocfs_ofd_rd_capa,
 				 lprocfs_ofd_wr_capa, 0 },
 	{ "capa_count",		 lprocfs_ofd_rd_capa_count, 0, 0 },
+	{ "job_cleanup_interval", lprocfs_rd_job_interval,
+				  lprocfs_wr_job_interval, 0},
 	{ 0 }
 };
 
@@ -282,150 +523,24 @@ static struct lprocfs_vars lprocfs_ofd_module_vars[] = {
 	{ 0 }
 };
 
-#define pct(a,b) (b ? a * 100 / b : 0)
-
-static void display_brw_stats(struct seq_file *seq, char *name, char *units,
-			      struct obd_histogram *read,
-			      struct obd_histogram *write, int log2)
-{
-	unsigned long	read_tot, write_tot, r, w, read_cum = 0, write_cum = 0;
-	int		i;
-
-	seq_printf(seq, "\n%26s read      |     write\n", " ");
-	seq_printf(seq, "%-22s %-5s %% cum %% |  %-5s %% cum %%\n",
-		   name, units, units);
-
-	read_tot = lprocfs_oh_sum(read);
-	write_tot = lprocfs_oh_sum(write);
-	for (i = 0; i < OBD_HIST_MAX; i++) {
-		r = read->oh_buckets[i];
-		w = write->oh_buckets[i];
-		read_cum += r;
-		write_cum += w;
-		if (read_cum == 0 && write_cum == 0)
-			continue;
-
-		if (!log2)
-			seq_printf(seq, "%u", i);
-		else if (i < 10)
-			seq_printf(seq, "%u", 1 << i);
-		else if (i < 20)
-			seq_printf(seq, "%uK", 1 << (i - 10));
-		else
-			seq_printf(seq, "%uM", 1 << (i - 20));
-
-		seq_printf(seq, ":\t\t%10lu %3lu %3lu   | %4lu %3lu %3lu\n",
-			   r, pct(r, read_tot), pct(read_cum, read_tot),
-			   w, pct(w, write_tot), pct(write_cum, write_tot));
-
-		if (read_cum == read_tot && write_cum == write_tot)
-			break;
-	}
-}
-
-static void brw_stats_show(struct seq_file *seq, struct brw_stats *brw_stats)
-{
-	struct timeval	now;
-	char		title[24];
-
-	/* this sampling races with updates */
-	cfs_gettimeofday(&now);
-	seq_printf(seq, "snapshot_time:         %lu.%lu (secs.usecs)\n",
-		   now.tv_sec, now.tv_usec);
-
-	display_brw_stats(seq, "pages per bulk r/w", "rpcs",
-			  &brw_stats->hist[BRW_R_PAGES],
-			  &brw_stats->hist[BRW_W_PAGES], 1);
-
-	display_brw_stats(seq, "discontiguous pages", "rpcs",
-			  &brw_stats->hist[BRW_R_DISCONT_PAGES],
-			  &brw_stats->hist[BRW_W_DISCONT_PAGES], 0);
-
-	display_brw_stats(seq, "discontiguous blocks", "rpcs",
-			  &brw_stats->hist[BRW_R_DISCONT_BLOCKS],
-			  &brw_stats->hist[BRW_W_DISCONT_BLOCKS], 0);
-
-	display_brw_stats(seq, "disk fragmented I/Os", "ios",
-			  &brw_stats->hist[BRW_R_DIO_FRAGS],
-			  &brw_stats->hist[BRW_W_DIO_FRAGS], 0);
-
-	display_brw_stats(seq, "disk I/Os in flight", "ios",
-			  &brw_stats->hist[BRW_R_RPC_HIST],
-			  &brw_stats->hist[BRW_W_RPC_HIST], 0);
-
-	sprintf(title, "I/O time (1/%ds)", CFS_HZ);
-	display_brw_stats(seq, title, "ios",
-			  &brw_stats->hist[BRW_R_IO_TIME],
-			  &brw_stats->hist[BRW_W_IO_TIME], 1);
-
-	display_brw_stats(seq, "disk I/O size", "ios",
-			  &brw_stats->hist[BRW_R_DISK_IOSIZE],
-			  &brw_stats->hist[BRW_W_DISK_IOSIZE], 1);
-}
-
-#undef pct
-
-static int ofd_brw_stats_seq_show(struct seq_file *seq, void *v)
-{
-	struct obd_device *dev = seq->private;
-	struct filter_obd *ofd = &dev->u.filter;
-
-	brw_stats_show(seq, &ofd->fo_filter_stats);
-
-	return 0;
-}
-
-static ssize_t ofd_brw_stats_seq_write(struct file *file, const char *buf,
-				       size_t len, loff_t *off)
-{
-	struct seq_file		*seq = file->private_data;
-	struct obd_device	*dev = seq->private;
-	struct filter_obd	*ofd = &dev->u.filter;
-	int			 i;
-
-	for (i = 0; i < BRW_LAST; i++)
-		lprocfs_oh_clear(&ofd->fo_filter_stats.hist[i]);
-
-	return len;
-}
-
-LPROC_SEQ_FOPS(ofd_brw_stats);
-
-int lproc_ofd_attach_seqstat(struct obd_device *dev)
-{
-	return lprocfs_obd_seq_create(dev, "brw_stats", 0444,
-				      &ofd_brw_stats_fops, dev);
-}
-
 void lprocfs_ofd_init_vars(struct lprocfs_static_vars *lvars)
 {
 	lvars->module_vars  = lprocfs_ofd_module_vars;
 	lvars->obd_vars     = lprocfs_ofd_obd_vars;
 }
 
-static int ofd_per_nid_stats_seq_show(struct seq_file *seq, void *v)
+void ofd_stats_counter_init(struct lprocfs_stats *stats)
 {
-	nid_stat_t *stat = seq->private;
-
-	if (stat->nid_brw_stats)
-		brw_stats_show(seq, stat->nid_brw_stats);
-
-	return 0;
+	LASSERT(stats && stats->ls_num == LPROC_OFD_STATS_LAST);
+	lprocfs_counter_init(stats, LPROC_OFD_STATS_READ,
+			     LPROCFS_CNTR_AVGMINMAX, "read", "bytes");
+	lprocfs_counter_init(stats, LPROC_OFD_STATS_WRITE,
+			     LPROCFS_CNTR_AVGMINMAX, "write", "bytes");
+	lprocfs_counter_init(stats, LPROC_OFD_STATS_SETATTR,
+			     0, "setattr", "reqs");
+	lprocfs_counter_init(stats, LPROC_OFD_STATS_PUNCH,
+			     0, "punch", "reqs");
+	lprocfs_counter_init(stats, LPROC_OFD_STATS_SYNC,
+			     0, "sync", "reqs");
 }
-
-static ssize_t ofd_per_nid_stats_seq_write(struct file *file, const char *buf,
-					   size_t len, loff_t *off)
-{
-	struct seq_file	*seq = file->private_data;
-        nid_stat_t	*stat = seq->private;
-        int		 i;
-
-	if (stat->nid_brw_stats)
-		for (i = 0; i < BRW_LAST; i++)
-			lprocfs_oh_clear(&stat->nid_brw_stats->hist[i]);
-
-	return len;
-}
-
-LPROC_SEQ_FOPS(ofd_per_nid_stats);
 #endif /* LPROCFS */