X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fosd-zfs%2Fosd_lproc.c;h=0dfb483628b11ab94b1779a6d7234444accb1230;hb=b738c4850935f3a9c483b3141cb37d6539557615;hp=6ce8a3bbc8be353731c2c7472a3d03384479dc27;hpb=35920b759ed78441db0cd9de6ac8ec66da862f22;p=fs%2Flustre-release.git diff --git a/lustre/osd-zfs/osd_lproc.c b/lustre/osd-zfs/osd_lproc.c index 6ce8a3b..0dfb483 100644 --- a/lustre/osd-zfs/osd_lproc.c +++ b/lustre/osd-zfs/osd_lproc.c @@ -26,10 +26,8 @@ /* * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. - */ -/* - * Copyright (c) 2011, 2012 Whamcloud, Inc. - * Use is subject to license terms. + * + * Copyright (c) 2012, 2015, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -41,25 +39,130 @@ * Author: Mike Pershin */ -#define DEBUG_SUBSYSTEM S_CLASS +#define DEBUG_SUBSYSTEM S_OSD #include #include #include -#include - #include -#include "udmu.h" #include "osd_internal.h" -#ifdef LPROCFS +#ifdef CONFIG_PROC_FS + +#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 scale) +{ + 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 %% | %-11s %% 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 (!scale) + seq_printf(seq, "%u", i); + else if (i < 10) + seq_printf(seq, "%u", scale << i); + else if (i < 20) + seq_printf(seq, "%uK", scale << (i-10)); + else + seq_printf(seq, "%uM", scale << (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; + + /* this sampling races with updates */ + do_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); +#if 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); +#endif + 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); + + display_brw_stats(seq, "I/O time (1/1000s)", "ios", + &brw_stats->hist[BRW_R_IO_TIME], + &brw_stats->hist[BRW_W_IO_TIME], 1000 / HZ); + + 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 osd_brw_stats_seq_show(struct seq_file *seq, void *v) +{ + struct osd_device *osd = seq->private; + + brw_stats_show(seq, &osd->od_brw_stats); + + return 0; +} + +static ssize_t osd_brw_stats_seq_write(struct file *file, + const char __user *buf, + size_t len, loff_t *off) +{ + struct seq_file *seq = file->private_data; + struct osd_device *osd = seq->private; + int i; + + for (i = 0; i < BRW_LAST; i++) + lprocfs_oh_clear(&osd->od_brw_stats.hist[i]); + + return len; +} + +LPROC_SEQ_FOPS(osd_brw_stats); static int osd_stats_init(struct osd_device *osd) { - int result; + int result, i; ENTRY; + for (i = 0; i < BRW_LAST; i++) + spin_lock_init(&osd->od_brw_stats.hist[i].oh_lock); + osd->od_stats = lprocfs_alloc_stats(LPROC_OSD_LAST, 0); if (osd->od_stats != NULL) { result = lprocfs_register_stats(osd->od_proc_entry, "stats", @@ -102,6 +205,8 @@ static int osd_stats_init(struct osd_device *osd) LPROCFS_CNTR_AVGMINMAX, "thandle_closing", "usec"); #endif + result = lprocfs_seq_create(osd->od_proc_entry, "brw_stats", + 0644, &osd_brw_stats_fops, osd); } else { result = -ENOMEM; } @@ -110,27 +215,29 @@ out: RETURN(result); } -static int lprocfs_osd_rd_fstype(char *page, char **start, off_t off, - int count, int *eof, void *data) +static int zfs_osd_fstype_seq_show(struct seq_file *m, void *data) { - return snprintf(page, count, "zfs\n"); + seq_puts(m, "zfs\n"); + return 0; } +LPROC_SEQ_FOPS_RO(zfs_osd_fstype); -static int lprocfs_osd_rd_mntdev(char *page, char **start, off_t off, int count, - int *eof, void *data) +static int zfs_osd_mntdev_seq_show(struct seq_file *m, void *data) { - struct osd_device *osd = osd_dt_dev((struct dt_device *)data); + struct osd_device *osd = osd_dt_dev((struct dt_device *)m->private); LASSERT(osd != NULL); - *eof = 1; - - return snprintf(page, count, "%s\n", osd->od_mntdev); + seq_printf(m, "%s\n", osd->od_mntdev); + return 0; } +LPROC_SEQ_FOPS_RO(zfs_osd_mntdev); -static int lprocfs_osd_wr_force_sync(struct file *file, const char *buffer, - unsigned long count, void *data) +static ssize_t +lprocfs_osd_force_sync_seq_write(struct file *file, const char __user *buffer, + size_t count, loff_t *off) { - struct dt_device *dt = data; + struct seq_file *m = file->private_data; + struct dt_device *dt = m->private; struct lu_env env; int rc; @@ -142,25 +249,30 @@ static int lprocfs_osd_wr_force_sync(struct file *file, const char *buffer, return rc == 0 ? count : rc; } +LPROC_SEQ_FOPS_WO_TYPE(zfs, osd_force_sync); -static int lprocfs_osd_rd_iused_est(char *page, char **start, off_t off, int count, - int *eof, void *data) +static int zfs_osd_iused_est_seq_show(struct seq_file *m, void *data) { - struct osd_device *osd = osd_dt_dev((struct dt_device *)data); + struct osd_device *osd = osd_dt_dev((struct dt_device *)m->private); LASSERT(osd != NULL); - return snprintf(page, count, "%d\n", osd->od_quota_iused_est); + seq_printf(m, "%d\n", osd->od_quota_iused_est); + return 0; } -static int lprocfs_osd_wr_iused_est(struct file *file, const char *buffer, - unsigned long count, void *data) +static ssize_t +zfs_osd_iused_est_seq_write(struct file *file, const char __user *buffer, + size_t count, loff_t *off) { - struct osd_device *osd = osd_dt_dev((struct dt_device *)data); - int rc, val; + struct seq_file *m = file->private_data; + struct dt_device *dt = m->private; + struct osd_device *osd = osd_dt_dev(dt); + int rc; + __s64 val; LASSERT(osd != NULL); - rc = lprocfs_write_helper(buffer, count, &val); + rc = lprocfs_str_to_s64(buffer, count, &val); if (rc) return rc; @@ -168,24 +280,36 @@ static int lprocfs_osd_wr_iused_est(struct file *file, const char *buffer, return count; } +LPROC_SEQ_FOPS(zfs_osd_iused_est); -struct lprocfs_vars lprocfs_osd_obd_vars[] = { - { "blocksize", lprocfs_osd_rd_blksize, 0, 0 }, - { "kbytestotal", lprocfs_osd_rd_kbytestotal, 0, 0 }, - { "kbytesfree", lprocfs_osd_rd_kbytesfree, 0, 0 }, - { "kbytesavail", lprocfs_osd_rd_kbytesavail, 0, 0 }, - { "filestotal", lprocfs_osd_rd_filestotal, 0, 0 }, - { "filesfree", lprocfs_osd_rd_filesfree, 0, 0 }, - { "fstype", lprocfs_osd_rd_fstype, 0, 0 }, - { "mntdev", lprocfs_osd_rd_mntdev, 0, 0 }, - { "force_sync", 0, lprocfs_osd_wr_force_sync }, - { "quota_iused_estimate", lprocfs_osd_rd_iused_est, - lprocfs_osd_wr_iused_est, 0, 0 }, - { 0 } -}; +LPROC_SEQ_FOPS_RO_TYPE(zfs, dt_blksize); +LPROC_SEQ_FOPS_RO_TYPE(zfs, dt_kbytestotal); +LPROC_SEQ_FOPS_RO_TYPE(zfs, dt_kbytesfree); +LPROC_SEQ_FOPS_RO_TYPE(zfs, dt_kbytesavail); +LPROC_SEQ_FOPS_RO_TYPE(zfs, dt_filestotal); +LPROC_SEQ_FOPS_RO_TYPE(zfs, dt_filesfree); -struct lprocfs_vars lprocfs_osd_module_vars[] = { - { "num_refs", lprocfs_rd_numrefs, 0, 0 }, +struct lprocfs_vars lprocfs_osd_obd_vars[] = { + { .name = "blocksize", + .fops = &zfs_dt_blksize_fops }, + { .name = "kbytestotal", + .fops = &zfs_dt_kbytestotal_fops }, + { .name = "kbytesfree", + .fops = &zfs_dt_kbytesfree_fops }, + { .name = "kbytesavail", + .fops = &zfs_dt_kbytesavail_fops }, + { .name = "filestotal", + .fops = &zfs_dt_filestotal_fops }, + { .name = "filesfree", + .fops = &zfs_dt_filesfree_fops }, + { .name = "fstype", + .fops = &zfs_osd_fstype_fops }, + { .name = "mntdev", + .fops = &zfs_osd_mntdev_fops }, + { .name = "force_sync", + .fops = &zfs_osd_force_sync_fops }, + { .name = "quota_iused_estimate", + .fops = &zfs_osd_iused_est_fops }, { 0 } }; @@ -206,7 +330,8 @@ int osd_procfs_init(struct osd_device *osd, const char *name) LASSERT(type != NULL); osd->od_proc_entry = lprocfs_register(name, type->typ_procroot, - lprocfs_osd_obd_vars, &osd->od_dt_dev); + lprocfs_osd_obd_vars, + &osd->od_dt_dev); if (IS_ERR(osd->od_proc_entry)) { rc = PTR_ERR(osd->od_proc_entry); CERROR("Error %d setting up lprocfs for %s\n", rc, name);