X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fllite%2Flproc_llite.c;h=ab3c1a21512007a180adf790f089d00940eeb896;hp=f77393df03af128fc72258c8e00391b87e275125;hb=8d27681c98b2e702b2d3ea7fc603e21c444f7590;hpb=7817e4c785d075aae76b635dcf799064590833b0;ds=sidebyside diff --git a/lustre/llite/lproc_llite.c b/lustre/llite/lproc_llite.c index f77393d..ab3c1a2 100644 --- a/lustre/llite/lproc_llite.c +++ b/lustre/llite/lproc_llite.c @@ -15,11 +15,7 @@ * * You should have received a copy of the GNU General Public License * version 2 along with this program; If not, see - * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * http://www.gnu.org/licenses/gpl-2.0.html * * GPL HEADER END */ @@ -27,7 +23,7 @@ * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2012, 2014, Intel Corporation. + * Copyright (c) 2012, 2016, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -36,6 +32,10 @@ #define DEBUG_SUBSYSTEM S_LLITE #include +#include +#ifdef HAVE_UIDGID_HEADER +# include +#endif #include #include #include @@ -50,6 +50,7 @@ struct proc_dir_entry *proc_lustre_fs_root; 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 __s64 ll_stats_pid_write(const char __user *buf, size_t len); static int ll_blksize_seq_show(struct seq_file *m, void *v) { @@ -62,7 +63,7 @@ static int ll_blksize_seq_show(struct seq_file *m, void *v) cfs_time_shift_64(-OBD_STATFS_CACHE_SECONDS), OBD_STATFS_NODELAY); if (!rc) - rc = seq_printf(m, "%u\n", osfs.os_bsize); + seq_printf(m, "%u\n", osfs.os_bsize); return rc; } LPROC_SEQ_FOPS_RO(ll_blksize); @@ -84,7 +85,7 @@ static int ll_kbytestotal_seq_show(struct seq_file *m, void *v) while (blk_size >>= 1) result <<= 1; - rc = seq_printf(m, LPU64"\n", result); + seq_printf(m, "%llu\n", result); } return rc; } @@ -107,7 +108,7 @@ static int ll_kbytesfree_seq_show(struct seq_file *m, void *v) while (blk_size >>= 1) result <<= 1; - rc = seq_printf(m, LPU64"\n", result); + seq_printf(m, "%llu\n", result); } return rc; } @@ -130,7 +131,7 @@ static int ll_kbytesavail_seq_show(struct seq_file *m, void *v) while (blk_size >>= 1) result <<= 1; - rc = seq_printf(m, LPU64"\n", result); + seq_printf(m, "%llu\n", result); } return rc; } @@ -147,7 +148,7 @@ static int ll_filestotal_seq_show(struct seq_file *m, void *v) cfs_time_shift_64(-OBD_STATFS_CACHE_SECONDS), OBD_STATFS_NODELAY); if (!rc) - rc = seq_printf(m, LPU64"\n", osfs.os_files); + seq_printf(m, "%llu\n", osfs.os_files); return rc; } LPROC_SEQ_FOPS_RO(ll_filestotal); @@ -163,7 +164,7 @@ static int ll_filesfree_seq_show(struct seq_file *m, void *v) cfs_time_shift_64(-OBD_STATFS_CACHE_SECONDS), OBD_STATFS_NODELAY); if (!rc) - rc = seq_printf(m, LPU64"\n", osfs.os_ffree); + seq_printf(m, "%llu\n", osfs.os_ffree); return rc; } LPROC_SEQ_FOPS_RO(ll_filesfree); @@ -171,15 +172,11 @@ LPROC_SEQ_FOPS_RO(ll_filesfree); static int ll_client_type_seq_show(struct seq_file *m, void *v) { struct ll_sb_info *sbi = ll_s2sbi((struct super_block *)m->private); - int rc; LASSERT(sbi != NULL); - 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; + seq_puts(m, "local client\n"); + return 0; } LPROC_SEQ_FOPS_RO(ll_client_type); @@ -188,7 +185,8 @@ static int ll_fstype_seq_show(struct seq_file *m, void *v) struct super_block *sb = m->private; LASSERT(sb != NULL); - return seq_printf(m, "%s\n", sb->s_type->name); + seq_printf(m, "%s\n", sb->s_type->name); + return 0; } LPROC_SEQ_FOPS_RO(ll_fstype); @@ -197,7 +195,8 @@ static int ll_sb_uuid_seq_show(struct seq_file *m, void *v) struct super_block *sb = m->private; LASSERT(sb != NULL); - return seq_printf(m, "%s\n", ll_s2sbi(sb)->ll_sb_uuid.uuid); + seq_printf(m, "%s\n", ll_s2sbi(sb)->ll_sb_uuid.uuid); + return 0; } LPROC_SEQ_FOPS_RO(ll_sb_uuid); @@ -205,7 +204,8 @@ static int ll_xattr_cache_seq_show(struct seq_file *m, void *v) { struct ll_sb_info *sbi = ll_s2sbi((struct super_block *)m->private); - return seq_printf(m, "%u\n", sbi->ll_xattr_cache_enabled); + seq_printf(m, "%u\n", sbi->ll_xattr_cache_enabled); + return 0; } static ssize_t ll_xattr_cache_seq_write(struct file *file, @@ -214,9 +214,10 @@ static ssize_t ll_xattr_cache_seq_write(struct file *file, { struct seq_file *m = file->private_data; struct ll_sb_info *sbi = ll_s2sbi((struct super_block *)m->private); - int val, rc; + __s64 val; + int rc; - rc = lprocfs_write_helper(buffer, count, &val); + rc = lprocfs_str_to_s64(buffer, count, &val); if (rc) return rc; @@ -255,7 +256,7 @@ static int ll_max_readahead_mb_seq_show(struct seq_file *m, void *v) pages_number = sbi->ll_ra_info.ra_max_pages; spin_unlock(&sbi->ll_lock); - mult = 1 << (20 - PAGE_CACHE_SHIFT); + mult = 1 << (20 - PAGE_SHIFT); return lprocfs_seq_read_frac_helper(m, pages_number, mult); } @@ -264,25 +265,23 @@ ll_max_readahead_mb_seq_write(struct file *file, const char __user *buffer, size_t count, loff_t *off) { struct seq_file *m = file->private_data; - struct ll_sb_info *sbi = ll_s2sbi((struct super_block *)m->private); - __u64 val; - long pages_number; - int mult; + struct super_block *sb = m->private; + struct ll_sb_info *sbi = ll_s2sbi(sb); + __s64 pages_number; int rc; - mult = 1 << (20 - PAGE_CACHE_SHIFT); - rc = lprocfs_write_frac_u64_helper(buffer, count, &val, mult); + rc = lprocfs_str_with_units_to_s64(buffer, count, &pages_number, 'M'); if (rc) return rc; - if (val > LONG_MAX) - return -ERANGE; - pages_number = (long)val; + pages_number >>= PAGE_SHIFT; if (pages_number < 0 || pages_number > totalram_pages / 2) { /* 1/2 of RAM */ - CERROR("can't set file readahead more than %lu MB\n", - totalram_pages >> (20 - PAGE_CACHE_SHIFT + 1)); + CERROR("%s: can't set max_readahead_mb=%lu > %luMB\n", + ll_get_fsname(sb, NULL, 0), + (unsigned long)pages_number >> (20 - PAGE_SHIFT), + totalram_pages >> (20 - PAGE_SHIFT + 1)); return -ERANGE; } @@ -304,7 +303,7 @@ static int ll_max_readahead_per_file_mb_seq_show(struct seq_file *m, void *v) pages_number = sbi->ll_ra_info.ra_max_pages_per_file; spin_unlock(&sbi->ll_lock); - mult = 1 << (20 - PAGE_CACHE_SHIFT); + mult = 1 << (20 - PAGE_SHIFT); return lprocfs_seq_read_frac_helper(m, pages_number, mult); } @@ -314,19 +313,22 @@ ll_max_readahead_per_file_mb_seq_write(struct file *file, size_t count, loff_t *off) { struct seq_file *m = file->private_data; - struct ll_sb_info *sbi = ll_s2sbi((struct super_block *)m->private); - int mult, rc, pages_number; + struct super_block *sb = m->private; + struct ll_sb_info *sbi = ll_s2sbi(sb); + int rc; + __s64 pages_number; - mult = 1 << (20 - PAGE_CACHE_SHIFT); - rc = lprocfs_write_frac_helper(buffer, count, &pages_number, mult); + rc = lprocfs_str_with_units_to_s64(buffer, count, &pages_number, 'M'); 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); + pages_number >>= PAGE_SHIFT; + + if (pages_number < 0 || pages_number > sbi->ll_ra_info.ra_max_pages) { + CERROR("%s: can't set max_readahead_per_file_mb=%lu > " + "max_read_ahead_mb=%lu\n", ll_get_fsname(sb, NULL, 0), + (unsigned long)pages_number >> (20 - PAGE_SHIFT), + sbi->ll_ra_info.ra_max_pages >> (20 - PAGE_SHIFT)); return -ERANGE; } @@ -348,7 +350,7 @@ static int ll_max_read_ahead_whole_mb_seq_show(struct seq_file *m, void *v) pages_number = sbi->ll_ra_info.ra_max_read_ahead_whole_pages; spin_unlock(&sbi->ll_lock); - mult = 1 << (20 - PAGE_CACHE_SHIFT); + mult = 1 << (20 - PAGE_SHIFT); return lprocfs_seq_read_frac_helper(m, pages_number, mult); } @@ -358,22 +360,27 @@ ll_max_read_ahead_whole_mb_seq_write(struct file *file, size_t count, loff_t *off) { struct seq_file *m = file->private_data; - struct ll_sb_info *sbi = ll_s2sbi((struct super_block *)m->private); - int mult, rc, pages_number; + struct super_block *sb = m->private; + struct ll_sb_info *sbi = ll_s2sbi(sb); + int rc; + __s64 pages_number; - mult = 1 << (20 - PAGE_CACHE_SHIFT); - rc = lprocfs_write_frac_helper(buffer, count, &pages_number, mult); + rc = lprocfs_str_with_units_to_s64(buffer, count, &pages_number, 'M'); if (rc) return rc; + pages_number >>= PAGE_SHIFT; + /* 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_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)); + int pages_shift = 20 - PAGE_SHIFT; + CERROR("%s: can't set max_read_ahead_whole_mb=%lu > " + "max_read_ahead_per_file_mb=%lu\n", + ll_get_fsname(sb, NULL, 0), + (unsigned long)pages_number >> pages_shift, + sbi->ll_ra_info.ra_max_pages_per_file >> pages_shift); return -ERANGE; } @@ -388,24 +395,24 @@ static int ll_max_cached_mb_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; - int shift = 20 - PAGE_CACHE_SHIFT; + struct cl_client_cache *cache = sbi->ll_cache; + int shift = 20 - PAGE_SHIFT; long max_cached_mb; long unused_mb; max_cached_mb = cache->ccc_lru_max >> shift; unused_mb = atomic_long_read(&cache->ccc_lru_left) >> shift; - return seq_printf(m, - "users: %d\n" - "max_cached_mb: %ld\n" - "used_mb: %ld\n" - "unused_mb: %ld\n" - "reclaim_count: %u\n", - atomic_read(&cache->ccc_users), - max_cached_mb, - max_cached_mb - unused_mb, - unused_mb, - cache->ccc_lru_shrinkers); + seq_printf(m, "users: %d\n" + "max_cached_mb: %ld\n" + "used_mb: %ld\n" + "unused_mb: %ld\n" + "reclaim_count: %u\n", + atomic_read(&cache->ccc_users), + max_cached_mb, + max_cached_mb - unused_mb, + unused_mb, + cache->ccc_lru_shrinkers); + return 0; } static ssize_t @@ -415,14 +422,12 @@ ll_max_cached_mb_seq_write(struct file *file, const char __user *buffer, 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; + struct cl_client_cache *cache = sbi->ll_cache; struct lu_env *env; - __u64 val; long diff = 0; long nrpages = 0; - long pages_number; - int refcheck; - int mult; + __u16 refcheck; + __s64 pages_number; long rc; char kernbuf[128]; ENTRY; @@ -434,21 +439,18 @@ ll_max_cached_mb_seq_write(struct file *file, const char __user *buffer, RETURN(-EFAULT); kernbuf[count] = 0; - mult = 1 << (20 - PAGE_CACHE_SHIFT); buffer += lprocfs_find_named_value(kernbuf, "max_cached_mb:", &count) - kernbuf; - rc = lprocfs_write_frac_u64_helper(buffer, count, &val, mult); + rc = lprocfs_str_with_units_to_s64(buffer, count, &pages_number, 'M'); if (rc) RETURN(rc); - if (val > LONG_MAX) - return -ERANGE; - pages_number = (long)val; + pages_number >>= PAGE_SHIFT; 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), - totalram_pages >> (20 - PAGE_CACHE_SHIFT)); + totalram_pages >> (20 - PAGE_SHIFT)); RETURN(-ERANGE); } /* Allow enough cache so clients can make well-formed RPCs */ @@ -526,7 +528,8 @@ static int ll_checksum_seq_show(struct seq_file *m, void *v) struct super_block *sb = m->private; struct ll_sb_info *sbi = ll_s2sbi(sb); - return seq_printf(m, "%u\n", (sbi->ll_flags & LL_SBI_CHECKSUM) ? 1 : 0); + seq_printf(m, "%u\n", (sbi->ll_flags & LL_SBI_CHECKSUM) ? 1 : 0); + return 0; } static ssize_t ll_checksum_seq_write(struct file *file, @@ -535,82 +538,65 @@ static ssize_t ll_checksum_seq_write(struct file *file, { 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) - /* 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(NULL, sbi->ll_dt_exp, sizeof(KEY_CHECKSUM), - KEY_CHECKSUM, sizeof(val), &val, NULL); - if (rc) - CWARN("Failed to set OSC checksum flags: %d\n", rc); - - return count; -} -LPROC_SEQ_FOPS(ll_checksum); + int rc; + __s64 val; -static int ll_max_rw_chunk_seq_show(struct seq_file *m, void *v) -{ - struct super_block *sb = m->private; + if (!sbi->ll_dt_exp) + /* Not set up yet */ + return -EAGAIN; - return seq_printf(m, "%lu\n", ll_s2sbi(sb)->ll_max_rw_chunk); -} + rc = lprocfs_str_to_s64(buffer, count, &val); + if (rc) + return rc; + if (val) + sbi->ll_flags |= LL_SBI_CHECKSUM; + else + sbi->ll_flags &= ~LL_SBI_CHECKSUM; -static ssize_t ll_max_rw_chunk_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; - int rc, val; + rc = obd_set_info_async(NULL, sbi->ll_dt_exp, sizeof(KEY_CHECKSUM), + KEY_CHECKSUM, sizeof(val), &val, NULL); + if (rc) + CWARN("Failed to set OSC checksum flags: %d\n", rc); - rc = lprocfs_write_helper(buffer, count, &val); - if (rc) - return rc; - ll_s2sbi(sb)->ll_max_rw_chunk = val; - return count; + return count; } -LPROC_SEQ_FOPS(ll_max_rw_chunk); +LPROC_SEQ_FOPS(ll_checksum); static int ll_rd_track_id(struct seq_file *m, enum stats_track_type type) { struct super_block *sb = m->private; if (ll_s2sbi(sb)->ll_stats_track_type == type) { - return seq_printf(m, "%d\n", - ll_s2sbi(sb)->ll_stats_track_id); + 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"); + seq_puts(m, "0 (all)\n"); } else { - return seq_printf(m, "untracked\n"); + seq_puts(m, "untracked\n"); } + return 0; } 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; - int rc, pid; + int rc; + __s64 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; + rc = lprocfs_str_to_s64(buffer, count, &pid); + if (rc) + return rc; + if (pid > INT_MAX || pid < 0) + return -ERANGE; + + 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_track_pid_seq_show(struct seq_file *m, void *v) @@ -660,7 +646,8 @@ static int ll_statahead_max_seq_show(struct seq_file *m, void *v) struct super_block *sb = m->private; struct ll_sb_info *sbi = ll_s2sbi(sb); - return seq_printf(m, "%u\n", sbi->ll_sa_max); + seq_printf(m, "%u\n", sbi->ll_sa_max); + return 0; } static ssize_t ll_statahead_max_seq_write(struct file *file, @@ -669,19 +656,20 @@ static ssize_t ll_statahead_max_seq_write(struct file *file, { struct seq_file *m = file->private_data; struct ll_sb_info *sbi = ll_s2sbi((struct super_block *)m->private); - int val, rc; + int rc; + __s64 val; - rc = lprocfs_write_helper(buffer, count, &val); - if (rc) - return rc; + rc = lprocfs_str_to_s64(buffer, count, &val); + if (rc) + return rc; - if (val >= 0 && val <= LL_SA_RPC_MAX) - sbi->ll_sa_max = val; - else - CERROR("Bad statahead_max value %d. Valid values are in the " - "range [0, %d]\n", val, LL_SA_RPC_MAX); + if (val >= 0 && val <= LL_SA_RPC_MAX) + sbi->ll_sa_max = val; + else + CERROR("Bad statahead_max value %lld. Valid values are in " + "the range [0, %d]\n", val, LL_SA_RPC_MAX); - return count; + return count; } LPROC_SEQ_FOPS(ll_statahead_max); @@ -690,8 +678,9 @@ static int ll_statahead_agl_seq_show(struct seq_file *m, void *v) struct super_block *sb = m->private; struct ll_sb_info *sbi = ll_s2sbi(sb); - return seq_printf(m, "%u\n", - sbi->ll_flags & LL_SBI_AGL_ENABLED ? 1 : 0); + seq_printf(m, "%u\n", + sbi->ll_flags & LL_SBI_AGL_ENABLED ? 1 : 0); + return 0; } static ssize_t ll_statahead_agl_seq_write(struct file *file, @@ -700,18 +689,19 @@ static ssize_t ll_statahead_agl_seq_write(struct file *file, { struct seq_file *m = file->private_data; struct ll_sb_info *sbi = ll_s2sbi((struct super_block *)m->private); - int val, rc; + int rc; + __s64 val; - rc = lprocfs_write_helper(buffer, count, &val); - if (rc) - return rc; + rc = lprocfs_str_to_s64(buffer, count, &val); + if (rc) + return rc; - if (val) - sbi->ll_flags |= LL_SBI_AGL_ENABLED; - else - sbi->ll_flags &= ~LL_SBI_AGL_ENABLED; + if (val) + sbi->ll_flags |= LL_SBI_AGL_ENABLED; + else + sbi->ll_flags &= ~LL_SBI_AGL_ENABLED; - return count; + return count; } LPROC_SEQ_FOPS(ll_statahead_agl); @@ -720,13 +710,13 @@ static int ll_statahead_stats_seq_show(struct seq_file *m, void *v) struct super_block *sb = m->private; struct ll_sb_info *sbi = ll_s2sbi(sb); - return seq_printf(m, - "statahead total: %u\n" - "statahead wrong: %u\n" - "agl total: %u\n", - atomic_read(&sbi->ll_sa_total), - atomic_read(&sbi->ll_sa_wrong), - atomic_read(&sbi->ll_agl_total)); + seq_printf(m, "statahead total: %u\n" + "statahead wrong: %u\n" + "agl total: %u\n", + atomic_read(&sbi->ll_sa_total), + atomic_read(&sbi->ll_sa_wrong), + atomic_read(&sbi->ll_agl_total)); + return 0; } LPROC_SEQ_FOPS_RO(ll_statahead_stats); @@ -735,8 +725,9 @@ static int ll_lazystatfs_seq_show(struct seq_file *m, void *v) struct super_block *sb = m->private; struct ll_sb_info *sbi = ll_s2sbi(sb); - return seq_printf(m, "%u\n", - (sbi->ll_flags & LL_SBI_LAZYSTATFS) ? 1 : 0); + seq_printf(m, "%u\n", + (sbi->ll_flags & LL_SBI_LAZYSTATFS) ? 1 : 0); + return 0; } static ssize_t ll_lazystatfs_seq_write(struct file *file, @@ -745,18 +736,19 @@ static ssize_t ll_lazystatfs_seq_write(struct file *file, { struct seq_file *m = file->private_data; struct ll_sb_info *sbi = ll_s2sbi((struct super_block *)m->private); - int val, rc; + int rc; + __s64 val; - rc = lprocfs_write_helper(buffer, count, &val); - if (rc) - return rc; + rc = lprocfs_str_to_s64(buffer, count, &val); + if (rc) + return rc; - if (val) - sbi->ll_flags |= LL_SBI_LAZYSTATFS; - else - sbi->ll_flags &= ~LL_SBI_LAZYSTATFS; + if (val) + sbi->ll_flags |= LL_SBI_LAZYSTATFS; + else + sbi->ll_flags &= ~LL_SBI_LAZYSTATFS; - return count; + return count; } LPROC_SEQ_FOPS(ll_lazystatfs); @@ -771,11 +763,23 @@ static int ll_max_easize_seq_show(struct seq_file *m, void *v) if (rc) return rc; - return seq_printf(m, "%u\n", ealen); + seq_printf(m, "%u\n", ealen); + return 0; } LPROC_SEQ_FOPS_RO(ll_max_easize); -static int ll_defult_easize_seq_show(struct seq_file *m, void *v) +/** + * Get default_easize. + * + * \see client_obd::cl_default_mds_easize + * + * \param[in] m seq_file handle + * \param[in] v unused for single entry + * + * \retval 0 on success + * \retval negative negated errno on failure + */ +static int ll_default_easize_seq_show(struct seq_file *m, void *v) { struct super_block *sb = m->private; struct ll_sb_info *sbi = ll_s2sbi(sb); @@ -786,39 +790,52 @@ static int ll_defult_easize_seq_show(struct seq_file *m, void *v) if (rc) return rc; - return seq_printf(m, "%u\n", ealen); + seq_printf(m, "%u\n", ealen); + return 0; } -LPROC_SEQ_FOPS_RO(ll_defult_easize); -static int ll_max_cookiesize_seq_show(struct seq_file *m, void *v) +/** + * Set default_easize. + * + * Range checking on the passed value is handled by + * ll_set_default_mdsize(). + * + * \see client_obd::cl_default_mds_easize + * + * \param[in] file proc file + * \param[in] buffer string passed from user space + * \param[in] count \a buffer length + * \param[in] off unused for single entry + * + * \retval positive \a count on success + * \retval negative negated errno on failure + */ +static ssize_t ll_default_easize_seq_write(struct file *file, + const char __user *buffer, + size_t count, loff_t *unused) { - struct super_block *sb = m->private; + struct seq_file *seq = file->private_data; + struct super_block *sb = (struct super_block *)seq->private; struct ll_sb_info *sbi = ll_s2sbi(sb); - unsigned int cookielen; + __s64 val; int rc; - rc = ll_get_max_cookiesize(sbi, &cookielen); + if (count == 0) + return 0; + + rc = lprocfs_str_to_s64(buffer, count, &val); if (rc) return rc; + if (val < 0 || val > INT_MAX) + return -ERANGE; - return seq_printf(m, "%u\n", cookielen); -} -LPROC_SEQ_FOPS_RO(ll_max_cookiesize); - -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); + rc = ll_set_default_mdsize(sbi, val); if (rc) return rc; - return seq_printf(m, "%u\n", cookielen); + return count; } -LPROC_SEQ_FOPS_RO(ll_defult_cookiesize); +LPROC_SEQ_FOPS(ll_default_easize); static int ll_sbi_flags_seq_show(struct seq_file *m, void *v) { @@ -844,21 +861,56 @@ static int ll_sbi_flags_seq_show(struct seq_file *m, void *v) } LPROC_SEQ_FOPS_RO(ll_sbi_flags); +static int ll_fast_read_seq_show(struct seq_file *m, void *v) +{ + struct super_block *sb = m->private; + struct ll_sb_info *sbi = ll_s2sbi(sb); + + seq_printf(m, "%u\n", !!(sbi->ll_flags & LL_SBI_FAST_READ)); + return 0; +} + +static ssize_t +ll_fast_read_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); + int rc; + __s64 val; + + rc = lprocfs_str_to_s64(buffer, count, &val); + if (rc) + return rc; + + spin_lock(&sbi->ll_lock); + if (val == 1) + sbi->ll_flags |= LL_SBI_FAST_READ; + else + sbi->ll_flags &= ~LL_SBI_FAST_READ; + spin_unlock(&sbi->ll_lock); + + return count; +} +LPROC_SEQ_FOPS(ll_fast_read); + 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; + 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; + mb = (pages * PAGE_SIZE) >> 20; - return seq_printf(m, "unstable_check: %8d\n" - "unstable_pages: %12ld\n" - "unstable_mb: %8d\n", - cache->ccc_unstable_check, pages, mb); + seq_printf(m, "unstable_check: %8d\n" + "unstable_pages: %12ld\n" + "unstable_mb: %8d\n", + cache->ccc_unstable_check, pages, mb); + return 0; } static ssize_t ll_unstable_stats_seq_write(struct file *file, @@ -868,7 +920,8 @@ static ssize_t ll_unstable_stats_seq_write(struct file *file, 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; + int rc; + __s64 val; if (count == 0) return 0; @@ -881,14 +934,14 @@ static ssize_t ll_unstable_stats_seq_write(struct file *file, buffer += lprocfs_find_named_value(kernbuf, "unstable_check:", &count) - kernbuf; - rc = lprocfs_write_helper(buffer, count, &val); + rc = lprocfs_str_to_s64(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); + 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; } @@ -900,7 +953,8 @@ static int ll_root_squash_seq_show(struct seq_file *m, void *v) 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); + seq_printf(m, "%u:%u\n", squash->rsi_uid, squash->rsi_gid); + return 0; } static ssize_t ll_root_squash_seq_write(struct file *file, @@ -922,20 +976,20 @@ 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; + int len; 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"); + seq_putc(m, '\n'); } else { - rc = seq_printf(m, "NONE\n"); + seq_puts(m, "NONE\n"); } up_read(&squash->rsi_sem); - return rc; + return 0; } static ssize_t ll_nosquash_nids_seq_write(struct file *file, @@ -959,7 +1013,7 @@ static ssize_t ll_nosquash_nids_seq_write(struct file *file, } LPROC_SEQ_FOPS(ll_nosquash_nids); -struct lprocfs_seq_vars lprocfs_llite_obd_vars[] = { +struct lprocfs_vars lprocfs_llite_obd_vars[] = { { .name = "uuid", .fops = &ll_sb_uuid_fops }, { .name = "fstype", @@ -969,7 +1023,7 @@ struct lprocfs_seq_vars lprocfs_llite_obd_vars[] = { { .name = "blocksize", .fops = &ll_blksize_fops }, { .name = "kbytestotal", - .fops = &ll_kbytestotal_fops }, + .fops = &ll_kbytestotal_fops }, { .name = "kbytesfree", .fops = &ll_kbytesfree_fops }, { .name = "kbytesavail", @@ -990,8 +1044,6 @@ struct lprocfs_seq_vars lprocfs_llite_obd_vars[] = { .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", @@ -1005,17 +1057,13 @@ struct lprocfs_seq_vars lprocfs_llite_obd_vars[] = { { .name = "statahead_stats", .fops = &ll_statahead_stats_fops }, { .name = "lazystatfs", - .fops = &ll_lazystatfs_fops }, + .fops = &ll_lazystatfs_fops }, { .name = "max_easize", - .fops = &ll_max_easize_fops }, + .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 }, + .fops = &ll_default_easize_fops }, { .name = "sbi_flags", - .fops = &ll_sbi_flags_fops }, + .fops = &ll_sbi_flags_fops }, { .name = "xattr_cache", .fops = &ll_xattr_cache_fops }, { .name = "unstable_stats", @@ -1024,6 +1072,8 @@ struct lprocfs_seq_vars lprocfs_llite_obd_vars[] = { .fops = &ll_root_squash_fops }, { .name = "nosquash_nids", .fops = &ll_nosquash_nids_fops }, + { .name = "fast_read", + .fops = &ll_fast_read_fops, }, { NULL } }; @@ -1045,14 +1095,12 @@ static const struct llite_file_opcode { "brw_read" }, { LPROC_LL_BRW_WRITE, LPROCFS_CNTR_AVGMINMAX|LPROCFS_TYPE_PAGES, "brw_write" }, - { LPROC_LL_OSC_READ, LPROCFS_CNTR_AVGMINMAX|LPROCFS_TYPE_BYTES, - "osc_read" }, - { LPROC_LL_OSC_WRITE, LPROCFS_CNTR_AVGMINMAX|LPROCFS_TYPE_BYTES, - "osc_write" }, { 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_FAULT, LPROCFS_TYPE_REGS, "page_fault" }, + { LPROC_LL_MKWRITE, LPROCFS_TYPE_REGS, "page_mkwrite" }, { LPROC_LL_LLSEEK, LPROCFS_TYPE_REGS, "seek" }, { LPROC_LL_FSYNC, LPROCFS_TYPE_REGS, "fsync" }, { LPROC_LL_READDIR, LPROCFS_TYPE_REGS, "readdir" }, @@ -1122,7 +1170,7 @@ 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_seq_vars lvars[2]; + struct lprocfs_vars lvars[2]; struct lustre_sb_info *lsi = s2lsi(sb); struct ll_sb_info *sbi = ll_s2sbi(sb); struct obd_device *obd; @@ -1150,7 +1198,7 @@ int lprocfs_register_mountpoint(struct proc_dir_entry *parent, snprintf(name, MAX_STRING_SIZE, "%.*s-%p", len, lsi->lsi_lmd->lmd_profile, sb); - sbi->ll_proc_root = lprocfs_seq_register(name, parent, NULL, NULL); + 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; @@ -1215,7 +1263,7 @@ int lprocfs_register_mountpoint(struct proc_dir_entry *parent, GOTO(out, err); - err = lprocfs_seq_add_vars(sbi->ll_proc_root, lprocfs_llite_obd_vars, sb); + err = lprocfs_add_vars(sbi->ll_proc_root, lprocfs_llite_obd_vars, sb); if (err) GOTO(out, err); @@ -1232,13 +1280,13 @@ int lprocfs_register_mountpoint(struct proc_dir_entry *parent, snprintf(name, MAX_STRING_SIZE, "common_name"); lvars[0].fops = &llite_name_fops; - err = lprocfs_seq_add_vars(dir, lvars, obd); + 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_seq_add_vars(dir, lvars, obd); + err = lprocfs_add_vars(dir, lvars, obd); if (err) GOTO(out, err); @@ -1255,13 +1303,13 @@ int lprocfs_register_mountpoint(struct proc_dir_entry *parent, snprintf(name, MAX_STRING_SIZE, "common_name"); lvars[0].fops = &llite_name_fops; - err = lprocfs_seq_add_vars(dir, lvars, obd); + 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_seq_add_vars(dir, lvars, obd); + err = lprocfs_add_vars(dir, lvars, obd); out: if (err) { lprocfs_remove(&sbi->ll_proc_root); @@ -1333,11 +1381,9 @@ static int ll_rw_extents_stats_pp_seq_show(struct seq_file *seq, void *v) do_gettimeofday(&now); 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; - } + seq_puts(seq, "disabled\n write anything to this file to activate, then '0' or 'disable' to deactivate\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"); @@ -1365,26 +1411,12 @@ static ssize_t ll_rw_extents_stats_pp_seq_write(struct file *file, 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; + __s64 value; 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; - } + value = ll_stats_pid_write(buf, len); if (value == 0) sbi->ll_rw_stats_on = 0; @@ -1412,18 +1444,16 @@ static int ll_rw_extents_stats_seq_show(struct seq_file *seq, void *v) do_gettimeofday(&now); 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; - } - seq_printf(seq, "snapshot_time: %lu.%lu (secs.usecs)\n", - now.tv_sec, now.tv_usec); + seq_puts(seq, "disabled\n write anything to this file to activate, then '0' or 'disable' to deactivate\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%"); + 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); @@ -1439,26 +1469,12 @@ static ssize_t ll_rw_extents_stats_seq_write(struct file *file, 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; + __s64 value; 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; - } + value = ll_stats_pid_write(buf, len); if (value == 0) sbi->ll_rw_stats_on = 0; @@ -1591,11 +1607,9 @@ static int ll_rw_offset_stats_seq_show(struct seq_file *seq, void *v) do_gettimeofday(&now); 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; - } + seq_puts(seq, "disabled\n write anything to this file to activate, then '0' or 'disable' to deactivate\n"); + return 0; + } spin_lock(&sbi->ll_process_lock); seq_printf(seq, "snapshot_time: %lu.%lu (secs.usecs)\n", @@ -1644,27 +1658,12 @@ static ssize_t ll_rw_offset_stats_seq_write(struct file *file, 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; + __s64 value; 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; - } + value = ll_stats_pid_write(buf, len); if (value == 0) sbi->ll_rw_stats_on = 0; @@ -1683,5 +1682,42 @@ static ssize_t ll_rw_offset_stats_seq_write(struct file *file, return len; } +/** + * ll_stats_pid_write() - Determine if stats collection should be enabled + * @buf: Buffer containing the data written + * @len: Number of bytes in the buffer + * + * Several proc files begin collecting stats when a value is written, and stop + * collecting when either '0' or 'disable' is written. This function checks the + * written value to see if collection should be enabled or disabled. + * + * Return: If '0' or 'disable' is provided, 0 is returned. If the text + * equivalent of a number is written, that number is returned. Otherwise, + * 1 is returned. Non-zero return values indicate collection should be enabled. + */ +static __s64 ll_stats_pid_write(const char __user *buf, size_t len) +{ + __s64 value = 1; + int rc; + char kernbuf[16]; + + rc = lprocfs_str_to_s64(buf, len, &value); + + if (rc < 0 && len < sizeof(kernbuf)) { + + if (copy_from_user(kernbuf, buf, len)) + return -EFAULT; + kernbuf[len] = 0; + + if (kernbuf[len - 1] == '\n') + kernbuf[len - 1] = 0; + + if (strncasecmp(kernbuf, "disable", 7) == 0) + value = 0; + } + + return value; +} + LPROC_SEQ_FOPS(ll_rw_offset_stats); #endif /* CONFIG_PROC_FS */