Whamcloud - gitweb
LU-17705 ptlrpc: replace synchronize_rcu() with rcu_barrier()
[fs/lustre-release.git] / lustre / ofd / lproc_ofd.c
index 8f9b855..b0c4210 100644 (file)
  * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, 2014 Intel Corporation.
+ * Copyright (c) 2012, 2017, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
  *
  * lustre/ofd/lproc_ofd.c
  *
@@ -45,6 +44,8 @@
 #include <lprocfs_status.h>
 #include <linux/seq_file.h>
 #include <lustre_lfsck.h>
+#include <uapi/linux/lustre/lustre_access_log.h>
+#include <obd_cksum.h>
 
 #include "ofd_internal.h"
 
  * \retval             0 on success
  * \retval             negative value on error
  */
-static int ofd_seqs_seq_show(struct seq_file *m, void *data)
+static ssize_t seqs_allocated_show(struct kobject *kobj, struct attribute *attr,
+                                  char *buf)
 {
-       struct obd_device *obd = m->private;
+       struct obd_device *obd = container_of(kobj, struct obd_device,
+                                             obd_kset.kobj);
        struct ofd_device *ofd = ofd_dev(obd->obd_lu_dev);
 
-       return seq_printf(m, "%u\n", ofd->ofd_seq_count);
+       return sprintf(buf, "%u\n", ofd->ofd_seq_count);
 }
-LPROC_SEQ_FOPS_RO(ofd_seqs);
+LUSTRE_RO_ATTR(seqs_allocated);
 
 /**
- * Show estimate of total amount of dirty data on clients.
+ * Show total number of grants for precreate.
  *
  * \param[in] m                seq_file handle
  * \param[in] data     unused for single entry
@@ -77,19 +80,20 @@ LPROC_SEQ_FOPS_RO(ofd_seqs);
  * \retval             0 on success
  * \retval             negative value on error
  */
-static int ofd_tot_dirty_seq_show(struct seq_file *m, void *data)
+static ssize_t grant_precreate_show(struct kobject *kobj,
+                                   struct attribute *attr,
+                                   char *buf)
 {
-       struct obd_device *obd = m->private;
-       struct ofd_device *ofd;
+       struct obd_device *obd = container_of(kobj, struct obd_device,
+                                             obd_kset.kobj);
 
-       LASSERT(obd != NULL);
-       ofd = ofd_dev(obd->obd_lu_dev);
-       return seq_printf(m, LPU64"\n", ofd->ofd_tot_dirty);
+       return sprintf(buf, "%ld\n",
+                      obd->obd_self_export->exp_target_data.ted_grant);
 }
-LPROC_SEQ_FOPS_RO(ofd_tot_dirty);
+LUSTRE_RO_ATTR(grant_precreate);
 
 /**
- * Show total amount of space granted to clients.
+ * Show number of precreates allowed in a single transaction.
  *
  * \param[in] m                seq_file handle
  * \param[in] data     unused for single entry
@@ -97,58 +101,54 @@ LPROC_SEQ_FOPS_RO(ofd_tot_dirty);
  * \retval             0 on success
  * \retval             negative value on error
  */
-static int ofd_tot_granted_seq_show(struct seq_file *m, void *data)
+static ssize_t precreate_batch_show(struct kobject *kobj,
+                                   struct attribute *attr,
+                                   char *buf)
 {
-       struct obd_device *obd = m->private;
-       struct ofd_device *ofd;
+       struct obd_device *obd = container_of(kobj, struct obd_device,
+                                             obd_kset.kobj);
+       struct ofd_device *ofd = ofd_dev(obd->obd_lu_dev);
 
-       LASSERT(obd != NULL);
-       ofd = ofd_dev(obd->obd_lu_dev);
-       return seq_printf(m, LPU64"\n", ofd->ofd_tot_granted);
+       return sprintf(buf, "%d\n", ofd->ofd_precreate_batch);
 }
-LPROC_SEQ_FOPS_RO(ofd_tot_granted);
 
 /**
- * Show total amount of space used by IO in progress.
+ * Change number of precreates allowed in a single transaction.
  *
- * \param[in] m                seq_file handle
- * \param[in] data     unused for single entry
+ * \param[in] file     proc file
+ * \param[in] buffer   string which represents maximum number
+ * \param[in] count    \a buffer length
+ * \param[in] off      unused for single entry
  *
- * \retval             0 on success
- * \retval             negative value on error
+ * \retval             \a count on success
+ * \retval             negative number on error
  */
-static int ofd_tot_pending_seq_show(struct seq_file *m, void *data)
+static ssize_t precreate_batch_store(struct kobject *kobj,
+                                    struct attribute *attr,
+                                    const char *buffer, size_t count)
 {
-       struct obd_device *obd = m->private;
-       struct ofd_device *ofd;
+       struct obd_device *obd = container_of(kobj, struct obd_device,
+                                             obd_kset.kobj);
+       struct ofd_device *ofd = ofd_dev(obd->obd_lu_dev);
+       unsigned int val;
+       int rc;
 
-       LASSERT(obd != NULL);
-       ofd = ofd_dev(obd->obd_lu_dev);
-       return seq_printf(m, LPU64"\n", ofd->ofd_tot_pending);
-}
-LPROC_SEQ_FOPS_RO(ofd_tot_pending);
+       rc = kstrtouint(buffer, 0, &val);
+       if (rc)
+               return rc;
 
-/**
- * Show total number of grants for precreate.
- *
- * \param[in] m                seq_file handle
- * \param[in] data     unused for single entry
- *
- * \retval             0 on success
- * \retval             negative value on error
- */
-static int ofd_grant_precreate_seq_show(struct seq_file *m, void *data)
-{
-       struct obd_device *obd = m->private;
+       if (val < 1 || val > 65536)
+               return -EINVAL;
 
-       LASSERT(obd != NULL);
-       return seq_printf(m, "%ld\n",
-                         obd->obd_self_export->exp_filter_data.fed_grant);
+       spin_lock(&ofd->ofd_batch_lock);
+       ofd->ofd_precreate_batch = val;
+       spin_unlock(&ofd->ofd_batch_lock);
+       return count;
 }
-LPROC_SEQ_FOPS_RO(ofd_grant_precreate);
+LUSTRE_RW_ATTR(precreate_batch);
 
 /**
- * Show number of precreates allowed in a single transaction.
+ * Show number of seconds to delay atime
  *
  * \param[in] m                seq_file handle
  * \param[in] data     unused for single entry
@@ -156,18 +156,18 @@ LPROC_SEQ_FOPS_RO(ofd_grant_precreate);
  * \retval             0 on success
  * \retval             negative value on error
  */
-static int ofd_precreate_batch_seq_show(struct seq_file *m, void *data)
+static ssize_t atime_diff_show(struct kobject *kobj, struct attribute *attr,
+                              char *buf)
 {
-       struct obd_device *obd = m->private;
-       struct ofd_device *ofd;
+       struct obd_device *obd = container_of(kobj, struct obd_device,
+                                             obd_kset.kobj);
+       struct ofd_device *ofd = ofd_dev(obd->obd_lu_dev);
 
-       LASSERT(obd != NULL);
-       ofd = ofd_dev(obd->obd_lu_dev);
-       return seq_printf(m, "%d\n", ofd->ofd_precreate_batch);
+       return scnprintf(buf, PAGE_SIZE, "%lld\n", ofd->ofd_atime_diff);
 }
 
 /**
- * Change number of precreates allowed in a single transaction.
+ * Change number of seconds to delay atime
  *
  * \param[in] file     proc file
  * \param[in] buffer   string which represents maximum number
@@ -177,29 +177,26 @@ static int ofd_precreate_batch_seq_show(struct seq_file *m, void *data)
  * \retval             \a count on success
  * \retval             negative number on error
  */
-static ssize_t
-ofd_precreate_batch_seq_write(struct file *file, const char __user *buffer,
-                             size_t count, loff_t *off)
+static ssize_t atime_diff_store(struct kobject *kobj, struct attribute *attr,
+                               const char *buffer, size_t count)
 {
-       struct seq_file   *m = file->private_data;
-       struct obd_device *obd = m->private;
+       struct obd_device *obd = container_of(kobj, struct obd_device,
+                                             obd_kset.kobj);
        struct ofd_device *ofd = ofd_dev(obd->obd_lu_dev);
-       int val;
+       unsigned int val;
        int rc;
 
-       rc = lprocfs_write_helper(buffer, count, &val);
+       rc = kstrtouint(buffer, 0, &val);
        if (rc)
                return rc;
 
-       if (val < 1)
+       if (val > 86400)
                return -EINVAL;
 
-       spin_lock(&ofd->ofd_batch_lock);
-       ofd->ofd_precreate_batch = val;
-       spin_unlock(&ofd->ofd_batch_lock);
+       ofd->ofd_atime_diff = val;
        return count;
 }
-LPROC_SEQ_FOPS(ofd_precreate_batch);
+LUSTRE_RW_ATTR(atime_diff);
 
 /**
  * Show the last used ID for each FID sequence used by OFD.
@@ -215,7 +212,6 @@ static int ofd_last_id_seq_show(struct seq_file *m, void *data)
        struct obd_device       *obd = m->private;
        struct ofd_device       *ofd;
        struct ofd_seq          *oseq = NULL;
-       int                     retval = 0, rc;
 
        if (obd == NULL)
                return 0;
@@ -228,188 +224,127 @@ static int ofd_last_id_seq_show(struct seq_file *m, void *data)
 
                seq = ostid_seq(&oseq->os_oi) == 0 ?
                      fid_idif_seq(ostid_id(&oseq->os_oi),
-                                  ofd->ofd_lut.lut_lsd.lsd_osd_index) :
-                     ostid_seq(&oseq->os_oi);
-               rc = seq_printf(m, DOSTID"\n", seq, ostid_id(&oseq->os_oi));
-               if (rc < 0) {
-                       retval = rc;
-                       break;
-               }
-               retval += rc;
+                               ofd->ofd_lut.lut_lsd.lsd_osd_index) & ~0xFFFF :
+                               ostid_seq(&oseq->os_oi);
+               seq_printf(m, DOSTID"\n", seq, ostid_id(&oseq->os_oi));
        }
        read_unlock(&ofd->ofd_seq_list_lock);
-       return retval;
+       return 0;
 }
+
 LPROC_SEQ_FOPS_RO(ofd_last_id);
 
 /**
- * Show maximum number of Filter Modification Data (FMD) maintained by OFD.
+ * Show if the OFD is in degraded mode.
  *
- * \param[in] m                seq_file handle
- * \param[in] data     unused for single entry
+ * Degraded means OFD has a failed drive or is undergoing RAID rebuild.
+ * The MDS will try to avoid using this OST for new object allocations
+ * to reduce the impact to global IO performance when clients writing to
+ * this OST are slowed down.  It also reduces the contention on the OST
+ * RAID device, allowing it to rebuild more quickly.
  *
- * \retval             0 on success
- * \retval             negative value on error
+ * \retval             count of bytes written
  */
-static int ofd_fmd_max_num_seq_show(struct seq_file *m, void *data)
+static ssize_t degraded_show(struct kobject *kobj, struct attribute *attr,
+                            char *buf)
 {
-       struct obd_device *obd = m->private;
+       struct obd_device *obd = container_of(kobj, struct obd_device,
+                                             obd_kset.kobj);
        struct ofd_device *ofd = ofd_dev(obd->obd_lu_dev);
 
-       return seq_printf(m, "%u\n", ofd->ofd_fmd_max_num);
+       return sprintf(buf, "%u\n", ofd->ofd_raid_degraded);
 }
 
 /**
- * Change number of FMDs maintained by OFD.
+ * Set OFD to degraded mode.
  *
- * This defines how large the list of FMDs can be.
+ * This is used to interface to userspace administrative tools for
+ * the underlying RAID storage, so that they can mark an OST
+ * as having degraded performance.
  *
- * \param[in] file     proc file
- * \param[in] buffer   string which represents maximum number
  * \param[in] count    \a buffer length
  * \param[in] off      unused for single entry
  *
  * \retval             \a count on success
  * \retval             negative number on error
  */
-static ssize_t
-ofd_fmd_max_num_seq_write(struct file *file, const char __user *buffer,
-                         size_t count, loff_t *off)
-{
-       struct seq_file         *m = file->private_data;
-       struct obd_device       *obd = m->private;
-       struct ofd_device       *ofd = ofd_dev(obd->obd_lu_dev);
-       int                      val;
-       int                      rc;
-
-       rc = lprocfs_write_helper(buffer, count, &val);
-       if (rc)
-               return rc;
-
-       if (val > 65536 || val < 1)
-               return -EINVAL;
-
-       ofd->ofd_fmd_max_num = val;
-       return count;
-}
-LPROC_SEQ_FOPS(ofd_fmd_max_num);
-
-/**
- * Show the maximum age of FMD data in seconds.
- *
- * Though it is shown in seconds, it is stored internally in units
- * of jiffies for efficiency.
- *
- * \param[in] m                seq_file handle
- * \param[in] data     unused for single entry
- *
- * \retval             0 on success
- * \retval             negative value on error
- */
-static int ofd_fmd_max_age_seq_show(struct seq_file *m, void *data)
+static ssize_t degraded_store(struct kobject *kobj, struct attribute *attr,
+                             const char *buffer, size_t count)
 {
-       struct obd_device *obd = m->private;
+       struct obd_device *obd = container_of(kobj, struct obd_device,
+                                             obd_kset.kobj);
        struct ofd_device *ofd = ofd_dev(obd->obd_lu_dev);
+       bool val;
+       int rc;
 
-       return seq_printf(m, "%ld\n", jiffies_to_msecs(ofd->ofd_fmd_max_age) /
-                                     MSEC_PER_SEC);
-}
-
-/**
- * Set the maximum age of FMD data in seconds.
- *
- * This defines how long FMD data stays in the FMD list.
- * It is stored internally in units of jiffies for efficiency.
- *
- * \param[in] file     proc file
- * \param[in] buffer   string which represents maximum number
- * \param[in] count    \a buffer length
- * \param[in] off      unused for single entry
- *
- * \retval             \a count on success
- * \retval             negative number on error
- */
-static ssize_t
-ofd_fmd_max_age_seq_write(struct file *file, const char __user *buffer,
-                         size_t count, loff_t *off)
-{
-       struct seq_file         *m = file->private_data;
-       struct obd_device       *obd = m->private;
-       struct ofd_device       *ofd = ofd_dev(obd->obd_lu_dev);
-       int                      val;
-       int                      rc;
-
-       rc = lprocfs_write_helper(buffer, count, &val);
+       rc = kstrtobool(buffer, &val);
        if (rc)
                return rc;
 
-       if (val > 65536 || val < 1)
-               return -EINVAL;
-
-       ofd->ofd_fmd_max_age = msecs_to_jiffies(val * MSEC_PER_SEC);
+       spin_lock(&ofd->ofd_flags_lock);
+       ofd->ofd_raid_degraded = val;
+       spin_unlock(&ofd->ofd_flags_lock);
        return count;
 }
-LPROC_SEQ_FOPS(ofd_fmd_max_age);
+LUSTRE_RW_ATTR(degraded);
 
 /**
- * Show if the OFD is in degraded mode.
- *
- * Degraded means OFD has a failed drive or is undergoing RAID rebuild.
- * The MDS will try to avoid using this OST for new object allocations
- * to reduce the impact to global IO performance when clients writing to
- * this OST are slowed down.  It also reduces the contention on the OST
- * RAID device, allowing it to rebuild more quickly.
+ * Show if the OFD is in no precreate mode.
  *
- * \param[in] m                seq_file handle
- * \param[in] data     unused for single entry
+ * This means OFD has been adminstratively disabled at the OST to prevent
+ * the MDS from creating any new files on the OST, though existing files
+ * can still be read, written, and unlinked.
  *
- * \retval             0 on success
- * \retval             negative value on error
+ * \retval             number of bytes written
  */
-static int ofd_degraded_seq_show(struct seq_file *m, void *data)
+static ssize_t no_create_show(struct kobject *kobj, struct attribute *attr,
+                                char *buf)
 {
-       struct obd_device *obd = m->private;
+       struct obd_device *obd = container_of(kobj, struct obd_device,
+                                             obd_kset.kobj);
        struct ofd_device *ofd = ofd_dev(obd->obd_lu_dev);
 
-       return seq_printf(m, "%u\n", ofd->ofd_raid_degraded);
+       return scnprintf(buf, PAGE_SIZE, "%u\n", ofd->ofd_lut.lut_no_create);
 }
 
 /**
- * Set OFD to degraded mode.
+ * Set OFD to no create mode.
  *
- * This is used to interface to userspace administrative tools for
- * the underlying RAID storage, so that they can mark an OST
- * as having degraded performance.
+ * This is used to interface to userspace administrative tools to
+ * disable new object creation on the OST.
  *
- * \param[in] file     proc file
- * \param[in] buffer   string which represents mode
- *                     1: set degraded mode
- *                     0: unset degraded mode
  * \param[in] count    \a buffer length
- * \param[in] off      unused for single entry
  *
  * \retval             \a count on success
  * \retval             negative number on error
  */
-static ssize_t
-ofd_degraded_seq_write(struct file *file, const char __user *buffer,
-                      size_t count, loff_t *off)
+static ssize_t no_create_store(struct kobject *kobj, struct attribute *attr,
+                                 const char *buffer, size_t count)
 {
-       struct seq_file         *m = file->private_data;
-       struct obd_device       *obd = m->private;
-       struct ofd_device       *ofd = ofd_dev(obd->obd_lu_dev);
-       int                      val, rc;
+       struct obd_device *obd = container_of(kobj, struct obd_device,
+                                             obd_kset.kobj);
+       struct ofd_device *ofd = ofd_dev(obd->obd_lu_dev);
+       bool val;
+       int rc;
 
-       rc = lprocfs_write_helper(buffer, count, &val);
+       rc = kstrtobool(buffer, &val);
        if (rc)
                return rc;
 
        spin_lock(&ofd->ofd_flags_lock);
-       ofd->ofd_raid_degraded = !!val;
+       ofd->ofd_lut.lut_no_create = val;
        spin_unlock(&ofd->ofd_flags_lock);
+
        return count;
 }
-LPROC_SEQ_FOPS(ofd_degraded);
+LUSTRE_RW_ATTR(no_create);
+
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 20, 53, 0)
+/* compatibility entry for a few releases */
+#define no_precreate_show no_create_show
+#define no_precreate_store no_create_store
+LUSTRE_RW_ATTR(no_precreate);
+#endif
 
 /**
  * Show OFD filesystem type.
@@ -420,18 +355,20 @@ LPROC_SEQ_FOPS(ofd_degraded);
  * \retval             0 on success
  * \retval             negative value on error
  */
-static int ofd_fstype_seq_show(struct seq_file *m, void *data)
+static ssize_t fstype_show(struct kobject *kobj, struct attribute *attr,
+                          char *buf)
 {
-       struct obd_device *obd = m->private;
+       struct obd_device *obd = container_of(kobj, struct obd_device,
+                                             obd_kset.kobj);
        struct ofd_device *ofd = ofd_dev(obd->obd_lu_dev);
        struct lu_device  *d;
 
        LASSERT(ofd->ofd_osd);
        d = &ofd->ofd_osd->dd_lu_dev;
        LASSERT(d->ld_type);
-       return seq_printf(m, "%s\n", d->ld_type->ldt_name);
+       return sprintf(buf, "%s\n", d->ld_type->ldt_name);
 }
-LPROC_SEQ_FOPS_RO(ofd_fstype);
+LUSTRE_RO_ATTR(fstype);
 
 /**
  * Show journal handling mode: synchronous or asynchronous.
@@ -450,12 +387,14 @@ LPROC_SEQ_FOPS_RO(ofd_fstype);
  * \retval             0 on success
  * \retval             negative value on error
  */
-static int ofd_syncjournal_seq_show(struct seq_file *m, void *data)
+static ssize_t sync_journal_show(struct kobject *kobj, struct attribute *attr,
+                               char *buf)
 {
-       struct obd_device       *obd = m->private;
-       struct ofd_device       *ofd = ofd_dev(obd->obd_lu_dev);
+       struct obd_device *obd = container_of(kobj, struct obd_device,
+                                             obd_kset.kobj);
+       struct ofd_device *ofd = ofd_dev(obd->obd_lu_dev);
 
-       return seq_printf(m, "%u\n", ofd->ofd_syncjournal);
+       return sprintf(buf, "%u\n", ofd->ofd_sync_journal);
 }
 
 /**
@@ -471,190 +410,133 @@ static int ofd_syncjournal_seq_show(struct seq_file *m, void *data)
  * \retval             \a count on success
  * \retval             negative number on error
  */
-static ssize_t
-ofd_syncjournal_seq_write(struct file *file, const char __user *buffer,
-                         size_t count, loff_t *off)
+static ssize_t sync_journal_store(struct kobject *kobj, struct attribute *attr,
+                                const char *buffer, size_t count)
 {
-       struct seq_file         *m = file->private_data;
-       struct obd_device       *obd = m->private;
-       struct ofd_device       *ofd = ofd_dev(obd->obd_lu_dev);
-       int                      val;
-       int                      rc;
+       struct obd_device *obd = container_of(kobj, struct obd_device,
+                                             obd_kset.kobj);
+       struct ofd_device *ofd = ofd_dev(obd->obd_lu_dev);
+       bool val;
+       int rc;
 
-       rc = lprocfs_write_helper(buffer, count, &val);
+       rc = kstrtobool(buffer, &val);
        if (rc)
                return rc;
 
-       if (val < 0)
-               return -EINVAL;
-
        spin_lock(&ofd->ofd_flags_lock);
-       ofd->ofd_syncjournal = !!val;
+       ofd->ofd_sync_journal = val;
        ofd_slc_set(ofd);
        spin_unlock(&ofd->ofd_flags_lock);
 
        return count;
 }
-LPROC_SEQ_FOPS(ofd_syncjournal);
-
-/* This must be longer than the longest string below */
-#define SYNC_STATES_MAXLEN 16
-static char *sync_on_cancel_states[] = {"never",
-                                       "blocking",
-                                       "always" };
+LUSTRE_RW_ATTR(sync_journal);
 
-/**
- * Show OFD policy for handling dirty data under a lock being cancelled.
- *
- * \param[in] m                seq_file handle
- * \param[in] data     unused for single entry
- *
- * \retval             0 on success
- * \retval             negative value on error
- */
-static int ofd_sync_lock_cancel_seq_show(struct seq_file *m, void *data)
+static int ofd_brw_size_seq_show(struct seq_file *m, void *data)
 {
        struct obd_device       *obd = m->private;
-       struct lu_target        *tgt = obd->u.obt.obt_lut;
+       struct ofd_device       *ofd = ofd_dev(obd->obd_lu_dev);
 
-       return seq_printf(m, "%s\n",
-                         sync_on_cancel_states[tgt->lut_sync_lock_cancel]);
+       seq_printf(m, "%u\n", ofd->ofd_brw_size / ONE_MB_BRW_SIZE);
+       return 0;
 }
 
-/**
- * Change OFD policy for handling dirty data under a lock being cancelled.
- *
- * This variable defines what action OFD takes upon lock cancel
- * There are three possible modes:
- * 1) never - never do sync upon lock cancel. This can lead to data
- *    inconsistencies if both the OST and client crash while writing a file
- *    that is also concurrently being read by another client. In these cases,
- *    this may allow the file data to "rewind" to an earlier state.
- * 2) blocking - do sync only if there is blocking lock, e.g. if another
- *    client is trying to access this same object
- * 3) always - do sync always
- *
- * \param[in] file     proc file
- * \param[in] buffer   string which represents policy
- * \param[in] count    \a buffer length
- * \param[in] off      unused for single entry
- *
- * \retval             \a count on success
- * \retval             negative number on error
- */
 static ssize_t
-ofd_sync_lock_cancel_seq_write(struct file *file, const char __user *buffer,
-                              size_t count, loff_t *off)
+ofd_brw_size_seq_write(struct file *file, const char __user *buffer,
+                      size_t count, loff_t *off)
 {
-       struct seq_file         *m = file->private_data;
-       struct obd_device       *obd = m->private;
-       struct lu_target        *tgt = obd->u.obt.obt_lut;
-       char                     kernbuf[SYNC_STATES_MAXLEN];
-       int                      val = -1;
-       int                      i;
+       struct seq_file *m = file->private_data;
+       struct obd_device *obd = m->private;
+       struct ofd_device *ofd = ofd_dev(obd->obd_lu_dev);
+       char kernbuf[22] = "";
+       u64 val;
+       int rc;
 
-       if (count == 0 || count >= sizeof(kernbuf))
+       if (count >= sizeof(kernbuf))
                return -EINVAL;
 
        if (copy_from_user(kernbuf, buffer, count))
                return -EFAULT;
        kernbuf[count] = 0;
 
-       if (kernbuf[count - 1] == '\n')
-               kernbuf[count - 1] = 0;
+       rc = sysfs_memparse(kernbuf, count, &val, "MiB");
+       if (rc < 0)
+               return rc;
 
-       for (i = 0 ; i < NUM_SYNC_ON_CANCEL_STATES; i++) {
-               if (strcmp(kernbuf, sync_on_cancel_states[i]) == 0) {
-                       val = i;
-                       break;
-               }
-       }
+       if (val == 0)
+               return -EINVAL;
 
-       /* Legacy numeric codes */
-       if (val == -1) {
-               int rc;
+       if (val > DT_MAX_BRW_SIZE ||
+           val < (1 << ofd->ofd_lut.lut_tgd.tgd_blockbits))
+               return -ERANGE;
 
-               /* Safe to use userspace buffer as lprocfs_write_helper will
-                * use copy from user for parsing */
-               rc = lprocfs_write_helper(buffer, count, &val);
-               if (rc)
-                       return rc;
-       }
-
-       if (val < 0 || val > 2)
-               return -EINVAL;
+       spin_lock(&ofd->ofd_flags_lock);
+       ofd->ofd_brw_size = val;
+       spin_unlock(&ofd->ofd_flags_lock);
 
-       spin_lock(&tgt->lut_flags_lock);
-       tgt->lut_sync_lock_cancel = val;
-       spin_unlock(&tgt->lut_flags_lock);
        return count;
 }
-LPROC_SEQ_FOPS(ofd_sync_lock_cancel);
+LPROC_SEQ_FOPS(ofd_brw_size);
 
-/**
- * Show if grants compatibility mode is disabled.
- *
- * When ofd_grant_compat_disable is set, we don't grant any space to clients
- * not supporting OBD_CONNECT_GRANT_PARAM. Otherwise, space granted to such
- * a client is inflated since it consumes PAGE_CACHE_SIZE of grant space per
- * block, (i.e. typically 4kB units), but underlaying file system might have
- * block size bigger than page size, e.g. ZFS. See LU-2049 for details.
- *
- * \param[in] m                seq_file handle
- * \param[in] data     unused for single entry
- *
- * \retval             0 on success
- * \retval             negative value on error
+/*
+ * ofd_checksum_type(server) proc handling
  */
-static int ofd_grant_compat_disable_seq_show(struct seq_file *m, void *data)
+DECLARE_CKSUM_NAME;
+
+static int ofd_checksum_type_seq_show(struct seq_file *m, void *data)
 {
        struct obd_device *obd = m->private;
-       struct ofd_device *ofd = ofd_dev(obd->obd_lu_dev);
+       struct lu_target *lut;
+       enum cksum_types pref;
+       int i;
+
+       if (!obd)
+               return 0;
+
+       lut = obd2obt(obd)->obt_lut;
+       /* select fastest checksum type on the server */
+       pref = obd_cksum_type_select(obd->obd_name,
+                                    lut->lut_cksum_types_supported,
+                                    lut->lut_dt_conf.ddp_t10_cksum_type);
 
-       return seq_printf(m, "%u\n", ofd->ofd_grant_compat_disable);
+       for (i = 0; i < ARRAY_SIZE(cksum_name); i++) {
+               if ((BIT(i) & lut->lut_cksum_types_supported) == 0)
+                       continue;
+
+               if (pref == BIT(i))
+                       seq_printf(m, "[%s] ", cksum_name[i]);
+               else
+                       seq_printf(m, "%s ", cksum_name[i]);
+       }
+       seq_puts(m, "\n");
+
+       return 0;
 }
 
-/**
- * Change grant compatibility mode.
- *
- * Setting ofd_grant_compat_disable prohibit any space granting to clients
- * not supporting OBD_CONNECT_GRANT_PARAM. See details above.
- *
- * \param[in] file     proc file
- * \param[in] buffer   string which represents mode
- *                     1: disable compatibility mode
- *                     0: enable compatibility mode
- * \param[in] count    \a buffer length
- * \param[in] off      unused for single entry
- *
- * \retval             \a count on success
- * \retval             negative number on error
- */
-static ssize_t
-ofd_grant_compat_disable_seq_write(struct file *file,
-                                  const char __user *buffer,
-                                  size_t count, loff_t *off)
-{
-       struct seq_file         *m = file->private_data;
-       struct obd_device       *obd = m->private;
-       struct ofd_device       *ofd = ofd_dev(obd->obd_lu_dev);
-       int                      val;
-       int                      rc;
+LPROC_SEQ_FOPS_RO(ofd_checksum_type);
 
-       rc = lprocfs_write_helper(buffer, count, &val);
-       if (rc)
-               return rc;
 
-       if (val < 0)
-               return -EINVAL;
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 16, 53, 0)
+static ssize_t sync_on_lock_cancel_show(struct kobject *kobj,
+                                       struct attribute *attr, char *buf)
+{
+       return sync_lock_cancel_show(kobj, attr, buf);
+}
 
-       spin_lock(&ofd->ofd_flags_lock);
-       ofd->ofd_grant_compat_disable = !!val;
-       spin_unlock(&ofd->ofd_flags_lock);
+static ssize_t sync_on_lock_cancel_store(struct kobject *kobj,
+                                        struct attribute *attr,
+                                        const char *buffer, size_t count)
+{
+       static bool sync_on_lock_cancel_warned;
 
-       return count;
+       if (!sync_on_lock_cancel_warned) {
+               sync_on_lock_cancel_warned = true;
+               pr_info("ofd: 'obdfilter.*.sync_on_lock_cancel' is deprecated, use 'obdfilter.*.sync_lock_cancel' instead\n");
+       }
+       return sync_lock_cancel_store(kobj, attr, buffer, count);
 }
-LPROC_SEQ_FOPS(ofd_grant_compat_disable);
+LUSTRE_RW_ATTR(sync_on_lock_cancel);
+#endif
 
 /**
  * Show the limit of soft sync RPCs.
@@ -668,12 +550,14 @@ LPROC_SEQ_FOPS(ofd_grant_compat_disable);
  * \retval             0 on success
  * \retval             negative value on error
  */
-static int ofd_soft_sync_limit_seq_show(struct seq_file *m, void *data)
+static ssize_t soft_sync_limit_show(struct kobject *kobj,
+                                   struct attribute *attr, char *buf)
 {
-       struct obd_device       *obd = m->private;
-       struct ofd_device       *ofd = ofd_dev(obd->obd_lu_dev);
+       struct obd_device *obd = container_of(kobj, struct obd_device,
+                                             obd_kset.kobj);
+       struct ofd_device *ofd = ofd_dev(obd->obd_lu_dev);
 
-       return lprocfs_uint_seq_show(m, &ofd->ofd_soft_sync_limit);
+       return sprintf(buf, "%u\n", ofd->ofd_soft_sync_limit);
 }
 
 /**
@@ -692,18 +576,24 @@ static int ofd_soft_sync_limit_seq_show(struct seq_file *m, void *data)
  * \retval             \a count on success
  * \retval             negative number on error
  */
-static ssize_t
-ofd_soft_sync_limit_seq_write(struct file *file, const char __user *buffer,
-                             size_t count, loff_t *off)
+static ssize_t soft_sync_limit_store(struct kobject *kobj,
+                                    struct attribute *attr,
+                                    const char *buffer, size_t count)
 {
-       struct seq_file   *m = file->private_data;
-       struct obd_device *obd = m->private;
+       struct obd_device *obd = container_of(kobj, struct obd_device,
+                                             obd_kset.kobj);
        struct ofd_device *ofd = ofd_dev(obd->obd_lu_dev);
+       unsigned int val;
+       int rc;
+
+       rc = kstrtouint(buffer, 0, &val);
+       if (rc < 0)
+               return rc;
 
-       return lprocfs_uint_seq_write(file, buffer, count,
-                                     (loff_t *) &ofd->ofd_soft_sync_limit);
+       ofd->ofd_soft_sync_limit = val;
+       return count;
 }
-LPROC_SEQ_FOPS(ofd_soft_sync_limit);
+LUSTRE_RW_ATTR(soft_sync_limit);
 
 /**
  * Show the LFSCK speed limit.
@@ -716,12 +606,14 @@ LPROC_SEQ_FOPS(ofd_soft_sync_limit);
  * \retval             0 on success
  * \retval             negative value on error
  */
-static int ofd_lfsck_speed_limit_seq_show(struct seq_file *m, void *data)
+static ssize_t lfsck_speed_limit_show(struct kobject *kobj,
+                                     struct attribute *attr, char *buf)
 {
-       struct obd_device       *obd = m->private;
-       struct ofd_device       *ofd = ofd_dev(obd->obd_lu_dev);
+       struct obd_device *obd = container_of(kobj, struct obd_device,
+                                             obd_kset.kobj);
+       struct ofd_device *ofd = ofd_dev(obd->obd_lu_dev);
 
-       return lfsck_get_speed(m, ofd->ofd_osd);
+       return lfsck_get_speed(buf, ofd->ofd_osd);
 }
 
 /**
@@ -737,17 +629,17 @@ static int ofd_lfsck_speed_limit_seq_show(struct seq_file *m, void *data)
  * \retval             \a count on success
  * \retval             negative number on error
  */
-static ssize_t
-ofd_lfsck_speed_limit_seq_write(struct file *file, const char __user *buffer,
-                               size_t count, loff_t *off)
+static ssize_t lfsck_speed_limit_store(struct kobject *kobj,
+                                      struct attribute *attr,
+                                      const char *buffer, size_t count)
 {
-       struct seq_file         *m = file->private_data;
-       struct obd_device       *obd = m->private;
-       struct ofd_device       *ofd = ofd_dev(obd->obd_lu_dev);
-       __u32                    val;
-       int                      rc;
+       struct obd_device *obd = container_of(kobj, struct obd_device,
+                                             obd_kset.kobj);
+       struct ofd_device *ofd = ofd_dev(obd->obd_lu_dev);
+       unsigned int val;
+       int rc;
 
-       rc = lprocfs_write_helper(buffer, count, &val);
+       rc = kstrtouint(buffer, 0, &val);
        if (rc != 0)
                return rc;
 
@@ -755,7 +647,7 @@ ofd_lfsck_speed_limit_seq_write(struct file *file, const char __user *buffer,
 
        return rc != 0 ? rc : count;
 }
-LPROC_SEQ_FOPS(ofd_lfsck_speed_limit);
+LUSTRE_RW_ATTR(lfsck_speed_limit);
 
 /**
  * Show LFSCK layout verification stats from the most recent LFSCK run.
@@ -773,6 +665,7 @@ static int ofd_lfsck_layout_seq_show(struct seq_file *m, void *data)
 
        return lfsck_dump(m, ofd->ofd_osd, LFSCK_TYPE_LAYOUT);
 }
+
 LPROC_SEQ_FOPS_RO(ofd_lfsck_layout);
 
 /**
@@ -789,11 +682,11 @@ static int ofd_lfsck_verify_pfid_seq_show(struct seq_file *m, void *data)
        struct obd_device *obd = m->private;
        struct ofd_device *ofd = ofd_dev(obd->obd_lu_dev);
 
-       return seq_printf(m,
-                         "switch: %s\ndetected: "LPU64"\nrepaired: "LPU64"\n",
-                         ofd->ofd_lfsck_verify_pfid ? "on" : "off",
-                         ofd->ofd_inconsistency_self_detected,
-                         ofd->ofd_inconsistency_self_repaired);
+       seq_printf(m, "switch: %s\ndetected: %llu\nrepaired: %llu\n",
+                  ofd->ofd_lfsck_verify_pfid ? "on" : "off",
+                  ofd->ofd_inconsistency_self_detected,
+                  ofd->ofd_inconsistency_self_repaired);
+       return 0;
 }
 
 /**
@@ -816,106 +709,251 @@ static ssize_t
 ofd_lfsck_verify_pfid_seq_write(struct file *file, const char __user *buffer,
                                size_t count, loff_t *off)
 {
-       struct seq_file         *m = file->private_data;
-       struct obd_device       *obd = m->private;
-       struct ofd_device       *ofd = ofd_dev(obd->obd_lu_dev);
-       __u32                    val;
-       int                      rc;
+       struct seq_file *m = file->private_data;
+       struct obd_device *obd = m->private;
+       struct ofd_device *ofd = ofd_dev(obd->obd_lu_dev);
+       bool val;
+       int rc;
 
-       rc = lprocfs_write_helper(buffer, count, &val);
-       if (rc != 0)
+       rc = kstrtobool_from_user(buffer, count, &val);
+       if (rc)
                return rc;
 
-       ofd->ofd_lfsck_verify_pfid = !!val;
+       ofd->ofd_lfsck_verify_pfid = val;
+       if (!ofd->ofd_lfsck_verify_pfid) {
+               ofd->ofd_inconsistency_self_detected = 0;
+               ofd->ofd_inconsistency_self_repaired = 0;
+       }
 
        return count;
 }
+
 LPROC_SEQ_FOPS(ofd_lfsck_verify_pfid);
 
-LPROC_SEQ_FOPS_RO_TYPE(ofd, uuid);
-LPROC_SEQ_FOPS_RO_TYPE(ofd, blksize);
-LPROC_SEQ_FOPS_RO_TYPE(ofd, kbytestotal);
-LPROC_SEQ_FOPS_RO_TYPE(ofd, kbytesfree);
-LPROC_SEQ_FOPS_RO_TYPE(ofd, kbytesavail);
-LPROC_SEQ_FOPS_RO_TYPE(ofd, filestotal);
-LPROC_SEQ_FOPS_RO_TYPE(ofd, filesfree);
+static ssize_t access_log_mask_show(struct kobject *kobj,
+                       struct attribute *attr, char *buf)
+{
+       struct obd_device *obd = container_of(kobj, struct obd_device,
+                                             obd_kset.kobj);
+       struct ofd_device *ofd = ofd_dev(obd->obd_lu_dev);
+
+       return scnprintf(buf, PAGE_SIZE, "%s%s%s\n",
+               (ofd->ofd_access_log_mask == 0) ? "0" : "",
+               (ofd->ofd_access_log_mask & OFD_ACCESS_READ) ? "r" : "",
+               (ofd->ofd_access_log_mask & OFD_ACCESS_WRITE) ? "w" : "");
+}
+
+static ssize_t access_log_mask_store(struct kobject *kobj,
+                                    struct attribute *attr,
+                                    const char *buffer, size_t count)
+{
+       struct obd_device *obd = container_of(kobj, struct obd_device,
+                                             obd_kset.kobj);
+       struct ofd_device *ofd = ofd_dev(obd->obd_lu_dev);
+       unsigned int mask = 0;
+       size_t i;
+
+       for (i = 0; i < count; i++) {
+               switch (tolower(buffer[i])) {
+               case '0':
+                       break;
+               case 'r':
+                       mask |= OFD_ACCESS_READ;
+                       break;
+               case 'w':
+                       mask |= OFD_ACCESS_WRITE;
+                       break;
+               default:
+                       return -EINVAL;
+               }
+       }
+
+       ofd->ofd_access_log_mask = mask;
+
+       return count;
+}
+LUSTRE_RW_ATTR(access_log_mask);
+
+static ssize_t access_log_size_show(struct kobject *kobj,
+                                   struct attribute *attr, char *buf)
+{
+       struct obd_device *obd = container_of(kobj, struct obd_device,
+                                             obd_kset.kobj);
+       struct ofd_device *ofd = ofd_dev(obd->obd_lu_dev);
+
+       return scnprintf(buf, PAGE_SIZE, "%u\n", ofd->ofd_access_log_size);
+}
+
+static ssize_t access_log_size_store(struct kobject *kobj,
+                                    struct attribute *attr,
+                                    const char *buffer, size_t count)
+{
+       struct obd_device *obd = container_of(kobj, struct obd_device,
+                                             obd_kset.kobj);
+       struct ofd_device *ofd = ofd_dev(obd->obd_lu_dev);
+       struct ofd_access_log *oal;
+       unsigned int size;
+       ssize_t rc;
+
+       rc = kstrtouint(buffer, 0, &size);
+       if (rc < 0)
+               return rc;
+
+       if (!ofd_access_log_size_is_valid(size))
+               return -EINVAL;
+
+       /* The size of the ofd_access_log cannot be changed after it
+        * has been created.
+        */
+       if (ofd->ofd_access_log_size == size)
+               return count;
+
+       oal = ofd_access_log_create(obd->obd_name, size);
+       if (IS_ERR(oal))
+               return PTR_ERR(oal);
+
+       spin_lock(&ofd->ofd_flags_lock);
+       if (ofd->ofd_access_log != NULL) {
+               rc = -EBUSY;
+       } else {
+               ofd->ofd_access_log = oal;
+               ofd->ofd_access_log_size = size;
+               oal = NULL;
+               rc = count;
+       }
+       spin_unlock(&ofd->ofd_flags_lock);
+
+       ofd_access_log_delete(oal);
+
+       return rc;
+}
+LUSTRE_RW_ATTR(access_log_size);
+
+static int ofd_site_stats_seq_show(struct seq_file *m, void *data)
+{
+       struct obd_device *obd = m->private;
+
+       return lu_site_stats_seq_print(obd->obd_lu_dev->ld_site, m);
+}
+
+LPROC_SEQ_FOPS_RO(ofd_site_stats);
+
+/**
+ * Show if the OFD enforces T10PI checksum.
+ *
+ * \param[in] m                seq_file handle
+ * \param[in] data     unused for single entry
+ *
+ * \retval             0 on success
+ * \retval             negative value on error
+ */
+static ssize_t checksum_t10pi_enforce_show(struct kobject *kobj,
+                                          struct attribute *attr,
+                                          char *buf)
+{
+       struct obd_device *obd = container_of(kobj, struct obd_device,
+                                             obd_kset.kobj);
+       struct lu_target *lut = obd2obt(obd)->obt_lut;
+
+       return scnprintf(buf, PAGE_SIZE, "%u\n", lut->lut_cksum_t10pi_enforce);
+}
+
+/**
+ * Force specific T10PI checksum modes to be enabled
+ *
+ * If T10PI *is* supported in hardware, allow only the supported T10PI type
+ * to be used. If T10PI is *not* supported by the OSD, setting the enforce
+ * parameter forces all T10PI types to be enabled (even if slower) for
+ * testing.
+ *
+ * The final determination of which algorithm to be used depends whether
+ * the client supports T10PI or not, and is handled at client connect time.
+ *
+ * \param[in] file     proc file
+ * \param[in] buffer   string which represents mode
+ *                     1: set T10PI checksums enforced
+ *                     0: unset T10PI checksums enforced
+ * \param[in] count    \a buffer length
+ * \param[in] off      unused for single entry
+ *
+ * \retval             \a count on success
+ * \retval             negative number on error
+ */
+static ssize_t checksum_t10pi_enforce_store(struct kobject *kobj,
+                                           struct attribute *attr,
+                                           const char *buffer, size_t count)
+{
+       struct obd_device *obd = container_of(kobj, struct obd_device,
+                                             obd_kset.kobj);
+       struct lu_target *lut = obd2obt(obd)->obt_lut;
+       bool enforce;
+       int rc;
+
+       rc = kstrtobool(buffer, &enforce);
+       if (rc)
+               return rc;
+
+       spin_lock(&lut->lut_flags_lock);
+       lut->lut_cksum_t10pi_enforce = enforce;
+       spin_unlock(&lut->lut_flags_lock);
+       return count;
+}
+LUSTRE_RW_ATTR(checksum_t10pi_enforce);
 
 LPROC_SEQ_FOPS_RO_TYPE(ofd, recovery_status);
-LPROC_SEQ_FOPS_RW_TYPE(ofd, recovery_time_soft);
-LPROC_SEQ_FOPS_RW_TYPE(ofd, recovery_time_hard);
-LPROC_SEQ_FOPS_WO_TYPE(ofd, evict_client);
-LPROC_SEQ_FOPS_RO_TYPE(ofd, num_exports);
-LPROC_SEQ_FOPS_RO_TYPE(ofd, target_instance);
-LPROC_SEQ_FOPS_RW_TYPE(ofd, ir_factor);
-LPROC_SEQ_FOPS_RW_TYPE(ofd, job_interval);
+LUSTRE_RW_ATTR(recovery_time_hard);
+LUSTRE_RW_ATTR(recovery_time_soft);
+LUSTRE_RW_ATTR(ir_factor);
+
+LPROC_SEQ_FOPS_WR_ONLY(ofd, evict_client);
+LPROC_SEQ_FOPS_RW_TYPE(ofd, checksum_dump);
+LUSTRE_RW_ATTR(job_cleanup_interval);
+
+LUSTRE_RO_ATTR(tot_dirty);
+LUSTRE_RO_ATTR(tot_granted);
+LUSTRE_RO_ATTR(tot_pending);
+LUSTRE_RW_ATTR(grant_compat_disable);
+LUSTRE_RO_ATTR(instance);
+
+LUSTRE_RO_ATTR(num_exports);
+LUSTRE_RW_ATTR(grant_check_threshold);
+LUSTRE_RO_ATTR(eviction_count);
 
 struct lprocfs_vars lprocfs_ofd_obd_vars[] = {
-       { .name =       "uuid",
-         .fops =       &ofd_uuid_fops                  },
-       { .name =       "blocksize",
-         .fops =       &ofd_blksize_fops               },
-       { .name =       "kbytestotal",
-         .fops =       &ofd_kbytestotal_fops           },
-       { .name =       "kbytesfree",
-         .fops =       &ofd_kbytesfree_fops            },
-       { .name =       "kbytesavail",
-         .fops =       &ofd_kbytesavail_fops           },
-       { .name =       "filestotal",
-         .fops =       &ofd_filestotal_fops            },
-       { .name =       "filesfree",
-         .fops =       &ofd_filesfree_fops             },
-       { .name =       "seqs_allocated",
-         .fops =       &ofd_seqs_fops                  },
-       { .name =       "fstype",
-         .fops =       &ofd_fstype_fops                },
        { .name =       "last_id",
          .fops =       &ofd_last_id_fops               },
-       { .name =       "tot_dirty",
-         .fops =       &ofd_tot_dirty_fops             },
-       { .name =       "tot_pending",
-         .fops =       &ofd_tot_pending_fops           },
-       { .name =       "tot_granted",
-         .fops =       &ofd_tot_granted_fops           },
-       { .name =       "grant_precreate",
-         .fops =       &ofd_grant_precreate_fops       },
-       { .name =       "precreate_batch",
-         .fops =       &ofd_precreate_batch_fops       },
        { .name =       "recovery_status",
          .fops =       &ofd_recovery_status_fops       },
-       { .name =       "recovery_time_soft",
-         .fops =       &ofd_recovery_time_soft_fops    },
-       { .name =       "recovery_time_hard",
-         .fops =       &ofd_recovery_time_hard_fops    },
        { .name =       "evict_client",
          .fops =       &ofd_evict_client_fops          },
-       { .name =       "num_exports",
-         .fops =       &ofd_num_exports_fops           },
-       { .name =       "degraded",
-         .fops =       &ofd_degraded_fops              },
-       { .name =       "sync_journal",
-         .fops =       &ofd_syncjournal_fops           },
-       { .name =       "sync_on_lock_cancel",
-         .fops =       &ofd_sync_lock_cancel_fops      },
-       { .name =       "instance",
-         .fops =       &ofd_target_instance_fops       },
-       { .name =       "ir_factor",
-         .fops =       &ofd_ir_factor_fops             },
-       { .name =       "grant_compat_disable",
-         .fops =       &ofd_grant_compat_disable_fops  },
-       { .name =       "client_cache_count",
-         .fops =       &ofd_fmd_max_num_fops           },
-       { .name =       "client_cache_seconds",
-         .fops =       &ofd_fmd_max_age_fops           },
-       { .name =       "job_cleanup_interval",
-         .fops =       &ofd_job_interval_fops          },
-       { .name =       "soft_sync_limit",
-         .fops =       &ofd_soft_sync_limit_fops       },
-       { .name =       "lfsck_speed_limit",
-         .fops =       &ofd_lfsck_speed_limit_fops     },
+       { .name =       "brw_size",
+         .fops =       &ofd_brw_size_fops              },
+       { .name =       "checksum_dump",
+         .fops =       &ofd_checksum_dump_fops         },
        { .name =       "lfsck_layout",
          .fops =       &ofd_lfsck_layout_fops          },
        { .name =       "lfsck_verify_pfid",
          .fops =       &ofd_lfsck_verify_pfid_fops     },
+       { .name =       "site_stats",
+         .fops =       &ofd_site_stats_fops            },
+       { .name =       "checksum_type",
+         .fops =       &ofd_checksum_type_fops         },
+       { NULL }
+};
+
+LDEBUGFS_SEQ_FOPS_RO_TYPE(ofd, recovery_stale_clients);
+
+struct ldebugfs_vars ldebugfs_ofd_obd_vars[] = {
+       { .name =       "recovery_stale_clients",
+         .fops =       &ofd_recovery_stale_clients_fops},
+       { NULL }
+};
+
+LDEBUGFS_SEQ_FOPS_RO_TYPE(ofd, srpc_serverctx);
+
+static struct ldebugfs_vars ldebugfs_ofd_gss_vars[] = {
+       { .name =       "srpc_serverctx",
+         .fops =       &ofd_srpc_serverctx_fops        },
        { NULL }
 };
 
@@ -924,34 +962,173 @@ struct lprocfs_vars lprocfs_ofd_obd_vars[] = {
  *
  * param[in] stats     statistics counters
  */
-void ofd_stats_counter_init(struct lprocfs_stats *stats)
+void ofd_stats_counter_init(struct lprocfs_stats *stats, unsigned int offset,
+                           enum lprocfs_counter_config cntr_umask)
 {
        LASSERT(stats && stats->ls_num >= LPROC_OFD_STATS_LAST);
 
+       lprocfs_counter_init(stats, LPROC_OFD_STATS_READ_BYTES,
+                            LPROCFS_TYPE_BYTES_FULL_HISTOGRAM & (~cntr_umask),
+                            "read_bytes");
+       lprocfs_counter_init(stats, LPROC_OFD_STATS_WRITE_BYTES,
+                            LPROCFS_TYPE_BYTES_FULL_HISTOGRAM & (~cntr_umask),
+                            "write_bytes");
        lprocfs_counter_init(stats, LPROC_OFD_STATS_READ,
-                            LPROCFS_CNTR_AVGMINMAX, "read_bytes", "bytes");
+                            LPROCFS_TYPE_LATENCY & (~cntr_umask), "read");
        lprocfs_counter_init(stats, LPROC_OFD_STATS_WRITE,
-                            LPROCFS_CNTR_AVGMINMAX, "write_bytes", "bytes");
+                            LPROCFS_TYPE_LATENCY & (~cntr_umask), "write");
        lprocfs_counter_init(stats, LPROC_OFD_STATS_GETATTR,
-                            0, "getattr", "reqs");
+                            LPROCFS_TYPE_LATENCY & (~cntr_umask), "getattr");
        lprocfs_counter_init(stats, LPROC_OFD_STATS_SETATTR,
-                            0, "setattr", "reqs");
+                            LPROCFS_TYPE_LATENCY & (~cntr_umask), "setattr");
        lprocfs_counter_init(stats, LPROC_OFD_STATS_PUNCH,
-                            0, "punch", "reqs");
+                            LPROCFS_TYPE_LATENCY & (~cntr_umask), "punch");
        lprocfs_counter_init(stats, LPROC_OFD_STATS_SYNC,
-                            0, "sync", "reqs");
+                            LPROCFS_TYPE_LATENCY & (~cntr_umask), "sync");
        lprocfs_counter_init(stats, LPROC_OFD_STATS_DESTROY,
-                            0, "destroy", "reqs");
+                            LPROCFS_TYPE_LATENCY & (~cntr_umask), "destroy");
        lprocfs_counter_init(stats, LPROC_OFD_STATS_CREATE,
-                            0, "create", "reqs");
+                            LPROCFS_TYPE_LATENCY & (~cntr_umask), "create");
        lprocfs_counter_init(stats, LPROC_OFD_STATS_STATFS,
-                            0, "statfs", "reqs");
+                            LPROCFS_TYPE_LATENCY & (~cntr_umask), "statfs");
        lprocfs_counter_init(stats, LPROC_OFD_STATS_GET_INFO,
-                            0, "get_info", "reqs");
+                            LPROCFS_TYPE_LATENCY & (~cntr_umask), "get_info");
        lprocfs_counter_init(stats, LPROC_OFD_STATS_SET_INFO,
-                            0, "set_info", "reqs");
+                            LPROCFS_TYPE_LATENCY & (~cntr_umask), "set_info");
        lprocfs_counter_init(stats, LPROC_OFD_STATS_QUOTACTL,
-                            0, "quotactl", "reqs");
+                            LPROCFS_TYPE_LATENCY & (~cntr_umask), "quotactl");
+       lprocfs_counter_init(stats, LPROC_OFD_STATS_PREALLOC,
+                            LPROCFS_TYPE_LATENCY & (~cntr_umask), "prealloc");
 }
 
+LPROC_SEQ_FOPS(lprocfs_nid_stats_clear);
+
+LUSTRE_OBD_UINT_PARAM_ATTR(at_min);
+LUSTRE_OBD_UINT_PARAM_ATTR(at_max);
+LUSTRE_OBD_UINT_PARAM_ATTR(at_history);
+
+static struct attribute *ofd_attrs[] = {
+       &lustre_attr_access_log_mask.attr,
+       &lustre_attr_access_log_size.attr,
+       &lustre_attr_atime_diff.attr,
+       &lustre_attr_checksum_t10pi_enforce.attr,
+       &lustre_attr_degraded.attr,
+       &lustre_attr_eviction_count.attr,
+       &lustre_attr_fstype.attr,
+       &lustre_attr_grant_check_threshold.attr,
+       &lustre_attr_grant_compat_disable.attr,
+       &lustre_attr_grant_precreate.attr,
+       &lustre_attr_instance.attr,
+       &lustre_attr_ir_factor.attr,
+       &lustre_attr_job_cleanup_interval.attr,
+       &lustre_attr_lfsck_speed_limit.attr,
+       &lustre_attr_no_create.attr,
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 20, 53, 0)
+       &lustre_attr_no_precreate.attr,
+#endif
+       &lustre_attr_num_exports.attr,
+       &lustre_attr_precreate_batch.attr,
+       &lustre_attr_recovery_time_hard.attr,
+       &lustre_attr_recovery_time_soft.attr,
+       &lustre_attr_seqs_allocated.attr,
+       &lustre_attr_tot_dirty.attr,
+       &lustre_attr_tot_granted.attr,
+       &lustre_attr_tot_pending.attr,
+       &lustre_attr_soft_sync_limit.attr,
+       &lustre_attr_sync_journal.attr,
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 16, 53, 0)
+       &lustre_attr_sync_on_lock_cancel.attr,
+#endif
+       &lustre_attr_at_min.attr,
+       &lustre_attr_at_max.attr,
+       &lustre_attr_at_history.attr,
+       NULL,
+};
+
+KOBJ_ATTRIBUTE_GROUPS(ofd); /* creates ofd_groups from ofd_attrs */
+
+/**
+ * Initialize all needed procfs entries for OFD device.
+ *
+ * \param[in] ofd      OFD device
+ *
+ * \retval             0 if successful
+ * \retval             negative value on error
+ */
+int ofd_tunables_init(struct ofd_device *ofd)
+{
+       struct obd_device *obd = ofd_obd(ofd);
+       struct proc_dir_entry *entry;
+       int rc = 0;
+
+       ENTRY;
+       /* lprocfs must be setup before the ofd so state can be safely added
+        * to /proc incrementally as the ofd is setup
+        */
+       obd->obd_ktype.default_groups = KOBJ_ATTR_GROUPS(ofd);
+       obd->obd_vars = lprocfs_ofd_obd_vars;
+       rc = lprocfs_obd_setup(obd, false);
+       if (rc) {
+               CERROR("%s: lprocfs_obd_setup failed: %d.\n",
+                      obd->obd_name, rc);
+               RETURN(rc);
+       }
+       ldebugfs_add_vars(obd->obd_debugfs_entry, ldebugfs_ofd_obd_vars, obd);
+
+       rc = tgt_tunables_init(&ofd->ofd_lut);
+       if (rc) {
+               CERROR("%s: tgt_tunables_init failed: rc = %d\n",
+                      obd->obd_name, rc);
+               GOTO(obd_cleanup, rc);
+       }
+
+       rc = lprocfs_alloc_obd_stats(obd, LPROC_OFD_STATS_LAST);
+       if (rc) {
+               CERROR("%s: lprocfs_alloc_obd_stats failed: %d.\n",
+                      obd->obd_name, rc);
+               GOTO(tgt_cleanup, rc);
+       }
+
+       obd->obd_debugfs_gss_dir = debugfs_create_dir("gss",
+                                                     obd->obd_debugfs_entry);
+       if (obd->obd_debugfs_gss_dir)
+               ldebugfs_add_vars(obd->obd_debugfs_gss_dir,
+                                 ldebugfs_ofd_gss_vars, obd);
+
+       entry = lprocfs_register("exports", obd->obd_proc_entry, NULL, NULL);
+       if (IS_ERR(entry)) {
+               rc = PTR_ERR(entry);
+               CERROR("%s: error %d setting up lprocfs for %s\n",
+                      obd->obd_name, rc, "exports");
+               GOTO(obd_free_stats, rc);
+       }
+       obd->obd_proc_exports_entry = entry;
+
+       entry = lprocfs_add_simple(obd->obd_proc_exports_entry, "clear",
+                                  obd, &lprocfs_nid_stats_clear_fops);
+       if (IS_ERR(entry)) {
+               rc = PTR_ERR(entry);
+               CERROR("%s: add proc entry 'clear' failed: %d.\n",
+                      obd->obd_name, rc);
+               GOTO(obd_free_stats, rc);
+       }
+
+       ofd_stats_counter_init(obd->obd_stats, 0, LPROCFS_CNTR_HISTOGRAM);
+
+       rc = lprocfs_job_stats_init(obd, LPROC_OFD_STATS_LAST,
+                                   ofd_stats_counter_init);
+       if (rc)
+               GOTO(obd_free_stats, rc);
+
+       RETURN(0);
+
+obd_free_stats:
+       lprocfs_free_obd_stats(obd);
+tgt_cleanup:
+       tgt_tunables_fini(&ofd->ofd_lut);
+obd_cleanup:
+       lprocfs_obd_cleanup(obd);
+
+       return rc;
+}
 #endif /* CONFIG_PROC_FS */