X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fllite%2Flproc_llite.c;h=a3d0b2bf2a12a44400b73370ecacb5b765b3c12c;hp=7e9ff3e4580b6d0cb6ca0243956593e22e51f96c;hb=48a0697d79101ad3ff7651779808dcf002a68890;hpb=e53d1c18ea9f8c08d55d573e8f0993e582c44c20 diff --git a/lustre/llite/lproc_llite.c b/lustre/llite/lproc_llite.c index 7e9ff3e..a3d0b2b 100644 --- a/lustre/llite/lproc_llite.c +++ b/lustre/llite/lproc_llite.c @@ -27,7 +27,7 @@ * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2012, 2013, Intel Corporation. + * Copyright (c) 2012, 2014, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -36,205 +36,184 @@ #define DEBUG_SUBSYSTEM S_LLITE #include -#include +#include #include -#include #include #include "llite_internal.h" +#include "vvp_internal.h" struct proc_dir_entry *proc_lustre_fs_root; -#ifdef LPROCFS +#ifdef CONFIG_PROC_FS /* /proc/lustre/llite mount point registration */ -extern struct file_operations vvp_dump_pgcache_file_ops; -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 const struct file_operations ll_rw_extents_stats_fops; +static const struct file_operations ll_rw_extents_stats_pp_fops; +static const 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) +static int ll_blksize_seq_show(struct seq_file *m, void *v) { - 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_shift_64(-OBD_STATFS_CACHE_SECONDS), - OBD_STATFS_NODELAY); - if (!rc) { - *eof = 1; - rc = snprintf(page, count, "%u\n", osfs.os_bsize); - } + struct super_block *sb = m->private; + struct obd_statfs osfs; + int rc; - return rc; + LASSERT(sb != NULL); + rc = ll_statfs_internal(sb, &osfs, + cfs_time_shift_64(-OBD_STATFS_CACHE_SECONDS), + OBD_STATFS_NODELAY); + if (!rc) + rc = seq_printf(m, "%u\n", osfs.os_bsize); + return rc; } +LPROC_SEQ_FOPS_RO(ll_blksize); -static int ll_rd_kbytestotal(char *page, char **start, off_t off, int count, - int *eof, void *data) +static int ll_kbytestotal_seq_show(struct seq_file *m, void *v) { - 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_shift_64(-OBD_STATFS_CACHE_SECONDS), - OBD_STATFS_NODELAY); - 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; + struct super_block *sb = m->private; + struct obd_statfs osfs; + int rc; + + LASSERT(sb != NULL); + rc = ll_statfs_internal(sb, &osfs, + cfs_time_shift_64(-OBD_STATFS_CACHE_SECONDS), + OBD_STATFS_NODELAY); + if (!rc) { + __u32 blk_size = osfs.os_bsize >> 10; + __u64 result = osfs.os_blocks; + while (blk_size >>= 1) + result <<= 1; + + rc = seq_printf(m, LPU64"\n", result); + } + return rc; } +LPROC_SEQ_FOPS_RO(ll_kbytestotal); -static int ll_rd_kbytesfree(char *page, char **start, off_t off, int count, - int *eof, void *data) +static int ll_kbytesfree_seq_show(struct seq_file *m, void *v) { - 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_shift_64(-OBD_STATFS_CACHE_SECONDS), - OBD_STATFS_NODELAY); - 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; + struct super_block *sb = m->private; + struct obd_statfs osfs; + int rc; + + LASSERT(sb != NULL); + rc = ll_statfs_internal(sb, &osfs, + cfs_time_shift_64(-OBD_STATFS_CACHE_SECONDS), + OBD_STATFS_NODELAY); + if (!rc) { + __u32 blk_size = osfs.os_bsize >> 10; + __u64 result = osfs.os_bfree; + + while (blk_size >>= 1) + result <<= 1; + + rc = seq_printf(m, LPU64"\n", result); + } + return rc; } +LPROC_SEQ_FOPS_RO(ll_kbytesfree); -static int ll_rd_kbytesavail(char *page, char **start, off_t off, int count, - int *eof, void *data) +static int ll_kbytesavail_seq_show(struct seq_file *m, void *v) { - 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_shift_64(-OBD_STATFS_CACHE_SECONDS), - OBD_STATFS_NODELAY); - 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); - } - return rc; + struct super_block *sb = m->private; + struct obd_statfs osfs; + int rc; + + LASSERT(sb != NULL); + rc = ll_statfs_internal(sb, &osfs, + cfs_time_shift_64(-OBD_STATFS_CACHE_SECONDS), + OBD_STATFS_NODELAY); + if (!rc) { + __u32 blk_size = osfs.os_bsize >> 10; + __u64 result = osfs.os_bavail; + + while (blk_size >>= 1) + result <<= 1; + + rc = seq_printf(m, LPU64"\n", result); + } + return rc; } +LPROC_SEQ_FOPS_RO(ll_kbytesavail); -static int ll_rd_filestotal(char *page, char **start, off_t off, int count, - int *eof, void *data) +static int ll_filestotal_seq_show(struct seq_file *m, void *v) { - 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_shift_64(-OBD_STATFS_CACHE_SECONDS), - OBD_STATFS_NODELAY); - if (!rc) { - *eof = 1; - rc = snprintf(page, count, LPU64"\n", osfs.os_files); - } - return rc; + struct super_block *sb = m->private; + struct obd_statfs osfs; + int rc; + + LASSERT(sb != NULL); + rc = ll_statfs_internal(sb, &osfs, + cfs_time_shift_64(-OBD_STATFS_CACHE_SECONDS), + OBD_STATFS_NODELAY); + if (!rc) + rc = seq_printf(m, LPU64"\n", osfs.os_files); + return rc; } +LPROC_SEQ_FOPS_RO(ll_filestotal); -static int ll_rd_filesfree(char *page, char **start, off_t off, int count, - int *eof, void *data) +static int ll_filesfree_seq_show(struct seq_file *m, void *v) { - 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_shift_64(-OBD_STATFS_CACHE_SECONDS), - OBD_STATFS_NODELAY); - if (!rc) { - *eof = 1; - rc = snprintf(page, count, LPU64"\n", osfs.os_ffree); - } - return rc; + struct super_block *sb = m->private; + struct obd_statfs osfs; + int rc; + LASSERT(sb != NULL); + rc = ll_statfs_internal(sb, &osfs, + cfs_time_shift_64(-OBD_STATFS_CACHE_SECONDS), + OBD_STATFS_NODELAY); + if (!rc) + rc = seq_printf(m, LPU64"\n", osfs.os_ffree); + return rc; } +LPROC_SEQ_FOPS_RO(ll_filesfree); -static int ll_rd_client_type(char *page, char **start, off_t off, int count, - int *eof, void *data) +static int ll_client_type_seq_show(struct seq_file *m, void *v) { - struct ll_sb_info *sbi = ll_s2sbi((struct super_block *)data); - int rc; - - LASSERT(sbi != NULL); + struct ll_sb_info *sbi = ll_s2sbi((struct super_block *)m->private); + int rc; - *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"); + LASSERT(sbi != NULL); - return rc; + if (sbi->ll_flags & LL_SBI_RMT_CLIENT) + rc = seq_printf(m, "remote client\n"); + else + rc = seq_printf(m, "local client\n"); + return rc; } +LPROC_SEQ_FOPS_RO(ll_client_type); -static int ll_rd_fstype(char *page, char **start, off_t off, int count, - int *eof, void *data) +static int ll_fstype_seq_show(struct seq_file *m, void *v) { - struct super_block *sb = (struct super_block*)data; + struct super_block *sb = m->private; - LASSERT(sb != NULL); - *eof = 1; - return snprintf(page, count, "%s\n", sb->s_type->name); + LASSERT(sb != NULL); + return seq_printf(m, "%s\n", sb->s_type->name); } +LPROC_SEQ_FOPS_RO(ll_fstype); -static int ll_rd_sb_uuid(char *page, char **start, off_t off, int count, - int *eof, void *data) +static int ll_sb_uuid_seq_show(struct seq_file *m, void *v) { - struct super_block *sb = (struct super_block *)data; + struct super_block *sb = m->private; - LASSERT(sb != NULL); - *eof = 1; - return snprintf(page, count, "%s\n", ll_s2sbi(sb)->ll_sb_uuid.uuid); + LASSERT(sb != NULL); + return seq_printf(m, "%s\n", ll_s2sbi(sb)->ll_sb_uuid.uuid); } +LPROC_SEQ_FOPS_RO(ll_sb_uuid); -static int ll_rd_xattr_cache(char *page, char **start, off_t off, - int count, int *eof, void *data) +static int ll_xattr_cache_seq_show(struct seq_file *m, void *v) { - struct super_block *sb = (struct super_block *)data; - struct ll_sb_info *sbi = ll_s2sbi(sb); - int rc; - - rc = snprintf(page, count, "%u\n", sbi->ll_xattr_cache_enabled); + struct ll_sb_info *sbi = ll_s2sbi((struct super_block *)m->private); - return rc; + return seq_printf(m, "%u\n", sbi->ll_xattr_cache_enabled); } -static int ll_wr_xattr_cache(struct file *file, const char *buffer, - unsigned long count, void *data) +static ssize_t ll_xattr_cache_seq_write(struct file *file, + const char __user *buffer, + size_t count, loff_t *off) { - struct super_block *sb = (struct super_block *)data; - struct ll_sb_info *sbi = ll_s2sbi(sb); + struct seq_file *m = file->private_data; + struct ll_sb_info *sbi = ll_s2sbi((struct super_block *)m->private); int val, rc; rc = lprocfs_write_helper(buffer, count, &val); @@ -251,24 +230,23 @@ static int ll_wr_xattr_cache(struct file *file, const char *buffer, return count; } +LPROC_SEQ_FOPS(ll_xattr_cache); -static int ll_rd_site_stats(char *page, char **start, off_t off, - int count, int *eof, void *data) +static int ll_site_stats_seq_show(struct seq_file *m, void *v) { - struct super_block *sb = data; - - /* - * See description of statistical counters in struct cl_site, and - * struct lu_site. - */ - return cl_site_stats_print(lu2cl_site(ll_s2sbi(sb)->ll_site), - page, count); + struct super_block *sb = m->private; + + /* + * See description of statistical counters in struct cl_site, and + * struct lu_site. + */ + return cl_site_stats_print(lu2cl_site(ll_s2sbi(sb)->ll_site), m); } +LPROC_SEQ_FOPS_RO(ll_site_stats); -static int ll_rd_max_readahead_mb(char *page, char **start, off_t off, - int count, int *eof, void *data) +static int ll_max_readahead_mb_seq_show(struct seq_file *m, void *v) { - struct super_block *sb = data; + struct super_block *sb = m->private; struct ll_sb_info *sbi = ll_s2sbi(sb); long pages_number; int mult; @@ -278,39 +256,49 @@ static int ll_rd_max_readahead_mb(char *page, char **start, off_t off, spin_unlock(&sbi->ll_lock); mult = 1 << (20 - PAGE_CACHE_SHIFT); - return lprocfs_read_frac_helper(page, count, pages_number, mult); + return lprocfs_seq_read_frac_helper(m, pages_number, mult); } -static int ll_wr_max_readahead_mb(struct file *file, const char *buffer, - unsigned long count, void *data) +static ssize_t +ll_max_readahead_mb_seq_write(struct file *file, const char __user *buffer, + size_t count, loff_t *off) { - struct super_block *sb = data; + struct seq_file *m = file->private_data; + struct super_block *sb = m->private; struct ll_sb_info *sbi = ll_s2sbi(sb); - int mult, rc, pages_number; + __u64 val; + long pages_number; + int pages_shift; + int rc; - mult = 1 << (20 - PAGE_CACHE_SHIFT); - rc = lprocfs_write_frac_helper(buffer, count, &pages_number, mult); + pages_shift = 20 - PAGE_CACHE_SHIFT; + rc = lprocfs_write_frac_u64_helper(buffer, count, &val, + 1 << pages_shift); if (rc) return rc; - if (pages_number < 0 || pages_number > num_physpages / 2) { + if (val > LONG_MAX) + return -ERANGE; + pages_number = (long)val; + + if (pages_number < 0 || pages_number > totalram_pages / 2) { /* 1/2 of RAM */ - CERROR("can't set file readahead more than %lu MB\n", - num_physpages >> (20 - PAGE_CACHE_SHIFT + 1)); + CERROR("%s: can't set max_readahead_mb=%lu > %luMB\n", + ll_get_fsname(sb, NULL, 0), pages_number >> pages_shift, + totalram_pages >> (pages_shift + 1)); return -ERANGE; } spin_lock(&sbi->ll_lock); sbi->ll_ra_info.ra_max_pages = pages_number; spin_unlock(&sbi->ll_lock); - return count; } +LPROC_SEQ_FOPS(ll_max_readahead_mb); -static int ll_rd_max_readahead_per_file_mb(char *page, char **start, off_t off, - int count, int *eof, void *data) +static int ll_max_readahead_per_file_mb_seq_show(struct seq_file *m, void *v) { - struct super_block *sb = data; + struct super_block *sb = m->private; struct ll_sb_info *sbi = ll_s2sbi(sb); long pages_number; int mult; @@ -320,40 +308,43 @@ static int ll_rd_max_readahead_per_file_mb(char *page, char **start, off_t off, spin_unlock(&sbi->ll_lock); mult = 1 << (20 - PAGE_CACHE_SHIFT); - return lprocfs_read_frac_helper(page, count, pages_number, mult); + return lprocfs_seq_read_frac_helper(m, pages_number, mult); } -static int ll_wr_max_readahead_per_file_mb(struct file *file, const char *buffer, - unsigned long count, void *data) +static ssize_t +ll_max_readahead_per_file_mb_seq_write(struct file *file, + const char __user *buffer, + size_t count, loff_t *off) { - struct super_block *sb = data; - struct ll_sb_info *sbi = ll_s2sbi(sb); - int mult, rc, pages_number; + struct seq_file *m = file->private_data; + struct super_block *sb = m->private; + struct ll_sb_info *sbi = ll_s2sbi(sb); + int pages_shift, rc, pages_number; - mult = 1 << (20 - PAGE_CACHE_SHIFT); - rc = lprocfs_write_frac_helper(buffer, count, &pages_number, mult); - if (rc) - return rc; + pages_shift = 20 - PAGE_CACHE_SHIFT; + rc = lprocfs_write_frac_helper(buffer, count, &pages_number, + 1 << pages_shift); + if (rc) + return rc; - if (pages_number < 0 || - pages_number > sbi->ll_ra_info.ra_max_pages) { - CERROR("can't set file readahead more than" - "max_read_ahead_mb %lu MB\n", - sbi->ll_ra_info.ra_max_pages); - return -ERANGE; - } + if (pages_number < 0 || pages_number > sbi->ll_ra_info.ra_max_pages) { + CERROR("%s: can't set max_readahead_per_file_mb=%u > " + "max_read_ahead_mb=%lu\n", ll_get_fsname(sb, NULL, 0), + pages_number >> pages_shift, + sbi->ll_ra_info.ra_max_pages >> pages_shift); + return -ERANGE; + } spin_lock(&sbi->ll_lock); sbi->ll_ra_info.ra_max_pages_per_file = pages_number; spin_unlock(&sbi->ll_lock); - return count; } +LPROC_SEQ_FOPS(ll_max_readahead_per_file_mb); -static int ll_rd_max_read_ahead_whole_mb(char *page, char **start, off_t off, - int count, int *eof, void *data) +static int ll_max_read_ahead_whole_mb_seq_show(struct seq_file *m, void *v) { - struct super_block *sb = data; + struct super_block *sb = m->private; struct ll_sb_info *sbi = ll_s2sbi(sb); long pages_number; int mult; @@ -363,18 +354,22 @@ static int ll_rd_max_read_ahead_whole_mb(char *page, char **start, off_t off, spin_unlock(&sbi->ll_lock); mult = 1 << (20 - PAGE_CACHE_SHIFT); - return lprocfs_read_frac_helper(page, count, pages_number, mult); + return lprocfs_seq_read_frac_helper(m, pages_number, mult); } -static int ll_wr_max_read_ahead_whole_mb(struct file *file, const char *buffer, - unsigned long count, void *data) +static ssize_t +ll_max_read_ahead_whole_mb_seq_write(struct file *file, + const char __user *buffer, + size_t count, loff_t *off) { - struct super_block *sb = data; + struct seq_file *m = file->private_data; + struct super_block *sb = m->private; struct ll_sb_info *sbi = ll_s2sbi(sb); - int mult, rc, pages_number; + int pages_shift, rc, pages_number; - mult = 1 << (20 - PAGE_CACHE_SHIFT); - rc = lprocfs_write_frac_helper(buffer, count, &pages_number, mult); + pages_shift = 20 - PAGE_CACHE_SHIFT; + rc = lprocfs_write_frac_helper(buffer, count, &pages_number, + 1 << pages_shift); if (rc) return rc; @@ -382,72 +377,90 @@ static int ll_wr_max_read_ahead_whole_mb(struct file *file, const char *buffer, * 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_per_file) { - CERROR("can't set max_read_ahead_whole_mb more than " - "max_read_ahead_per_file_mb: %lu\n", - sbi->ll_ra_info.ra_max_pages_per_file >> - (20 - PAGE_CACHE_SHIFT)); + CERROR("%s: can't set max_read_ahead_whole_mb=%u > " + "max_read_ahead_per_file_mb=%lu\n", + ll_get_fsname(sb, NULL, 0), + pages_number >> pages_shift, + sbi->ll_ra_info.ra_max_pages_per_file >> pages_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; } +LPROC_SEQ_FOPS(ll_max_read_ahead_whole_mb); -static int ll_rd_max_cached_mb(char *page, char **start, off_t off, - int count, int *eof, void *data) +static int ll_max_cached_mb_seq_show(struct seq_file *m, void *v) { - struct super_block *sb = data; + struct super_block *sb = m->private; struct ll_sb_info *sbi = ll_s2sbi(sb); struct cl_client_cache *cache = &sbi->ll_cache; int shift = 20 - PAGE_CACHE_SHIFT; - int max_cached_mb; - int unused_mb; + long max_cached_mb; + long unused_mb; - *eof = 1; max_cached_mb = cache->ccc_lru_max >> shift; - unused_mb = cfs_atomic_read(&cache->ccc_lru_left) >> shift; - return snprintf(page, count, + unused_mb = atomic_long_read(&cache->ccc_lru_left) >> shift; + return seq_printf(m, "users: %d\n" - "max_cached_mb: %d\n" - "used_mb: %d\n" - "unused_mb: %d\n" + "max_cached_mb: %ld\n" + "used_mb: %ld\n" + "unused_mb: %ld\n" "reclaim_count: %u\n", - cfs_atomic_read(&cache->ccc_users), + atomic_read(&cache->ccc_users), max_cached_mb, max_cached_mb - unused_mb, unused_mb, cache->ccc_lru_shrinkers); } -static int ll_wr_max_cached_mb(struct file *file, const char *buffer, - unsigned long count, void *data) +static ssize_t +ll_max_cached_mb_seq_write(struct file *file, const char __user *buffer, + size_t count, loff_t *off) { - struct super_block *sb = data; + struct seq_file *m = file->private_data; + struct super_block *sb = m->private; struct ll_sb_info *sbi = ll_s2sbi(sb); struct cl_client_cache *cache = &sbi->ll_cache; - int mult, rc, pages_number; - int diff = 0; - int nrpages = 0; + struct lu_env *env; + __u64 val; + long diff = 0; + long nrpages = 0; + long pages_number; + int refcheck; + int mult; + long rc; + char kernbuf[128]; ENTRY; + if (count >= sizeof(kernbuf)) + RETURN(-EINVAL); + + if (copy_from_user(kernbuf, buffer, count)) + RETURN(-EFAULT); + kernbuf[count] = 0; + mult = 1 << (20 - PAGE_CACHE_SHIFT); - buffer = lprocfs_find_named_value(buffer, "max_cached_mb:", &count); - rc = lprocfs_write_frac_helper(buffer, count, &pages_number, mult); + buffer += lprocfs_find_named_value(kernbuf, "max_cached_mb:", &count) - + kernbuf; + rc = lprocfs_write_frac_u64_helper(buffer, count, &val, mult); if (rc) RETURN(rc); - if (pages_number < 0 || pages_number > num_physpages) { + if (val > LONG_MAX) + return -ERANGE; + pages_number = (long)val; + + if (pages_number < 0 || pages_number > totalram_pages) { CERROR("%s: can't set max cache more than %lu MB\n", ll_get_fsname(sb, NULL, 0), - num_physpages >> (20 - PAGE_CACHE_SHIFT)); + totalram_pages >> (20 - PAGE_CACHE_SHIFT)); RETURN(-ERANGE); } - - if (sbi->ll_dt_exp == NULL) - RETURN(-ENODEV); + /* Allow enough cache so clients can make well-formed RPCs */ + pages_number = max_t(long, pages_number, PTLRPC_MAX_BRW_PAGES); spin_lock(&sbi->ll_lock); diff = pages_number - cache->ccc_lru_max; @@ -455,24 +468,28 @@ static int ll_wr_max_cached_mb(struct file *file, const char *buffer, /* easy - add more LRU slots. */ if (diff >= 0) { - cfs_atomic_add(diff, &cache->ccc_lru_left); + atomic_long_add(diff, &cache->ccc_lru_left); GOTO(out, rc = 0); } + env = cl_env_get(&refcheck); + if (IS_ERR(env)) + RETURN(rc); + diff = -diff; while (diff > 0) { - int tmp; + long tmp; /* reduce LRU budget from free slots. */ do { - int ov, nv; + long ov, nv; - ov = cfs_atomic_read(&cache->ccc_lru_left); + ov = atomic_long_read(&cache->ccc_lru_left); if (ov == 0) break; nv = ov > diff ? ov - diff : 0; - rc = cfs_atomic_cmpxchg(&cache->ccc_lru_left, ov, nv); + rc = atomic_long_cmpxchg(&cache->ccc_lru_left, ov, nv); if (likely(ov == rc)) { diff -= ov - nv; nrpages += ov - nv; @@ -483,15 +500,21 @@ static int ll_wr_max_cached_mb(struct file *file, const char *buffer, if (diff <= 0) break; + if (sbi->ll_dt_exp == NULL) { /* being initialized */ + rc = -ENODEV; + break; + } + /* difficult - have to ask OSCs to drop LRU slots. */ tmp = diff << 1; - rc = obd_set_info_async(NULL, sbi->ll_dt_exp, + rc = obd_set_info_async(env, sbi->ll_dt_exp, sizeof(KEY_CACHE_LRU_SHRINK), KEY_CACHE_LRU_SHRINK, sizeof(tmp), &tmp, NULL); if (rc < 0) break; } + cl_env_put(env, &refcheck); out: if (rc >= 0) { @@ -500,26 +523,26 @@ out: spin_unlock(&sbi->ll_lock); rc = count; } else { - cfs_atomic_add(nrpages, &cache->ccc_lru_left); + atomic_long_add(nrpages, &cache->ccc_lru_left); } return rc; } +LPROC_SEQ_FOPS(ll_max_cached_mb); -static int ll_rd_checksum(char *page, char **start, off_t off, - int count, int *eof, void *data) +static int ll_checksum_seq_show(struct seq_file *m, void *v) { - struct super_block *sb = data; - struct ll_sb_info *sbi = ll_s2sbi(sb); + struct super_block *sb = m->private; + struct ll_sb_info *sbi = ll_s2sbi(sb); - return snprintf(page, count, "%u\n", - (sbi->ll_flags & LL_SBI_CHECKSUM) ? 1 : 0); + return seq_printf(m, "%u\n", (sbi->ll_flags & LL_SBI_CHECKSUM) ? 1 : 0); } -static int ll_wr_checksum(struct file *file, const char *buffer, - unsigned long count, void *data) +static ssize_t ll_checksum_seq_write(struct file *file, + const char __user *buffer, + size_t count, loff_t *off) { - struct super_block *sb = data; - struct ll_sb_info *sbi = ll_s2sbi(sb); + struct seq_file *m = file->private_data; + struct ll_sb_info *sbi = ll_s2sbi((struct super_block *)m->private); int val, rc; if (!sbi->ll_dt_exp) @@ -541,19 +564,21 @@ static int ll_wr_checksum(struct file *file, const char *buffer, return count; } +LPROC_SEQ_FOPS(ll_checksum); -static int ll_rd_max_rw_chunk(char *page, char **start, off_t off, - int count, int *eof, void *data) +static int ll_max_rw_chunk_seq_show(struct seq_file *m, void *v) { - struct super_block *sb = data; + struct super_block *sb = m->private; - return snprintf(page, count, "%lu\n", ll_s2sbi(sb)->ll_max_rw_chunk); + return seq_printf(m, "%lu\n", ll_s2sbi(sb)->ll_max_rw_chunk); } -static int ll_wr_max_rw_chunk(struct file *file, const char *buffer, - unsigned long count, void *data) +static ssize_t ll_max_rw_chunk_seq_write(struct file *file, + const char __user *buffer, + size_t count, loff_t *off) { - struct super_block *sb = data; + struct seq_file *m = file->private_data; + struct super_block *sb = m->private; int rc, val; rc = lprocfs_write_helper(buffer, count, &val); @@ -562,27 +587,26 @@ static int ll_wr_max_rw_chunk(struct file *file, const char *buffer, ll_s2sbi(sb)->ll_max_rw_chunk = val; return count; } +LPROC_SEQ_FOPS(ll_max_rw_chunk); -static int ll_rd_track_id(char *page, int count, void *data, - enum stats_track_type type) +static int ll_rd_track_id(struct seq_file *m, 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); + struct super_block *sb = m->private; - } 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"); - } + if (ll_s2sbi(sb)->ll_stats_track_type == type) { + return seq_printf(m, "%d\n", + ll_s2sbi(sb)->ll_stats_track_id); + } else if (ll_s2sbi(sb)->ll_stats_track_type == STATS_TRACK_ALL) { + return seq_printf(m, "0 (all)\n"); + } else { + return seq_printf(m, "untracked\n"); + } } -static int ll_wr_track_id(const char *buffer, unsigned long count, void *data, - enum stats_track_type type) +static int ll_wr_track_id(const char __user *buffer, unsigned long count, + void *data, enum stats_track_type type) { - struct super_block *sb = data; + struct super_block *sb = data; int rc, pid; rc = lprocfs_write_helper(buffer, count, &pid); @@ -597,57 +621,63 @@ static int ll_wr_track_id(const char *buffer, unsigned long count, void *data, return count; } -static int ll_rd_track_pid(char *page, char **start, off_t off, - int count, int *eof, void *data) +static int ll_track_pid_seq_show(struct seq_file *m, void *v) { - return (ll_rd_track_id(page, count, data, STATS_TRACK_PID)); + return ll_rd_track_id(m, STATS_TRACK_PID); } -static int ll_wr_track_pid(struct file *file, const char *buffer, - unsigned long count, void *data) +static ssize_t ll_track_pid_seq_write(struct file *file, + const char __user *buffer, + size_t count, loff_t *off) { - return (ll_wr_track_id(buffer, count, data, STATS_TRACK_PID)); + struct seq_file *seq = file->private_data; + return ll_wr_track_id(buffer, count, seq->private, STATS_TRACK_PID); } +LPROC_SEQ_FOPS(ll_track_pid); -static int ll_rd_track_ppid(char *page, char **start, off_t off, - int count, int *eof, void *data) +static int ll_track_ppid_seq_show(struct seq_file *m, void *v) { - return (ll_rd_track_id(page, count, data, STATS_TRACK_PPID)); + return ll_rd_track_id(m, STATS_TRACK_PPID); } -static int ll_wr_track_ppid(struct file *file, const char *buffer, - unsigned long count, void *data) +static ssize_t ll_track_ppid_seq_write(struct file *file, + const char __user *buffer, + size_t count, loff_t *off) { - return (ll_wr_track_id(buffer, count, data, STATS_TRACK_PPID)); + struct seq_file *seq = file->private_data; + return ll_wr_track_id(buffer, count, seq->private, STATS_TRACK_PPID); } +LPROC_SEQ_FOPS(ll_track_ppid); -static int ll_rd_track_gid(char *page, char **start, off_t off, - int count, int *eof, void *data) +static int ll_track_gid_seq_show(struct seq_file *m, void *v) { - return (ll_rd_track_id(page, count, data, STATS_TRACK_GID)); + return ll_rd_track_id(m, STATS_TRACK_GID); } -static int ll_wr_track_gid(struct file *file, const char *buffer, - unsigned long count, void *data) +static ssize_t ll_track_gid_seq_write(struct file *file, + const char __user *buffer, + size_t count, loff_t *off) { - return (ll_wr_track_id(buffer, count, data, STATS_TRACK_GID)); + struct seq_file *seq = file->private_data; + return ll_wr_track_id(buffer, count, seq->private, STATS_TRACK_GID); } +LPROC_SEQ_FOPS(ll_track_gid); -static int ll_rd_statahead_max(char *page, char **start, off_t off, - int count, int *eof, void *data) +static int ll_statahead_max_seq_show(struct seq_file *m, void *v) { - struct super_block *sb = data; - struct ll_sb_info *sbi = ll_s2sbi(sb); + struct super_block *sb = m->private; + struct ll_sb_info *sbi = ll_s2sbi(sb); - return snprintf(page, count, "%u\n", sbi->ll_sa_max); + return seq_printf(m, "%u\n", sbi->ll_sa_max); } -static int ll_wr_statahead_max(struct file *file, const char *buffer, - unsigned long count, void *data) +static ssize_t ll_statahead_max_seq_write(struct file *file, + const char __user *buffer, + size_t count, loff_t *off) { - struct super_block *sb = data; - struct ll_sb_info *sbi = ll_s2sbi(sb); - int val, rc; + struct seq_file *m = file->private_data; + struct ll_sb_info *sbi = ll_s2sbi((struct super_block *)m->private); + int val, rc; rc = lprocfs_write_helper(buffer, count, &val); if (rc) @@ -661,23 +691,24 @@ static int ll_wr_statahead_max(struct file *file, const char *buffer, return count; } +LPROC_SEQ_FOPS(ll_statahead_max); -static int ll_rd_statahead_agl(char *page, char **start, off_t off, - int count, int *eof, void *data) +static int ll_statahead_agl_seq_show(struct seq_file *m, void *v) { - struct super_block *sb = data; - struct ll_sb_info *sbi = ll_s2sbi(sb); + struct super_block *sb = m->private; + struct ll_sb_info *sbi = ll_s2sbi(sb); - return snprintf(page, count, "%u\n", - sbi->ll_flags & LL_SBI_AGL_ENABLED ? 1 : 0); + return seq_printf(m, "%u\n", + sbi->ll_flags & LL_SBI_AGL_ENABLED ? 1 : 0); } -static int ll_wr_statahead_agl(struct file *file, const char *buffer, - unsigned long count, void *data) +static ssize_t ll_statahead_agl_seq_write(struct file *file, + const char __user *buffer, + size_t count, loff_t *off) { - struct super_block *sb = data; - struct ll_sb_info *sbi = ll_s2sbi(sb); - int val, rc; + struct seq_file *m = file->private_data; + struct ll_sb_info *sbi = ll_s2sbi((struct super_block *)m->private); + int val, rc; rc = lprocfs_write_helper(buffer, count, &val); if (rc) @@ -690,14 +721,14 @@ static int ll_wr_statahead_agl(struct file *file, const char *buffer, return count; } +LPROC_SEQ_FOPS(ll_statahead_agl); -static int ll_rd_statahead_stats(char *page, char **start, off_t off, - int count, int *eof, void *data) +static int ll_statahead_stats_seq_show(struct seq_file *m, void *v) { - struct super_block *sb = data; - struct ll_sb_info *sbi = ll_s2sbi(sb); + struct super_block *sb = m->private; + struct ll_sb_info *sbi = ll_s2sbi(sb); - return snprintf(page, count, + return seq_printf(m, "statahead total: %u\n" "statahead wrong: %u\n" "agl total: %u\n", @@ -705,23 +736,24 @@ static int ll_rd_statahead_stats(char *page, char **start, off_t off, atomic_read(&sbi->ll_sa_wrong), atomic_read(&sbi->ll_agl_total)); } +LPROC_SEQ_FOPS_RO(ll_statahead_stats); -static int ll_rd_lazystatfs(char *page, char **start, off_t off, - int count, int *eof, void *data) +static int ll_lazystatfs_seq_show(struct seq_file *m, void *v) { - struct super_block *sb = data; - struct ll_sb_info *sbi = ll_s2sbi(sb); + struct super_block *sb = m->private; + struct ll_sb_info *sbi = ll_s2sbi(sb); - return snprintf(page, count, "%u\n", - (sbi->ll_flags & LL_SBI_LAZYSTATFS) ? 1 : 0); + return seq_printf(m, "%u\n", + (sbi->ll_flags & LL_SBI_LAZYSTATFS) ? 1 : 0); } -static int ll_wr_lazystatfs(struct file *file, const char *buffer, - unsigned long count, void *data) +static ssize_t ll_lazystatfs_seq_write(struct file *file, + const char __user *buffer, + size_t count, loff_t *off) { - struct super_block *sb = data; - struct ll_sb_info *sbi = ll_s2sbi(sb); - int val, rc; + struct seq_file *m = file->private_data; + struct ll_sb_info *sbi = ll_s2sbi((struct super_block *)m->private); + int val, rc; rc = lprocfs_write_helper(buffer, count, &val); if (rc) @@ -734,30 +766,74 @@ static int ll_wr_lazystatfs(struct file *file, const char *buffer, return count; } +LPROC_SEQ_FOPS(ll_lazystatfs); -static int ll_rd_maxea_size(char *page, char **start, off_t off, - int count, int *eof, void *data) +static int ll_max_easize_seq_show(struct seq_file *m, void *v) { - struct super_block *sb = data; - struct ll_sb_info *sbi = ll_s2sbi(sb); - unsigned int ealen; - int rc; + struct super_block *sb = m->private; + struct ll_sb_info *sbi = ll_s2sbi(sb); + unsigned int ealen; + int rc; - rc = ll_get_max_mdsize(sbi, &ealen); - if (rc) - return rc; + rc = ll_get_max_mdsize(sbi, &ealen); + if (rc) + return rc; + + return seq_printf(m, "%u\n", ealen); +} +LPROC_SEQ_FOPS_RO(ll_max_easize); + +static int ll_defult_easize_seq_show(struct seq_file *m, void *v) +{ + struct super_block *sb = m->private; + struct ll_sb_info *sbi = ll_s2sbi(sb); + unsigned int ealen; + int rc; + + rc = ll_get_default_mdsize(sbi, &ealen); + if (rc) + return rc; + + return seq_printf(m, "%u\n", ealen); +} +LPROC_SEQ_FOPS_RO(ll_defult_easize); + +static int ll_max_cookiesize_seq_show(struct seq_file *m, void *v) +{ + struct super_block *sb = m->private; + struct ll_sb_info *sbi = ll_s2sbi(sb); + unsigned int cookielen; + int rc; - return snprintf(page, count, "%u\n", ealen); + rc = ll_get_max_cookiesize(sbi, &cookielen); + if (rc) + return rc; + + return seq_printf(m, "%u\n", cookielen); } +LPROC_SEQ_FOPS_RO(ll_max_cookiesize); -static int ll_rd_sbi_flags(char *page, char **start, off_t off, - int count, int *eof, void *data) +static int ll_defult_cookiesize_seq_show(struct seq_file *m, void *v) +{ + struct super_block *sb = m->private; + struct ll_sb_info *sbi = ll_s2sbi(sb); + unsigned int cookielen; + int rc; + + rc = ll_get_default_cookiesize(sbi, &cookielen); + if (rc) + return rc; + + return seq_printf(m, "%u\n", cookielen); +} +LPROC_SEQ_FOPS_RO(ll_defult_cookiesize); + +static int ll_sbi_flags_seq_show(struct seq_file *m, void *v) { const char *str[] = LL_SBI_FLAGS; - struct super_block *sb = data; + struct super_block *sb = m->private; int flags = ll_s2sbi(sb)->ll_flags; int i = 0; - int rc = 0; while (flags != 0) { if (ARRAY_SIZE(str) <= i) { @@ -767,53 +843,201 @@ static int ll_rd_sbi_flags(char *page, char **start, off_t off, } if (flags & 0x1) - rc += snprintf(page + rc, count - rc, "%s ", str[i]); + seq_printf(m, "%s ", str[i]); flags >>= 1; ++i; } - if (rc > 0) - rc += snprintf(page + rc, count - rc, "\b\n"); + seq_printf(m, "\b\n"); + return 0; +} +LPROC_SEQ_FOPS_RO(ll_sbi_flags); + +static int ll_unstable_stats_seq_show(struct seq_file *m, void *v) +{ + struct super_block *sb = m->private; + struct ll_sb_info *sbi = ll_s2sbi(sb); + struct cl_client_cache *cache = &sbi->ll_cache; + long pages; + int mb; + + pages = atomic_long_read(&cache->ccc_unstable_nr); + mb = (pages * PAGE_CACHE_SIZE) >> 20; + + return seq_printf(m, "unstable_check: %8d\n" + "unstable_pages: %12ld\n" + "unstable_mb: %8d\n", + cache->ccc_unstable_check, pages, mb); +} + +static ssize_t ll_unstable_stats_seq_write(struct file *file, + const char __user *buffer, + size_t count, loff_t *unused) +{ + struct seq_file *seq = file->private_data; + struct ll_sb_info *sbi = ll_s2sbi((struct super_block *)seq->private); + char kernbuf[128]; + int val, rc; + + if (count == 0) + return 0; + if (count >= sizeof(kernbuf)) + return -EINVAL; + + if (copy_from_user(kernbuf, buffer, count)) + return -EFAULT; + kernbuf[count] = 0; + + buffer += lprocfs_find_named_value(kernbuf, "unstable_check:", &count) - + kernbuf; + rc = lprocfs_write_helper(buffer, count, &val); + if (rc < 0) + return rc; + + /* borrow lru lock to set the value */ + spin_lock(&sbi->ll_cache.ccc_lru_lock); + sbi->ll_cache.ccc_unstable_check = !!val; + spin_unlock(&sbi->ll_cache.ccc_lru_lock); + + return count; +} +LPROC_SEQ_FOPS(ll_unstable_stats); + +static int ll_root_squash_seq_show(struct seq_file *m, void *v) +{ + struct super_block *sb = m->private; + struct ll_sb_info *sbi = ll_s2sbi(sb); + struct root_squash_info *squash = &sbi->ll_squash; + + return seq_printf(m, "%u:%u\n", squash->rsi_uid, squash->rsi_gid); +} + +static ssize_t ll_root_squash_seq_write(struct file *file, + const char __user *buffer, + size_t count, loff_t *off) +{ + struct seq_file *m = file->private_data; + struct super_block *sb = m->private; + struct ll_sb_info *sbi = ll_s2sbi(sb); + struct root_squash_info *squash = &sbi->ll_squash; + + return lprocfs_wr_root_squash(buffer, count, squash, + ll_get_fsname(sb, NULL, 0)); +} +LPROC_SEQ_FOPS(ll_root_squash); + +static int ll_nosquash_nids_seq_show(struct seq_file *m, void *v) +{ + struct super_block *sb = m->private; + struct ll_sb_info *sbi = ll_s2sbi(sb); + struct root_squash_info *squash = &sbi->ll_squash; + int len, rc; + + down_read(&squash->rsi_sem); + if (!list_empty(&squash->rsi_nosquash_nids)) { + len = cfs_print_nidlist(m->buf + m->count, m->size - m->count, + &squash->rsi_nosquash_nids); + m->count += len; + rc = seq_printf(m, "\n"); + } else { + rc = seq_printf(m, "NONE\n"); + } + up_read(&squash->rsi_sem); + return rc; } -static struct lprocfs_vars lprocfs_llite_obd_vars[] = { - { "uuid", ll_rd_sb_uuid, 0, 0 }, - //{ "mntpt_path", ll_rd_path, 0, 0 }, - { "fstype", ll_rd_fstype, 0, 0 }, - { "site", ll_rd_site_stats, 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_per_file_mb", ll_rd_max_readahead_per_file_mb, - ll_wr_max_readahead_per_file_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 }, - { "statahead_max", ll_rd_statahead_max, ll_wr_statahead_max, 0 }, - { "statahead_agl", ll_rd_statahead_agl, ll_wr_statahead_agl, 0 }, - { "statahead_stats", ll_rd_statahead_stats, 0, 0 }, - { "lazystatfs", ll_rd_lazystatfs, ll_wr_lazystatfs, 0 }, - { "max_easize", ll_rd_maxea_size, 0, 0 }, - { "sbi_flags", ll_rd_sbi_flags, 0, 0 }, - { "xattr_cache", ll_rd_xattr_cache, ll_wr_xattr_cache, 0 }, - { 0 } +static ssize_t ll_nosquash_nids_seq_write(struct file *file, + const char __user *buffer, + size_t count, loff_t *off) +{ + struct seq_file *m = file->private_data; + struct super_block *sb = m->private; + struct ll_sb_info *sbi = ll_s2sbi(sb); + struct root_squash_info *squash = &sbi->ll_squash; + int rc; + + rc = lprocfs_wr_nosquash_nids(buffer, count, squash, + ll_get_fsname(sb, NULL, 0)); + if (rc < 0) + return rc; + + ll_compute_rootsquash_state(sbi); + + return rc; +} +LPROC_SEQ_FOPS(ll_nosquash_nids); + +struct lprocfs_vars lprocfs_llite_obd_vars[] = { + { .name = "uuid", + .fops = &ll_sb_uuid_fops }, + { .name = "fstype", + .fops = &ll_fstype_fops }, + { .name = "site", + .fops = &ll_site_stats_fops }, + { .name = "blocksize", + .fops = &ll_blksize_fops }, + { .name = "kbytestotal", + .fops = &ll_kbytestotal_fops }, + { .name = "kbytesfree", + .fops = &ll_kbytesfree_fops }, + { .name = "kbytesavail", + .fops = &ll_kbytesavail_fops }, + { .name = "filestotal", + .fops = &ll_filestotal_fops }, + { .name = "filesfree", + .fops = &ll_filesfree_fops }, + { .name = "client_type", + .fops = &ll_client_type_fops }, + { .name = "max_read_ahead_mb", + .fops = &ll_max_readahead_mb_fops }, + { .name = "max_read_ahead_per_file_mb", + .fops = &ll_max_readahead_per_file_mb_fops }, + { .name = "max_read_ahead_whole_mb", + .fops = &ll_max_read_ahead_whole_mb_fops }, + { .name = "max_cached_mb", + .fops = &ll_max_cached_mb_fops }, + { .name = "checksum_pages", + .fops = &ll_checksum_fops }, + { .name = "max_rw_chunk", + .fops = &ll_max_rw_chunk_fops }, + { .name = "stats_track_pid", + .fops = &ll_track_pid_fops }, + { .name = "stats_track_ppid", + .fops = &ll_track_ppid_fops }, + { .name = "stats_track_gid", + .fops = &ll_track_gid_fops }, + { .name = "statahead_max", + .fops = &ll_statahead_max_fops }, + { .name = "statahead_agl", + .fops = &ll_statahead_agl_fops }, + { .name = "statahead_stats", + .fops = &ll_statahead_stats_fops }, + { .name = "lazystatfs", + .fops = &ll_lazystatfs_fops }, + { .name = "max_easize", + .fops = &ll_max_easize_fops }, + { .name = "default_easize", + .fops = &ll_defult_easize_fops }, + { .name = "max_cookiesize", + .fops = &ll_max_cookiesize_fops }, + { .name = "default_cookiesize", + .fops = &ll_defult_cookiesize_fops }, + { .name = "sbi_flags", + .fops = &ll_sbi_flags_fops }, + { .name = "xattr_cache", + .fops = &ll_xattr_cache_fops }, + { .name = "unstable_stats", + .fops = &ll_unstable_stats_fops }, + { .name = "root_squash", + .fops = &ll_root_squash_fops }, + { .name = "nosquash_nids", + .fops = &ll_nosquash_nids_fops }, + { NULL } }; #define MAX_STRING_SIZE 128 -struct llite_file_opcode { +static const struct llite_file_opcode { __u32 opcode; __u32 type; const char *opname; @@ -877,69 +1101,74 @@ void ll_stats_ops_tally(struct ll_sb_info *sbi, int op, int count) else if (sbi->ll_stats_track_type == STATS_TRACK_PPID && sbi->ll_stats_track_id == current->parent->pid) lprocfs_counter_add(sbi->ll_stats, op, count); - else if (sbi->ll_stats_track_type == STATS_TRACK_GID && - sbi->ll_stats_track_id == cfs_curproc_gid()) - lprocfs_counter_add(sbi->ll_stats, op, count); + else if (sbi->ll_stats_track_type == STATS_TRACK_GID && + sbi->ll_stats_track_id == + from_kgid(&init_user_ns, current_gid())) + lprocfs_counter_add(sbi->ll_stats, op, count); } EXPORT_SYMBOL(ll_stats_ops_tally); static const char *ra_stat_string[] = { - [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", + [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", + [RA_STAT_FAILED_REACH_END] = "failed to reach end" }; +LPROC_SEQ_FOPS_RO_TYPE(llite, name); +LPROC_SEQ_FOPS_RO_TYPE(llite, uuid); int lprocfs_register_mountpoint(struct proc_dir_entry *parent, struct super_block *sb, char *osc, char *mdc) { - struct lprocfs_vars lvars[2]; - struct lustre_sb_info *lsi = s2lsi(sb); - struct ll_sb_info *sbi = ll_s2sbi(sb); - struct obd_device *obd; - char name[MAX_STRING_SIZE + 1], *ptr; - int err, id, len, rc; - 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; - - /* 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); - } + struct lprocfs_vars lvars[2]; + struct lustre_sb_info *lsi = s2lsi(sb); + struct ll_sb_info *sbi = ll_s2sbi(sb); + struct obd_device *obd; + struct proc_dir_entry *dir; + char name[MAX_STRING_SIZE + 1], *ptr; + int err, id, len, rc; + ENTRY; - rc = lprocfs_seq_create(sbi->ll_proc_root, "dump_page_cache", 0444, - &vvp_dump_pgcache_file_ops, sbi); - if (rc) - CWARN("Error adding the dump_page_cache file\n"); + 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; + + /* 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); + } + + rc = lprocfs_seq_create(sbi->ll_proc_root, "dump_page_cache", 0444, + &vvp_dump_pgcache_file_ops, sbi); + if (rc) + CWARN("Error adding the dump_page_cache file\n"); rc = lprocfs_seq_create(sbi->ll_proc_root, "extents_stats", 0644, &ll_rw_extents_stats_fops, sbi); @@ -994,54 +1223,60 @@ int lprocfs_register_mountpoint(struct proc_dir_entry *parent, GOTO(out, err); - err = lprocfs_add_vars(sbi->ll_proc_root, lprocfs_llite_obd_vars, sb); - if (err) - GOTO(out, err); + err = lprocfs_add_vars(sbi->ll_proc_root, lprocfs_llite_obd_vars, sb); + if (err) + GOTO(out, err); - /* MDC info */ - obd = class_name2obd(mdc); + /* MDC info */ + obd = class_name2obd(mdc); - LASSERT(obd != NULL); - LASSERT(obd->obd_magic == OBD_DEVICE_MAGIC); - LASSERT(obd->obd_type->typ_name != NULL); + 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); - lvars[0].read_fptr = lprocfs_rd_name; - err = lprocfs_add_vars(sbi->ll_proc_root, lvars, obd); - if (err) - GOTO(out, err); + dir = proc_mkdir(obd->obd_type->typ_name, sbi->ll_proc_root); + if (dir == NULL) + GOTO(out, 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); - if (err) - GOTO(out, err); + snprintf(name, MAX_STRING_SIZE, "common_name"); + lvars[0].fops = &llite_name_fops; + err = lprocfs_add_vars(dir, lvars, obd); + if (err) + GOTO(out, err); - /* OSC */ - obd = class_name2obd(osc); + snprintf(name, MAX_STRING_SIZE, "uuid"); + lvars[0].fops = &llite_uuid_fops; + err = lprocfs_add_vars(dir, lvars, obd); + if (err) + GOTO(out, err); - LASSERT(obd != NULL); - LASSERT(obd->obd_magic == OBD_DEVICE_MAGIC); - LASSERT(obd->obd_type->typ_name != NULL); + /* OSC */ + obd = class_name2obd(osc); - 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, err); + LASSERT(obd != NULL); + LASSERT(obd->obd_magic == OBD_DEVICE_MAGIC); + LASSERT(obd->obd_type->typ_name != NULL); + + dir = proc_mkdir(obd->obd_type->typ_name, sbi->ll_proc_root); + if (dir == NULL) + GOTO(out, 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); + snprintf(name, MAX_STRING_SIZE, "common_name"); + lvars[0].fops = &llite_name_fops; + err = lprocfs_add_vars(dir, lvars, obd); + if (err) + GOTO(out, err); + + snprintf(name, MAX_STRING_SIZE, "uuid"); + lvars[0].fops = &llite_uuid_fops; + err = lprocfs_add_vars(dir, lvars, obd); out: - if (err) { - lprocfs_remove(&sbi->ll_proc_root); - lprocfs_free_stats(&sbi->ll_ra_stats); - lprocfs_free_stats(&sbi->ll_stats); - } - RETURN(err); + if (err) { + lprocfs_remove(&sbi->ll_proc_root); + lprocfs_free_stats(&sbi->ll_ra_stats); + lprocfs_free_stats(&sbi->ll_stats); + } + RETURN(err); } void lprocfs_unregister_mountpoint(struct ll_sb_info *sbi) @@ -1101,12 +1336,12 @@ 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; + int k; - cfs_gettimeofday(&now); + do_gettimeofday(&now); - if (!sbi->ll_rw_stats_on) { - seq_printf(seq, "disabled\n" + if (!sbi->ll_rw_stats_on) { + seq_printf(seq, "disabled\n" "write anything in this file to activate, " "then 0 or \"[D/d]isabled\" to deactivate\n"); return 0; @@ -1130,24 +1365,39 @@ static int ll_rw_extents_stats_pp_seq_show(struct seq_file *seq, void *v) } static ssize_t ll_rw_extents_stats_pp_seq_write(struct file *file, - const char *buf, size_t len, - loff_t *off) + const char __user *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; - int value = 1, rc = 0; + 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; + int value = 1, rc = 0; - rc = lprocfs_write_helper(buf, len, &value); - if (rc < 0 && (strcmp(buf, "disabled") == 0 || - strcmp(buf, "Disabled") == 0)) - value = 0; + if (len == 0) + return -EINVAL; - if (value == 0) - sbi->ll_rw_stats_on = 0; - else - sbi->ll_rw_stats_on = 1; + rc = lprocfs_write_helper(buf, len, &value); + if (rc < 0 && len < 16) { + char kernbuf[16]; + + if (copy_from_user(kernbuf, buf, len)) + return -EFAULT; + kernbuf[len] = 0; + + if (kernbuf[len - 1] == '\n') + kernbuf[len - 1] = 0; + + if (strcmp(kernbuf, "disabled") == 0 || + strcmp(kernbuf, "Disabled") == 0) + value = 0; + } + + if (value == 0) + sbi->ll_rw_stats_on = 0; + else + sbi->ll_rw_stats_on = 1; spin_lock(&sbi->ll_pp_extent_lock); for (i = 0; i < LL_PROCESS_HIST_MAX; i++) { @@ -1163,13 +1413,13 @@ 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; + struct timeval now; + struct ll_sb_info *sbi = seq->private; + struct ll_rw_extents_info *io_extents = &sbi->ll_rw_extents_info; - cfs_gettimeofday(&now); + do_gettimeofday(&now); - if (!sbi->ll_rw_stats_on) { + if (!sbi->ll_rw_stats_on) { seq_printf(seq, "disabled\n" "write anything in this file to activate, " "then 0 or \"[D/d]isabled\" to deactivate\n"); @@ -1189,24 +1439,40 @@ static int ll_rw_extents_stats_seq_show(struct seq_file *seq, void *v) return 0; } -static ssize_t ll_rw_extents_stats_seq_write(struct file *file, const char *buf, - size_t len, loff_t *off) +static ssize_t ll_rw_extents_stats_seq_write(struct file *file, + const char __user *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; - int value = 1, rc = 0; + 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; + int value = 1, rc = 0; - rc = lprocfs_write_helper(buf, len, &value); - if (rc < 0 && (strcmp(buf, "disabled") == 0 || - strcmp(buf, "Disabled") == 0)) - value = 0; + if (len == 0) + return -EINVAL; + + rc = lprocfs_write_helper(buf, len, &value); + if (rc < 0 && len < 16) { + char kernbuf[16]; + + if (copy_from_user(kernbuf, buf, len)) + return -EFAULT; + kernbuf[len] = 0; + + if (kernbuf[len - 1] == '\n') + kernbuf[len - 1] = 0; + + if (strcmp(kernbuf, "disabled") == 0 || + strcmp(kernbuf, "Disabled") == 0) + value = 0; + } + + if (value == 0) + sbi->ll_rw_stats_on = 0; + else + sbi->ll_rw_stats_on = 1; - if (value == 0) - sbi->ll_rw_stats_on = 0; - else - 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; @@ -1217,7 +1483,6 @@ static ssize_t ll_rw_extents_stats_seq_write(struct file *file, const char *buf, return len; } - LPROC_SEQ_FOPS(ll_rw_extents_stats); void ll_rw_stats_tally(struct ll_sb_info *sbi, pid_t pid, @@ -1329,11 +1594,11 @@ static int ll_rw_offset_stats_seq_show(struct seq_file *seq, void *v) 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; - int i; + int i; - cfs_gettimeofday(&now); + do_gettimeofday(&now); - if (!sbi->ll_rw_stats_on) { + if (!sbi->ll_rw_stats_on) { seq_printf(seq, "disabled\n" "write anything in this file to activate, " "then 0 or \"[D/d]isabled\" to deactivate\n"); @@ -1379,25 +1644,40 @@ static int ll_rw_offset_stats_seq_show(struct seq_file *seq, void *v) return 0; } -static ssize_t ll_rw_offset_stats_seq_write(struct file *file, const char *buf, - size_t len, loff_t *off) +static ssize_t ll_rw_offset_stats_seq_write(struct file *file, + const char __user *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; - int value = 1, rc = 0; + 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; + int value = 1, rc = 0; - rc = lprocfs_write_helper(buf, len, &value); + if (len == 0) + return -EINVAL; - if (rc < 0 && (strcmp(buf, "disabled") == 0 || - strcmp(buf, "Disabled") == 0)) - value = 0; + rc = lprocfs_write_helper(buf, len, &value); - if (value == 0) - sbi->ll_rw_stats_on = 0; - else - sbi->ll_rw_stats_on = 1; + if (rc < 0 && len < 16) { + char kernbuf[16]; + + if (copy_from_user(kernbuf, buf, len)) + return -EFAULT; + kernbuf[len] = 0; + + if (kernbuf[len - 1] == '\n') + kernbuf[len - 1] = 0; + + if (strcmp(kernbuf, "disabled") == 0 || + strcmp(kernbuf, "Disabled") == 0) + value = 0; + } + + if (value == 0) + sbi->ll_rw_stats_on = 0; + else + sbi->ll_rw_stats_on = 1; spin_lock(&sbi->ll_process_lock); sbi->ll_offset_process_count = 0; @@ -1412,10 +1692,4 @@ static ssize_t ll_rw_offset_stats_seq_write(struct file *file, const char *buf, } LPROC_SEQ_FOPS(ll_rw_offset_stats); - -void lprocfs_llite_init_vars(struct lprocfs_static_vars *lvars) -{ - lvars->module_vars = NULL; - lvars->obd_vars = lprocfs_llite_obd_vars; -} -#endif /* LPROCFS */ +#endif /* CONFIG_PROC_FS */