Whamcloud - gitweb
Branch HEAD
[fs/lustre-release.git] / lustre / llite / lproc_llite.c
index 1f51681..03dd0ac 100644 (file)
  */
 #define DEBUG_SUBSYSTEM S_LLITE
 
-#include <linux/lustre_lite.h>
-#include <linux/lprocfs_status.h>
+#include <linux/version.h>
+#include <lustre_lite.h>
+#include <lprocfs_status.h>
+#include <linux/seq_file.h>
+#include <obd_support.h>
 
+#include "llite_internal.h"
 
-int rd_path(char* page, char **start, off_t off, int count, int *eof, 
-            void *data)
+struct proc_dir_entry *proc_lustre_fs_root;
+
+#ifdef LPROCFS
+/* /proc/lustre/llite mount point registration */
+struct file_operations llite_dump_pgcache_fops;
+struct file_operations ll_ra_stats_fops;
+struct file_operations ll_rw_extents_stats_fops;
+struct file_operations ll_rw_extents_stats_pp_fops;
+struct file_operations ll_rw_offset_stats_fops;
+
+static int ll_rd_blksize(char *page, char **start, off_t off, int count,
+                         int *eof, void *data)
 {
-        return 0;
+        struct super_block *sb = (struct super_block *)data;
+        struct obd_statfs osfs;
+        int rc;
+
+        LASSERT(sb != NULL);
+        rc = ll_statfs_internal(sb, &osfs, cfs_time_current_64() - HZ);
+        if (!rc) {
+              *eof = 1;
+              rc = snprintf(page, count, "%u\n", osfs.os_bsize);
+        }
+
+        return rc;
 }
-int rd_fstype(char* page, char **start, off_t off, int count, int *eof, 
-              void *data)
+
+static int ll_rd_kbytestotal(char *page, char **start, off_t off, int count,
+                             int *eof, void *data)
 {
-        int len = 0;
-        struct super_block *sb = (struct super_block*)data;
-        
-        len += snprintf(page, count, "%s\n", sb->s_type->name); 
-        return len;
+        struct super_block *sb = (struct super_block *)data;
+        struct obd_statfs osfs;
+        int rc;
+
+        LASSERT(sb != NULL);
+        rc = ll_statfs_internal(sb, &osfs, cfs_time_current_64() - HZ);
+        if (!rc) {
+                __u32 blk_size = osfs.os_bsize >> 10;
+                __u64 result = osfs.os_blocks;
+
+                while (blk_size >>= 1)
+                        result <<= 1;
+
+                *eof = 1;
+                rc = snprintf(page, count, LPU64"\n", result);
+        }
+        return rc;
+
 }
-int rd_blksize(char* page, char **start, off_t off, int count, int *eof, 
-               void *data)
+
+static int ll_rd_kbytesfree(char *page, char **start, off_t off, int count,
+                            int *eof, void *data)
 {
-        int len = 0;
-        struct super_block *sb = (struct super_block*)data;
-        struct statfs mystats;
+        struct super_block *sb = (struct super_block *)data;
+        struct obd_statfs osfs;
+        int rc;
 
-        (sb->s_op->statfs)(sb, &mystats);
-        len += snprintf(page, count, LPU64"\n", (__u64)(mystats.f_bsize)); 
-        return len;
+        LASSERT(sb != NULL);
+        rc = ll_statfs_internal(sb, &osfs, cfs_time_current_64() - HZ);
+        if (!rc) {
+                __u32 blk_size = osfs.os_bsize >> 10;
+                __u64 result = osfs.os_bfree;
 
+                while (blk_size >>= 1)
+                        result <<= 1;
+
+                *eof = 1;
+                rc = snprintf(page, count, LPU64"\n", result);
+        }
+        return rc;
 }
-int rd_kbytestotal(char* page, char **start, off_t off, int count, int *eof, 
-                   void *data)
+
+static int ll_rd_kbytesavail(char *page, char **start, off_t off, int count,
+                             int *eof, void *data)
 {
-        int len = 0;
-        struct super_block *sb = (struct super_block*)data;
-        struct statfs mystats;
-        __u32 blk_size;
-        __u64 result;
-
-        (sb->s_op->statfs)(sb, &mystats);
-        blk_size = mystats.f_bsize;
-        blk_size >>= 10;
-        result = mystats.f_blocks;
-        
-        while(blk_size >>= 1){
-                result <<= 1;
+        struct super_block *sb = (struct super_block *)data;
+        struct obd_statfs osfs;
+        int rc;
+
+        LASSERT(sb != NULL);
+        rc = ll_statfs_internal(sb, &osfs, cfs_time_current_64() - HZ);
+        if (!rc) {
+                __u32 blk_size = osfs.os_bsize >> 10;
+                __u64 result = osfs.os_bavail;
+
+                while (blk_size >>= 1)
+                        result <<= 1;
+
+                *eof = 1;
+                rc = snprintf(page, count, LPU64"\n", result);
         }
-       
-        len += snprintf(page, count, LPU64"\n", result); 
-        return len;
-        
+        return rc;
 }
 
+static int ll_rd_filestotal(char *page, char **start, off_t off, int count,
+                            int *eof, void *data)
+{
+        struct super_block *sb = (struct super_block *)data;
+        struct obd_statfs osfs;
+        int rc;
 
-int rd_kbytesfree(char* page, char **start, off_t off, int count, int *eof, 
-                  void *data)
+        LASSERT(sb != NULL);
+        rc = ll_statfs_internal(sb, &osfs, cfs_time_current_64() - HZ);
+        if (!rc) {
+                 *eof = 1;
+                 rc = snprintf(page, count, LPU64"\n", osfs.os_files);
+        }
+        return rc;
+}
+
+static int ll_rd_filesfree(char *page, char **start, off_t off, int count,
+                           int *eof, void *data)
 {
-        int len = 0;
-        struct super_block *sb = (struct super_block*)data;
-        struct statfs mystats; 
-        __u32 blk_size;
-        __u64 result;
-
-        (sb->s_op->statfs)(sb, &mystats);
-        blk_size = mystats.f_bsize;
-        blk_size >>= 10;
-        result = mystats.f_bfree;
-        
-        while(blk_size >>= 1){
-                result <<= 1;
+        struct super_block *sb = (struct super_block *)data;
+        struct obd_statfs osfs;
+        int rc;
+
+        LASSERT(sb != NULL);
+        rc = ll_statfs_internal(sb, &osfs, cfs_time_current_64() - HZ);
+        if (!rc) {
+                 *eof = 1;
+                 rc = snprintf(page, count, LPU64"\n", osfs.os_ffree);
         }
-       
-        len += snprintf(page, count, LPU64"\n", result); 
-        return len;
+        return rc;
 
-        
 }
 
-int rd_filestotal(char* page, char **start, off_t off, int count, int *eof, 
-                  void *data)
+static int ll_rd_client_type(char *page, char **start, off_t off, int count,
+                            int *eof, void *data)
 {
-        
-        int len = 0;
-        struct super_block *sb = (struct super_block*)data;
-        struct statfs mystats; 
-        
-        (sb->s_op->statfs)(sb, &mystats);
-        len += snprintf(page, count, LPU64"\n", (__u64)(mystats.f_files)); 
-        return len;
+        struct ll_sb_info *sbi = ll_s2sbi((struct super_block *)data);
+        int rc;
+
+        LASSERT(sbi != NULL);
+
+        *eof = 1;
+        if (sbi->ll_flags & LL_SBI_RMT_CLIENT)
+                rc = snprintf(page, count, "remote client\n");
+        else
+                rc = snprintf(page, count, "local client\n");
+
+        return rc;
 }
 
-int rd_filesfree(char* page, char **start, off_t off, int count, int *eof, 
-                 void *data)
+static int ll_rd_fstype(char *page, char **start, off_t off, int count,
+                        int *eof, void *data)
 {
-        
-        int len = 0;
         struct super_block *sb = (struct super_block*)data;
-        struct statfs mystats; 
+
+        LASSERT(sb != NULL);
+        *eof = 1;
+        return snprintf(page, count, "%s\n", sb->s_type->name);
+}
+
+static int ll_rd_sb_uuid(char *page, char **start, off_t off, int count,
+                         int *eof, void *data)
+{
+        struct super_block *sb = (struct super_block *)data;
+
+        LASSERT(sb != NULL);
+        *eof = 1;
+        return snprintf(page, count, "%s\n", ll_s2sbi(sb)->ll_sb_uuid.uuid);
+}
+
+static int ll_rd_max_readahead_mb(char *page, char **start, off_t off,
+                                   int count, int *eof, void *data)
+{
+        struct super_block *sb = data;
+        struct ll_sb_info *sbi = ll_s2sbi(sb);
+        long pages_number;
+        int mult;
+
+        spin_lock(&sbi->ll_lock);
+        pages_number = sbi->ll_ra_info.ra_max_pages;
+        spin_unlock(&sbi->ll_lock);
+
+        mult = 1 << (20 - PAGE_CACHE_SHIFT);
+        return lprocfs_read_frac_helper(page, count, pages_number, mult);
+}
+
+static int ll_wr_max_readahead_mb(struct file *file, const char *buffer,
+                                   unsigned long count, void *data)
+{
+        struct super_block *sb = data;
+        struct ll_sb_info *sbi = ll_s2sbi(sb);
+        int mult, rc, pages_number;
+
+        mult = 1 << (20 - CFS_PAGE_SHIFT);
+        rc = lprocfs_write_frac_helper(buffer, count, &pages_number, mult);
+        if (rc)
+                return rc;
+
+        if (pages_number < 0 || pages_number > num_physpages / 2) {
+                CERROR("can't set file readahead more than %lu MB\n",
+                        num_physpages >> (20 - CFS_PAGE_SHIFT + 1)); /*1/2 of RAM*/
+                return -ERANGE;
+        }
+
+        spin_lock(&sbi->ll_lock);
+        sbi->ll_ra_info.ra_max_pages = pages_number;
+        spin_unlock(&sbi->ll_lock);
+
+        return count;
+}
+
+static int ll_rd_max_read_ahead_whole_mb(char *page, char **start, off_t off,
+                                       int count, int *eof, void *data)
+{
+        struct super_block *sb = data;
+        struct ll_sb_info *sbi = ll_s2sbi(sb);
+        long pages_number;
+        int mult;
+
+        spin_lock(&sbi->ll_lock);
+        pages_number = sbi->ll_ra_info.ra_max_read_ahead_whole_pages;
+        spin_unlock(&sbi->ll_lock);
+
+        mult = 1 << (20 - CFS_PAGE_SHIFT);
+        return lprocfs_read_frac_helper(page, count, pages_number, mult);
+}
+
+static int ll_wr_max_read_ahead_whole_mb(struct file *file, const char *buffer,
+                                       unsigned long count, void *data)
+{
+        struct super_block *sb = data;
+        struct ll_sb_info *sbi = ll_s2sbi(sb);
+        int mult, rc, pages_number;
+
+        mult = 1 << (20 - CFS_PAGE_SHIFT);
+        rc = lprocfs_write_frac_helper(buffer, count, &pages_number, mult);
+        if (rc)
+                return rc;
+
+        /* Cap this at the current max readahead window size, the readahead
+         * algorithm does this anyway so it's pointless to set it larger. */
+        if (pages_number < 0 || pages_number > sbi->ll_ra_info.ra_max_pages) {
+                CERROR("can't set max_read_ahead_whole_mb more than "
+                       "max_read_ahead_mb: %lu\n",
+                       sbi->ll_ra_info.ra_max_pages >> (20 - CFS_PAGE_SHIFT));
+                return -ERANGE;
+        }
+
+        spin_lock(&sbi->ll_lock);
+        sbi->ll_ra_info.ra_max_read_ahead_whole_pages = pages_number;
+        spin_unlock(&sbi->ll_lock);
+
+        return count;
+}
+
+static int ll_rd_max_cached_mb(char *page, char **start, off_t off,
+                               int count, int *eof, void *data)
+{
+        struct super_block *sb = data;
+        struct ll_sb_info *sbi = ll_s2sbi(sb);
+        long pages_number;
+        int mult;
+
+        spin_lock(&sbi->ll_lock);
+        pages_number = sbi->ll_async_page_max;
+        spin_unlock(&sbi->ll_lock);
+
+        mult = 1 << (20 - CFS_PAGE_SHIFT);
+        return lprocfs_read_frac_helper(page, count, pages_number, mult);;
+}
+
+static int ll_wr_max_cached_mb(struct file *file, const char *buffer,
+                                  unsigned long count, void *data)
+{
+        struct super_block *sb = data;
+        struct ll_sb_info *sbi = ll_s2sbi(sb);
+        int mult, rc, pages_number;
+
+        mult = 1 << (20 - CFS_PAGE_SHIFT);
+        rc = lprocfs_write_frac_helper(buffer, count, &pages_number, mult);
+        if (rc)
+                return rc;
+
+        if (pages_number < 0 || pages_number > num_physpages) {
+                CERROR("can't set max cache more than %lu MB\n",
+                        num_physpages >> (20 - CFS_PAGE_SHIFT));
+                return -ERANGE;
+        }
+
+        spin_lock(&sbi->ll_lock);
+        sbi->ll_async_page_max = pages_number ;
+        spin_unlock(&sbi->ll_lock);
         
-        (sb->s_op->statfs)(sb, &mystats);
-        len += snprintf(page, count, LPU64"\n", (__u64)(mystats.f_ffree)); 
-        return len;
+        if (!sbi->ll_dt_exp)
+                /* Not set up yet, don't call llap_shrink_cache */
+                return count;
+
+        if (sbi->ll_async_page_count >= sbi->ll_async_page_max)
+                llap_shrink_cache(sbi, 0);
+
+        return count;
 }
 
-int rd_filegroups(char* page, char **start, off_t off, int count, int *eof, 
-                  void *data)
+static int ll_rd_checksum(char *page, char **start, off_t off,
+                          int count, int *eof, void *data)
 {
-        return 0;
+        struct super_block *sb = data;
+        struct ll_sb_info *sbi = ll_s2sbi(sb);
+
+        return snprintf(page, count, "%u\n",
+                        (sbi->ll_flags & LL_SBI_CHECKSUM) ? 1 : 0);
 }
-int rd_uuid(char* page, char **start, off_t off, int count, int *eof, 
-            void *data)
+
+static int ll_wr_checksum(struct file *file, const char *buffer,
+                          unsigned long count, void *data)
 {
-        int len = 0;
-        struct super_block *sb = (struct super_block*)data;
+        struct super_block *sb = data;
         struct ll_sb_info *sbi = ll_s2sbi(sb);
-        len += snprintf(page, count, "%s\n", sbi->ll_sb_uuid); 
-        return len;    
+        int val, rc;
+
+        if (!sbi->ll_dt_exp)
+                /* Not set up yet */
+                return -EAGAIN;
 
+        rc = lprocfs_write_helper(buffer, count, &val);
+        if (rc)
+                return rc;
+        if (val)
+                sbi->ll_flags |= LL_SBI_CHECKSUM;
+        else
+                sbi->ll_flags &= ~LL_SBI_CHECKSUM;
+
+        rc = obd_set_info_async(sbi->ll_dt_exp, strlen("checksum"), "checksum",
+                                sizeof(val), &val, NULL);
+        if (rc)
+                CWARN("Failed to set OSC checksum flags: %d\n", rc);
+
+        return count;
 }
-int rd_dev_name(char* page, char **start, off_t off, int count, int *eof, 
-                void *data)
+
+static int ll_rd_max_rw_chunk(char *page, char **start, off_t off,
+                          int count, int *eof, void *data)
 {
-        int len = 0;
-        struct obd_device* dev = (struct obd_device*)data;
-        len += snprintf(page, count, "%s\n", dev->obd_name);
-        return len;
+        struct super_block *sb = data;
+
+        return snprintf(page, count, "%lu\n", ll_s2sbi(sb)->ll_max_rw_chunk);
 }
 
-int rd_dev_uuid(char* page, char **start, off_t off, int count, int *eof, 
-                void *data)
+static int ll_wr_max_rw_chunk(struct file *file, const char *buffer,
+                          unsigned long count, void *data)
 {
-        int len = 0;
-        struct obd_device* dev = (struct obd_device*)data;
-        len += snprintf(page, count, "%s\n", dev->obd_uuid);
-        return len;
+        struct super_block *sb = data;
+        int rc, val;
+
+        rc = lprocfs_write_helper(buffer, count, &val);
+        if (rc)
+                return rc;
+        ll_s2sbi(sb)->ll_max_rw_chunk = val;
+        return count;
+}
+
+static int ll_rd_track_id(char *page, int count, void *data, 
+                          enum stats_track_type type)
+{
+        struct super_block *sb = data;
+
+        if (ll_s2sbi(sb)->ll_stats_track_type == type) {
+                return snprintf(page, count, "%d\n",
+                                ll_s2sbi(sb)->ll_stats_track_id);
+        
+        } else if (ll_s2sbi(sb)->ll_stats_track_type == STATS_TRACK_ALL) {
+                return snprintf(page, count, "0 (all)\n");
+        } else {
+                return snprintf(page, count, "untracked\n");
+        }
+}
+
+static int ll_wr_track_id(const char *buffer, unsigned long count, void *data,
+                          enum stats_track_type type)
+{
+        struct super_block *sb = data;
+        int rc, pid;
+
+        rc = lprocfs_write_helper(buffer, count, &pid);
+        if (rc)
+                return rc;
+        ll_s2sbi(sb)->ll_stats_track_id = pid;
+        if (pid == 0)
+                ll_s2sbi(sb)->ll_stats_track_type = STATS_TRACK_ALL;
+        else
+                ll_s2sbi(sb)->ll_stats_track_type = type;
+        lprocfs_clear_stats(ll_s2sbi(sb)->ll_stats);
+        return count;
+}
+
+static int ll_rd_track_pid(char *page, char **start, off_t off,
+                          int count, int *eof, void *data)
+{
+        return (ll_rd_track_id(page, count, data, STATS_TRACK_PID));
+}
+
+static int ll_wr_track_pid(struct file *file, const char *buffer,
+                          unsigned long count, void *data)
+{
+        return (ll_wr_track_id(buffer, count, data, STATS_TRACK_PID));
+}
+
+static int ll_rd_track_ppid(char *page, char **start, off_t off,
+                          int count, int *eof, void *data)
+{
+        return (ll_rd_track_id(page, count, data, STATS_TRACK_PPID));
+}
+
+static int ll_wr_track_ppid(struct file *file, const char *buffer,
+                          unsigned long count, void *data)
+{
+        return (ll_wr_track_id(buffer, count, data, STATS_TRACK_PPID));
 }
 
+static int ll_rd_track_gid(char *page, char **start, off_t off,
+                          int count, int *eof, void *data)
+{
+        return (ll_rd_track_id(page, count, data, STATS_TRACK_GID));
+}
 
-struct lprocfs_vars status_var_nm_1[] = {
-        {"status/uuid", rd_uuid, 0, 0},
-        {"status/mntpt_path", rd_path, 0, 0},
-        {"status/fstype", rd_fstype, 0, 0},
-        {"status/blocksize",rd_blksize, 0, 0},
-        {"status/kbytestotal",rd_kbytestotal, 0, 0},
-        {"status/kbytesfree", rd_kbytesfree, 0, 0},
-        {"status/filestotal", rd_filestotal, 0, 0},
-        {"status/filesfree", rd_filesfree, 0, 0},
-        {"status/filegroups", rd_filegroups, 0, 0},
-        {0}
+static int ll_wr_track_gid(struct file *file, const char *buffer,
+                          unsigned long count, void *data)
+{                                                                 
+        return (ll_wr_track_id(buffer, count, data, STATS_TRACK_GID));
+}
+
+static struct lprocfs_vars lprocfs_obd_vars[] = {
+        { "uuid",         ll_rd_sb_uuid,          0, 0 },
+        //{ "mntpt_path",   ll_rd_path,             0, 0 },
+        { "fstype",       ll_rd_fstype,           0, 0 },
+        { "blocksize",    ll_rd_blksize,          0, 0 },
+        { "kbytestotal",  ll_rd_kbytestotal,      0, 0 },
+        { "kbytesfree",   ll_rd_kbytesfree,       0, 0 },
+        { "kbytesavail",  ll_rd_kbytesavail,      0, 0 },
+        { "filestotal",   ll_rd_filestotal,       0, 0 },
+        { "filesfree",    ll_rd_filesfree,        0, 0 },
+        { "client_type",  ll_rd_client_type,      0, 0 },
+        //{ "filegroups",   lprocfs_rd_filegroups,  0, 0 },
+        { "max_read_ahead_mb", ll_rd_max_readahead_mb,
+                               ll_wr_max_readahead_mb, 0 },
+        { "max_read_ahead_whole_mb", ll_rd_max_read_ahead_whole_mb,
+                                     ll_wr_max_read_ahead_whole_mb, 0 },
+        { "max_cached_mb",    ll_rd_max_cached_mb, ll_wr_max_cached_mb, 0 },
+        { "checksum_pages",   ll_rd_checksum, ll_wr_checksum, 0 },
+        { "max_rw_chunk",     ll_rd_max_rw_chunk, ll_wr_max_rw_chunk, 0 },
+        { "stats_track_pid",  ll_rd_track_pid, ll_wr_track_pid, 0 },
+        { "stats_track_ppid", ll_rd_track_ppid, ll_wr_track_ppid, 0 },
+        { "stats_track_gid",  ll_rd_track_gid, ll_wr_track_gid, 0 },
+        { 0 }
 };
 
-/* 
- * Proc registration function for Lustre
- * file system
- */
+#define MAX_STRING_SIZE 128
 
+struct llite_file_opcode {
+        __u32       opcode;
+        __u32       type;
+        const char *opname;
+} llite_opcode_table[LPROC_LL_FILE_OPCODES] = {
+        /* file operation */
+        { LPROC_LL_DIRTY_HITS,     LPROCFS_TYPE_REGS, "dirty_pages_hits" },
+        { LPROC_LL_DIRTY_MISSES,   LPROCFS_TYPE_REGS, "dirty_pages_misses" },
+        { LPROC_LL_WB_WRITEPAGE,   LPROCFS_CNTR_AVGMINMAX|LPROCFS_TYPE_PAGES,
+                                   "writeback_from_writepage" },
+        { LPROC_LL_WB_PRESSURE,    LPROCFS_CNTR_AVGMINMAX|LPROCFS_TYPE_PAGES,
+                                   "writeback_from_pressure" },
+        { LPROC_LL_WB_OK,          LPROCFS_CNTR_AVGMINMAX|LPROCFS_TYPE_PAGES,
+                                   "writeback_ok_pages" },
+        { LPROC_LL_WB_FAIL,        LPROCFS_CNTR_AVGMINMAX|LPROCFS_TYPE_PAGES,
+                                   "writeback_failed_pages" },
+        { LPROC_LL_READ_BYTES,     LPROCFS_CNTR_AVGMINMAX|LPROCFS_TYPE_BYTES,
+                                   "read_bytes" },
+        { LPROC_LL_WRITE_BYTES,    LPROCFS_CNTR_AVGMINMAX|LPROCFS_TYPE_BYTES,
+                                   "write_bytes" },
+        { LPROC_LL_BRW_READ,       LPROCFS_CNTR_AVGMINMAX|LPROCFS_TYPE_PAGES,
+                                   "brw_read" },
+        { LPROC_LL_BRW_WRITE,      LPROCFS_CNTR_AVGMINMAX|LPROCFS_TYPE_PAGES,
+                                   "brw_write" },
 
-#define MAX_STRING_SIZE 100
-void ll_proc_namespace(struct super_block* sb, char* osc, char* mdc)
+        { LPROC_LL_IOCTL,          LPROCFS_TYPE_REGS, "ioctl" },
+        { LPROC_LL_OPEN,           LPROCFS_TYPE_REGS, "open" },
+        { LPROC_LL_RELEASE,        LPROCFS_TYPE_REGS, "close" },
+        { LPROC_LL_MAP,            LPROCFS_TYPE_REGS, "mmap" },
+        { LPROC_LL_LLSEEK,         LPROCFS_TYPE_REGS, "seek" },
+        { LPROC_LL_FSYNC,          LPROCFS_TYPE_REGS, "fsync" },
+        /* inode operation */
+        { LPROC_LL_SETATTR,        LPROCFS_TYPE_REGS, "setattr" },
+        { LPROC_LL_TRUNC,          LPROCFS_TYPE_REGS, "truncate" },
+        { LPROC_LL_FLOCK,          LPROCFS_TYPE_REGS, "flock" },
+        { LPROC_LL_GETATTR,        LPROCFS_TYPE_REGS, "getattr" },
+        /* special inode operation */
+        { LPROC_LL_STAFS,          LPROCFS_TYPE_REGS, "statfs" },
+        { LPROC_LL_ALLOC_INODE,    LPROCFS_TYPE_REGS, "alloc_inode" },
+        { LPROC_LL_SETXATTR,       LPROCFS_TYPE_REGS, "setxattr" },
+        { LPROC_LL_GETXATTR,       LPROCFS_TYPE_REGS, "getxattr" },
+        { LPROC_LL_LISTXATTR,      LPROCFS_TYPE_REGS, "listxattr" },
+        { LPROC_LL_REMOVEXATTR,    LPROCFS_TYPE_REGS, "removexattr" },
+        { LPROC_LL_INODE_PERM,     LPROCFS_TYPE_REGS, "inode_permission" },
+        { LPROC_LL_DIRECT_READ,    LPROCFS_CNTR_AVGMINMAX|LPROCFS_TYPE_PAGES,
+                                   "direct_read" },
+        { LPROC_LL_DIRECT_WRITE,   LPROCFS_CNTR_AVGMINMAX|LPROCFS_TYPE_PAGES,
+                                   "direct_write" },
+
+};
+
+void ll_stats_ops_tally(struct ll_sb_info *sbi, int op, int count)
+{
+        if (!sbi->ll_stats)
+                return;
+        if (sbi->ll_stats_track_type == STATS_TRACK_ALL)
+                lprocfs_counter_add(sbi->ll_stats, op, count);
+        else if (sbi->ll_stats_track_type == STATS_TRACK_PID &&
+                 sbi->ll_stats_track_id == current->pid)
+                lprocfs_counter_add(sbi->ll_stats, op, count);
+        else if (sbi->ll_stats_track_type == STATS_TRACK_PPID &&
+                 sbi->ll_stats_track_id == current->p_pptr->pid)
+                lprocfs_counter_add(sbi->ll_stats, op, count);
+        else if (sbi->ll_stats_track_type == STATS_TRACK_GID &&
+                 sbi->ll_stats_track_id == current->gid)
+                lprocfs_counter_add(sbi->ll_stats, op, count);
+}
+EXPORT_SYMBOL(ll_stats_ops_tally);
+
+int lprocfs_register_mountpoint(struct proc_dir_entry *parent,
+                                struct super_block *sb, char *osc, char *mdc)
 {
-        char mnt_name[MAX_STRING_SIZE+1];
-        char uuid_name[MAX_STRING_SIZE+1];
-        struct lprocfs_vars d_vars[3];
+        struct lprocfs_vars lvars[2];
+        struct lustre_sb_info *lsi = s2lsi(sb);
         struct ll_sb_info *sbi = ll_s2sbi(sb);
-        struct obd_device* obd;
-        int err;
+        struct obd_device *obd;
+        char name[MAX_STRING_SIZE + 1], *ptr;
+        int err, id, len;
+        struct proc_dir_entry *entry;
+        ENTRY;
+
+        memset(lvars, 0, sizeof(lvars));
+
+        name[MAX_STRING_SIZE] = '\0';
+        lvars[0].name = name;
+
+        LASSERT(sbi != NULL);
+        LASSERT(mdc != NULL);
+        LASSERT(osc != NULL);
 
+        /* Get fsname */
+        len = strlen(lsi->lsi_lmd->lmd_profile);
+        ptr = strrchr(lsi->lsi_lmd->lmd_profile, '-');
+        if (ptr && (strcmp(ptr, "-client") == 0))
+                len -= 7; 
         
-        /* Register this mount instance with LProcFS */
-        snprintf(mnt_name, MAX_STRING_SIZE, "mount_%s", sbi->ll_sb_uuid);
-        mnt_name[MAX_STRING_SIZE] = '\0';
-        sbi->ll_proc_root = lprocfs_reg_mnt(mnt_name);
-        if (sbi->ll_proc_root == NULL) {
-                CDEBUG(D_OTHER, "Could not register FS");
-                return;
+        /* Mount info */
+        snprintf(name, MAX_STRING_SIZE, "%.*s-%p", len,
+                 lsi->lsi_lmd->lmd_profile, sb);
+        
+        sbi->ll_proc_root = lprocfs_register(name, parent, NULL, NULL);
+        if (IS_ERR(sbi->ll_proc_root)) {
+                err = PTR_ERR(sbi->ll_proc_root);
+                sbi->ll_proc_root = NULL;
+                RETURN(err);
         }
-        /* Add the static configuration info */
-        err = lprocfs_add_vars(sbi->ll_proc_root,status_var_nm_1, sb);
-        if (err) {
-                CDEBUG(D_OTHER, "Unable to add procfs variables\n");
-                return;
+
+        entry = create_proc_entry("dump_page_cache", 0444, sbi->ll_proc_root);
+        if (entry == NULL)
+                GOTO(out, err = -ENOMEM);
+        entry->proc_fops = &llite_dump_pgcache_fops;
+        entry->data = sbi;
+
+        entry = create_proc_entry("read_ahead_stats", 0644, sbi->ll_proc_root);
+        if (entry == NULL)
+                GOTO(out, err = -ENOMEM);
+        entry->proc_fops = &ll_ra_stats_fops;
+        entry->data = sbi;
+
+        entry = create_proc_entry("extents_stats", 0644, sbi->ll_proc_root);
+        if (entry == NULL)
+                 GOTO(out, err = -ENOMEM);
+        entry->proc_fops = &ll_rw_extents_stats_fops;
+        entry->data = sbi;
+
+        entry = create_proc_entry("extents_stats_per_process", 0644,
+                                  sbi->ll_proc_root);
+        if (entry == NULL)
+                 GOTO(out, err = -ENOMEM);
+        entry->proc_fops = &ll_rw_extents_stats_pp_fops;
+        entry->data = sbi;
+
+        entry = create_proc_entry("offset_stats", 0644, sbi->ll_proc_root);
+        if (entry == NULL)
+                GOTO(out, err = -ENOMEM);
+        entry->proc_fops = &ll_rw_offset_stats_fops;
+        entry->data = sbi;
+
+        /* File operations stats */
+        sbi->ll_stats = lprocfs_alloc_stats(LPROC_LL_FILE_OPCODES, 0);
+        if (sbi->ll_stats == NULL)
+                GOTO(out, err = -ENOMEM);
+        /* do counter init */
+        for (id = 0; id < LPROC_LL_FILE_OPCODES; id++) {
+                __u32 type = llite_opcode_table[id].type;
+                void *ptr = NULL;
+                if (type & LPROCFS_TYPE_REGS)
+                        ptr = "regs";
+                else {
+                        if (type & LPROCFS_TYPE_BYTES)
+                                ptr = "bytes";
+                        else {
+                                if (type & LPROCFS_TYPE_PAGES)
+                                        ptr = "pages";
+                        }
+                }
+                lprocfs_counter_init(sbi->ll_stats, 
+                                     llite_opcode_table[id].opcode,
+                                     (type & LPROCFS_CNTR_AVGMINMAX),
+                                     llite_opcode_table[id].opname, ptr);
         }
-        /* MDC */
-        obd = class_uuid2obd(mdc);
-        snprintf(mnt_name, MAX_STRING_SIZE, "status/%s/common_name", 
+        err = lprocfs_register_stats(sbi->ll_proc_root, "stats", sbi->ll_stats);
+        if (err)
+                GOTO(out, err);
+
+        err = lprocfs_add_vars(sbi->ll_proc_root, lprocfs_obd_vars, sb);
+        if (err)
+                GOTO(out, err);
+
+        /* MDC info */
+        obd = class_name2obd(mdc);
+
+        LASSERT(obd != NULL);
+        LASSERT(obd->obd_magic == OBD_DEVICE_MAGIC);
+        LASSERT(obd->obd_type->typ_name != NULL);
+
+        snprintf(name, MAX_STRING_SIZE, "%s/common_name",
                  obd->obd_type->typ_name);
-        mnt_name[MAX_STRING_SIZE] = '\0';
-        memset(d_vars, 0, sizeof(d_vars));
-        d_vars[0].read_fptr = rd_dev_name;
-        d_vars[0].write_fptr = NULL;
-        d_vars[0].name = mnt_name;
-        snprintf(uuid_name, MAX_STRING_SIZE, "status/%s/uuid",
+        lvars[0].read_fptr = lprocfs_rd_name;
+        err = lprocfs_add_vars(sbi->ll_proc_root, lvars, obd);
+        if (err)
+                GOTO(out, err);
+
+        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)
+                GOTO(out, err);
+
+        /* OSC */
+        obd = class_name2obd(osc);
+
+        LASSERT(obd != NULL);
+        LASSERT(obd->obd_magic == OBD_DEVICE_MAGIC);
+        LASSERT(obd->obd_type->typ_name != NULL);
+
+        snprintf(name, MAX_STRING_SIZE, "%s/common_name",
                  obd->obd_type->typ_name);
-        uuid_name[MAX_STRING_SIZE] = '\0';
-        d_vars[1].read_fptr = rd_dev_uuid;
-        d_vars[1].write_fptr = NULL;
-        d_vars[1].name = uuid_name;
+        lvars[0].read_fptr = lprocfs_rd_name;
+        err = lprocfs_add_vars(sbi->ll_proc_root, lvars, obd);
+        if (err)
+                GOTO(out, err);
 
-        err = lprocfs_add_vars(sbi->ll_proc_root, d_vars, obd);
+        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) {
-                CDEBUG(D_OTHER, "Unable to add fs proc dynamic variables\n");
-                return;
+                lprocfs_remove(&sbi->ll_proc_root);
+                lprocfs_free_stats(&sbi->ll_stats);
         }
-        /* OSC or LOV*/
-        obd = class_uuid2obd(osc);
+        RETURN(err);
+}
+
+void lprocfs_unregister_mountpoint(struct ll_sb_info *sbi)
+{
+        if (sbi->ll_proc_root) {
+                lprocfs_remove(&sbi->ll_proc_root);
+                lprocfs_free_stats(&sbi->ll_stats);
+        }
+}
+#undef MAX_STRING_SIZE
 
-        /* Reuse mnt_name */
-        snprintf(mnt_name, MAX_STRING_SIZE, 
-                 "status/%s/common_name", obd->obd_type->typ_name);
-        mnt_name[MAX_STRING_SIZE] = '\0';
-        memset(d_vars, 0, sizeof(d_vars));
-        d_vars[0].read_fptr = rd_dev_name;
-        d_vars[0].write_fptr = NULL;
-        d_vars[0].name = mnt_name;
+#define seq_page_flag(seq, page, flag, has_flags) do {                  \
+                if (test_bit(PG_##flag, &(page)->flags)) {              \
+                        if (!has_flags)                                 \
+                                has_flags = 1;                          \
+                        else                                            \
+                                seq_putc(seq, '|');                     \
+                        seq_puts(seq, #flag);                           \
+                }                                                       \
+        } while(0);
 
-        snprintf(uuid_name, MAX_STRING_SIZE, "status/%s/uuid",
-                 obd->obd_type->typ_name);
-        uuid_name[MAX_STRING_SIZE] = '\0';
-        d_vars[1].read_fptr = rd_dev_uuid;
-        d_vars[1].write_fptr = NULL;
-        d_vars[1].name = uuid_name;
+static void *llite_dump_pgcache_seq_start(struct seq_file *seq, loff_t *pos)
+{
+        struct ll_async_page *dummy_llap = seq->private;
 
-        err = lprocfs_add_vars(sbi->ll_proc_root, d_vars, obd);
-        if (err) {
-                CDEBUG(D_OTHER, "Unable to add fs proc dynamic variables\n");
+        if (dummy_llap->llap_magic == 2)
+                return NULL;
+
+        return (void *)1;
+}
+
+static int llite_dump_pgcache_seq_show(struct seq_file *seq, void *v)
+{
+        struct ll_async_page *llap, *dummy_llap = seq->private;
+        struct ll_sb_info *sbi = dummy_llap->llap_cookie;
+
+        /* 2.4 doesn't seem to have SEQ_START_TOKEN, so we implement
+         * it in our own state */
+        if (dummy_llap->llap_magic == 0) {
+                seq_printf(seq, "gener |  llap  cookie  origin wq du wb | page "
+                                "inode index count [ page flags ]\n");
+                return 0;
+        }
+
+        spin_lock(&sbi->ll_lock);
+
+        llap = llite_pglist_next_llap(sbi, &dummy_llap->llap_pglist_item);
+        if (llap != NULL)  {
+                int has_flags = 0;
+                struct page *page = llap->llap_page;
+
+                LASSERTF(llap->llap_origin < LLAP__ORIGIN_MAX, "%u\n",
+                         llap->llap_origin);
+
+                seq_printf(seq," %5lu | %p %p %s %s %s %s | %p %lu/%u(%p) "
+                           "%lu %u [",
+                           sbi->ll_pglist_gen,
+                           llap, llap->llap_cookie,
+                           llap_origins[llap->llap_origin],
+                           llap->llap_write_queued ? "wq" : "- ",
+                           llap->llap_defer_uptodate ? "du" : "- ",
+                           PageWriteback(page) ? "wb" : "-",
+                           page, page->mapping->host->i_ino,
+                           page->mapping->host->i_generation,
+                           page->mapping->host, page->index,
+                           page_count(page));
+                seq_page_flag(seq, page, locked, has_flags);
+                seq_page_flag(seq, page, error, has_flags);
+                seq_page_flag(seq, page, referenced, has_flags);
+                seq_page_flag(seq, page, uptodate, has_flags);
+                seq_page_flag(seq, page, dirty, has_flags);
+#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,12))
+                seq_page_flag(seq, page, highmem, has_flags);
+#endif
+                seq_page_flag(seq, page, writeback, has_flags);
+                if (!has_flags)
+                        seq_puts(seq, "-]\n");
+                else
+                        seq_puts(seq, "]\n");
+        }
+
+        spin_unlock(&sbi->ll_lock);
+
+        return 0;
+}
+
+static void *llite_dump_pgcache_seq_next(struct seq_file *seq, void *v, 
+                                         loff_t *pos)
+{
+        struct ll_async_page *llap, *dummy_llap = seq->private;
+        struct ll_sb_info *sbi = dummy_llap->llap_cookie;
+
+        /* bail if we just displayed the banner */
+        if (dummy_llap->llap_magic == 0) {
+                dummy_llap->llap_magic = 1;
+                return dummy_llap;
+        }
+
+        /* we've just displayed the llap that is after us in the list.
+         * we advance to a position beyond it, returning null if there
+         * isn't another llap in the list beyond that new position. */
+        spin_lock(&sbi->ll_lock);
+        llap = llite_pglist_next_llap(sbi, &dummy_llap->llap_pglist_item);
+        list_del_init(&dummy_llap->llap_pglist_item);
+        if (llap) {
+                list_add(&dummy_llap->llap_pglist_item,&llap->llap_pglist_item);
+                llap =llite_pglist_next_llap(sbi,&dummy_llap->llap_pglist_item);
+        }
+        spin_unlock(&sbi->ll_lock);
+
+        ++*pos;
+        if (llap == NULL) {
+                dummy_llap->llap_magic = 2;
+                return NULL;
+        }
+        return dummy_llap;
+}
+
+static void null_stop(struct seq_file *seq, void *v)
+{
+}
+
+struct seq_operations llite_dump_pgcache_seq_sops = {
+        .start = llite_dump_pgcache_seq_start,
+        .stop = null_stop,
+        .next = llite_dump_pgcache_seq_next,
+        .show = llite_dump_pgcache_seq_show,
+};
+
+/* we're displaying llaps in a list_head list.  we don't want to hold a lock
+ * while we walk the entire list, and we don't want to have to seek into
+ * the right position in the list as an app advances with many syscalls.  we
+ * allocate a dummy llap and hang it off file->private.  its position in
+ * the list records where the app is currently displaying.  this way our
+ * seq .start and .stop don't actually do anything.  .next returns null
+ * when the dummy hits the end of the list which eventually leads to .release
+ * where we tear down.  this kind of displaying is super-racey, so we put
+ * a generation counter on the list so the output shows when the list
+ * changes between reads.
+ */
+static int llite_dump_pgcache_seq_open(struct inode *inode, struct file *file)
+{
+        struct proc_dir_entry *dp = PDE(inode);
+        struct ll_async_page *dummy_llap;
+        struct seq_file *seq;
+        struct ll_sb_info *sbi = dp->data;
+        int rc = -ENOMEM;
+
+        LPROCFS_ENTRY_AND_CHECK(dp);
+
+        OBD_ALLOC_PTR_WAIT(dummy_llap);
+        if (dummy_llap == NULL)
+                GOTO(out, rc);
+        dummy_llap->llap_page = NULL;
+        dummy_llap->llap_cookie = sbi;
+        dummy_llap->llap_magic = 0;
+
+        rc = seq_open(file, &llite_dump_pgcache_seq_sops);
+        if (rc) {
+                OBD_FREE(dummy_llap, sizeof(*dummy_llap));
+                GOTO(out, rc);
+        }
+        seq = file->private_data;
+        seq->private = dummy_llap;
+
+        spin_lock(&sbi->ll_lock);
+        list_add(&dummy_llap->llap_pglist_item, &sbi->ll_pglist);
+        spin_unlock(&sbi->ll_lock);
+
+out:
+        if (rc)
+                LPROCFS_EXIT();
+        return rc;
+}
+
+static int llite_dump_pgcache_seq_release(struct inode *inode,
+                                          struct file *file)
+{
+        struct seq_file *seq = file->private_data;
+        struct ll_async_page *dummy_llap = seq->private;
+        struct ll_sb_info *sbi = dummy_llap->llap_cookie;
+
+        spin_lock(&sbi->ll_lock);
+        if (!list_empty(&dummy_llap->llap_pglist_item))
+                list_del_init(&dummy_llap->llap_pglist_item);
+        spin_unlock(&sbi->ll_lock);
+        OBD_FREE(dummy_llap, sizeof(*dummy_llap));
+
+        return lprocfs_seq_release(inode, file);
+}
+
+struct file_operations llite_dump_pgcache_fops = {
+        .owner   = THIS_MODULE,
+        .open    = llite_dump_pgcache_seq_open,
+        .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_GRAB_PAGE] = "failed grab_cache_page",
+                [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",
+                [RA_STAT_WRONG_GRAB_PAGE] = "wrong page from grab_cache_page",
+        };
+
+        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 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;
+}
+
+LPROC_SEQ_FOPS(ll_ra_stats);
+
+#define pct(a,b) (b ? a * 100 / b : 0)
+
+static void ll_display_extents_info(struct ll_rw_extents_info *io_extents,
+                                   struct seq_file *seq, int which)
+{
+        unsigned long read_tot = 0, write_tot = 0, read_cum, write_cum;
+        unsigned long start, end, r, w;
+        char *unitp = "KMGTPEZY";
+        int i, units = 10;
+        struct per_process_info *pp_info = &io_extents->pp_extents[which];
+
+        read_cum = 0;
+        write_cum = 0;
+        start = 0;
+
+        for(i = 0; i < LL_HIST_MAX; i++) {
+                read_tot += pp_info->pp_r_hist.oh_buckets[i];
+                write_tot += pp_info->pp_w_hist.oh_buckets[i];
+        }
+
+        for(i = 0; i < LL_HIST_MAX; i++) {
+                r = pp_info->pp_r_hist.oh_buckets[i];
+                w = pp_info->pp_w_hist.oh_buckets[i];
+                read_cum += r;
+                write_cum += w;
+                end = 1 << (i + LL_HIST_START - units);
+                seq_printf(seq, "%4lu%c - %4lu%c%c: %14lu %4lu %4lu  | "
+                           "%14lu %4lu %4lu\n", start, *unitp, end, *unitp,
+                           (i == LL_HIST_MAX - 1) ? '+' : ' ',
+                           r, pct(r, read_tot), pct(read_cum, read_tot),
+                           w, pct(w, write_tot), pct(write_cum, write_tot));
+                start = end;
+                if (start == 1<<10) {
+                        start = 1;
+                        units += 10;
+                        unitp++;
+                }
+                if (read_cum == read_tot && write_cum == write_tot)
+                        break;
+        }
+}
+
+static int ll_rw_extents_stats_pp_seq_show(struct seq_file *seq, void *v)
+{
+        struct timeval now;
+        struct ll_sb_info *sbi = seq->private;
+        struct ll_rw_extents_info *io_extents = &sbi->ll_rw_extents_info;
+        int k;
+
+        do_gettimeofday(&now);
+
+        if (!sbi->ll_rw_stats_on) {
+                seq_printf(seq, "Disabled\n"
+                                "Write anything in this file to activate\n");
+                return 0;
+        }
+        seq_printf(seq, "snapshot_time:         %lu.%lu (secs.usecs)\n",
+                   now.tv_sec, now.tv_usec);
+        seq_printf(seq, "%15s %19s       | %20s\n", " ", "read", "write");
+        seq_printf(seq, "%13s   %14s %4s %4s  | %14s %4s %4s\n", 
+                   "extents", "calls", "%", "cum%",
+                   "calls", "%", "cum%");
+        spin_lock(&sbi->ll_pp_extent_lock);
+        for(k = 0; k < LL_PROCESS_HIST_MAX; k++) {
+                if(io_extents->pp_extents[k].pid != 0) {
+                        seq_printf(seq, "\nPID: %d\n",
+                                   io_extents->pp_extents[k].pid);
+                        ll_display_extents_info(io_extents, seq, k);
+                }
+        }
+        spin_unlock(&sbi->ll_pp_extent_lock);
+        return 0;
+}
+
+static ssize_t ll_rw_extents_stats_pp_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_rw_extents_info *io_extents = &sbi->ll_rw_extents_info;
+        int i;
+
+        sbi->ll_rw_stats_on = 1;
+        spin_lock(&sbi->ll_pp_extent_lock);
+        for(i = 0; i < LL_PROCESS_HIST_MAX; i++) {
+                io_extents->pp_extents[i].pid = 0;
+                lprocfs_oh_clear(&io_extents->pp_extents[i].pp_r_hist);
+                lprocfs_oh_clear(&io_extents->pp_extents[i].pp_w_hist);
+        }
+        spin_unlock(&sbi->ll_pp_extent_lock);
+        return len;
+}
+
+LPROC_SEQ_FOPS(ll_rw_extents_stats_pp);
+
+static int ll_rw_extents_stats_seq_show(struct seq_file *seq, void *v)
+{
+        struct timeval now;
+        struct ll_sb_info *sbi = seq->private;
+        struct ll_rw_extents_info *io_extents = &sbi->ll_rw_extents_info;
+
+        do_gettimeofday(&now);
+
+        if (!sbi->ll_rw_stats_on) {
+                seq_printf(seq, "Disabled\n"
+                                "Write anything in this file to activate\n");
+                return 0;
+        }
+        seq_printf(seq, "snapshot_time:         %lu.%lu (secs.usecs)\n",
+                   now.tv_sec, now.tv_usec);
+
+        seq_printf(seq, "%15s %19s       | %20s\n", " ", "read", "write");
+        seq_printf(seq, "%13s   %14s %4s %4s  | %14s %4s %4s\n", 
+                   "extents", "calls", "%", "cum%",
+                   "calls", "%", "cum%");
+        spin_lock(&sbi->ll_lock);
+        ll_display_extents_info(io_extents, seq, LL_PROCESS_HIST_MAX);
+        spin_unlock(&sbi->ll_lock);
+
+        return 0;
+}
+
+static ssize_t ll_rw_extents_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_rw_extents_info *io_extents = &sbi->ll_rw_extents_info;
+        int i;
+
+        sbi->ll_rw_stats_on = 1;
+        spin_lock(&sbi->ll_pp_extent_lock);
+        for(i = 0; i <= LL_PROCESS_HIST_MAX; i++)
+        {
+                io_extents->pp_extents[i].pid = 0;
+                lprocfs_oh_clear(&io_extents->pp_extents[i].pp_r_hist);
+                lprocfs_oh_clear(&io_extents->pp_extents[i].pp_w_hist);
+        }
+        spin_unlock(&sbi->ll_pp_extent_lock);
+
+        return len;
+}
+
+LPROC_SEQ_FOPS(ll_rw_extents_stats);
+
+void ll_rw_stats_tally(struct ll_sb_info *sbi, pid_t pid, struct file
+                               *file, size_t count, int rw)
+{
+        int i, cur = -1;
+        struct ll_rw_process_info *process;
+        struct ll_rw_process_info *offset;
+        int *off_count = &sbi->ll_rw_offset_entry_count;
+        int *process_count = &sbi->ll_offset_process_count;
+        struct ll_rw_extents_info *io_extents = &sbi->ll_rw_extents_info;
+
+        if(!sbi->ll_rw_stats_on)
                 return;
+        process = sbi->ll_rw_process_info;
+        offset = sbi->ll_rw_offset_info;
+
+        spin_lock(&sbi->ll_pp_extent_lock);
+        /* Extent statistics */
+        for(i = 0; i < LL_PROCESS_HIST_MAX; i++) {
+                if(io_extents->pp_extents[i].pid == pid) {
+                        cur = i;
+                        break;
+                }
         }
+
+        if (cur == -1) {
+                /* new process */
+                sbi->ll_extent_process_count = 
+                        (sbi->ll_extent_process_count + 1) % LL_PROCESS_HIST_MAX;
+                cur = sbi->ll_extent_process_count;
+                io_extents->pp_extents[cur].pid = pid;
+                lprocfs_oh_clear(&io_extents->pp_extents[cur].pp_r_hist);
+                lprocfs_oh_clear(&io_extents->pp_extents[cur].pp_w_hist);
+        }
+
+        for(i = 0; (count >= (1 << LL_HIST_START << i)) && 
+             (i < (LL_HIST_MAX - 1)); i++);
+        if (rw == 0) {
+                io_extents->pp_extents[cur].pp_r_hist.oh_buckets[i]++;
+                io_extents->pp_extents[LL_PROCESS_HIST_MAX].pp_r_hist.oh_buckets[i]++;
+        } else {
+                io_extents->pp_extents[cur].pp_w_hist.oh_buckets[i]++;
+                io_extents->pp_extents[LL_PROCESS_HIST_MAX].pp_w_hist.oh_buckets[i]++;
+        }
+        spin_unlock(&sbi->ll_pp_extent_lock);
+
+        spin_lock(&sbi->ll_process_lock);
+        /* Offset statistics */
+        for (i = 0; i < LL_PROCESS_HIST_MAX; i++) {
+                if (process[i].rw_pid == pid) {
+                        if (process[i].rw_last_file != file) {
+                                process[i].rw_range_start = file->f_pos;
+                                process[i].rw_last_file_pos =
+                                                        file->f_pos + count;
+                                process[i].rw_smallest_extent = count;
+                                process[i].rw_largest_extent = count;
+                                process[i].rw_offset = 0;
+                                process[i].rw_last_file = file;
+                                spin_unlock(&sbi->ll_process_lock);
+                                return;
+                        }
+                        if (process[i].rw_last_file_pos != file->f_pos) {
+                                *off_count =
+                                    (*off_count + 1) % LL_OFFSET_HIST_MAX;
+                                offset[*off_count].rw_op = process[i].rw_op;
+                                offset[*off_count].rw_pid = pid;
+                                offset[*off_count].rw_range_start =
+                                        process[i].rw_range_start;
+                                offset[*off_count].rw_range_end =
+                                        process[i].rw_last_file_pos;
+                                offset[*off_count].rw_smallest_extent =
+                                        process[i].rw_smallest_extent;
+                                offset[*off_count].rw_largest_extent =
+                                        process[i].rw_largest_extent;
+                                offset[*off_count].rw_offset =
+                                        process[i].rw_offset;
+                                process[i].rw_op = rw;
+                                process[i].rw_range_start = file->f_pos;
+                                process[i].rw_smallest_extent = count;
+                                process[i].rw_largest_extent = count;
+                                process[i].rw_offset = file->f_pos -
+                                        process[i].rw_last_file_pos;
+                        }
+                        if(process[i].rw_smallest_extent > count)
+                                process[i].rw_smallest_extent = count;
+                        if(process[i].rw_largest_extent < count)
+                                process[i].rw_largest_extent = count;
+                        process[i].rw_last_file_pos = file->f_pos + count;
+                        spin_unlock(&sbi->ll_process_lock);
+                        return;
+                }
+        }
+        *process_count = (*process_count + 1) % LL_PROCESS_HIST_MAX;
+        process[*process_count].rw_pid = pid;
+        process[*process_count].rw_op = rw;
+        process[*process_count].rw_range_start = file->f_pos;
+        process[*process_count].rw_last_file_pos = file->f_pos + count;
+        process[*process_count].rw_smallest_extent = count;
+        process[*process_count].rw_largest_extent = count;
+        process[*process_count].rw_offset = 0;
+        process[*process_count].rw_last_file = file;
+        spin_unlock(&sbi->ll_process_lock);
 }
-#undef MAX_STRING_SIZE
+
+char lpszt[] = LPSZ;
+
+static int ll_rw_offset_stats_seq_show(struct seq_file *seq, void *v)
+{
+        struct timeval now;
+        struct ll_sb_info *sbi = seq->private;
+        struct ll_rw_process_info *offset = sbi->ll_rw_offset_info;
+        struct ll_rw_process_info *process = sbi->ll_rw_process_info;
+        char format[50];
+        int i;
+
+        do_gettimeofday(&now);
+
+        if (!sbi->ll_rw_stats_on) {
+                seq_printf(seq, "Disabled\n"
+                                "Write anything in this file to activate\n");
+                return 0;
+        }
+        spin_lock(&sbi->ll_process_lock);
+
+        seq_printf(seq, "snapshot_time:         %lu.%lu (secs.usecs)\n",
+                   now.tv_sec, now.tv_usec);
+        seq_printf(seq, "%3s %10s %14s %14s %17s %17s %14s\n",
+                   "R/W", "PID", "RANGE START", "RANGE END",
+                   "SMALLEST EXTENT", "LARGEST EXTENT", "OFFSET");
+        sprintf(format, "%s%s%s%s%s\n",
+                "%3c %10d %14Lu %14Lu %17", lpszt+1, " %17", lpszt+1, " %14Ld");
+        /* We stored the discontiguous offsets here; print them first */
+        for(i = 0; i < LL_OFFSET_HIST_MAX; i++) {
+                if (offset[i].rw_pid != 0)
+                        /* Is there a way to snip the '%' off of LPSZ? */
+                        seq_printf(seq, format,
+                                   offset[i].rw_op ? 'W' : 'R',
+                                   offset[i].rw_pid,
+                                   offset[i].rw_range_start,
+                                   offset[i].rw_range_end,
+                                   offset[i].rw_smallest_extent,
+                                   offset[i].rw_largest_extent,
+                                   offset[i].rw_offset);
+        }
+        /* Then print the current offsets for each process */
+        for(i = 0; i < LL_PROCESS_HIST_MAX; i++) {
+                if (process[i].rw_pid != 0)
+                        seq_printf(seq, format,
+                                   process[i].rw_op ? 'W' : 'R',
+                                   process[i].rw_pid,
+                                   process[i].rw_range_start,
+                                   process[i].rw_last_file_pos,
+                                   process[i].rw_smallest_extent,
+                                   process[i].rw_largest_extent,
+                                   process[i].rw_offset);
+        }
+        spin_unlock(&sbi->ll_process_lock);
+
+        return 0;
+}
+
+static ssize_t ll_rw_offset_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_rw_process_info *process_info = sbi->ll_rw_process_info;
+        struct ll_rw_process_info *offset_info = sbi->ll_rw_offset_info;
+
+        sbi->ll_rw_stats_on = 1;
+
+        spin_lock(&sbi->ll_process_lock);
+        sbi->ll_offset_process_count = 0;
+        sbi->ll_rw_offset_entry_count = 0;
+        memset(process_info, 0, sizeof(struct ll_rw_process_info) *
+               LL_PROCESS_HIST_MAX);
+        memset(offset_info, 0, sizeof(struct ll_rw_process_info) *
+               LL_OFFSET_HIST_MAX);
+        spin_unlock(&sbi->ll_process_lock);
+
+        return len;
+}
+
+LPROC_SEQ_FOPS(ll_rw_offset_stats);
+
+LPROCFS_INIT_VARS(llite, NULL, lprocfs_obd_vars)
+#endif /* LPROCFS */