/* /proc/lustre/llite mount point registration */
struct proc_dir_entry *proc_lustre_fs_root;
struct file_operations llite_dump_pgcache_fops;
+struct file_operations ll_ra_stats_fops;
+struct file_operations llite_wait_times_fops;
+
#ifndef LPROCFS
int lprocfs_register_mountpoint(struct proc_dir_entry *parent,
struct ll_sb_info *sbi = ll_s2sbi(sb);
int readahead;
ENTRY;
-
- if (1 != sscanf(buffer, "%d", &readahead))
+
+ if (sscanf(buffer, "%d", &readahead) != 1)
RETURN(-EINVAL);
if (readahead)
struct ll_sb_info *sbi = ll_s2sbi(sb);
ENTRY;
+ CWARN("Starting a LOV/OST update !\n");
RETURN(ll_process_config_update(sbi, 0));
}
unsigned val;
spin_lock(&sbi->ll_lock);
- val = (sbi->ll_max_read_ahead_pages << PAGE_CACHE_SHIFT) >> 20;
+ val = (sbi->ll_ra_info.ra_max_pages << PAGE_CACHE_SHIFT) >> 20;
spin_unlock(&sbi->ll_lock);
return snprintf(page, count, "%u\n", val);
return -ERANGE;
spin_lock(&sbi->ll_lock);
- sbi->ll_max_read_ahead_pages = (val << 20) >> PAGE_CACHE_SHIFT;
+ sbi->ll_ra_info.ra_max_pages = (val << 20) >> PAGE_CACHE_SHIFT;
spin_unlock(&sbi->ll_lock);
return count;
char name[MAX_STRING_SIZE + 1];
int err, id;
struct lprocfs_stats *svc_stats = NULL;
+ struct proc_dir_entry *mdc_symlink, *osc_symlink;
struct proc_dir_entry *entry;
ENTRY;
entry->proc_fops = &llite_dump_pgcache_fops;
entry->data = sbi;
+ entry = create_proc_entry("wait_times", 0444, sbi->ll_proc_root);
+ if (entry == NULL)
+ GOTO(out, err = -ENOMEM);
+ entry->proc_fops = &llite_wait_times_fops;
+ entry->data = sbi;
+
+ entry = create_proc_entry("read_ahead_stats", 0444, sbi->ll_proc_root);
+ if (entry == NULL)
+ GOTO(out, err = -ENOMEM);
+ entry->proc_fops = &ll_ra_stats_fops;
+ entry->data = sbi;
+
svc_stats = lprocfs_alloc_stats(LPROC_LL_FILE_OPCODES);
if (svc_stats == NULL) {
err = -ENOMEM;
LASSERT(obd->obd_type != NULL);
LASSERT(obd->obd_type->typ_name != NULL);
- snprintf(name, MAX_STRING_SIZE, "%s/common_name",
- obd->obd_type->typ_name);
- lvars[0].read_fptr = lprocfs_rd_name;
- err = lprocfs_add_vars(sbi->ll_proc_root, lvars, obd);
- if (err)
- goto out;
-
- snprintf(name, MAX_STRING_SIZE, "%s/uuid", obd->obd_type->typ_name);
- lvars[0].read_fptr = lprocfs_rd_uuid;
- err = lprocfs_add_vars(sbi->ll_proc_root, lvars, obd);
- if (err)
+ snprintf(name, MAX_STRING_SIZE, "../../%s/%s",
+ obd->obd_type->typ_name, obd->obd_name);
+ mdc_symlink = proc_symlink(obd->obd_type->typ_name, sbi->ll_proc_root,
+ name);
+ if (mdc_symlink == NULL) {
+ err = -ENOMEM;
goto out;
+ }
/* OSC */
obd = class_name2obd(osc);
LASSERT(obd->obd_type != NULL);
LASSERT(obd->obd_type->typ_name != NULL);
- snprintf(name, MAX_STRING_SIZE, "%s/common_name",
- obd->obd_type->typ_name);
- lvars[0].read_fptr = lprocfs_rd_name;
- err = lprocfs_add_vars(sbi->ll_proc_root, lvars, obd);
- if (err)
- goto out;
+ snprintf(name, MAX_STRING_SIZE, "../../%s/%s",
+ obd->obd_type->typ_name, obd->obd_name);
+ osc_symlink = proc_symlink(obd->obd_type->typ_name, sbi->ll_proc_root,
+ name);
+ if (osc_symlink == NULL)
+ err = -ENOMEM;
+
- snprintf(name, MAX_STRING_SIZE, "%s/uuid", obd->obd_type->typ_name);
- lvars[0].read_fptr = lprocfs_rd_uuid;
- err = lprocfs_add_vars(sbi->ll_proc_root, lvars, obd);
out:
if (err) {
if (svc_stats)
.read = seq_read,
.release = llite_dump_pgcache_seq_release,
};
+static int ll_ra_stats_seq_show(struct seq_file *seq, void *v)
+{
+ struct timeval now;
+ struct ll_sb_info *sbi = seq->private;
+ struct ll_ra_info *ra = &sbi->ll_ra_info;
+ int i;
+ static char *ra_stat_strings[] = {
+ [RA_STAT_HIT] = "hits",
+ [RA_STAT_MISS] = "misses",
+ [RA_STAT_DISTANT_READPAGE] = "readpage not consecutive",
+ [RA_STAT_MISS_IN_WINDOW] = "miss inside window",
+ [RA_STAT_FAILED_MATCH] = "failed lock match",
+ [RA_STAT_DISCARDED] = "read but discarded",
+ [RA_STAT_ZERO_LEN] = "zero length file",
+ [RA_STAT_ZERO_WINDOW] = "zero size window",
+ [RA_STAT_EOF] = "read-ahead to EOF",
+ [RA_STAT_MAX_IN_FLIGHT] = "hit max r-a issue",
+ };
+
+ do_gettimeofday(&now);
+
+ spin_lock(&sbi->ll_lock);
+
+ seq_printf(seq, "snapshot_time: %lu:%lu (secs:usecs)\n",
+ now.tv_sec, now.tv_usec);
+ seq_printf(seq, "pending issued pages: %lu\n",
+ ra->ra_cur_pages);
+
+ for(i = 0; i < _NR_RA_STAT; i++)
+ seq_printf(seq, "%-25s %lu\n", ra_stat_strings[i],
+ ra->ra_stats[i]);
+
+ spin_unlock(&sbi->ll_lock);
+
+ return 0;
+}
+
+static void *ll_ra_stats_seq_start(struct seq_file *p, loff_t *pos)
+{
+ if (*pos == 0)
+ return (void *)1;
+ return NULL;
+}
+static void *ll_ra_stats_seq_next(struct seq_file *p, void *v, loff_t *pos)
+{
+ ++*pos;
+ return NULL;
+}
+static void ll_ra_stats_seq_stop(struct seq_file *p, void *v)
+{
+}
+struct seq_operations ll_ra_stats_seq_sops = {
+ .start = ll_ra_stats_seq_start,
+ .stop = ll_ra_stats_seq_stop,
+ .next = ll_ra_stats_seq_next,
+ .show = ll_ra_stats_seq_show,
+};
+
+static int ll_ra_stats_seq_open(struct inode *inode, struct file *file)
+{
+ struct proc_dir_entry *dp = PDE(inode);
+ struct seq_file *seq;
+ int rc;
+
+ rc = seq_open(file, &ll_ra_stats_seq_sops);
+ if (rc)
+ return rc;
+ seq = file->private_data;
+ seq->private = dp->data;
+ return 0;
+}
+
+static ssize_t ll_ra_stats_seq_write(struct file *file, const char *buf,
+ size_t len, loff_t *off)
+{
+ struct seq_file *seq = file->private_data;
+ struct ll_sb_info *sbi = seq->private;
+ struct ll_ra_info *ra = &sbi->ll_ra_info;
+
+ spin_lock(&sbi->ll_lock);
+ memset(ra->ra_stats, 0, sizeof(ra->ra_stats));
+ spin_unlock(&sbi->ll_lock);
+
+ return len;
+}
+
+struct file_operations ll_ra_stats_fops = {
+ .owner = THIS_MODULE,
+ .open = ll_ra_stats_seq_open,
+ .read = seq_read,
+ .write = ll_ra_stats_seq_write,
+ .llseek = seq_lseek,
+ .release = seq_release,
+};
+
+#define PRINTF_STIME(stime) (unsigned long)(stime)->st_num, \
+ lprocfs_stime_avg_ms(stime), lprocfs_stime_avg_us(stime)
+
+static int llite_wait_times_seq_show(struct seq_file *seq, void *v)
+{
+ struct ll_sb_info *sbi = seq->private;
+ struct timeval now;
+
+ do_gettimeofday(&now);
+
+ spin_lock(&sbi->ll_lock);
+
+ seq_printf(seq, "snapshot_time: %lu:%lu (secs:usecs)\n\n",
+ now.tv_sec, now.tv_usec);
+
+ seq_printf(seq, "lock wait times: (num, average ms)\n");
+ seq_printf(seq, "\tread\t%lu\t%lu.%04lu\n",
+ PRINTF_STIME(&sbi->ll_read_stime));
+ seq_printf(seq, "\twrite\t%lu\t%lu.%04lu\n",
+ PRINTF_STIME(&sbi->ll_write_stime));
+ seq_printf(seq, "\tgroup\t%lu\t%lu.%04lu\n",
+ PRINTF_STIME(&sbi->ll_grouplock_stime));
+ seq_printf(seq, "\tseek\t%lu\t%lu.%04lu\n",
+ PRINTF_STIME(&sbi->ll_seek_stime));
+ seq_printf(seq, "\tsetattr\t%lu\t%lu.%04lu\n\n",
+ PRINTF_STIME(&sbi->ll_setattr_stime));
+
+ seq_printf(seq, "io path wait times: (num, average ms)\n");
+ seq_printf(seq, "\tll_brw\t%lu\t%lu.%04lu\n",
+ PRINTF_STIME(&sbi->ll_brw_stime));
+#if 0
+ seq_printf(seq, "\tdone\t%lu\t%lu.%04lu\n",
+ PRINTF_STIME(&sbi->ll_done_stime));
+#endif
+
+ spin_unlock(&sbi->ll_lock);
+
+ return 0;
+}
+#undef pct
+
+static void *llite_wait_times_seq_start(struct seq_file *p, loff_t *pos)
+{
+ if (*pos == 0)
+ return (void *)1;
+ return NULL;
+}
+static void *llite_wait_times_seq_next(struct seq_file *p, void *v, loff_t *pos)
+{
+ ++*pos;
+ return NULL;
+}
+static void llite_wait_times_seq_stop(struct seq_file *p, void *v)
+{
+}
+struct seq_operations llite_wait_times_seq_sops = {
+ .start = llite_wait_times_seq_start,
+ .stop = llite_wait_times_seq_stop,
+ .next = llite_wait_times_seq_next,
+ .show = llite_wait_times_seq_show,
+};
+
+static int llite_wait_times_seq_open(struct inode *inode, struct file *file)
+{
+ struct proc_dir_entry *dp = PDE(inode);
+ struct seq_file *seq;
+ int rc;
+
+ rc = seq_open(file, &llite_wait_times_seq_sops);
+ if (rc)
+ return rc;
+ seq = file->private_data;
+ seq->private = dp->data;
+ return 0;
+}
+
+static ssize_t llite_wait_times_seq_write(struct file *file, const char *buf,
+ size_t len, loff_t *off)
+{
+ struct seq_file *seq = file->private_data;
+ struct ll_sb_info *sbi = seq->private;
+
+ spin_lock(&sbi->ll_lock);
+ memset(&sbi->ll_read_stime, 0, sizeof(sbi->ll_read_stime));
+ memset(&sbi->ll_write_stime, 0, sizeof(sbi->ll_write_stime));
+ memset(&sbi->ll_grouplock_stime, 0, sizeof(sbi->ll_grouplock_stime));
+ memset(&sbi->ll_seek_stime, 0, sizeof(sbi->ll_seek_stime));
+ memset(&sbi->ll_setattr_stime, 0, sizeof(sbi->ll_setattr_stime));
+ memset(&sbi->ll_brw_stime, 0, sizeof(sbi->ll_brw_stime));
+// memset(&sbi->ll_done_stime, 0, sizeof(sbi->ll_done_stime));
+ spin_unlock(&sbi->ll_lock);
+
+ return len;
+}
+
+struct file_operations llite_wait_times_fops = {
+ .owner = THIS_MODULE,
+ .open = llite_wait_times_seq_open,
+ .read = seq_read,
+ .write = llite_wait_times_seq_write,
+ .llseek = seq_lseek,
+ .release = seq_release,
+};
#endif /* LPROCFS */
git://git.whamcloud.com / fs / lustre-release.git / blobdiff