X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=lustre%2Fofd%2Flproc_ofd.c;h=abc67a8b973ea26f82f86a52cd65e57198095923;hb=2b905746ee3b5d9dbafcdb1af5930aea18120a7b;hp=d42e1e5f7cb4760fd519407bf17ca26e160ff264;hpb=520631764c0e9d1bf5c70f8d060b81a2f322d5dc;p=fs%2Flustre-release.git

diff --git a/lustre/ofd/lproc_ofd.c b/lustre/ofd/lproc_ofd.c
index d42e1e5..abc67a8 100644
--- a/lustre/ofd/lproc_ofd.c
+++ b/lustre/ofd/lproc_ofd.c
@@ -23,7 +23,7 @@
  * 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/
@@ -59,78 +59,16 @@
  * \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);
 
-	seq_printf(m, "%u\n", ofd->ofd_seq_count);
-	return 0;
-}
-LPROC_SEQ_FOPS_RO(ofd_seqs);
-
-/**
- * Show estimate of total amount of dirty data on clients.
- *
- * \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_tot_dirty_seq_show(struct seq_file *m, void *data)
-{
-	struct obd_device *obd = m->private;
-	struct ofd_device *ofd;
-
-	LASSERT(obd != NULL);
-	ofd = ofd_dev(obd->obd_lu_dev);
-	seq_printf(m, "%llu\n", ofd->ofd_tot_dirty);
-	return 0;
-}
-LPROC_SEQ_FOPS_RO(ofd_tot_dirty);
-
-/**
- * Show total amount of space granted to clients.
- *
- * \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_tot_granted_seq_show(struct seq_file *m, void *data)
-{
-	struct obd_device *obd = m->private;
-	struct ofd_device *ofd;
-
-	LASSERT(obd != NULL);
-	ofd = ofd_dev(obd->obd_lu_dev);
-	seq_printf(m, "%llu\n", ofd->ofd_tot_granted);
-	return 0;
-}
-LPROC_SEQ_FOPS_RO(ofd_tot_granted);
-
-/**
- * Show total amount of space used by IO in progress.
- *
- * \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_tot_pending_seq_show(struct seq_file *m, void *data)
-{
-	struct obd_device *obd = m->private;
-	struct ofd_device *ofd;
-
-	LASSERT(obd != NULL);
-	ofd = ofd_dev(obd->obd_lu_dev);
-	seq_printf(m, "%llu\n", ofd->ofd_tot_pending);
-	return 0;
+	return sprintf(buf, "%u\n", ofd->ofd_seq_count);
 }
-LPROC_SEQ_FOPS_RO(ofd_tot_pending);
+LUSTRE_RO_ATTR(seqs_allocated);
 
 /**
  * Show total number of grants for precreate.
@@ -141,16 +79,17 @@ LPROC_SEQ_FOPS_RO(ofd_tot_pending);
  * \retval		0 on success
  * \retval		negative value on error
  */
-static int ofd_grant_precreate_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 obd_device *obd = container_of(kobj, struct obd_device,
+					      obd_kset.kobj);
 
-	LASSERT(obd != NULL);
-	seq_printf(m, "%ld\n",
-		   obd->obd_self_export->exp_filter_data.fed_grant);
-	return 0;
+	return sprintf(buf, "%ld\n",
+		       obd->obd_self_export->exp_target_data.ted_grant);
 }
-LPROC_SEQ_FOPS_RO(ofd_grant_precreate);
+LUSTRE_RO_ATTR(grant_precreate);
 
 /**
  * Show number of precreates allowed in a single transaction.
@@ -161,15 +100,15 @@ 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 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);
-	seq_printf(m, "%d\n", ofd->ofd_precreate_batch);
-	return 0;
+	return sprintf(buf, "%d\n", ofd->ofd_precreate_batch);
 }
 
 /**
@@ -183,21 +122,21 @@ 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 precreate_batch_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);
-	__s64 val;
+	unsigned int val;
 	int rc;
 
-	rc = lprocfs_str_to_s64(buffer, count, &val);
+	rc = kstrtouint(buffer, 0, &val);
 	if (rc)
 		return rc;
 
-	if (val < 1 || val > INT_MAX)
+	if (val < 1 || val > 65536)
 		return -EINVAL;
 
 	spin_lock(&ofd->ofd_batch_lock);
@@ -205,7 +144,7 @@ ofd_precreate_batch_seq_write(struct file *file, const char __user *buffer,
 	spin_unlock(&ofd->ofd_batch_lock);
 	return count;
 }
-LPROC_SEQ_FOPS(ofd_precreate_batch);
+LUSTRE_RW_ATTR(precreate_batch);
 
 /**
  * Show the last used ID for each FID sequence used by OFD.
@@ -240,118 +179,8 @@ static int ofd_last_id_seq_show(struct seq_file *m, void *data)
 	read_unlock(&ofd->ofd_seq_list_lock);
 	return 0;
 }
-LPROC_SEQ_FOPS_RO(ofd_last_id);
-
-/**
- * Show maximum number of Filter Modification Data (FMD) maintained by OFD.
- *
- * \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_num_seq_show(struct seq_file *m, void *data)
-{
-	struct obd_device *obd = m->private;
-	struct ofd_device *ofd = ofd_dev(obd->obd_lu_dev);
-
-	seq_printf(m, "%u\n", ofd->ofd_fmd_max_num);
-	return 0;
-}
-
-/**
- * Change number of FMDs maintained by OFD.
- *
- * This defines how large the list of FMDs can be.
- *
- * \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);
-	__s64 val;
-	int rc;
-
-	rc = lprocfs_str_to_s64(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)
-{
-	struct obd_device *obd = m->private;
-	struct ofd_device *ofd = ofd_dev(obd->obd_lu_dev);
-
-	seq_printf(m, "%ld\n", jiffies_to_msecs(ofd->ofd_fmd_max_age) /
-		   MSEC_PER_SEC);
-	return 0;
-}
-
-/**
- * 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);
-	__s64			 val;
-	int			 rc;
-
-	rc = lprocfs_str_to_s64(buffer, count, &val);
-	if (rc)
-		return rc;
-
-	if (val > 65536 || val < 1)
-		return -EINVAL;
-
-	ofd->ofd_fmd_max_age = msecs_to_jiffies(val * MSEC_PER_SEC);
-	return count;
-}
-LPROC_SEQ_FOPS(ofd_fmd_max_age);
+LPROC_SEQ_FOPS_RO(ofd_last_id);
 
 /**
  * Show if the OFD is in degraded mode.
@@ -368,13 +197,14 @@ LPROC_SEQ_FOPS(ofd_fmd_max_age);
  * \retval		0 on success
  * \retval		negative value on error
  */
-static int ofd_degraded_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);
 
-	seq_printf(m, "%u\n", ofd->ofd_raid_degraded);
-	return 0;
+	return sprintf(buf, "%u\n", ofd->ofd_raid_degraded);
 }
 
 /**
@@ -394,26 +224,25 @@ static int ofd_degraded_seq_show(struct seq_file *m, void *data)
  * \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 degraded_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);
+	bool val;
 	int rc;
-	__s64 val;
 
-	rc = lprocfs_str_to_s64(buffer, count, &val);
+	rc = kstrtobool(buffer, &val);
 	if (rc)
 		return rc;
 
 	spin_lock(&ofd->ofd_flags_lock);
-	ofd->ofd_raid_degraded = !!val;
+	ofd->ofd_raid_degraded = val;
 	spin_unlock(&ofd->ofd_flags_lock);
 	return count;
 }
-LPROC_SEQ_FOPS(ofd_degraded);
+LUSTRE_RW_ATTR(degraded);
 
 /**
  * Show OFD filesystem type.
@@ -424,19 +253,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);
-	seq_printf(m, "%s\n", d->ld_type->ldt_name);
-	return 0;
+	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.
@@ -455,13 +285,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);
 
-	seq_printf(m, "%u\n", ofd->ofd_syncjournal);
-	return 0;
+	return sprintf(buf, "%u\n", ofd->ofd_sync_journal);
 }
 
 /**
@@ -477,34 +308,27 @@ 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 obd_device *obd = container_of(kobj, struct obd_device,
+					      obd_kset.kobj);
 	struct ofd_device *ofd = ofd_dev(obd->obd_lu_dev);
-	__s64 val;
+	bool val;
 	int rc;
 
-	rc = lprocfs_str_to_s64(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
+LUSTRE_RW_ATTR(sync_journal);
 
 static int ofd_brw_size_seq_show(struct seq_file *m, void *data)
 {
@@ -525,16 +349,15 @@ ofd_brw_size_seq_write(struct file *file, const char __user *buffer,
 	__s64 val;
 	int rc;
 
-	rc = lprocfs_str_to_s64(buffer, count, &val);
+	rc = lprocfs_str_with_units_to_s64(buffer, count, &val, 'M');
 	if (rc)
 		return rc;
 
-	if (val < 0)
+	if (val <= 0)
 		return -EINVAL;
 
-	val = val * ONE_MB_BRW_SIZE;
-	if (val <= 0 || val > DT_MAX_BRW_SIZE ||
-	    val < (1 << ofd->ofd_blockbits))
+	if (val > DT_MAX_BRW_SIZE ||
+	    val < (1 << ofd->ofd_lut.lut_tgd.tgd_blockbits))
 		return -ERANGE;
 
 	spin_lock(&ofd->ofd_flags_lock);
@@ -543,162 +366,8 @@ ofd_brw_size_seq_write(struct file *file, const char __user *buffer,
 
 	return count;
 }
-LPROC_SEQ_FOPS(ofd_brw_size);
-
-static char *sync_on_cancel_states[] = {"never",
-					"blocking",
-					"always" };
-
-/**
- * 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)
-{
-	struct obd_device	*obd = m->private;
-	struct lu_target	*tgt = obd->u.obt.obt_lut;
-
-	seq_printf(m, "%s\n",
-		   sync_on_cancel_states[tgt->lut_sync_lock_cancel]);
-	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)
-{
-	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];
-	__s64 val = -1;
-	int i;
-
-	if (count == 0 || 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;
-
-	for (i = 0 ; i < NUM_SYNC_ON_CANCEL_STATES; i++) {
-		if (strcmp(kernbuf, sync_on_cancel_states[i]) == 0) {
-			val = i;
-			break;
-		}
-	}
-
-	/* Legacy numeric codes */
-	if (val == -1) {
-		int rc = lprocfs_str_to_s64(buffer, count, &val);
-		if (rc)
-			return rc;
-	}
-
-	if (val < 0 || val > 2)
-		return -EINVAL;
-
-	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);
-
-/**
- * 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_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
- */
-static int ofd_grant_compat_disable_seq_show(struct seq_file *m, void *data)
-{
-	struct obd_device *obd = m->private;
-	struct ofd_device *ofd = ofd_dev(obd->obd_lu_dev);
-
-	seq_printf(m, "%u\n", ofd->ofd_grant_compat_disable);
-	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);
-	__s64 val;
-	int rc;
-
-	rc = lprocfs_str_to_s64(buffer, count, &val);
-	if (rc)
-		return rc;
-
-	if (val < 0)
-		return -EINVAL;
-
-	spin_lock(&ofd->ofd_flags_lock);
-	ofd->ofd_grant_compat_disable = !!val;
-	spin_unlock(&ofd->ofd_flags_lock);
 
-	return count;
-}
-LPROC_SEQ_FOPS(ofd_grant_compat_disable);
+LPROC_SEQ_FOPS(ofd_brw_size);
 
 /**
  * Show the limit of soft sync RPCs.
@@ -712,12 +381,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);
 }
 
 /**
@@ -736,18 +407,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 0;
 }
-LPROC_SEQ_FOPS(ofd_soft_sync_limit);
+LUSTRE_RW_ATTR(soft_sync_limit);
 
 /**
  * Show the LFSCK speed limit.
@@ -760,12 +437,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);
 }
 
 /**
@@ -781,28 +460,25 @@ 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 obd_device *obd = container_of(kobj, struct obd_device,
+					      obd_kset.kobj);
 	struct ofd_device *ofd = ofd_dev(obd->obd_lu_dev);
-	__s64 val;
+	unsigned int val;
 	int rc;
 
-	rc = lprocfs_str_to_s64(buffer, count, &val);
+	rc = kstrtouint(buffer, 0, &val);
 	if (rc != 0)
 		return rc;
 
-	if (val < 0)
-		return -ERANGE;
-
 	rc = lfsck_set_speed(ofd->ofd_osd, val);
 
 	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.
@@ -820,6 +496,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);
 
 /**
@@ -866,17 +543,22 @@ ofd_lfsck_verify_pfid_seq_write(struct file *file, const char __user *buffer,
 	struct seq_file *m = file->private_data;
 	struct obd_device *obd = m->private;
 	struct ofd_device *ofd = ofd_dev(obd->obd_lu_dev);
-	__s64 val;
+	bool val;
 	int rc;
 
-	rc = lprocfs_str_to_s64(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);
 
 static int ofd_site_stats_seq_show(struct seq_file *m, void *data)
@@ -885,90 +567,225 @@ static int ofd_site_stats_seq_show(struct seq_file *m, void *data)
 
 	return lu_site_stats_seq_print(obd->obd_lu_dev->ld_site, m);
 }
+
 LPROC_SEQ_FOPS_RO(ofd_site_stats);
 
-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);
+/**
+ * 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 ofd_device *ofd = ofd_dev(obd->obd_lu_dev);
+
+	return sprintf(buf, "%u\n", ofd->ofd_checksum_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 ofd_device *ofd = ofd_dev(obd->obd_lu_dev);
+	bool enforce;
+	int rc;
+
+	rc = kstrtobool(buffer, &enforce);
+	if (rc)
+		return rc;
+
+	spin_lock(&ofd->ofd_flags_lock);
+	ofd->ofd_checksum_t10pi_enforce = enforce;
+	spin_unlock(&ofd->ofd_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);
-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);
 
 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 =	"brw_size",
 	  .fops =	&ofd_brw_size_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 =	"checksum_dump",
+	  .fops =	&ofd_checksum_dump_fops		},
 	{ .name =	"lfsck_layout",
 	  .fops =	&ofd_lfsck_layout_fops		},
 	{ .name	=	"lfsck_verify_pfid",
@@ -1013,4 +830,111 @@ void ofd_stats_counter_init(struct lprocfs_stats *stats)
 			     0, "quotactl", "reqs");
 }
 
+LPROC_SEQ_FOPS(lprocfs_nid_stats_clear);
+
+static struct attribute *ofd_attrs[] = {
+	&lustre_attr_tot_dirty.attr,
+	&lustre_attr_tot_granted.attr,
+	&lustre_attr_tot_pending.attr,
+	&lustre_attr_grant_compat_disable.attr,
+	&lustre_attr_instance.attr,
+	&lustre_attr_recovery_time_hard.attr,
+	&lustre_attr_recovery_time_soft.attr,
+	&lustre_attr_ir_factor.attr,
+	&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_sync_journal.attr,
+	&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
+	NULL,
+};
+
+/**
+ * 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_attrs = ofd_attrs;
+	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);
+	}
+
+	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);
+	}
+
+	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);
+
+	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 */