X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fobdfilter%2Flproc_obdfilter.c;h=0bd3a80e915b2cb51e87abaf5edffc1b46ad45dc;hb=2dc9c16e770415d56839e1996015fec5fab93f29;hp=308b8f294f8e9319ff8992e7299c089df391f13c;hpb=c5050e412572b00cbe93d8517d2d1f767bebfa92;p=fs%2Flustre-release.git diff --git a/lustre/obdfilter/lproc_obdfilter.c b/lustre/obdfilter/lproc_obdfilter.c index 308b8f2..0bd3a80 100644 --- a/lustre/obdfilter/lproc_obdfilter.c +++ b/lustre/obdfilter/lproc_obdfilter.c @@ -24,6 +24,8 @@ #include #include #include +#include +#include #include "filter_internal.h" @@ -32,10 +34,49 @@ static struct lprocfs_vars lprocfs_obd_vars[] = { {0} }; static struct lprocfs_vars lprocfs_module_vars[] = { {0} }; #else +static int lprocfs_filter_rd_groups(char *page, char **start, off_t off, + int count, int *eof, void *data) +{ + struct obd_device *obd = (struct obd_device *)data; + + *eof = 1; + return snprintf(page, count, "%u\n", obd->u.filter.fo_group_count); +} + +static int lprocfs_filter_rd_tot_dirty(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, LPU64"\n", obd->u.filter.fo_tot_dirty); +} + +static int lprocfs_filter_rd_tot_granted(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, LPU64"\n", obd->u.filter.fo_tot_granted); +} + +static int lprocfs_filter_rd_tot_pending(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, LPU64"\n", obd->u.filter.fo_tot_pending); +} + static int lprocfs_filter_rd_mntdev(char *page, char **start, off_t off, int count, int *eof, void *data) { - struct obd_device* obd = (struct obd_device *)data; + struct obd_device *obd = (struct obd_device *)data; LASSERT(obd != NULL); LASSERT(obd->u.filter.fo_vfsmnt->mnt_devname); @@ -48,12 +89,49 @@ static int lprocfs_filter_rd_last_id(char *page, char **start, off_t off, int count, int *eof, void *data) { struct obd_device *obd = data; + struct filter_obd *filter = &obd->u.filter; + int retval = 0, rc, i; if (obd == NULL) return 0; - return snprintf(page, count, LPU64"\n", - filter_last_id(&obd->u.filter, 0)); + for (i = 1; i < filter->fo_group_count; i++) { + rc = snprintf(page, count, LPU64"\n",filter_last_id(filter, i)); + if (rc < 0) { + retval = rc; + break; + } + page += rc; + count -= rc; + retval += rc; + } + return retval; +} + +int lprocfs_filter_rd_readcache(char *page, char **start, off_t off, int count, + int *eof, void *data) +{ + struct obd_device *obd = data; + int rc; + + rc = snprintf(page, count, LPU64"\n", + obd->u.filter.fo_readcache_max_filesize); + return rc; +} + +int lprocfs_filter_wr_readcache(struct file *file, const char *buffer, + unsigned long count, void *data) +{ + struct obd_device *obd = data; + __u64 val; + int rc; + + rc = lprocfs_write_u64_helper(buffer, count, &val); + if (rc) + return rc; + + obd->u.filter.fo_readcache_max_filesize = val; + return count; } static struct lprocfs_vars lprocfs_obd_vars[] = { @@ -61,12 +139,20 @@ static struct lprocfs_vars lprocfs_obd_vars[] = { { "blocksize", lprocfs_rd_blksize, 0, 0 }, { "kbytestotal", lprocfs_rd_kbytestotal, 0, 0 }, { "kbytesfree", lprocfs_rd_kbytesfree, 0, 0 }, + { "kbytesavail", lprocfs_rd_kbytesavail, 0, 0 }, { "filestotal", lprocfs_rd_filestotal, 0, 0 }, { "filesfree", lprocfs_rd_filesfree, 0, 0 }, - //{ "filegroups", lprocfs_rd_filegroups, 0, 0 }, + { "filegroups", lprocfs_filter_rd_groups, 0, 0 }, { "fstype", lprocfs_rd_fstype, 0, 0 }, { "mntdev", lprocfs_filter_rd_mntdev, 0, 0 }, - { "last_id", lprocfs_filter_rd_last_id, 0, 0 }, + { "last_id", lprocfs_filter_rd_last_id,0, 0 }, + { "tot_dirty", lprocfs_filter_rd_tot_dirty, 0, 0 }, + { "tot_pending", lprocfs_filter_rd_tot_pending, 0, 0 }, + { "tot_granted", lprocfs_filter_rd_tot_granted, 0, 0 }, + { "num_exports", lprocfs_rd_num_exports, 0, 0 }, + { "readcache_max_filesize", + lprocfs_filter_rd_readcache, + lprocfs_filter_wr_readcache, 0 }, { 0 } }; @@ -75,5 +161,229 @@ static struct lprocfs_vars lprocfs_module_vars[] = { { 0 } }; +void filter_tally_write(struct filter_obd *filter, struct page **pages, + int nr_pages, unsigned long *blocks, int blocks_per_page) +{ + struct page *last_page = NULL; + unsigned long *last_block = NULL; + unsigned long discont_pages = 0; + unsigned long discont_blocks = 0; + int i; + + if (nr_pages == 0) + return; + + lprocfs_oh_tally_log2(&filter->fo_w_pages, nr_pages); + + while (nr_pages-- > 0) { + if (last_page && (*pages)->index != (last_page->index + 1)) + discont_pages++; + last_page = *pages; + pages++; + for (i = 0; i < blocks_per_page; i++) { + if (last_block && *blocks != (*last_block + 1)) + discont_blocks++; + last_block = blocks++; + } + } + + lprocfs_oh_tally(&filter->fo_w_discont_pages, discont_pages); + lprocfs_oh_tally(&filter->fo_w_discont_blocks, discont_blocks); +} + +void filter_tally_read(struct filter_obd *filter, struct niobuf_local *lnb, + int niocount) +{ + struct niobuf_local *end; + struct page *last_page = NULL; + unsigned long discont_pages = 0; + unsigned long discont_blocks = 0; + + if (niocount == 0) + return; + + for (end = lnb + niocount; lnb < end && lnb->page; lnb++) { + struct page *page = lnb->page; + if (last_page) { + if (page->index != (last_page->index + 1)) + discont_pages++; + /* XXX not so smart for now */ +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)) + if ((page->buffers && last_page->buffers) && + (page->buffers->b_blocknr != + (last_page->buffers->b_blocknr + 1))) + discont_blocks++; +#else +#warning "port on 2.6 -bzzz" +#endif + } + last_page = page; + } + + lprocfs_oh_tally_log2(&filter->fo_r_pages, niocount); + lprocfs_oh_tally(&filter->fo_r_discont_pages, discont_pages); + lprocfs_oh_tally(&filter->fo_r_discont_blocks, discont_blocks); +} + +#define pct(a,b) (b ? a * 100 / b : 0) + +static int filter_brw_stats_seq_show(struct seq_file *seq, void *v) +{ + struct timeval now; + struct obd_device *dev = seq->private; + struct filter_obd *filter = &dev->u.filter; + unsigned long read_tot = 0, write_tot = 0, read_cum, write_cum; + int i; + + do_gettimeofday(&now); + + /* this sampling races with updates */ + + seq_printf(seq, "snapshot_time: %lu:%lu (secs:usecs)\n", + now.tv_sec, now.tv_usec); + + seq_printf(seq, "\n\t\t\tread\t\t\twrite\n"); + seq_printf(seq, "pages per brw brws %% cum %% |"); + seq_printf(seq, " rpcs %% cum %%\n"); + + read_tot = lprocfs_oh_sum(&filter->fo_r_pages); + write_tot = lprocfs_oh_sum(&filter->fo_w_pages); + + read_cum = 0; + write_cum = 0; + for (i = 0; i < OBD_HIST_MAX; i++) { + unsigned long r = filter->fo_r_pages.oh_buckets[i]; + unsigned long w = filter->fo_w_pages.oh_buckets[i]; + read_cum += r; + write_cum += w; + seq_printf(seq, "%d:\t\t%10lu %3lu %3lu | %10lu %3lu %3lu\n", + 1 << i, 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; + } + + seq_printf(seq, "\n\t\t\tread\t\t\twrite\n"); + seq_printf(seq, "discont pages rpcs %% cum %% |"); + seq_printf(seq, " rpcs %% cum %%\n"); + + read_tot = lprocfs_oh_sum(&filter->fo_r_discont_pages); + write_tot = lprocfs_oh_sum(&filter->fo_w_discont_pages); + + read_cum = 0; + write_cum = 0; + + for (i = 0; i < OBD_HIST_MAX; i++) { + unsigned long r = filter->fo_r_discont_pages.oh_buckets[i]; + unsigned long w = filter->fo_w_discont_pages.oh_buckets[i]; + read_cum += r; + write_cum += w; + seq_printf(seq, "%d:\t\t%10lu %3lu %3lu | %10lu %3lu %3lu\n", + i, 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; + } + + seq_printf(seq, "\n\t\t\tread\t\t\twrite\n"); + seq_printf(seq, "discont blocks rpcs %% cum %% |"); + seq_printf(seq, " rpcs %% cum %%\n"); + + read_tot = lprocfs_oh_sum(&filter->fo_r_discont_blocks); + write_tot = lprocfs_oh_sum(&filter->fo_w_discont_blocks); + + read_cum = 0; + write_cum = 0; + for (i = 0; i < OBD_HIST_MAX; i++) { + unsigned long r = filter->fo_r_discont_blocks.oh_buckets[i]; + unsigned long w = filter->fo_w_discont_blocks.oh_buckets[i]; + read_cum += r; + write_cum += w; + seq_printf(seq, "%d:\t\t%10lu %3lu %3lu | %10lu %3lu %3lu\n", + i, 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; + } + + return 0; +} +#undef pct + +static void *filter_brw_stats_seq_start(struct seq_file *p, loff_t *pos) +{ + if (*pos == 0) + return (void *)1; + return NULL; +} +static void *filter_brw_stats_seq_next(struct seq_file *p, void *v, loff_t *pos) +{ + ++*pos; + return NULL; +} +static void filter_brw_stats_seq_stop(struct seq_file *p, void *v) +{ +} +struct seq_operations filter_brw_stats_seq_sops = { + .start = filter_brw_stats_seq_start, + .stop = filter_brw_stats_seq_stop, + .next = filter_brw_stats_seq_next, + .show = filter_brw_stats_seq_show, +}; + +static int filter_brw_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, &filter_brw_stats_seq_sops); + if (rc) + return rc; + seq = file->private_data; + seq->private = dp->data; + return 0; +} + +static ssize_t filter_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 *filter = &dev->u.filter; + + lprocfs_oh_clear(&filter->fo_r_pages); + lprocfs_oh_clear(&filter->fo_w_pages); + lprocfs_oh_clear(&filter->fo_r_discont_pages); + lprocfs_oh_clear(&filter->fo_w_discont_pages); + lprocfs_oh_clear(&filter->fo_r_discont_blocks); + lprocfs_oh_clear(&filter->fo_w_discont_blocks); + + return len; +} + +struct file_operations filter_brw_stats_fops = { + .owner = THIS_MODULE, + .open = filter_brw_stats_seq_open, + .read = seq_read, + .write = filter_brw_stats_seq_write, + .llseek = seq_lseek, + .release = seq_release, +}; + +int lproc_filter_attach_seqstat(struct obd_device *dev) +{ + return lprocfs_obd_seq_create(dev, "brw_stats", 0444, + &filter_brw_stats_fops, dev); +} + + + #endif /* LPROCFS */ -LPROCFS_INIT_VARS(filter,lprocfs_module_vars, lprocfs_obd_vars) +LPROCFS_INIT_VARS(filter, lprocfs_module_vars, lprocfs_obd_vars)