Whamcloud - gitweb
LU-17705 ptlrpc: replace synchronize_rcu() with rcu_barrier()
[fs/lustre-release.git] / lustre / ofd / lproc_ofd.c
index 9593c3d..b0c4210 100644 (file)
@@ -27,7 +27,6 @@
  */
 /*
  * 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"
 
@@ -147,6 +148,57 @@ static ssize_t precreate_batch_store(struct kobject *kobj,
 LUSTRE_RW_ATTR(precreate_batch);
 
 /**
+ * Show number of seconds to delay atime
+ *
+ * \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 atime_diff_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, "%lld\n", ofd->ofd_atime_diff);
+}
+
+/**
+ * Change number of seconds to delay atime
+ *
+ * \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 atime_diff_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 val;
+       int rc;
+
+       rc = kstrtouint(buffer, 0, &val);
+       if (rc)
+               return rc;
+
+       if (val > 86400)
+               return -EINVAL;
+
+       ofd->ofd_atime_diff = val;
+       return count;
+}
+LUSTRE_RW_ATTR(atime_diff);
+
+/**
  * Show the last used ID for each FID sequence used by OFD.
  *
  * \param[in] m                seq_file handle
@@ -172,8 +224,8 @@ 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);
+                               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);
@@ -245,18 +297,18 @@ LUSTRE_RW_ATTR(degraded);
  *
  * \retval             number of bytes written
  */
-static ssize_t no_precreate_show(struct kobject *kobj, struct attribute *attr,
+static ssize_t no_create_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 snprintf(buf, PAGE_SIZE, "%u\n", ofd->ofd_no_precreate);
+       return scnprintf(buf, PAGE_SIZE, "%u\n", ofd->ofd_lut.lut_no_create);
 }
 
 /**
- * Set OFD to no precreate mode.
+ * Set OFD to no create mode.
  *
  * This is used to interface to userspace administrative tools to
  * disable new object creation on the OST.
@@ -266,7 +318,7 @@ static ssize_t no_precreate_show(struct kobject *kobj, struct attribute *attr,
  * \retval             \a count on success
  * \retval             negative number on error
  */
-static ssize_t no_precreate_store(struct kobject *kobj, struct attribute *attr,
+static ssize_t no_create_store(struct kobject *kobj, struct attribute *attr,
                                  const char *buffer, size_t count)
 {
        struct obd_device *obd = container_of(kobj, struct obd_device,
@@ -280,12 +332,19 @@ static ssize_t no_precreate_store(struct kobject *kobj, struct attribute *attr,
                return rc;
 
        spin_lock(&ofd->ofd_flags_lock);
-       ofd->ofd_no_precreate = val;
+       ofd->ofd_lut.lut_no_create = val;
        spin_unlock(&ofd->ofd_flags_lock);
 
        return count;
 }
+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.
@@ -419,15 +478,48 @@ ofd_brw_size_seq_write(struct file *file, const char __user *buffer,
 }
 LPROC_SEQ_FOPS(ofd_brw_size);
 
+/*
+ * ofd_checksum_type(server) proc handling
+ */
+DECLARE_CKSUM_NAME;
+
+static int ofd_checksum_type_seq_show(struct seq_file *m, void *data)
+{
+       struct obd_device *obd = m->private;
+       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);
+
+       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;
+}
+
+LPROC_SEQ_FOPS_RO(ofd_checksum_type);
+
+
 #if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 16, 53, 0)
-static bool sync_on_lock_cancel_warned;
 static ssize_t sync_on_lock_cancel_show(struct kobject *kobj,
                                        struct attribute *attr, char *buf)
 {
-       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_show(kobj, attr, buf);
 }
 
@@ -435,6 +527,8 @@ 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;
+
        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");
@@ -497,7 +591,7 @@ static ssize_t soft_sync_limit_store(struct kobject *kobj,
                return rc;
 
        ofd->ofd_soft_sync_limit = val;
-       return 0;
+       return count;
 }
 LUSTRE_RW_ATTR(soft_sync_limit);
 
@@ -636,6 +730,105 @@ ofd_lfsck_verify_pfid_seq_write(struct file *file, const char __user *buffer,
 
 LPROC_SEQ_FOPS(ofd_lfsck_verify_pfid);
 
+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;
@@ -660,9 +853,9 @@ static ssize_t checksum_t10pi_enforce_show(struct kobject *kobj,
 {
        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_target *lut = obd2obt(obd)->obt_lut;
 
-       return sprintf(buf, "%u\n", ofd->ofd_checksum_t10pi_enforce);
+       return scnprintf(buf, PAGE_SIZE, "%u\n", lut->lut_cksum_t10pi_enforce);
 }
 
 /**
@@ -692,7 +885,7 @@ static ssize_t checksum_t10pi_enforce_store(struct kobject *kobj,
 {
        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_target *lut = obd2obt(obd)->obt_lut;
        bool enforce;
        int rc;
 
@@ -700,139 +893,13 @@ static ssize_t checksum_t10pi_enforce_store(struct kobject *kobj,
        if (rc)
                return rc;
 
-       spin_lock(&ofd->ofd_flags_lock);
-       ofd->ofd_checksum_t10pi_enforce = enforce;
-       spin_unlock(&ofd->ofd_flags_lock);
+       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);
 
-#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 14, 53, 0)
-static bool max_file_warned;
-static bool rd_cache_warned;
-static bool wr_cache_warned;
-
-static ssize_t read_cache_enable_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);
-
-       if (!rd_cache_warned) {
-               rd_cache_warned = true;
-               pr_info("ofd: 'obdfilter.*.read_cache_enabled' is deprecated, use 'osd-*.read_cache_enabled' instead\n");
-       }
-
-       if (!ofd->ofd_read_cache_enable)
-               return -EOPNOTSUPP;
-
-       return lustre_attr_show(&ofd->ofd_osd->dd_kobj,
-                               ofd->ofd_read_cache_enable, buf);
-}
-
-static ssize_t read_cache_enable_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);
-
-       if (!rd_cache_warned) {
-               rd_cache_warned = true;
-               pr_info("ofd: 'obdfilter.*.read_cache_enabled' is deprecated, use 'osd-*.read_cache_enabled' instead\n");
-       }
-
-       if (!ofd->ofd_read_cache_enable)
-               return -EOPNOTSUPP;
-
-       return lustre_attr_store(&ofd->ofd_osd->dd_kobj,
-                                ofd->ofd_read_cache_enable, buffer, count);
-}
-LUSTRE_RW_ATTR(read_cache_enable);
-
-static ssize_t readcache_max_filesize_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);
-
-       if (!max_file_warned) {
-               max_file_warned = true;
-               pr_info("ofd: 'obdfilter.*.readcache_max_filesize' is deprecated, use 'osd-*.readcache_max_filesize' instead\n");
-       }
-
-       if (!ofd->ofd_read_cache_max_filesize)
-               return -EOPNOTSUPP;
-
-       return lustre_attr_show(&ofd->ofd_osd->dd_kobj,
-                               ofd->ofd_read_cache_max_filesize, buf);
-}
-
-static ssize_t readcache_max_filesize_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);
-
-       if (!max_file_warned) {
-               max_file_warned = true;
-               pr_info("ofd: 'obdfilter.*.readcache_max_filesize' is deprecated, use 'osd-*.readcache_max_filesize' instead\n");
-       }
-
-       if (!ofd->ofd_read_cache_max_filesize)
-               return -EOPNOTSUPP;
-
-       return lustre_attr_store(&ofd->ofd_osd->dd_kobj,
-                                ofd->ofd_read_cache_max_filesize,
-                                buffer, count);
-}
-LUSTRE_RW_ATTR(readcache_max_filesize);
-
-static ssize_t writethrough_cache_enable_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);
-
-       if (!wr_cache_warned) {
-               wr_cache_warned = true;
-               pr_info("ofd: 'obdfilter.*.writethrough_cache_enabled' is deprecated, use 'osd-*.writethrough_cache_enabled' instead\n");
-       }
-
-       if (!ofd->ofd_write_cache_enable)
-               return -EOPNOTSUPP;
-
-       return lustre_attr_show(&ofd->ofd_osd->dd_kobj,
-                               ofd->ofd_write_cache_enable, buf);
-}
-
-static ssize_t writethrough_cache_enable_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);
-
-       if (!ofd->ofd_write_cache_enable)
-               return -EOPNOTSUPP;
-
-       return lustre_attr_store(&ofd->ofd_osd->dd_kobj,
-                                ofd->ofd_write_cache_enable,
-                                buffer, count);
-}
-LUSTRE_RW_ATTR(writethrough_cache_enable);
-#endif
-
 LPROC_SEQ_FOPS_RO_TYPE(ofd, recovery_status);
 LUSTRE_RW_ATTR(recovery_time_hard);
 LUSTRE_RW_ATTR(recovery_time_soft);
@@ -849,6 +916,8 @@ 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 =       "last_id",
@@ -867,6 +936,24 @@ struct lprocfs_vars lprocfs_ofd_obd_vars[] = {
          .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 }
 };
 
@@ -875,70 +962,91 @@ 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_tot_dirty.attr,
-       &lustre_attr_tot_granted.attr,
-       &lustre_attr_tot_pending.attr,
+       &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_recovery_time_hard.attr,
-       &lustre_attr_recovery_time_soft.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_seqs_allocated.attr,
-       &lustre_attr_grant_precreate.attr,
        &lustre_attr_precreate_batch.attr,
-       &lustre_attr_degraded.attr,
-       &lustre_attr_fstype.attr,
-       &lustre_attr_no_precreate.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_soft_sync_limit.attr,
-       &lustre_attr_lfsck_speed_limit.attr,
-       &lustre_attr_job_cleanup_interval.attr,
-       &lustre_attr_checksum_t10pi_enforce.attr,
-#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 14, 53, 0)
-       &lustre_attr_read_cache_enable.attr,
-       &lustre_attr_readcache_max_filesize.attr,
-       &lustre_attr_writethrough_cache_enable.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.
  *
@@ -957,7 +1065,7 @@ int ofd_tunables_init(struct ofd_device *ofd)
        /* 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_attrs = ofd_attrs;
+       obd->obd_ktype.default_groups = KOBJ_ATTR_GROUPS(ofd);
        obd->obd_vars = lprocfs_ofd_obd_vars;
        rc = lprocfs_obd_setup(obd, false);
        if (rc) {
@@ -965,6 +1073,7 @@ int ofd_tunables_init(struct ofd_device *ofd)
                       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) {
@@ -980,6 +1089,12 @@ int ofd_tunables_init(struct ofd_device *ofd)
                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);
@@ -998,7 +1113,7 @@ int ofd_tunables_init(struct ofd_device *ofd)
                GOTO(obd_free_stats, rc);
        }
 
-       ofd_stats_counter_init(obd->obd_stats);
+       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);