X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fosc%2Flproc_osc.c;h=3815169bb23dd28aec025b832dc03b0fd9176d6c;hp=4f0035d9173f3bfe6da75ea2072d1bbb30acb30a;hb=2f347eb0da65973bfc4acbd49ad48698bf71441f;hpb=fbb7ead129258897f5a5d5c9ce28d31fbbe5bca2 diff --git a/lustre/osc/lproc_osc.c b/lustre/osc/lproc_osc.c index 4f0035d..3815169 100644 --- a/lustre/osc/lproc_osc.c +++ b/lustre/osc/lproc_osc.c @@ -1,92 +1,141 @@ /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- * vim:expandtab:shiftwidth=8:tabstop=8: * - * Copyright (C) 2002, 2003 Cluster File Systems, Inc. + * GPL HEADER START * - * This file is part of Lustre, http://www.lustre.org. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Lustre is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 only, + * as published by the Free Software Foundation. * - * Lustre is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License version 2 for more details (a copy is included + * in the LICENSE file that accompanied this code). * - * You should have received a copy of the GNU General Public License - * along with Lustre; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * 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. + * + * GPL HEADER END + */ +/* + * Copyright 2008 Sun Microsystems, Inc. All rights reserved + * Use is subject to license terms. + */ +/* + * This file is part of Lustre, http://www.lustre.org/ + * Lustre is a trademark of Sun Microsystems, Inc. */ #define DEBUG_SUBSYSTEM S_CLASS #include -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)) #include -#endif -#include -#include +#include +#include +#include #include #include "osc_internal.h" -#ifndef LPROCFS -static struct lprocfs_vars lprocfs_obd_vars[] = { {0} }; -static struct lprocfs_vars lprocfs_module_vars[] = { {0} }; -#else +#ifdef LPROCFS +static int osc_rd_active(char *page, char **start, off_t off, + int count, int *eof, void *data) +{ + struct obd_device *dev = data; + 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; +} + +static int osc_wr_active(struct file *file, const char *buffer, + unsigned long count, void *data) +{ + struct obd_device *dev = data; + int val, rc; + + rc = lprocfs_write_helper(buffer, count, &val); + if (rc) + return rc; + if (val < 0 || val > 1) + return -ERANGE; + + LPROCFS_CLIMP_CHECK(dev); + /* opposite senses */ + if (dev->u.cli.cl_import->imp_deactive == val) + rc = ptlrpc_set_import_active(dev->u.cli.cl_import, val); + else + CDEBUG(D_CONFIG, "activate %d: ignoring repeat request\n", val); + + LPROCFS_CLIMP_EXIT(dev); + return count; +} -int osc_rd_max_pages_per_rpc(char *page, char **start, off_t off, int count, - int *eof, void *data) +static int osc_rd_max_pages_per_rpc(char *page, char **start, off_t off, + int count, int *eof, void *data) { struct obd_device *dev = data; struct client_obd *cli = &dev->u.cli; int rc; - spin_lock(&cli->cl_loi_list_lock); + client_obd_list_lock(&cli->cl_loi_list_lock); rc = snprintf(page, count, "%d\n", cli->cl_max_pages_per_rpc); - spin_unlock(&cli->cl_loi_list_lock); + client_obd_list_unlock(&cli->cl_loi_list_lock); return rc; } -int osc_wr_max_pages_per_rpc(struct file *file, const char *buffer, - unsigned long count, void *data) +static int osc_wr_max_pages_per_rpc(struct file *file, const char *buffer, + unsigned long count, void *data) { struct obd_device *dev = data; struct client_obd *cli = &dev->u.cli; + struct obd_connect_data *ocd = &cli->cl_import->imp_connect_data; int val, rc; rc = lprocfs_write_helper(buffer, count, &val); if (rc) return rc; - if (val < 1 || val > PTLRPC_MAX_BRW_PAGES) + LPROCFS_CLIMP_CHECK(dev); + if (val < 1 || val > ocd->ocd_brw_size >> CFS_PAGE_SHIFT) { + LPROCFS_CLIMP_EXIT(dev); return -ERANGE; - - spin_lock(&cli->cl_loi_list_lock); + } + client_obd_list_lock(&cli->cl_loi_list_lock); cli->cl_max_pages_per_rpc = val; - spin_unlock(&cli->cl_loi_list_lock); + client_obd_list_unlock(&cli->cl_loi_list_lock); + LPROCFS_CLIMP_EXIT(dev); return count; } -int osc_rd_max_rpcs_in_flight(char *page, char **start, off_t off, int count, - int *eof, void *data) +static int osc_rd_max_rpcs_in_flight(char *page, char **start, off_t off, + int count, int *eof, void *data) { struct obd_device *dev = data; struct client_obd *cli = &dev->u.cli; int rc; - spin_lock(&cli->cl_loi_list_lock); + client_obd_list_lock(&cli->cl_loi_list_lock); rc = snprintf(page, count, "%u\n", cli->cl_max_rpcs_in_flight); - spin_unlock(&cli->cl_loi_list_lock); + client_obd_list_unlock(&cli->cl_loi_list_lock); return rc; } -int osc_wr_max_rpcs_in_flight(struct file *file, const char *buffer, - unsigned long count, void *data) +static int osc_wr_max_rpcs_in_flight(struct file *file, const char *buffer, + unsigned long count, void *data) { struct obd_device *dev = data; struct client_obd *cli = &dev->u.cli; + struct ptlrpc_request_pool *pool = cli->cl_import->imp_rq_pool; int val, rc; rc = lprocfs_write_helper(buffer, count, &val); @@ -96,78 +145,151 @@ int osc_wr_max_rpcs_in_flight(struct file *file, const char *buffer, if (val < 1 || val > OSC_MAX_RIF_MAX) return -ERANGE; - spin_lock(&cli->cl_loi_list_lock); + LPROCFS_CLIMP_CHECK(dev); + 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; - spin_unlock(&cli->cl_loi_list_lock); + client_obd_list_unlock(&cli->cl_loi_list_lock); + LPROCFS_CLIMP_EXIT(dev); return count; } -int osc_rd_max_dirty_mb(char *page, char **start, off_t off, int count, - int *eof, void *data) +static int osc_rd_max_dirty_mb(char *page, char **start, off_t off, int count, + int *eof, void *data) { struct obd_device *dev = data; struct client_obd *cli = &dev->u.cli; - unsigned val; + long val; + int mult; - spin_lock(&cli->cl_loi_list_lock); - val = cli->cl_dirty_max >> 20; - spin_unlock(&cli->cl_loi_list_lock); + client_obd_list_lock(&cli->cl_loi_list_lock); + val = cli->cl_dirty_max; + client_obd_list_unlock(&cli->cl_loi_list_lock); - return snprintf(page, count, "%u\n", val); + mult = 1 << 20; + return lprocfs_read_frac_helper(page, count, val, mult); } -int osc_wr_max_dirty_mb(struct file *file, const char *buffer, - unsigned long count, void *data) +static int osc_wr_max_dirty_mb(struct file *file, const char *buffer, + unsigned long count, void *data) { struct obd_device *dev = data; struct client_obd *cli = &dev->u.cli; - int val, rc; + int pages_number, mult, rc; - rc = lprocfs_write_helper(buffer, count, &val); + mult = 1 << (20 - CFS_PAGE_SHIFT); + rc = lprocfs_write_frac_helper(buffer, count, &pages_number, mult); if (rc) return rc; - if (val < 0 || val > OSC_MAX_DIRTY_MB_MAX || - val > num_physpages >> (20 - PAGE_SHIFT - 2)) /* 1/4 of RAM */ + if (pages_number < 0 || + pages_number > OSC_MAX_DIRTY_MB_MAX << (20 - CFS_PAGE_SHIFT) || + pages_number > cfs_num_physpages / 4) /* 1/4 of RAM */ return -ERANGE; - spin_lock(&cli->cl_loi_list_lock); - cli->cl_dirty_max = (obd_count)val * 1024 * 1024; + client_obd_list_lock(&cli->cl_loi_list_lock); + cli->cl_dirty_max = (obd_count)(pages_number << CFS_PAGE_SHIFT); osc_wake_cache_waiters(cli); - spin_unlock(&cli->cl_loi_list_lock); + client_obd_list_unlock(&cli->cl_loi_list_lock); return count; } -int osc_rd_cur_dirty_bytes(char *page, char **start, off_t off, int count, - int *eof, void *data) +static int osc_rd_cur_dirty_bytes(char *page, char **start, off_t off, + int count, int *eof, void *data) { struct obd_device *dev = data; struct client_obd *cli = &dev->u.cli; int rc; - spin_lock(&cli->cl_loi_list_lock); + client_obd_list_lock(&cli->cl_loi_list_lock); rc = snprintf(page, count, "%lu\n", cli->cl_dirty); - spin_unlock(&cli->cl_loi_list_lock); + client_obd_list_unlock(&cli->cl_loi_list_lock); return rc; } -int osc_rd_cur_grant_bytes(char *page, char **start, off_t off, int count, - int *eof, void *data) +static int osc_rd_cur_grant_bytes(char *page, char **start, off_t off, + int count, int *eof, void *data) { struct obd_device *dev = data; struct client_obd *cli = &dev->u.cli; int rc; - spin_lock(&cli->cl_loi_list_lock); + client_obd_list_lock(&cli->cl_loi_list_lock); rc = snprintf(page, count, "%lu\n", cli->cl_avail_grant); - spin_unlock(&cli->cl_loi_list_lock); + client_obd_list_unlock(&cli->cl_loi_list_lock); return rc; } -int osc_rd_create_count(char *page, char **start, off_t off, int count, - int *eof, void *data) +static int osc_wr_cur_grant_bytes(struct file *file, const char *buffer, + unsigned long count, void *data) +{ + struct obd_device *obd = data; + struct client_obd *cli = &obd->u.cli; + int rc; + __u64 val; + + if (obd == NULL) + return 0; + + rc = lprocfs_write_u64_helper(buffer, count, &val); + if (rc) + 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); + + LPROCFS_CLIMP_CHECK(obd); + if (cli->cl_import->imp_state == LUSTRE_IMP_FULL) + rc = osc_shrink_grant_to_target(cli, val); + LPROCFS_CLIMP_EXIT(obd); + if (rc) + return rc; + return count; +} + +static int osc_rd_grant_shrink_interval(char *page, char **start, off_t off, + int count, int *eof, void *data) +{ + struct obd_device *obd = data; + + if (obd == NULL) + return 0; + return snprintf(page, count, "%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) +{ + struct obd_device *obd = data; + int val, rc; + + if (obd == NULL) + return 0; + + rc = lprocfs_write_helper(buffer, count, &val); + if (rc) + return rc; + + if (val <= 0) + return -ERANGE; + + obd->u.cli.cl_grant_shrink_interval = val; + + return count; +} + +static int osc_rd_create_count(char *page, char **start, off_t off, int count, + int *eof, void *data) { struct obd_device *obd = data; @@ -178,8 +300,89 @@ int osc_rd_create_count(char *page, char **start, off_t off, int count, obd->u.cli.cl_oscc.oscc_grow_count); } -int osc_wr_create_count(struct file *file, const char *buffer, - unsigned long count, void *data) +/** + * Set OSC creator's osc_creator::oscc_grow_count + * + * \param file proc file + * \param buffer buffer containing the value + * \param count buffer size + * \param data obd device + * + * \retval \a count + */ +static int osc_wr_create_count(struct file *file, const char *buffer, + unsigned long count, void *data) +{ + struct obd_device *obd = data; + int val, rc, i; + + if (obd == NULL) + return 0; + + rc = lprocfs_write_helper(buffer, count, &val); + if (rc) + return rc; + + /* The MDT ALWAYS needs to limit the precreate count to + * OST_MAX_PRECREATE, and the constant cannot be changed + * because it is a value shared between the OSC and OST + * that is the maximum possible number of objects that will + * ever be handled by MDT->OST recovery processing. + * + * If the OST ever gets a request to delete more orphans, + * this implies that something has gone badly on the MDT + * and the OST will refuse to delete so much data from the + * filesystem as a safety measure. */ + if (val < OST_MIN_PRECREATE || val > OST_MAX_PRECREATE) + return -ERANGE; + if (val > obd->u.cli.cl_oscc.oscc_max_grow_count) + return -ERANGE; + + for (i = 1; (i << 1) <= val; i <<= 1) + ; + obd->u.cli.cl_oscc.oscc_grow_count = i; + + return count; +} + +/** + * Read OSC creator's osc_creator::oscc_max_grow_count + * + * \param page buffer to hold the returning string + * \param start + * \param off + * \param count + * \param eof + * proc read function parameters, please refer to kernel + * code fs/proc/generic.c proc_file_read() + * \param data obd device + * + * \retval number of characters printed. + */ +static int osc_rd_max_create_count(char *page, char **start, off_t off, + int count, int *eof, void *data) +{ + struct obd_device *obd = data; + + if (obd == NULL) + return 0; + + return snprintf(page, count, "%d\n", + obd->u.cli.cl_oscc.oscc_max_grow_count); +} + +/** + * Set OSC creator's osc_creator::oscc_max_grow_count + * + * \param file proc file + * \param buffer buffer containing the value + * \param count buffer size + * \param data obd device + * + * \retval \a count + */ +static int osc_wr_max_create_count(struct file *file, const char *buffer, + unsigned long count, void *data) { struct obd_device *obd = data; int val, rc; @@ -193,14 +396,19 @@ int osc_wr_create_count(struct file *file, const char *buffer, if (val < 0) return -ERANGE; + if (val > OST_MAX_PRECREATE) + return -ERANGE; - obd->u.cli.cl_oscc.oscc_grow_count = val; + if (obd->u.cli.cl_oscc.oscc_grow_count > val) + obd->u.cli.cl_oscc.oscc_grow_count = val; + + obd->u.cli.cl_oscc.oscc_max_grow_count = val; return count; } -int osc_rd_prealloc_next_id(char *page, char **start, off_t off, int count, - int *eof, void *data) +static int osc_rd_prealloc_next_id(char *page, char **start, off_t off, + int count, int *eof, void *data) { struct obd_device *obd = data; @@ -211,8 +419,8 @@ int osc_rd_prealloc_next_id(char *page, char **start, off_t off, int count, obd->u.cli.cl_oscc.oscc_next_id); } -int osc_rd_prealloc_last_id(char *page, char **start, off_t off, int count, - int *eof, void *data) +static int osc_rd_prealloc_last_id(char *page, char **start, off_t off, + int count, int *eof, void *data) { struct obd_device *obd = data; @@ -223,8 +431,169 @@ int osc_rd_prealloc_last_id(char *page, char **start, off_t off, int count, obd->u.cli.cl_oscc.oscc_last_id); } -static struct lprocfs_vars lprocfs_obd_vars[] = { +static int osc_rd_checksum(char *page, char **start, off_t off, int count, + int *eof, void *data) +{ + struct obd_device *obd = data; + + if (obd == NULL) + return 0; + + return snprintf(page, count, "%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) +{ + struct obd_device *obd = data; + int val, rc; + + if (obd == NULL) + return 0; + + rc = lprocfs_write_helper(buffer, count, &val); + if (rc) + return rc; + + obd->u.cli.cl_checksum = (val ? 1 : 0); + + return count; +} + +static int osc_rd_checksum_type(char *page, char **start, off_t off, int count, + int *eof, void *data) +{ + struct obd_device *obd = data; + int i, len =0; + 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; +} + +static int osc_wd_checksum_type(struct file *file, const char *buffer, + unsigned long count, void *data) +{ + struct obd_device *obd = data; + int i; + DECLARE_CKSUM_NAME; + char kernbuf[10]; + + if (obd == NULL) + return 0; + + if (count > sizeof(kernbuf) - 1) + return -EINVAL; + if (cfs_copy_from_user(kernbuf, buffer, count)) + return -EFAULT; + if (count > 0 && kernbuf[count - 1] == '\n') + kernbuf[count - 1] = '\0'; + else + kernbuf[count] = '\0'; + + for (i = 0; i < ARRAY_SIZE(cksum_name); i++) { + if (((1 << i) & obd->u.cli.cl_supp_cksum_types) == 0) + continue; + if (!strcmp(kernbuf, cksum_name[i])) { + obd->u.cli.cl_cksum_type = 1 << i; + return count; + } + } + return -EINVAL; +} + +static int osc_rd_resend_count(char *page, char **start, off_t off, int count, + int *eof, void *data) +{ + struct obd_device *obd = data; + + return snprintf(page, count, "%u\n", + cfs_atomic_read(&obd->u.cli.cl_resends)); +} + +static int osc_wr_resend_count(struct file *file, const char *buffer, + unsigned long count, void *data) +{ + struct obd_device *obd = data; + int val, rc; + + rc = lprocfs_write_helper(buffer, count, &val); + if (rc) + return rc; + + if (val < 0) + return -EINVAL; + + cfs_atomic_set(&obd->u.cli.cl_resends, val); + + return count; +} + +static int osc_rd_contention_seconds(char *page, char **start, off_t off, + int count, int *eof, void *data) +{ + struct obd_device *obd = data; + struct osc_device *od = obd2osc_dev(obd); + + return snprintf(page, count, "%u\n", od->od_contention_time); +} + +static int osc_wr_contention_seconds(struct file *file, const char *buffer, + unsigned long count, void *data) +{ + struct obd_device *obd = data; + struct osc_device *od = obd2osc_dev(obd); + + return lprocfs_write_helper(buffer, count, &od->od_contention_time) ?: + count; +} + +static int osc_rd_lockless_truncate(char *page, char **start, off_t off, + int count, int *eof, void *data) +{ + struct obd_device *obd = data; + struct osc_device *od = obd2osc_dev(obd); + + return snprintf(page, count, "%u\n", od->od_lockless_truncate); +} + +static int osc_wr_lockless_truncate(struct file *file, const char *buffer, + unsigned long count, void *data) +{ + struct obd_device *obd = data; + struct osc_device *od = obd2osc_dev(obd); + + return lprocfs_write_helper(buffer, count, &od->od_lockless_truncate) ?: + count; +} + +static int osc_rd_destroys_in_flight(char *page, char **start, off_t off, + int count, int *eof, void *data) +{ + struct obd_device *obd = data; + return snprintf(page, count, "%u\n", + cfs_atomic_read(&obd->u.cli.cl_destroy_in_flight)); +} + +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 }, @@ -234,46 +603,58 @@ static struct lprocfs_vars lprocfs_obd_vars[] = { //{ "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", osc_rd_max_pages_per_rpc, osc_wr_max_pages_per_rpc, 0 }, { "max_rpcs_in_flight", osc_rd_max_rpcs_in_flight, osc_wr_max_rpcs_in_flight, 0 }, - { "max_dirty_mb", osc_rd_max_dirty_mb, osc_wr_max_dirty_mb, 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 }, { "cur_dirty_bytes", osc_rd_cur_dirty_bytes, 0, 0 }, - { "cur_grant_bytes", osc_rd_cur_grant_bytes, 0, 0 }, - { "create_count", osc_rd_create_count, osc_wr_create_count, 0 }, + { "cur_grant_bytes", osc_rd_cur_grant_bytes, + osc_wr_cur_grant_bytes, 0 }, + { "grant_shrink_interval", osc_rd_grant_shrink_interval, + osc_wr_grant_shrink_interval, 0 }, + { "create_count", osc_rd_create_count, osc_wr_create_count, 0 }, + { "max_create_count", osc_rd_max_create_count, + osc_wr_max_create_count, 0}, { "prealloc_next_id", osc_rd_prealloc_next_id, 0, 0 }, { "prealloc_last_id", osc_rd_prealloc_last_id, 0, 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, 0, 0 }, + { "state", lprocfs_rd_state, 0, 0 }, { 0 } }; -static struct lprocfs_vars lprocfs_module_vars[] = { +static struct lprocfs_vars lprocfs_osc_module_vars[] = { { "num_refs", lprocfs_rd_numrefs, 0, 0 }, { 0 } }; #define pct(a,b) (b ? a * 100 / b : 0) -#define PRINTF_STIME(stime) (unsigned long)(stime)->st_num, \ - lprocfs_stime_avg_ms(stime), lprocfs_stime_avg_us(stime) - - 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 flags; unsigned long read_tot = 0, write_tot = 0, read_cum, write_cum; int i; - do_gettimeofday(&now); + cfs_gettimeofday(&now); - spin_lock_irqsave(&cli->cl_loi_list_lock, flags); + client_obd_list_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", @@ -283,7 +664,6 @@ static int osc_rpc_stats_seq_show(struct seq_file *seq, void *v) seq_printf(seq, "pending read pages: %d\n", 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"); @@ -330,56 +710,33 @@ static int osc_rpc_stats_seq_show(struct seq_file *seq, void *v) break; } - seq_printf(seq, "\nrpc service time: (rpcs, average ms)\n"); - seq_printf(seq, "\tread\t%lu\t%lu.%04lu\n", - PRINTF_STIME(&cli->cl_read_stime)); - seq_printf(seq, "\twrite\t%lu\t%lu.%04lu\n\n", - PRINTF_STIME(&cli->cl_write_stime)); - - seq_printf(seq, "app waiting: (num, average ms)\n"); - seq_printf(seq, "\tenter cache\t%lu\t%lu.%04lu\n", - PRINTF_STIME(&cli->cl_enter_stime)); + seq_printf(seq, "\n\t\t\tread\t\t\twrite\n"); + seq_printf(seq, "offset rpcs %% cum %% |"); + seq_printf(seq, " rpcs %% cum %%\n"); - spin_unlock_irqrestore(&cli->cl_loi_list_lock, flags); + read_tot = lprocfs_oh_sum(&cli->cl_read_offset_hist); + write_tot = lprocfs_oh_sum(&cli->cl_write_offset_hist); - return 0; -} -#undef pct - -static void *osc_rpc_stats_seq_start(struct seq_file *p, loff_t *pos) -{ - if (*pos == 0) - return (void *)1; - return NULL; -} -static void *osc_rpc_stats_seq_next(struct seq_file *p, void *v, loff_t *pos) -{ - ++*pos; - return NULL; -} -static void osc_rpc_stats_seq_stop(struct seq_file *p, void *v) -{ -} -struct seq_operations osc_rpc_stats_seq_sops = { - .start = osc_rpc_stats_seq_start, - .stop = osc_rpc_stats_seq_stop, - .next = osc_rpc_stats_seq_next, - .show = osc_rpc_stats_seq_show, -}; + read_cum = 0; + write_cum = 0; + for (i = 0; i < OBD_HIST_MAX; i++) { + unsigned long r = cli->cl_read_offset_hist.oh_buckets[i]; + unsigned long w = cli->cl_write_offset_hist.oh_buckets[i]; + read_cum += r; + write_cum += w; + seq_printf(seq, "%d:\t\t%10lu %3lu %3lu | %10lu %3lu %3lu\n", + (i == 0) ? 0 : 1 << (i - 1), + r, pct(r, read_tot), pct(read_cum, read_tot), + w, pct(w, write_tot), pct(write_cum, write_tot)); + if (read_cum == read_tot && write_cum == write_tot) + break; + } -static int osc_rpc_stats_seq_open(struct inode *inode, struct file *file) -{ - struct proc_dir_entry *dp = PDE(inode); - struct seq_file *seq; - int rc; + client_obd_list_unlock(&cli->cl_loi_list_lock); - rc = seq_open(file, &osc_rpc_stats_seq_sops); - if (rc) - return rc; - seq = file->private_data; - seq->private = dp->data; return 0; } +#undef pct static ssize_t osc_rpc_stats_seq_write(struct file *file, const char *buf, size_t len, loff_t *off) @@ -392,28 +749,61 @@ static ssize_t osc_rpc_stats_seq_write(struct file *file, const char *buf, lprocfs_oh_clear(&cli->cl_write_rpc_hist); lprocfs_oh_clear(&cli->cl_read_page_hist); lprocfs_oh_clear(&cli->cl_write_page_hist); + lprocfs_oh_clear(&cli->cl_read_offset_hist); + lprocfs_oh_clear(&cli->cl_write_offset_hist); + + return len; +} + +LPROC_SEQ_FOPS(osc_rpc_stats); + +static int osc_stats_seq_show(struct seq_file *seq, void *v) +{ + struct timeval now; + struct obd_device *dev = seq->private; + struct osc_stats *stats = &obd2osc_dev(dev)->od_stats; - memset(&cli->cl_read_stime, 0, sizeof(cli->cl_read_stime)); - memset(&cli->cl_write_stime, 0, sizeof(cli->cl_write_stime)); - memset(&cli->cl_enter_stime, 0, sizeof(cli->cl_enter_stime)); + cfs_gettimeofday(&now); + seq_printf(seq, "snapshot_time: %lu.%lu (secs.usecs)\n", + now.tv_sec, now.tv_usec); + seq_printf(seq, "lockless_write_bytes\t\t"LPU64"\n", + stats->os_lockless_writes); + seq_printf(seq, "lockless_read_bytes\t\t"LPU64"\n", + stats->os_lockless_reads); + seq_printf(seq, "lockless_truncate\t\t"LPU64"\n", + stats->os_lockless_truncates); + return 0; +} + +static ssize_t osc_stats_seq_write(struct file *file, const char *buf, + size_t len, loff_t *off) +{ + struct seq_file *seq = file->private_data; + struct obd_device *dev = seq->private; + struct osc_stats *stats = &obd2osc_dev(dev)->od_stats; + + memset(stats, 0, sizeof(*stats)); return len; } -struct file_operations osc_rpc_stats_fops = { - .owner = THIS_MODULE, - .open = osc_rpc_stats_seq_open, - .read = seq_read, - .write = osc_rpc_stats_seq_write, - .llseek = seq_lseek, - .release = seq_release, -}; +LPROC_SEQ_FOPS(osc_stats); int lproc_osc_attach_seqstat(struct obd_device *dev) { - return lprocfs_obd_seq_create(dev, "rpc_stats", 0444, - &osc_rpc_stats_fops, dev); + int rc; + + rc = lprocfs_seq_create(dev->obd_proc_entry, "osc_stats", 0444, + &osc_stats_fops, dev); + if (rc == 0) + rc = lprocfs_obd_seq_create(dev, "rpc_stats", 0444, + &osc_rpc_stats_fops, 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 */ -LPROCFS_INIT_VARS(osc, lprocfs_module_vars, lprocfs_obd_vars)