*/
/*
* This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
*
* lustre/ofd/lproc_ofd.c
*
#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"
LUSTRE_RW_ATTR(precreate_batch);
/**
- * Show the last used ID for each FID sequence used by OFD.
+ * 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 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;
-
- if (obd == NULL)
- return 0;
-
- ofd = ofd_dev(obd->obd_lu_dev);
-
- read_lock(&ofd->ofd_seq_list_lock);
- list_for_each_entry(oseq, &ofd->ofd_seq_list, os_list) {
- __u64 seq;
-
- 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);
- seq_printf(m, DOSTID"\n", seq, ostid_id(&oseq->os_oi));
- }
- 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 ssize_t client_cache_count_show(struct kobject *kobj,
- struct attribute *attr,
- char *buf)
+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 lu_target *lut = obd->u.obt.obt_lut;
+ struct ofd_device *ofd = ofd_dev(obd->obd_lu_dev);
- return sprintf(buf, "%u\n", lut->lut_fmd_max_num);
+ return scnprintf(buf, PAGE_SIZE, "%lld\n", ofd->ofd_atime_diff);
}
/**
- * Change number of FMDs maintained by OFD.
- *
- * This defines how large the list of FMDs can be.
+ * Change number of seconds to delay atime
*
* \param[in] file proc file
* \param[in] buffer string which represents maximum number
* \retval \a count on success
* \retval negative number on error
*/
-static ssize_t client_cache_count_store(struct kobject *kobj,
- struct attribute *attr,
- const char *buffer, size_t count)
+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 lu_target *lut = obd->u.obt.obt_lut;
- int val;
+ struct ofd_device *ofd = ofd_dev(obd->obd_lu_dev);
+ unsigned int val;
int rc;
- rc = kstrtoint(buffer, 0, &val);
+ rc = kstrtouint(buffer, 0, &val);
if (rc)
return rc;
- if (val < 1 || val > 65536)
+ if (val > 86400)
return -EINVAL;
- lut->lut_fmd_max_num = val;
+ ofd->ofd_atime_diff = val;
return count;
}
-LUSTRE_RW_ATTR(client_cache_count);
+LUSTRE_RW_ATTR(atime_diff);
/**
- * Show the maximum age of FMD data in seconds.
+ * Show the last used ID for each FID sequence used 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 ssize_t client_cache_seconds_show(struct kobject *kobj,
- struct attribute *attr,
- char *buf)
+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;
+
+ if (obd == NULL)
+ return 0;
+
+ ofd = ofd_dev(obd->obd_lu_dev);
+
+ read_lock(&ofd->ofd_seq_list_lock);
+ list_for_each_entry(oseq, &ofd->ofd_seq_list, os_list) {
+ __u64 seq;
+
+ seq = ostid_seq(&oseq->os_oi) == 0 ?
+ fid_idif_seq(ostid_id(&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);
+ return 0;
+}
+
+LPROC_SEQ_FOPS_RO(ofd_last_id);
+
+/**
+ * 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.
+ *
+ * \retval count of bytes written
+ */
+static ssize_t degraded_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 = obd->u.obt.obt_lut;
+ struct ofd_device *ofd = ofd_dev(obd->obd_lu_dev);
- return sprintf(buf, "%lld\n", lut->lut_fmd_max_age);
+ return sprintf(buf, "%u\n", ofd->ofd_raid_degraded);
}
/**
- * Set the maximum age of FMD data in seconds.
+ * Set OFD to degraded mode.
*
- * This defines how long FMD data stays in the FMD list.
+ * 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 client_cache_seconds_store(struct kobject *kobj,
- struct attribute *attr,
- const char *buffer, size_t count)
+static ssize_t degraded_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 = obd->u.obt.obt_lut;
- time64_t val;
+ struct ofd_device *ofd = ofd_dev(obd->obd_lu_dev);
+ bool val;
int rc;
- rc = kstrtoll(buffer, 0, &val);
+ rc = kstrtobool(buffer, &val);
if (rc)
return rc;
- if (val < 1 || val > 65536) /* ~ 18 hour max */
- return -EINVAL;
-
- lut->lut_fmd_max_age = val;
+ spin_lock(&ofd->ofd_flags_lock);
+ ofd->ofd_raid_degraded = val;
+ spin_unlock(&ofd->ofd_flags_lock);
return count;
}
-LUSTRE_RW_ATTR(client_cache_seconds);
+LUSTRE_RW_ATTR(degraded);
/**
- * Show if the OFD is in degraded mode.
+ * Show if the OFD is in no precreate 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.
+ * 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.
*
- * \param[in] m seq_file handle
- * \param[in] data unused for single entry
- *
- * \retval 0 on success
- * \retval negative value on error
+ * \retval number of bytes written
*/
-static ssize_t degraded_show(struct kobject *kobj, struct attribute *attr,
- char *buf)
+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 sprintf(buf, "%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 degraded_store(struct kobject *kobj, struct attribute *attr,
- const char *buffer, size_t count)
+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,
obd_kset.kobj);
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;
}
-LUSTRE_RW_ATTR(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.
}
LUSTRE_RW_ATTR(sync_journal);
-/* This must be longer than the longest string below */
-#define SYNC_STATES_MAXLEN 16
-
static int ofd_brw_size_seq_show(struct seq_file *m, void *data)
{
struct obd_device *obd = m->private;
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;
+ char kernbuf[22] = "";
+ u64 val;
int rc;
- rc = lprocfs_str_with_units_to_s64(buffer, count, &val, 'M');
- if (rc)
+ if (count >= sizeof(kernbuf))
+ return -EINVAL;
+
+ if (copy_from_user(kernbuf, buffer, count))
+ return -EFAULT;
+ kernbuf[count] = 0;
+
+ rc = sysfs_memparse(kernbuf, count, &val, "MiB");
+ if (rc < 0)
return rc;
- if (val <= 0)
+ if (val == 0)
return -EINVAL;
if (val > DT_MAX_BRW_SIZE ||
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
+/*
+ * ofd_checksum_type(server) proc handling
*/
-static ssize_t sync_lock_cancel_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 *tgt = obd->u.obt.obt_lut;
+DECLARE_CKSUM_NAME;
- return sprintf(buf, "%s\n",
- sync_on_cancel_states[tgt->lut_sync_lock_cancel]);
-}
-
-/**
- * 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 sync_lock_cancel_store(struct kobject *kobj,
- struct attribute *attr,
- const char *buffer, size_t count)
+static int ofd_checksum_type_seq_show(struct seq_file *m, void *data)
{
- struct obd_device *obd = container_of(kobj, struct obd_device,
- obd_kset.kobj);
- struct lu_target *tgt = obd->u.obt.obt_lut;
- int val = -1;
+ struct obd_device *obd = m->private;
+ struct lu_target *lut;
+ enum cksum_types pref;
int i;
- if (count == 0 || count >= SYNC_STATES_MAXLEN)
- return -EINVAL;
+ if (!obd)
+ return 0;
- for (i = 0 ; i < NUM_SYNC_ON_CANCEL_STATES; i++) {
- if (strcmp(buffer, sync_on_cancel_states[i]) == 0) {
- val = i;
- break;
- }
- }
+ 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);
- /* Legacy numeric codes */
- if (val == -1) {
- int rc = kstrtoint(buffer, 0, &val);
- if (rc)
- return rc;
+ 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");
- if (val < 0 || val > 2)
- return -EINVAL;
+ return 0;
+}
- spin_lock(&tgt->lut_flags_lock);
- tgt->lut_sync_lock_cancel = val;
- spin_unlock(&tgt->lut_flags_lock);
- return count;
+LPROC_SEQ_FOPS_RO(ofd_checksum_type);
+
+
+#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);
}
-LUSTRE_RW_ATTR(sync_lock_cancel);
+
+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");
+ }
+ return sync_lock_cancel_store(kobj, attr, buffer, count);
+}
+LUSTRE_RW_ATTR(sync_on_lock_cancel);
+#endif
/**
* Show the limit of soft sync RPCs.
return rc;
ofd->ofd_soft_sync_limit = val;
- return 0;
+ return count;
}
LUSTRE_RW_ATTR(soft_sync_limit);
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;
{
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);
}
/**
{
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;
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);
-LPROC_SEQ_FOPS_RW_TYPE(ofd, recovery_time_soft);
-LPROC_SEQ_FOPS_RW_TYPE(ofd, recovery_time_hard);
+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_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, checksum_dump);
-LPROC_SEQ_FOPS_RW_TYPE(ofd, job_interval);
+LUSTRE_RW_ATTR(job_cleanup_interval);
-LPROC_SEQ_FOPS_RO(tgt_tot_dirty);
-LPROC_SEQ_FOPS_RO(tgt_tot_granted);
-LPROC_SEQ_FOPS_RO(tgt_tot_pending);
-LPROC_SEQ_FOPS(tgt_grant_compat_disable);
+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 = "last_id",
.fops = &ofd_last_id_fops },
- { .name = "tot_dirty",
- .fops = &tgt_tot_dirty_fops },
- { .name = "tot_pending",
- .fops = &tgt_tot_pending_fops },
- { .name = "tot_granted",
- .fops = &tgt_tot_granted_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 = "brw_size",
.fops = &ofd_brw_size_fops },
- { .name = "instance",
- .fops = &ofd_target_instance_fops },
- { .name = "ir_factor",
- .fops = &ofd_ir_factor_fops },
{ .name = "checksum_dump",
.fops = &ofd_checksum_dump_fops },
- { .name = "grant_compat_disable",
- .fops = &tgt_grant_compat_disable_fops },
- { .name = "job_cleanup_interval",
- .fops = &ofd_job_interval_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 }
};
*
* 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_seqs_allocated.attr,
- &lustre_attr_grant_precreate.attr,
- &lustre_attr_precreate_batch.attr,
- &lustre_attr_client_cache_count.attr,
- &lustre_attr_client_cache_seconds.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_sync_journal.attr,
- &lustre_attr_sync_lock_cancel.attr,
- &lustre_attr_soft_sync_limit.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_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,
+ &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.
*
/* 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) {
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(obd_cleanup, 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);
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);
obd_free_stats:
lprocfs_free_obd_stats(obd);
+tgt_cleanup:
+ tgt_tunables_fini(&ofd->ofd_lut);
obd_cleanup:
lprocfs_obd_cleanup(obd);
git://git.whamcloud.com / fs / lustre-release.git / blobdiff