X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fosc%2Flproc_osc.c;h=73ec74884f6f968226ed500a4600e44bfe9b9837;hp=b43dd5bd7ff24db7ae31669cdf141257a9b7b742;hb=59efcfeb109edd2c695ce961fb8c872d9c515116;hpb=02a976b13d16fac7708fbd1827fcc6129b7e20f3 diff --git a/lustre/osc/lproc_osc.c b/lustre/osc/lproc_osc.c index b43dd5b..73ec748 100644 --- a/lustre/osc/lproc_osc.c +++ b/lustre/osc/lproc_osc.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) 2011, 2013, Intel Corporation. + * Copyright (c) 2011, 2014, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -43,24 +43,24 @@ #include #include "osc_internal.h" -#ifdef LPROCFS -static int osc_rd_active(char *page, char **start, off_t off, - int count, int *eof, void *data) +#ifdef CONFIG_PROC_FS +static int osc_active_seq_show(struct seq_file *m, void *v) { - struct obd_device *dev = data; - int rc; + struct obd_device *dev = m->private; + int rc; - LPROCFS_CLIMP_CHECK(dev); - rc = snprintf(page, count, "%d\n", !dev->u.cli.cl_import->imp_deactive); - LPROCFS_CLIMP_EXIT(dev); - return rc; + LPROCFS_CLIMP_CHECK(dev); + rc = seq_printf(m, "%d\n", !dev->u.cli.cl_import->imp_deactive); + LPROCFS_CLIMP_EXIT(dev); + return rc; } -static int osc_wr_active(struct file *file, const char *buffer, - unsigned long count, void *data) +static ssize_t osc_active_seq_write(struct file *file, + const char __user *buffer, + size_t count, loff_t *off) { - struct obd_device *dev = data; - int val, rc; + struct obd_device *dev = ((struct seq_file *)file->private_data)->private; + int val, rc; rc = lprocfs_write_helper(buffer, count, &val); if (rc) @@ -76,24 +76,25 @@ static int osc_wr_active(struct file *file, const char *buffer, return count; } +LPROC_SEQ_FOPS(osc_active); -static int osc_rd_max_rpcs_in_flight(char *page, char **start, off_t off, - int count, int *eof, void *data) +static int osc_max_rpcs_in_flight_seq_show(struct seq_file *m, void *v) { - struct obd_device *dev = data; - struct client_obd *cli = &dev->u.cli; - int rc; + struct obd_device *dev = m->private; + struct client_obd *cli = &dev->u.cli; + int rc; - client_obd_list_lock(&cli->cl_loi_list_lock); - rc = snprintf(page, count, "%u\n", cli->cl_max_rpcs_in_flight); - client_obd_list_unlock(&cli->cl_loi_list_lock); - return rc; + spin_lock(&cli->cl_loi_list_lock); + rc = seq_printf(m, "%u\n", cli->cl_max_rpcs_in_flight); + spin_unlock(&cli->cl_loi_list_lock); + return rc; } -static int osc_wr_max_rpcs_in_flight(struct file *file, const char *buffer, - unsigned long count, void *data) +static ssize_t osc_max_rpcs_in_flight_seq_write(struct file *file, + const char __user *buffer, + size_t count, loff_t *off) { - struct obd_device *dev = data; + struct obd_device *dev = ((struct seq_file *)file->private_data)->private; struct client_obd *cli = &dev->u.cli; struct ptlrpc_request_pool *pool = cli->cl_import->imp_rq_pool; int val, rc; @@ -109,34 +110,36 @@ static int osc_wr_max_rpcs_in_flight(struct file *file, const char *buffer, if (pool && val > cli->cl_max_rpcs_in_flight) pool->prp_populate(pool, val-cli->cl_max_rpcs_in_flight); - client_obd_list_lock(&cli->cl_loi_list_lock); - cli->cl_max_rpcs_in_flight = val; - client_obd_list_unlock(&cli->cl_loi_list_lock); + spin_lock(&cli->cl_loi_list_lock); + cli->cl_max_rpcs_in_flight = val; + client_adjust_max_dirty(cli); + spin_unlock(&cli->cl_loi_list_lock); - LPROCFS_CLIMP_EXIT(dev); - return count; + LPROCFS_CLIMP_EXIT(dev); + return count; } +LPROC_SEQ_FOPS(osc_max_rpcs_in_flight); -static int osc_rd_max_dirty_mb(char *page, char **start, off_t off, int count, - int *eof, void *data) +static int osc_max_dirty_mb_seq_show(struct seq_file *m, void *v) { - struct obd_device *dev = data; + struct obd_device *dev = m->private; struct client_obd *cli = &dev->u.cli; long val; int mult; - client_obd_list_lock(&cli->cl_loi_list_lock); - val = cli->cl_dirty_max; - client_obd_list_unlock(&cli->cl_loi_list_lock); + spin_lock(&cli->cl_loi_list_lock); + val = cli->cl_dirty_max_pages; + spin_unlock(&cli->cl_loi_list_lock); - mult = 1 << 20; - return lprocfs_read_frac_helper(page, count, val, mult); + mult = 1 << (20 - PAGE_CACHE_SHIFT); + return lprocfs_seq_read_frac_helper(m, val, mult); } -static int osc_wr_max_dirty_mb(struct file *file, const char *buffer, - unsigned long count, void *data) +static ssize_t osc_max_dirty_mb_seq_write(struct file *file, + const char __user *buffer, + size_t count, loff_t *off) { - struct obd_device *dev = data; + struct obd_device *dev = ((struct seq_file *)file->private_data)->private; struct client_obd *cli = &dev->u.cli; int pages_number, mult, rc; @@ -150,86 +153,113 @@ static int osc_wr_max_dirty_mb(struct file *file, const char *buffer, pages_number > totalram_pages / 4) /* 1/4 of RAM */ return -ERANGE; - client_obd_list_lock(&cli->cl_loi_list_lock); - cli->cl_dirty_max = (obd_count)(pages_number << PAGE_CACHE_SHIFT); + spin_lock(&cli->cl_loi_list_lock); + cli->cl_dirty_max_pages = pages_number; osc_wake_cache_waiters(cli); - client_obd_list_unlock(&cli->cl_loi_list_lock); + spin_unlock(&cli->cl_loi_list_lock); return count; } +LPROC_SEQ_FOPS(osc_max_dirty_mb); -static int osc_rd_cached_mb(char *page, char **start, off_t off, int count, - int *eof, void *data) +static int osc_cached_mb_seq_show(struct seq_file *m, void *v) { - struct obd_device *dev = data; + struct obd_device *dev = m->private; struct client_obd *cli = &dev->u.cli; int shift = 20 - PAGE_CACHE_SHIFT; int rc; - rc = snprintf(page, count, - "used_mb: %d\n" - "busy_cnt: %d\n", - (cfs_atomic_read(&cli->cl_lru_in_list) + - cfs_atomic_read(&cli->cl_lru_busy)) >> shift, - cfs_atomic_read(&cli->cl_lru_busy)); + rc = seq_printf(m, + "used_mb: %ld\n" + "busy_cnt: %ld\n", + (atomic_long_read(&cli->cl_lru_in_list) + + atomic_long_read(&cli->cl_lru_busy)) >> shift, + atomic_long_read(&cli->cl_lru_busy)); return rc; } /* shrink the number of caching pages to a specific number */ -static int osc_wr_cached_mb(struct file *file, const char *buffer, - unsigned long count, void *data) +static ssize_t +osc_cached_mb_seq_write(struct file *file, const char __user *buffer, + size_t count, loff_t *off) { - struct obd_device *dev = data; + struct obd_device *dev = ((struct seq_file *)file->private_data)->private; struct client_obd *cli = &dev->u.cli; - int pages_number, mult, rc; + __u64 val; + long pages_number; + long rc; + int mult; + char kernbuf[128]; + + 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, "used_mb:", &count); - rc = lprocfs_write_frac_helper(buffer, count, &pages_number, mult); + buffer += lprocfs_find_named_value(kernbuf, "used_mb:", &count) - + kernbuf; + rc = lprocfs_write_frac_u64_helper(buffer, count, &val, mult); + if (rc) return rc; + if (val > LONG_MAX) + return -ERANGE; + pages_number = (long)val; + if (pages_number < 0) return -ERANGE; - rc = cfs_atomic_read(&cli->cl_lru_in_list) - pages_number; - if (rc > 0) - (void)osc_lru_shrink(cli, rc); + rc = atomic_long_read(&cli->cl_lru_in_list) - pages_number; + if (rc > 0) { + struct lu_env *env; + int refcheck; + + env = cl_env_get(&refcheck); + if (!IS_ERR(env)) { + (void)osc_lru_shrink(env, cli, rc, true); + cl_env_put(env, &refcheck); + } + } return count; } +LPROC_SEQ_FOPS(osc_cached_mb); -static int osc_rd_cur_dirty_bytes(char *page, char **start, off_t off, - int count, int *eof, void *data) +static int osc_cur_dirty_bytes_seq_show(struct seq_file *m, void *v) { - struct obd_device *dev = data; - struct client_obd *cli = &dev->u.cli; - int rc; + struct obd_device *dev = m->private; + struct client_obd *cli = &dev->u.cli; + int rc; - client_obd_list_lock(&cli->cl_loi_list_lock); - rc = snprintf(page, count, "%lu\n", cli->cl_dirty); - client_obd_list_unlock(&cli->cl_loi_list_lock); - return rc; + spin_lock(&cli->cl_loi_list_lock); + rc = seq_printf(m, "%lu\n", cli->cl_dirty_pages << PAGE_CACHE_SHIFT); + spin_unlock(&cli->cl_loi_list_lock); + return rc; } +LPROC_SEQ_FOPS_RO(osc_cur_dirty_bytes); -static int osc_rd_cur_grant_bytes(char *page, char **start, off_t off, - int count, int *eof, void *data) +static int osc_cur_grant_bytes_seq_show(struct seq_file *m, void *v) { - struct obd_device *dev = data; - struct client_obd *cli = &dev->u.cli; - int rc; + struct obd_device *dev = m->private; + struct client_obd *cli = &dev->u.cli; + int rc; - client_obd_list_lock(&cli->cl_loi_list_lock); - rc = snprintf(page, count, "%lu\n", cli->cl_avail_grant); - client_obd_list_unlock(&cli->cl_loi_list_lock); - return rc; + spin_lock(&cli->cl_loi_list_lock); + rc = seq_printf(m, "%lu\n", cli->cl_avail_grant); + spin_unlock(&cli->cl_loi_list_lock); + return rc; } -static int osc_wr_cur_grant_bytes(struct file *file, const char *buffer, - unsigned long count, void *data) +static ssize_t osc_cur_grant_bytes_seq_write(struct file *file, + const char __user *buffer, + size_t count, loff_t *off) { - struct obd_device *obd = data; + struct obd_device *obd = ((struct seq_file *)file->private_data)->private; struct client_obd *cli = &obd->u.cli; int rc; __u64 val; @@ -242,12 +272,13 @@ static int osc_wr_cur_grant_bytes(struct file *file, const char *buffer, return rc; /* this is only for shrinking grant */ - client_obd_list_lock(&cli->cl_loi_list_lock); - if (val >= cli->cl_avail_grant) { - client_obd_list_unlock(&cli->cl_loi_list_lock); - return 0; - } - client_obd_list_unlock(&cli->cl_loi_list_lock); + spin_lock(&cli->cl_loi_list_lock); + if (val >= cli->cl_avail_grant) { + spin_unlock(&cli->cl_loi_list_lock); + return 0; + } + + spin_unlock(&cli->cl_loi_list_lock); LPROCFS_CLIMP_CHECK(obd); if (cli->cl_import->imp_state == LUSTRE_IMP_FULL) @@ -257,39 +288,40 @@ static int osc_wr_cur_grant_bytes(struct file *file, const char *buffer, return rc; return count; } +LPROC_SEQ_FOPS(osc_cur_grant_bytes); -static int osc_rd_cur_lost_grant_bytes(char *page, char **start, off_t off, - int count, int *eof, void *data) +static int osc_cur_lost_grant_bytes_seq_show(struct seq_file *m, void *v) { - struct obd_device *dev = data; - struct client_obd *cli = &dev->u.cli; - int rc; + struct obd_device *dev = m->private; + struct client_obd *cli = &dev->u.cli; + int rc; - client_obd_list_lock(&cli->cl_loi_list_lock); - rc = snprintf(page, count, "%lu\n", cli->cl_lost_grant); - client_obd_list_unlock(&cli->cl_loi_list_lock); - return rc; + spin_lock(&cli->cl_loi_list_lock); + rc = seq_printf(m, "%lu\n", cli->cl_lost_grant); + spin_unlock(&cli->cl_loi_list_lock); + return rc; } +LPROC_SEQ_FOPS_RO(osc_cur_lost_grant_bytes); -static int osc_rd_grant_shrink_interval(char *page, char **start, off_t off, - int count, int *eof, void *data) +static int osc_grant_shrink_interval_seq_show(struct seq_file *m, void *v) { - struct obd_device *obd = data; + struct obd_device *obd = m->private; - if (obd == NULL) - return 0; - return snprintf(page, count, "%d\n", - obd->u.cli.cl_grant_shrink_interval); + if (obd == NULL) + return 0; + return seq_printf(m, "%d\n", + obd->u.cli.cl_grant_shrink_interval); } -static int osc_wr_grant_shrink_interval(struct file *file, const char *buffer, - unsigned long count, void *data) +static ssize_t osc_grant_shrink_interval_seq_write(struct file *file, + const char __user *buffer, + size_t count, loff_t *off) { - struct obd_device *obd = data; - int val, rc; + struct obd_device *obd = ((struct seq_file *)file->private_data)->private; + int val, rc; - if (obd == NULL) - return 0; + if (obd == NULL) + return 0; rc = lprocfs_write_helper(buffer, count, &val); if (rc) @@ -302,24 +334,25 @@ static int osc_wr_grant_shrink_interval(struct file *file, const char *buffer, return count; } +LPROC_SEQ_FOPS(osc_grant_shrink_interval); -static int osc_rd_checksum(char *page, char **start, off_t off, int count, - int *eof, void *data) +static int osc_checksum_seq_show(struct seq_file *m, void *v) { - struct obd_device *obd = data; + struct obd_device *obd = m->private; - if (obd == NULL) - return 0; + if (obd == NULL) + return 0; - return snprintf(page, count, "%d\n", - obd->u.cli.cl_checksum ? 1 : 0); + return seq_printf(m, "%d\n", + obd->u.cli.cl_checksum ? 1 : 0); } -static int osc_wr_checksum(struct file *file, const char *buffer, - unsigned long count, void *data) +static ssize_t osc_checksum_seq_write(struct file *file, + const char __user *buffer, + size_t count, loff_t *off) { - struct obd_device *obd = data; - int val, rc; + struct obd_device *obd = ((struct seq_file *)file->private_data)->private; + int val, rc; if (obd == NULL) return 0; @@ -332,39 +365,37 @@ static int osc_wr_checksum(struct file *file, const char *buffer, return count; } +LPROC_SEQ_FOPS(osc_checksum); -static int osc_rd_checksum_type(char *page, char **start, off_t off, int count, - int *eof, void *data) +static int osc_checksum_type_seq_show(struct seq_file *m, void *v) { - struct obd_device *obd = data; - int i, len =0; - DECLARE_CKSUM_NAME; + struct obd_device *obd = m->private; + int i; + DECLARE_CKSUM_NAME; if (obd == NULL) return 0; - for (i = 0; i < ARRAY_SIZE(cksum_name) && len < count; i++) { - if (((1 << i) & obd->u.cli.cl_supp_cksum_types) == 0) - continue; - if (obd->u.cli.cl_cksum_type == (1 << i)) - len += snprintf(page + len, count - len, "[%s] ", - cksum_name[i]); - else - len += snprintf(page + len, count - len, "%s ", - cksum_name[i]); - } - if (len < count) - len += sprintf(page + len, "\n"); - return len; + for (i = 0; i < ARRAY_SIZE(cksum_name); i++) { + if (((1 << i) & obd->u.cli.cl_supp_cksum_types) == 0) + continue; + if (obd->u.cli.cl_cksum_type == (1 << i)) + seq_printf(m, "[%s] ", cksum_name[i]); + else + seq_printf(m, "%s ", cksum_name[i]); + } + seq_printf(m, "\n"); + return 0; } -static int osc_wd_checksum_type(struct file *file, const char *buffer, - unsigned long count, void *data) +static ssize_t osc_checksum_type_seq_write(struct file *file, + const char __user *buffer, + size_t count, loff_t *off) { - struct obd_device *obd = data; - int i; - DECLARE_CKSUM_NAME; - char kernbuf[10]; + struct obd_device *obd = ((struct seq_file *)file->private_data)->private; + int i; + DECLARE_CKSUM_NAME; + char kernbuf[10]; if (obd == NULL) return 0; @@ -388,84 +419,92 @@ static int osc_wd_checksum_type(struct file *file, const char *buffer, } return -EINVAL; } +LPROC_SEQ_FOPS(osc_checksum_type); -static int osc_rd_resend_count(char *page, char **start, off_t off, int count, - int *eof, void *data) +static int osc_resend_count_seq_show(struct seq_file *m, void *v) { - struct obd_device *obd = data; + struct obd_device *obd = m->private; - return snprintf(page, count, "%u\n", - cfs_atomic_read(&obd->u.cli.cl_resends)); + return seq_printf(m, "%u\n", atomic_read(&obd->u.cli.cl_resends)); } -static int osc_wr_resend_count(struct file *file, const char *buffer, - unsigned long count, void *data) +static ssize_t osc_resend_count_seq_write(struct file *file, + const char __user *buffer, + size_t count, loff_t *off) { - struct obd_device *obd = data; - int val, rc; + struct obd_device *obd = ((struct seq_file *)file->private_data)->private; + int val, rc; - rc = lprocfs_write_helper(buffer, count, &val); - if (rc) - return rc; + rc = lprocfs_write_helper(buffer, count, &val); + if (rc) + return rc; - if (val < 0) - return -EINVAL; + if (val < 0) + return -EINVAL; - cfs_atomic_set(&obd->u.cli.cl_resends, val); + atomic_set(&obd->u.cli.cl_resends, val); - return count; + return count; } +LPROC_SEQ_FOPS(osc_resend_count); -static int osc_rd_contention_seconds(char *page, char **start, off_t off, - int count, int *eof, void *data) +static int osc_contention_seconds_seq_show(struct seq_file *m, void *v) { - struct obd_device *obd = data; - struct osc_device *od = obd2osc_dev(obd); + struct obd_device *obd = m->private; + struct osc_device *od = obd2osc_dev(obd); - return snprintf(page, count, "%u\n", od->od_contention_time); + return seq_printf(m, "%u\n", od->od_contention_time); } -static int osc_wr_contention_seconds(struct file *file, const char *buffer, - unsigned long count, void *data) +static ssize_t osc_contention_seconds_seq_write(struct file *file, + const char __user *buffer, + size_t count, loff_t *off) { - struct obd_device *obd = data; - struct osc_device *od = obd2osc_dev(obd); + struct obd_device *obd = ((struct seq_file *)file->private_data)->private; + struct osc_device *od = obd2osc_dev(obd); - return lprocfs_write_helper(buffer, count, &od->od_contention_time) ?: - count; + return lprocfs_write_helper(buffer, count, &od->od_contention_time) ?: count; } +LPROC_SEQ_FOPS(osc_contention_seconds); -static int osc_rd_lockless_truncate(char *page, char **start, off_t off, - int count, int *eof, void *data) +static int osc_lockless_truncate_seq_show(struct seq_file *m, void *v) { - struct obd_device *obd = data; - struct osc_device *od = obd2osc_dev(obd); + struct obd_device *obd = m->private; + struct osc_device *od = obd2osc_dev(obd); - return snprintf(page, count, "%u\n", od->od_lockless_truncate); + return seq_printf(m, "%u\n", od->od_lockless_truncate); } -static int osc_wr_lockless_truncate(struct file *file, const char *buffer, - unsigned long count, void *data) +static ssize_t osc_lockless_truncate_seq_write(struct file *file, + const char __user *buffer, + size_t count, loff_t *off) { - struct obd_device *obd = data; + struct obd_device *obd = ((struct seq_file *)file->private_data)->private; struct osc_device *od = obd2osc_dev(obd); return lprocfs_write_helper(buffer, count, &od->od_lockless_truncate) ?: count; } +LPROC_SEQ_FOPS(osc_lockless_truncate); + +static int osc_destroys_in_flight_seq_show(struct seq_file *m, void *v) +{ + struct obd_device *obd = m->private; + return seq_printf(m, "%u\n", + atomic_read(&obd->u.cli.cl_destroy_in_flight)); +} +LPROC_SEQ_FOPS_RO(osc_destroys_in_flight); -static int osc_rd_destroys_in_flight(char *page, char **start, off_t off, - int count, int *eof, void *data) +static int osc_obd_max_pages_per_rpc_seq_show(struct seq_file *m, void *v) { - struct obd_device *obd = data; - return snprintf(page, count, "%u\n", - cfs_atomic_read(&obd->u.cli.cl_destroy_in_flight)); + return lprocfs_obd_max_pages_per_rpc_seq_show(m, m->private); } -static int lprocfs_osc_wr_max_pages_per_rpc(struct file *file, - const char *buffer, unsigned long count, void *data) +static ssize_t osc_obd_max_pages_per_rpc_seq_write(struct file *file, + const char __user *buffer, + size_t count, loff_t *off) { - struct obd_device *dev = data; + struct obd_device *dev = ((struct seq_file *)file->private_data)->private; struct client_obd *cli = &dev->u.cli; struct obd_connect_data *ocd = &cli->cl_import->imp_connect_data; int chunk_mask, rc; @@ -484,120 +523,177 @@ static int lprocfs_osc_wr_max_pages_per_rpc(struct file *file, chunk_mask = ~((1 << (cli->cl_chunkbits - PAGE_CACHE_SHIFT)) - 1); /* max_pages_per_rpc must be chunk aligned */ val = (val + ~chunk_mask) & chunk_mask; - if (val == 0 || val > ocd->ocd_brw_size >> PAGE_CACHE_SHIFT) { + if (val == 0 || (ocd->ocd_brw_size != 0 && + val > ocd->ocd_brw_size >> PAGE_CACHE_SHIFT)) { LPROCFS_CLIMP_EXIT(dev); return -ERANGE; } - client_obd_list_lock(&cli->cl_loi_list_lock); + spin_lock(&cli->cl_loi_list_lock); cli->cl_max_pages_per_rpc = val; - client_obd_list_unlock(&cli->cl_loi_list_lock); + client_adjust_max_dirty(cli); + spin_unlock(&cli->cl_loi_list_lock); LPROCFS_CLIMP_EXIT(dev); return count; } +LPROC_SEQ_FOPS(osc_obd_max_pages_per_rpc); -static struct lprocfs_vars lprocfs_osc_obd_vars[] = { - { "uuid", lprocfs_rd_uuid, 0, 0 }, - { "ping", 0, lprocfs_wr_ping, 0, 0, 0222 }, - { "connect_flags", lprocfs_rd_connect_flags, 0, 0 }, - { "blocksize", lprocfs_rd_blksize, 0, 0 }, - { "kbytestotal", lprocfs_rd_kbytestotal, 0, 0 }, - { "kbytesfree", lprocfs_rd_kbytesfree, 0, 0 }, - { "kbytesavail", lprocfs_rd_kbytesavail, 0, 0 }, - { "filestotal", lprocfs_rd_filestotal, 0, 0 }, - { "filesfree", lprocfs_rd_filesfree, 0, 0 }, - //{ "filegroups", lprocfs_rd_filegroups, 0, 0 }, - { "ost_server_uuid", lprocfs_rd_server_uuid, 0, 0 }, - { "ost_conn_uuid", lprocfs_rd_conn_uuid, 0, 0 }, - { "active", osc_rd_active, - osc_wr_active, 0 }, - { "max_pages_per_rpc", lprocfs_obd_rd_max_pages_per_rpc, - lprocfs_osc_wr_max_pages_per_rpc, 0 }, - { "max_rpcs_in_flight", osc_rd_max_rpcs_in_flight, - osc_wr_max_rpcs_in_flight, 0 }, - { "destroys_in_flight", osc_rd_destroys_in_flight, 0, 0 }, - { "max_dirty_mb", osc_rd_max_dirty_mb, osc_wr_max_dirty_mb, 0 }, - { "osc_cached_mb", osc_rd_cached_mb, osc_wr_cached_mb, 0 }, - { "cur_dirty_bytes", osc_rd_cur_dirty_bytes, 0, 0 }, - { "cur_grant_bytes", osc_rd_cur_grant_bytes, - osc_wr_cur_grant_bytes, 0 }, - { "cur_lost_grant_bytes", osc_rd_cur_lost_grant_bytes, 0, 0}, - { "grant_shrink_interval", osc_rd_grant_shrink_interval, - osc_wr_grant_shrink_interval, 0 }, - { "checksums", osc_rd_checksum, osc_wr_checksum, 0 }, - { "checksum_type", osc_rd_checksum_type, osc_wd_checksum_type, 0 }, - { "resend_count", osc_rd_resend_count, osc_wr_resend_count, 0}, - { "timeouts", lprocfs_rd_timeouts, 0, 0 }, - { "contention_seconds", osc_rd_contention_seconds, - osc_wr_contention_seconds, 0 }, - { "lockless_truncate", osc_rd_lockless_truncate, - osc_wr_lockless_truncate, 0 }, - { "import", lprocfs_rd_import, lprocfs_wr_import, 0 }, - { "state", lprocfs_rd_state, 0, 0 }, - { "pinger_recov", lprocfs_rd_pinger_recov, - lprocfs_wr_pinger_recov, 0, 0 }, - { 0 } -}; - -static struct lprocfs_vars lprocfs_osc_module_vars[] = { - { "num_refs", lprocfs_rd_numrefs, 0, 0 }, - { 0 } +static int osc_unstable_stats_seq_show(struct seq_file *m, void *v) +{ + struct obd_device *dev = m->private; + struct client_obd *cli = &dev->u.cli; + long pages; + int mb; + + pages = atomic_long_read(&cli->cl_unstable_count); + mb = (pages * PAGE_CACHE_SIZE) >> 20; + + return seq_printf(m, "unstable_pages: %20ld\n" + "unstable_mb: %10d\n", + pages, mb); +} +LPROC_SEQ_FOPS_RO(osc_unstable_stats); + +LPROC_SEQ_FOPS_RO_TYPE(osc, uuid); +LPROC_SEQ_FOPS_RO_TYPE(osc, connect_flags); +LPROC_SEQ_FOPS_RO_TYPE(osc, blksize); +LPROC_SEQ_FOPS_RO_TYPE(osc, kbytestotal); +LPROC_SEQ_FOPS_RO_TYPE(osc, kbytesfree); +LPROC_SEQ_FOPS_RO_TYPE(osc, kbytesavail); +LPROC_SEQ_FOPS_RO_TYPE(osc, filestotal); +LPROC_SEQ_FOPS_RO_TYPE(osc, filesfree); +LPROC_SEQ_FOPS_RO_TYPE(osc, server_uuid); +LPROC_SEQ_FOPS_RO_TYPE(osc, conn_uuid); +LPROC_SEQ_FOPS_RO_TYPE(osc, timeouts); +LPROC_SEQ_FOPS_RO_TYPE(osc, state); + +LPROC_SEQ_FOPS_WO_TYPE(osc, ping); + +LPROC_SEQ_FOPS_RW_TYPE(osc, import); +LPROC_SEQ_FOPS_RW_TYPE(osc, pinger_recov); + +struct lprocfs_vars lprocfs_osc_obd_vars[] = { + { .name = "uuid", + .fops = &osc_uuid_fops }, + { .name = "ping", + .fops = &osc_ping_fops, + .proc_mode = 0222 }, + { .name = "connect_flags", + .fops = &osc_connect_flags_fops }, + { .name = "blocksize", + .fops = &osc_blksize_fops }, + { .name = "kbytestotal", + .fops = &osc_kbytestotal_fops }, + { .name = "kbytesfree", + .fops = &osc_kbytesfree_fops }, + { .name = "kbytesavail", + .fops = &osc_kbytesavail_fops }, + { .name = "filestotal", + .fops = &osc_filestotal_fops }, + { .name = "filesfree", + .fops = &osc_filesfree_fops }, + { .name = "ost_server_uuid", + .fops = &osc_server_uuid_fops }, + { .name = "ost_conn_uuid", + .fops = &osc_conn_uuid_fops }, + { .name = "active", + .fops = &osc_active_fops }, + { .name = "max_pages_per_rpc", + .fops = &osc_obd_max_pages_per_rpc_fops }, + { .name = "max_rpcs_in_flight", + .fops = &osc_max_rpcs_in_flight_fops }, + { .name = "destroys_in_flight", + .fops = &osc_destroys_in_flight_fops }, + { .name = "max_dirty_mb", + .fops = &osc_max_dirty_mb_fops }, + { .name = "osc_cached_mb", + .fops = &osc_cached_mb_fops }, + { .name = "cur_dirty_bytes", + .fops = &osc_cur_dirty_bytes_fops }, + { .name = "cur_grant_bytes", + .fops = &osc_cur_grant_bytes_fops }, + { .name = "cur_lost_grant_bytes", + .fops = &osc_cur_lost_grant_bytes_fops }, + { .name = "grant_shrink_interval", + .fops = &osc_grant_shrink_interval_fops }, + { .name = "checksums", + .fops = &osc_checksum_fops }, + { .name = "checksum_type", + .fops = &osc_checksum_type_fops }, + { .name = "resend_count", + .fops = &osc_resend_count_fops }, + { .name = "timeouts", + .fops = &osc_timeouts_fops }, + { .name = "contention_seconds", + .fops = &osc_contention_seconds_fops }, + { .name = "lockless_truncate", + .fops = &osc_lockless_truncate_fops }, + { .name = "import", + .fops = &osc_import_fops }, + { .name = "state", + .fops = &osc_state_fops }, + { .name = "pinger_recov", + .fops = &osc_pinger_recov_fops }, + { .name = "unstable_stats", + .fops = &osc_unstable_stats_fops }, + { NULL } }; #define pct(a,b) (b ? a * 100 / b : 0) static int osc_rpc_stats_seq_show(struct seq_file *seq, void *v) { - struct timeval now; - struct obd_device *dev = seq->private; - struct client_obd *cli = &dev->u.cli; - unsigned long read_tot = 0, write_tot = 0, read_cum, write_cum; + struct timeval now; + struct obd_device *dev = seq->private; + struct client_obd *cli = &dev->u.cli; + unsigned long read_tot = 0, write_tot = 0, read_cum, write_cum; int i; do_gettimeofday(&now); - client_obd_list_lock(&cli->cl_loi_list_lock); + spin_lock(&cli->cl_loi_list_lock); - seq_printf(seq, "snapshot_time: %lu.%lu (secs.usecs)\n", - now.tv_sec, now.tv_usec); - seq_printf(seq, "read RPCs in flight: %d\n", - cli->cl_r_in_flight); - seq_printf(seq, "write RPCs in flight: %d\n", - cli->cl_w_in_flight); - seq_printf(seq, "pending write pages: %d\n", - cfs_atomic_read(&cli->cl_pending_w_pages)); - seq_printf(seq, "pending read pages: %d\n", - cfs_atomic_read(&cli->cl_pending_r_pages)); - - seq_printf(seq, "\n\t\t\tread\t\t\twrite\n"); - seq_printf(seq, "pages per rpc rpcs %% cum %% |"); - seq_printf(seq, " rpcs %% cum %%\n"); - - read_tot = lprocfs_oh_sum(&cli->cl_read_page_hist); - write_tot = lprocfs_oh_sum(&cli->cl_write_page_hist); - - read_cum = 0; - write_cum = 0; - for (i = 0; i < OBD_HIST_MAX; i++) { - unsigned long r = cli->cl_read_page_hist.oh_buckets[i]; - unsigned long w = cli->cl_write_page_hist.oh_buckets[i]; - read_cum += r; - write_cum += w; - seq_printf(seq, "%d:\t\t%10lu %3lu %3lu | %10lu %3lu %3lu\n", - 1 << i, r, pct(r, read_tot), - pct(read_cum, read_tot), w, - pct(w, write_tot), - pct(write_cum, write_tot)); - if (read_cum == read_tot && write_cum == write_tot) - break; - } + seq_printf(seq, "snapshot_time: %lu.%lu (secs.usecs)\n", + now.tv_sec, now.tv_usec); + seq_printf(seq, "read RPCs in flight: %d\n", + cli->cl_r_in_flight); + seq_printf(seq, "write RPCs in flight: %d\n", + cli->cl_w_in_flight); + seq_printf(seq, "pending write pages: %d\n", + atomic_read(&cli->cl_pending_w_pages)); + seq_printf(seq, "pending read pages: %d\n", + atomic_read(&cli->cl_pending_r_pages)); + + seq_printf(seq, "\n\t\t\tread\t\t\twrite\n"); + seq_printf(seq, "pages per rpc rpcs %% cum %% |"); + seq_printf(seq, " rpcs %% cum %%\n"); + + read_tot = lprocfs_oh_sum(&cli->cl_read_page_hist); + write_tot = lprocfs_oh_sum(&cli->cl_write_page_hist); + + read_cum = 0; + write_cum = 0; + for (i = 0; i < OBD_HIST_MAX; i++) { + unsigned long r = cli->cl_read_page_hist.oh_buckets[i]; + unsigned long w = cli->cl_write_page_hist.oh_buckets[i]; + + read_cum += r; + write_cum += w; + seq_printf(seq, "%d:\t\t%10lu %3lu %3lu | %10lu %3lu %3lu\n", + 1 << i, r, pct(r, read_tot), + pct(read_cum, read_tot), w, + pct(w, write_tot), + pct(write_cum, write_tot)); + if (read_cum == read_tot && write_cum == write_tot) + break; + } - seq_printf(seq, "\n\t\t\tread\t\t\twrite\n"); - seq_printf(seq, "rpcs in flight rpcs %% cum %% |"); - seq_printf(seq, " rpcs %% cum %%\n"); + seq_printf(seq, "\n\t\t\tread\t\t\twrite\n"); + seq_printf(seq, "rpcs in flight rpcs %% cum %% |"); + seq_printf(seq, " rpcs %% cum %%\n"); - read_tot = lprocfs_oh_sum(&cli->cl_read_rpc_hist); - write_tot = lprocfs_oh_sum(&cli->cl_write_rpc_hist); + read_tot = lprocfs_oh_sum(&cli->cl_read_rpc_hist); + write_tot = lprocfs_oh_sum(&cli->cl_write_rpc_hist); read_cum = 0; write_cum = 0; @@ -637,13 +733,14 @@ static int osc_rpc_stats_seq_show(struct seq_file *seq, void *v) break; } - client_obd_list_unlock(&cli->cl_loi_list_lock); + spin_unlock(&cli->cl_loi_list_lock); return 0; } #undef pct -static ssize_t osc_rpc_stats_seq_write(struct file *file, const char *buf, +static ssize_t osc_rpc_stats_seq_write(struct file *file, + const char __user *buf, size_t len, loff_t *off) { struct seq_file *seq = file->private_data; @@ -659,7 +756,6 @@ static ssize_t osc_rpc_stats_seq_write(struct file *file, const char *buf, return len; } - LPROC_SEQ_FOPS(osc_rpc_stats); static int osc_stats_seq_show(struct seq_file *seq, void *v) @@ -681,7 +777,8 @@ static int osc_stats_seq_show(struct seq_file *seq, void *v) return 0; } -static ssize_t osc_stats_seq_write(struct file *file, const char *buf, +static ssize_t osc_stats_seq_write(struct file *file, + const char __user *buf, size_t len, loff_t *off) { struct seq_file *seq = file->private_data; @@ -706,10 +803,4 @@ int lproc_osc_attach_seqstat(struct obd_device *dev) return rc; } - -void lprocfs_osc_init_vars(struct lprocfs_static_vars *lvars) -{ - lvars->module_vars = lprocfs_osc_module_vars; - lvars->obd_vars = lprocfs_osc_obd_vars; -} -#endif /* LPROCFS */ +#endif /* CONFIG_PROC_FS */