* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2011, 2016, Intel Corporation.
+ * Copyright (c) 2011, 2017, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
#include <asm/statfs.h>
#include <linux/module.h>
-#include <lnet/nidstr.h>
+#include <uapi/linux/lnet/nidstr.h>
/* LUSTRE_VERSION_CODE */
-#include <lustre_ver.h>
+#include <uapi/linux/lustre/lustre_ver.h>
/*
* struct OBD_{ALLOC,FREE}*()
* MDT_FAIL_CHECK
static void rename_stats_show(struct seq_file *seq,
struct rename_stats *rename_stats)
{
- struct timeval now;
+ struct timespec64 now;
- /* this sampling races with updates */
- do_gettimeofday(&now);
- seq_printf(seq, "rename_stats:\n");
- seq_printf(seq, "- %-15s %lu.%lu\n", "snapshot_time:",
- now.tv_sec, now.tv_usec);
+ /* this sampling races with updates */
+ ktime_get_real_ts64(&now);
+ seq_printf(seq, "rename_stats:\n");
+ seq_printf(seq, "- %-15s %llu.%9lu\n", "snapshot_time:",
+ (s64)now.tv_sec, now.tv_nsec);
display_rename_stats(seq, "same_dir",
&rename_stats->hist[RENAME_SAMEDIR_SIZE]);
struct obd_device *obd = m->private;
struct mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
- seq_printf(m, "%u\n", mdt->mdt_identity_cache->uc_entry_expire);
+ seq_printf(m, "%lld\n", mdt->mdt_identity_cache->uc_entry_expire);
return 0;
}
struct seq_file *m = file->private_data;
struct obd_device *obd = m->private;
struct mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
+ time64_t val;
int rc;
- __s64 val;
- rc = lprocfs_str_to_s64(buffer, count, &val);
+ rc = kstrtoll_from_user(buffer, count, 0, &val);
if (rc)
return rc;
- if (val < 0 || val > INT_MAX)
+
+ if (val < 0)
return -ERANGE;
mdt->mdt_identity_cache->uc_entry_expire = val;
struct obd_device *obd = m->private;
struct mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
- seq_printf(m, "%u\n", mdt->mdt_identity_cache->uc_acquire_expire);
+ seq_printf(m, "%lld\n", mdt->mdt_identity_cache->uc_acquire_expire);
return 0;
}
struct seq_file *m = file->private_data;
struct obd_device *obd = m->private;
struct mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
+ time64_t val;
int rc;
- __s64 val;
- rc = lprocfs_str_to_s64(buffer, count, &val);
+ rc = kstrtoll_from_user(buffer, count, 0, &val);
if (rc)
return rc;
+
if (val < 0 || val > INT_MAX)
return -ERANGE;
struct seq_file *m = file->private_data;
struct obd_device *obd = m->private;
struct mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
+ int uid;
int rc;
- __s64 uid;
- rc = lprocfs_str_to_s64(buffer, count, &uid);
+ rc = kstrtoint_from_user(buffer, count, 0, &uid);
if (rc)
return rc;
- if (uid < INT_MIN || uid > INT_MAX)
- return -ERANGE;
mdt_flush_identity(mdt->mdt_identity_cache, uid);
return count;
}
-LPROC_SEQ_FOPS_WO_TYPE(mdt, identity_flush);
+LPROC_SEQ_FOPS_WR_ONLY(mdt, identity_flush);
static ssize_t
lprocfs_identity_info_seq_write(struct file *file, const char __user *buffer,
return rc ? rc : count;
}
-LPROC_SEQ_FOPS_WO_TYPE(mdt, identity_info);
+LPROC_SEQ_FOPS_WR_ONLY(mdt, identity_info);
static int mdt_site_stats_seq_show(struct seq_file *m, void *data)
{
struct seq_file *m = file->private_data;
struct obd_device *obd = m->private;
struct mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
- __s64 val;
+ bool val;
int rc;
- rc = lprocfs_str_to_s64(buffer, count, &val);
+ rc = kstrtobool_from_user(buffer, count, &val);
if (rc)
return rc;
- mdt->mdt_opts.mo_evict_tgt_nids = !!val;
+
+ mdt->mdt_opts.mo_evict_tgt_nids = val;
return count;
}
LPROC_SEQ_FOPS(mdt_evict_tgt_nids);
struct seq_file *m = file->private_data;
struct obd_device *obd = m->private;
struct mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
+ bool val;
int rc;
- __s64 val;
- rc = lprocfs_str_to_s64(buffer, count, &val);
+ rc = kstrtobool_from_user(buffer, count, &val);
if (rc)
return rc;
- if (val < INT_MIN || val > INT_MAX)
- return -ERANGE;
mdt_enable_cos(mdt, val);
return count;
struct seq_file *m = file->private_data;
struct obd_device *obd = m->private;
struct mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
- __s64 val;
+ bool val;
int rc;
- rc = lprocfs_str_to_s64(buffer, count, &val);
+ rc = kstrtobool_from_user(buffer, count, &val);
if (rc)
return rc;
- if (val > 1 || val < 0)
- return -ERANGE;
-
mdt->mdt_enable_remote_dir = val;
return count;
}
struct seq_file *m = file->private_data;
struct obd_device *obd = m->private;
struct mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
- __s64 val;
+ int val;
int rc;
- rc = lprocfs_str_to_s64(buffer, count, &val);
+ rc = kstrtoint_from_user(buffer, count, 0, &val);
if (rc)
return rc;
struct seq_file *m = file->private_data;
struct obd_device *obd = m->private;
struct mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
- __s64 val;
+ int val;
int rc;
- rc = lprocfs_str_to_s64(buffer, count, &val);
+ rc = kstrtoint_from_user(buffer, count, 0, &val);
if (rc)
return rc;
- if (val < INT_MIN || val > INT_MAX)
- return -ERANGE;
-
atomic_set(&mdt->mdt_async_commit_count, val);
return count;
struct seq_file *m = file->private_data;
struct obd_device *obd = m->private;
struct lu_target *tgt = obd->u.obt.obt_lut;
- __s64 val;
+ int val;
int rc;
- rc = lprocfs_str_to_s64(buffer, count, &val);
+ rc = kstrtoint_from_user(buffer, count, 0, &val);
if (rc)
return rc;
- if (val < INT_MIN || val > INT_MAX)
- return -ERANGE;
-
atomic_set(&tgt->lut_sync_count, val);
return count;
}
LPROC_SEQ_FOPS(mdt_sync_count);
+static char *dom_open_lock_modes[NUM_DOM_LOCK_ON_OPEN_MODES] = {
+ [NO_DOM_LOCK_ON_OPEN] = "never",
+ [TRYLOCK_DOM_ON_OPEN] = "trylock",
+ [ALWAYS_DOM_LOCK_ON_OPEN] = "always",
+};
+
+/* This must be longer than the longest string above */
+#define DOM_LOCK_MODES_MAXLEN 16
+
+/**
+ * Show MDT policy for data prefetch on open for DoM files..
+ *
+ * \param[in] m seq_file handle
+ * \param[in] data unused
+ *
+ * \retval 0 on success
+ * \retval negative value on error
+ */
+static int mdt_dom_lock_seq_show(struct seq_file *m, void *data)
+{
+ struct obd_device *obd = m->private;
+ struct mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
+
+ seq_printf(m, "%s\n", dom_open_lock_modes[mdt->mdt_opts.mo_dom_lock]);
+ return 0;
+}
+
+/**
+ * Change MDT policy for data prefetch on open for DoM files.
+ *
+ * This variable defines how DOM lock is taken at open enqueue.
+ * There are three possible modes:
+ * 1) never - never take DoM lock on open. DoM lock will be taken as separate
+ * IO lock with own enqueue.
+ * 2) trylock - DoM lock will be taken only if non-blocked.
+ * 3) always - DoM lock will be taken always even if it is blocking lock.
+ *
+ * If dom_read_open is enabled too then DoM lock is taken in PR mode and
+ * is paired with LAYOUT lock when possible.
+ *
+ * \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
+mdt_dom_lock_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 mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
+ char kernbuf[DOM_LOCK_MODES_MAXLEN];
+ int val = -1;
+ int i, rc;
+
+ 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_DOM_LOCK_ON_OPEN_MODES; i++) {
+ if (strcmp(kernbuf, dom_open_lock_modes[i]) == 0) {
+ val = i;
+ break;
+ }
+ }
+
+ /* Legacy numeric codes */
+ if (val == -1) {
+ rc = kstrtoint_from_user(buffer, count, 0, &val);
+ if (rc)
+ return rc;
+ }
+
+ if (val < 0 || val >= NUM_DOM_LOCK_ON_OPEN_MODES)
+ return -EINVAL;
+
+ mdt->mdt_opts.mo_dom_lock = val;
+ return count;
+}
+LPROC_SEQ_FOPS(mdt_dom_lock);
+
+/**
+ * Show MDT policy for data prefetch on open for DoM files..
+ *
+ * \param[in] m seq_file handle
+ * \param[in] data unused
+ *
+ * \retval 0 on success
+ * \retval negative value on error
+ */
+static int mdt_dom_read_open_seq_show(struct seq_file *m, void *data)
+{
+ struct obd_device *obd = m->private;
+ struct mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
+
+ seq_printf(m, "%u\n", !!mdt->mdt_opts.mo_dom_read_open);
+ return 0;
+}
+
+/**
+ * Modify MDT policy for data prefetch on open for DoM files.
+ *
+ * If enabled then Data-on-MDT file data may be read during open and
+ * returned back in reply. It works only with mo_dom_lock enabled.
+ *
+ * \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
+mdt_dom_read_open_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 mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
+ bool val;
+ int rc;
+
+ rc = kstrtobool_from_user(buffer, count, &val);
+ if (rc)
+ return rc;
+
+ mdt->mdt_opts.mo_dom_read_open = !!val;
+ return count;
+}
+LPROC_SEQ_FOPS(mdt_dom_read_open);
+
+static int mdt_migrate_hsm_allowed_seq_show(struct seq_file *m, void *data)
+{
+ struct obd_device *obd = m->private;
+ struct mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
+
+ seq_printf(m, "%u\n", (mdt->mdt_opts.mo_migrate_hsm_allowed != 0));
+ return 0;
+}
+
+static ssize_t
+mdt_migrate_hsm_allowed_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 mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
+ bool val;
+ int rc;
+
+ rc = kstrtobool_from_user(buffer, count, &val);
+ if (rc)
+ return rc;
+
+ mdt->mdt_opts.mo_migrate_hsm_allowed = val;
+ return count;
+}
+LPROC_SEQ_FOPS(mdt_migrate_hsm_allowed);
-LPROC_SEQ_FOPS_RO_TYPE(mdt, uuid);
LPROC_SEQ_FOPS_RO_TYPE(mdt, recovery_status);
LPROC_SEQ_FOPS_RO_TYPE(mdt, num_exports);
LPROC_SEQ_FOPS_RO_TYPE(mdt, target_instance);
LPROC_SEQ_FOPS_RO_TYPE(mdt, hash);
-LPROC_SEQ_FOPS_WO_TYPE(mdt, mds_evict_client);
+LPROC_SEQ_FOPS_WR_ONLY(mdt, mds_evict_client);
LPROC_SEQ_FOPS_RW_TYPE(mdt, job_interval);
LPROC_SEQ_FOPS_RW_TYPE(mdt, ir_factor);
LPROC_SEQ_FOPS_RW_TYPE(mdt, nid_stats_clear);
LPROC_SEQ_FOPS_RW_TYPE(mdt, recovery_time_hard);
LPROC_SEQ_FOPS_RW_TYPE(mdt, recovery_time_soft);
+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);
+
static struct lprocfs_vars lprocfs_mdt_obd_vars[] = {
- { .name = "uuid",
- .fops = &mdt_uuid_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 = "grant_compat_disable",
+ .fops = &tgt_grant_compat_disable_fops },
{ .name = "recovery_status",
.fops = &mdt_recovery_status_fops },
{ .name = "num_exports",
.fops = &mdt_async_commit_count_fops },
{ .name = "sync_count",
.fops = &mdt_sync_count_fops },
+ { .name = "dom_lock",
+ .fops = &mdt_dom_lock_fops },
+ { .name = "dom_read_open",
+ .fops = &mdt_dom_read_open_fops },
+ { .name = "migrate_hsm_allowed",
+ .fops = &mdt_migrate_hsm_allowed_fops },
{ NULL }
};
struct obd_export *exp = req->rq_export;
if (exp->exp_obd && exp->exp_obd->obd_md_stats)
- lprocfs_counter_incr(exp->exp_obd->obd_md_stats, opcode);
+ lprocfs_counter_incr(exp->exp_obd->obd_md_stats,
+ opcode + LPROC_MD_LAST_OPC);
if (exp->exp_nid_stats && exp->exp_nid_stats->nid_stats != NULL)
lprocfs_counter_incr(exp->exp_nid_stats->nid_stats, opcode);
if (exp->exp_obd && exp->exp_obd->u.obt.obt_jobstats.ojs_hash &&
opcode, 1);
}
+static const char * const mdt_stats[] = {
+ [LPROC_MDT_OPEN] = "open",
+ [LPROC_MDT_CLOSE] = "close",
+ [LPROC_MDT_MKNOD] = "mknod",
+ [LPROC_MDT_LINK] = "link",
+ [LPROC_MDT_UNLINK] = "unlink",
+ [LPROC_MDT_MKDIR] = "mkdir",
+ [LPROC_MDT_RMDIR] = "rmdir",
+ [LPROC_MDT_RENAME] = "rename",
+ [LPROC_MDT_GETATTR] = "getattr",
+ [LPROC_MDT_SETATTR] = "setattr",
+ [LPROC_MDT_GETXATTR] = "getxattr",
+ [LPROC_MDT_SETXATTR] = "setxattr",
+ [LPROC_MDT_STATFS] = "statfs",
+ [LPROC_MDT_SYNC] = "sync",
+ [LPROC_MDT_SAMEDIR_RENAME] = "samedir_rename",
+ [LPROC_MDT_CROSSDIR_RENAME] = "crossdir_rename",
+ [LPROC_MDT_IO_READ] = "read_bytes",
+ [LPROC_MDT_IO_WRITE] = "write_bytes",
+ [LPROC_MDT_IO_PUNCH] = "punch",
+};
+
void mdt_stats_counter_init(struct lprocfs_stats *stats)
{
- lprocfs_counter_init(stats, LPROC_MDT_OPEN, 0, "open", "reqs");
- lprocfs_counter_init(stats, LPROC_MDT_CLOSE, 0, "close", "reqs");
- lprocfs_counter_init(stats, LPROC_MDT_MKNOD, 0, "mknod", "reqs");
- lprocfs_counter_init(stats, LPROC_MDT_LINK, 0, "link", "reqs");
- lprocfs_counter_init(stats, LPROC_MDT_UNLINK, 0, "unlink", "reqs");
- lprocfs_counter_init(stats, LPROC_MDT_MKDIR, 0, "mkdir", "reqs");
- lprocfs_counter_init(stats, LPROC_MDT_RMDIR, 0, "rmdir", "reqs");
- lprocfs_counter_init(stats, LPROC_MDT_RENAME, 0, "rename", "reqs");
- lprocfs_counter_init(stats, LPROC_MDT_GETATTR, 0, "getattr", "reqs");
- lprocfs_counter_init(stats, LPROC_MDT_SETATTR, 0, "setattr", "reqs");
- lprocfs_counter_init(stats, LPROC_MDT_GETXATTR, 0, "getxattr", "reqs");
- lprocfs_counter_init(stats, LPROC_MDT_SETXATTR, 0, "setxattr", "reqs");
- lprocfs_counter_init(stats, LPROC_MDT_STATFS, 0, "statfs", "reqs");
- lprocfs_counter_init(stats, LPROC_MDT_SYNC, 0, "sync", "reqs");
- lprocfs_counter_init(stats, LPROC_MDT_SAMEDIR_RENAME, 0,
- "samedir_rename", "reqs");
- lprocfs_counter_init(stats, LPROC_MDT_CROSSDIR_RENAME, 0,
- "crossdir_rename", "reqs");
+ int idx;
+
+ LASSERT(stats && stats->ls_num >= ARRAY_SIZE(mdt_stats));
+
+ for (idx = 0; idx < ARRAY_SIZE(mdt_stats); idx++) {
+ int flags = 0;
+
+ if (idx == LPROC_MDT_IO_WRITE || idx == LPROC_MDT_IO_READ)
+ flags = LPROCFS_CNTR_AVGMINMAX;
+
+ lprocfs_counter_init(stats, idx, flags, mdt_stats[idx], "reqs");
+ }
}
int mdt_procfs_init(struct mdt_device *mdt, const char *name)
{
- struct obd_device *obd = mdt2obd_dev(mdt);
- int rc;
- ENTRY;
+ struct obd_device *obd = mdt2obd_dev(mdt);
+ int rc;
+ int i;
+ ENTRY;
LASSERT(name != NULL);
obd->obd_vars = lprocfs_mdt_obd_vars;
- rc = lprocfs_obd_setup(obd);
+ rc = lprocfs_obd_setup(obd, true);
if (rc) {
CERROR("%s: cannot create proc entries: rc = %d\n",
mdt_obd_name(mdt), rc);
if (obd->obd_proc_exports_entry)
lprocfs_add_simple(obd->obd_proc_exports_entry, "clear",
obd, &mdt_nid_stats_clear_fops);
- rc = lprocfs_alloc_md_stats(obd, LPROC_MDT_LAST);
+
+ rc = lprocfs_alloc_md_stats(obd, ARRAY_SIZE(mdt_stats));
if (rc)
return rc;
- mdt_stats_counter_init(obd->obd_md_stats);
- rc = lprocfs_job_stats_init(obd, LPROC_MDT_LAST,
+ /* add additional MDT md_stats after the default ones */
+ for (i = 0; i < ARRAY_SIZE(mdt_stats); i++) {
+ int idx = i + LPROC_MD_LAST_OPC;
+ int flags = 0;
+
+ if (idx == LPROC_MDT_IO_WRITE || idx == LPROC_MDT_IO_READ)
+ flags = LPROCFS_CNTR_AVGMINMAX;
+
+ lprocfs_counter_init(obd->obd_md_stats, idx, flags,
+ mdt_stats[i], "reqs");
+ }
+
+ rc = lprocfs_job_stats_init(obd, ARRAY_SIZE(mdt_stats),
mdt_stats_counter_init);
rc = lproc_mdt_attach_rename_seqstat(mdt);
git://git.whamcloud.com / fs / lustre-release.git / blobdiff