X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fosc%2Flproc_osc.c;h=73ec74884f6f968226ed500a4600e44bfe9b9837;hp=4f0035d9173f3bfe6da75ea2072d1bbb30acb30a;hb=59efcfeb109edd2c695ce961fb8c872d9c515116;hpb=fbb7ead129258897f5a5d5c9ce28d31fbbe5bca2

diff --git a/lustre/osc/lproc_osc.c b/lustre/osc/lproc_osc.c
index 4f0035d..73ec748 100644
--- a/lustre/osc/lproc_osc.c
+++ b/lustre/osc/lproc_osc.c
@@ -1,92 +1,102 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
+/*
+ * GPL HEADER START
  *
- *  Copyright (C) 2002, 2003 Cluster File Systems, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *   This file is part of Lustre, http://www.lustre.org.
+ * 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 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 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).
  *
- *   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.
+ * 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
  *
- *   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.
+ * 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 (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Use is subject to license terms.
+ *
+ * Copyright (c) 2011, 2014, Intel Corporation.
+ */
+/*
+ * This file is part of Lustre, http://www.lustre.org/
+ * Lustre is a trademark of Sun Microsystems, Inc.
  */
 #define DEBUG_SUBSYSTEM S_CLASS
 
 #include <linux/version.h>
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0))
 #include <asm/statfs.h>
-#endif
-#include <linux/obd_class.h>
-#include <linux/lprocfs_status.h>
+#include <obd_cksum.h>
+#include <obd_class.h>
+#include <lprocfs_status.h>
 #include <linux/seq_file.h>
 #include "osc_internal.h"
 
-#ifndef LPROCFS
-static struct lprocfs_vars lprocfs_obd_vars[]  = { {0} };
-static struct lprocfs_vars lprocfs_module_vars[] = { {0} };
-#else
-
-int osc_rd_max_pages_per_rpc(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;
-        struct client_obd *cli = &dev->u.cli;
-        int rc;
+	struct obd_device *dev = m->private;
+	int rc;
 
-        spin_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);
-        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;
 }
 
-int osc_wr_max_pages_per_rpc(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;
-        struct client_obd *cli = &dev->u.cli;
-        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)
                 return rc;
-
-        if (val < 1 || val > PTLRPC_MAX_BRW_PAGES)
+        if (val < 0 || val > 1)
                 return -ERANGE;
 
-        spin_lock(&cli->cl_loi_list_lock);
-        cli->cl_max_pages_per_rpc = val;
-        spin_unlock(&cli->cl_loi_list_lock);
+        /* 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);
 
         return count;
 }
+LPROC_SEQ_FOPS(osc_active);
 
-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;
-
-        spin_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);
-        return rc;
+	struct obd_device *dev = m->private;
+	struct client_obd *cli = &dev->u.cli;
+	int 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;
 }
 
-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;
 
         rc = lprocfs_write_helper(buffer, count, &val);
@@ -96,93 +106,253 @@ 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);
-        cli->cl_max_rpcs_in_flight = val;
-        spin_unlock(&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);
 
-        return count;
+	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;
 }
+LPROC_SEQ_FOPS(osc_max_rpcs_in_flight);
 
-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;
-        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);
+	spin_lock(&cli->cl_loi_list_lock);
+	val = cli->cl_dirty_max_pages;
+	spin_unlock(&cli->cl_loi_list_lock);
 
-        return snprintf(page, count, "%u\n", val);
+	mult = 1 << (20 - PAGE_CACHE_SHIFT);
+	return lprocfs_seq_read_frac_helper(m, val, mult);
 }
 
-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 client_obd *cli = &dev->u.cli;
-        int val, rc;
+	struct obd_device *dev = ((struct seq_file *)file->private_data)->private;
+	struct client_obd *cli = &dev->u.cli;
+	int pages_number, mult, rc;
+
+	mult = 1 << (20 - PAGE_CACHE_SHIFT);
+	rc = lprocfs_write_frac_helper(buffer, count, &pages_number, mult);
+	if (rc)
+		return rc;
+
+	if (pages_number <= 0 ||
+	    pages_number > OSC_MAX_DIRTY_MB_MAX << (20 - PAGE_CACHE_SHIFT) ||
+	    pages_number > totalram_pages / 4) /* 1/4 of RAM */
+		return -ERANGE;
+
+	spin_lock(&cli->cl_loi_list_lock);
+	cli->cl_dirty_max_pages = pages_number;
+	osc_wake_cache_waiters(cli);
+	spin_unlock(&cli->cl_loi_list_lock);
+
+	return count;
+}
+LPROC_SEQ_FOPS(osc_max_dirty_mb);
 
-        rc = lprocfs_write_helper(buffer, count, &val);
+static int osc_cached_mb_seq_show(struct seq_file *m, void *v)
+{
+	struct obd_device *dev = m->private;
+	struct client_obd *cli = &dev->u.cli;
+	int shift = 20 - PAGE_CACHE_SHIFT;
+	int rc;
+
+	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 ssize_t
+osc_cached_mb_seq_write(struct file *file, const char __user *buffer,
+			size_t count, loff_t *off)
+{
+	struct obd_device *dev = ((struct seq_file *)file->private_data)->private;
+	struct client_obd *cli = &dev->u.cli;
+	__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(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 = 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_cur_dirty_bytes_seq_show(struct seq_file *m, void *v)
+{
+	struct obd_device *dev = m->private;
+	struct client_obd *cli = &dev->u.cli;
+	int 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_cur_grant_bytes_seq_show(struct seq_file *m, void *v)
+{
+	struct obd_device *dev = m->private;
+	struct client_obd *cli = &dev->u.cli;
+	int 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 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 = ((struct seq_file *)file->private_data)->private;
+        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;
 
-        if (val < 0 || val > OSC_MAX_DIRTY_MB_MAX ||
-            val > num_physpages >> (20 - PAGE_SHIFT - 2)) /* 1/4 of RAM */
-                return -ERANGE;
+        /* this is only for shrinking grant */
+	spin_lock(&cli->cl_loi_list_lock);
+	if (val >= cli->cl_avail_grant) {
+		spin_unlock(&cli->cl_loi_list_lock);
+		return 0;
+	}
 
-        spin_lock(&cli->cl_loi_list_lock);
-        cli->cl_dirty_max = (obd_count)val * 1024 * 1024;
-        osc_wake_cache_waiters(cli);
-        spin_unlock(&cli->cl_loi_list_lock);
+	spin_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;
 }
+LPROC_SEQ_FOPS(osc_cur_grant_bytes);
 
-int osc_rd_cur_dirty_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;
+
+	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_grant_shrink_interval_seq_show(struct seq_file *m, void *v)
+{
+	struct obd_device *obd = m->private;
 
-        spin_lock(&cli->cl_loi_list_lock);
-        rc = snprintf(page, count, "%lu\n", cli->cl_dirty);
-        spin_unlock(&cli->cl_loi_list_lock);
-        return rc;
+	if (obd == NULL)
+		return 0;
+	return seq_printf(m, "%d\n",
+			  obd->u.cli.cl_grant_shrink_interval);
 }
 
-int osc_rd_cur_grant_bytes(char *page, char **start, off_t off, int count,
-                           int *eof, 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 *dev = data;
-        struct client_obd *cli = &dev->u.cli;
-        int rc;
+	struct obd_device *obd = ((struct seq_file *)file->private_data)->private;
+	int val, rc;
+
+	if (obd == NULL)
+		return 0;
 
-        spin_lock(&cli->cl_loi_list_lock);
-        rc = snprintf(page, count, "%lu\n", cli->cl_avail_grant);
-        spin_unlock(&cli->cl_loi_list_lock);
-        return rc;
+        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;
 }
+LPROC_SEQ_FOPS(osc_grant_shrink_interval);
 
-int osc_rd_create_count(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_oscc.oscc_grow_count);
+	return seq_printf(m, "%d\n",
+			  obd->u.cli.cl_checksum ? 1 : 0);
 }
 
-int osc_wr_create_count(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;
@@ -191,115 +361,349 @@ int osc_wr_create_count(struct file *file, const char *buffer,
         if (rc)
                 return rc;
 
-        if (val < 0)
-                return -ERANGE;
-
-        obd->u.cli.cl_oscc.oscc_grow_count = val;
+        obd->u.cli.cl_checksum = (val ? 1 : 0);
 
         return count;
 }
+LPROC_SEQ_FOPS(osc_checksum);
 
-int osc_rd_prealloc_next_id(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;
+	struct obd_device *obd = m->private;
+	int i;
+	DECLARE_CKSUM_NAME;
 
         if (obd == NULL)
                 return 0;
 
-        return snprintf(page, count, LPU64"\n",
-                        obd->u.cli.cl_oscc.oscc_next_id);
+	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;
 }
 
-int osc_rd_prealloc_last_id(char *page, char **start, off_t off, int count,
-                            int *eof, 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;
+	struct obd_device *obd = ((struct seq_file *)file->private_data)->private;
+	int i;
+	DECLARE_CKSUM_NAME;
+	char kernbuf[10];
 
         if (obd == NULL)
                 return 0;
 
-        return snprintf(page, count, LPU64"\n",
-                        obd->u.cli.cl_oscc.oscc_last_id);
-}
-
-static struct lprocfs_vars lprocfs_obd_vars[] = {
-        { "uuid",            lprocfs_rd_uuid,        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 },
-        { "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 },
-        { "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 },
-        { "prealloc_next_id", osc_rd_prealloc_next_id, 0, 0 },
-        { "prealloc_last_id", osc_rd_prealloc_last_id, 0, 0 },
-        { 0 }
-};
+        if (count > sizeof(kernbuf) - 1)
+                return -EINVAL;
+	if (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;
+}
+LPROC_SEQ_FOPS(osc_checksum_type);
 
-static struct lprocfs_vars lprocfs_module_vars[] = {
-        { "num_refs",        lprocfs_rd_numrefs,     0, 0 },
-        { 0 }
-};
+static int osc_resend_count_seq_show(struct seq_file *m, void *v)
+{
+	struct obd_device *obd = m->private;
 
-#define pct(a,b) (b ? a * 100 / b : 0)
+	return seq_printf(m, "%u\n", atomic_read(&obd->u.cli.cl_resends));
+}
+
+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 = ((struct seq_file *)file->private_data)->private;
+	int val, rc;
 
-#define PRINTF_STIME(stime) (unsigned long)(stime)->st_num,     \
-        lprocfs_stime_avg_ms(stime), lprocfs_stime_avg_us(stime)
+	rc = lprocfs_write_helper(buffer, count, &val);
+	if (rc)
+		return rc;
 
+	if (val < 0)
+		return -EINVAL;
 
-static int osc_rpc_stats_seq_show(struct seq_file *seq, void *v)
+	atomic_set(&obd->u.cli.cl_resends, val);
+
+	return count;
+}
+LPROC_SEQ_FOPS(osc_resend_count);
+
+static int osc_contention_seconds_seq_show(struct seq_file *m, 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;
+	struct obd_device *obd = m->private;
+	struct osc_device *od  = obd2osc_dev(obd);
 
-        do_gettimeofday(&now);
+	return seq_printf(m, "%u\n", od->od_contention_time);
+}
 
-        spin_lock_irqsave(&cli->cl_loi_list_lock, flags);
+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 = ((struct seq_file *)file->private_data)->private;
+	struct osc_device *od  = obd2osc_dev(obd);
 
-        seq_printf(seq, "snapshot_time:         %lu.%lu (secs.usecs)\n",
-                   now.tv_sec, now.tv_usec);
+	return lprocfs_write_helper(buffer, count, &od->od_contention_time) ?: count;
+}
+LPROC_SEQ_FOPS(osc_contention_seconds);
 
-        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",
-                   cli->cl_pending_w_pages);
-        seq_printf(seq, "pending read pages:   %d\n",
-                   cli->cl_pending_r_pages);
+static int osc_lockless_truncate_seq_show(struct seq_file *m, void *v)
+{
+	struct obd_device *obd = m->private;
+	struct osc_device *od  = obd2osc_dev(obd);
 
+	return seq_printf(m, "%u\n", od->od_lockless_truncate);
+}
 
-        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");
+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 = ((struct seq_file *)file->private_data)->private;
+        struct osc_device *od  = obd2osc_dev(obd);
 
-        read_tot = lprocfs_oh_sum(&cli->cl_read_page_hist);
-        write_tot = lprocfs_oh_sum(&cli->cl_write_page_hist);
+        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_obd_max_pages_per_rpc_seq_show(struct seq_file *m, void *v)
+{
+	return lprocfs_obd_max_pages_per_rpc_seq_show(m, m->private);
+}
+
+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 = ((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;
+	__u64 val;
+
+	rc = lprocfs_write_u64_helper(buffer, count, &val);
+	if (rc)
+		return rc;
+
+	/* if the max_pages is specified in bytes, convert to pages */
+	if (val >= ONE_MB_BRW_SIZE)
+		val >>= PAGE_CACHE_SHIFT;
+
+	LPROCFS_CLIMP_CHECK(dev);
+
+	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 || (ocd->ocd_brw_size != 0 &&
+			 val > ocd->ocd_brw_size >> PAGE_CACHE_SHIFT)) {
+		LPROCFS_CLIMP_EXIT(dev);
+		return -ERANGE;
+	}
+	spin_lock(&cli->cl_loi_list_lock);
+	cli->cl_max_pages_per_rpc = val;
+	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 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;
+	int i;
+
+	do_gettimeofday(&now);
+
+	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",
+		   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");
+
+	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;
         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];
+                unsigned long r = cli->cl_read_rpc_hist.oh_buckets[i];
+                unsigned long w = cli->cl_write_rpc_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),
+                                 i, r, pct(r, read_tot),
                                  pct(read_cum, read_tot), w,
                                  pct(w, write_tot),
                                  pct(write_cum, write_tot));
@@ -308,80 +712,35 @@ static int osc_rpc_stats_seq_show(struct seq_file *seq, void *v)
         }
 
         seq_printf(seq, "\n\t\t\tread\t\t\twrite\n");
-        seq_printf(seq, "rpcs in flight        rpcs   %% cum %% |");
+        seq_printf(seq, "offset                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_offset_hist);
+        write_tot = lprocfs_oh_sum(&cli->cl_write_offset_hist);
 
         read_cum = 0;
         write_cum = 0;
         for (i = 0; i < OBD_HIST_MAX; i++) {
-                unsigned long r = cli->cl_read_rpc_hist.oh_buckets[i];
-                unsigned long w = cli->cl_write_rpc_hist.oh_buckets[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, r, pct(r, read_tot),
-                                 pct(read_cum, read_tot), w,
-                                 pct(w, write_tot),
-                                 pct(write_cum, write_tot));
+                           (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;
         }
 
-        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));
-
-        spin_unlock_irqrestore(&cli->cl_loi_list_lock, flags);
+	spin_unlock(&cli->cl_loi_list_lock);
 
         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,
-};
-
-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;
-
-        rc = seq_open(file, &osc_rpc_stats_seq_sops);
-        if (rc)
-                return rc;
-        seq = file->private_data;
-        seq->private = dp->data;
-        return 0;
-}
-
-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;
@@ -392,28 +751,56 @@ 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);
 
-        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));
+        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;
+
+	do_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 __user *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;
 
-#endif /* LPROCFS */
-LPROCFS_INIT_VARS(osc, lprocfs_module_vars, lprocfs_obd_vars)
+	rc = lprocfs_seq_create(dev->obd_proc_entry, "osc_stats", 0644,
+				&osc_stats_fops, dev);
+	if (rc == 0)
+		rc = lprocfs_obd_seq_create(dev, "rpc_stats", 0644,
+					    &osc_rpc_stats_fops, dev);
+
+	return rc;
+}
+#endif /* CONFIG_PROC_FS */