*/
/*
* This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
*
* lustre/mdt/mdt_lproc.c
*
#include <lustre_mds.h>
#include <lprocfs_status.h>
#include "mdt_internal.h"
+#include <obd_cksum.h>
/**
* The rename stats output would be YAML formats, like
* rename_stats:
- * - snapshot_time: 1234567890.123456
+ * - snapshot_time: 1234567890.123456789
+ * - start_time: 1234567880.987654321
+ * - elapsed_time: 9.135802468
* - same_dir:
* 4kB: { samples: 1230, pct: 33, cum_pct: 45 }
* 8kB: { samples: 1242, pct: 33, cum_pct: 78 }
**/
static void display_rename_stats(struct seq_file *seq, char *name,
- struct obd_histogram *hist)
-{
- unsigned long tot, t, cum = 0;
- int i;
-
- tot = lprocfs_oh_sum(hist);
- if (tot > 0)
- seq_printf(seq, "- %-15s\n", name);
- /* dir size start from 4K, start i from 10(2^10) here */
- for (i = 0; i < OBD_HIST_MAX; i++) {
- t = hist->oh_buckets[i];
- cum += t;
- if (cum == 0)
- continue;
-
- if (i < 10)
- seq_printf(seq, "%6s%d%s", " ", 1<< i, "bytes:");
- else if (i < 20)
- seq_printf(seq, "%6s%d%s", " ", 1<<(i-10), "KB:");
- else
- seq_printf(seq, "%6s%d%s", " ", 1<<(i-20), "MB:");
+ struct obd_histogram *rs_hist)
+{
+ unsigned long tot, t, cum = 0;
+ int i;
+
+ tot = lprocfs_oh_sum(rs_hist);
+ if (tot > 0)
+ seq_printf(seq, "- %s\n", name);
+
+ for (i = 0; i < OBD_HIST_MAX; i++) {
+ t = rs_hist->oh_buckets[i];
+ cum += t;
+ if (cum == 0)
+ continue;
+
+ if (i < 10)
+ seq_printf(seq, "%6s%d%s", " ", 1 << i, "bytes:");
+ else if (i < 20)
+ seq_printf(seq, "%6s%d%s", " ", 1 << (i - 10), "KB:");
+ else
+ seq_printf(seq, "%6s%d%s", " ", 1 << (i - 20), "MB:");
seq_printf(seq, " { sample: %3lu, pct: %3u, cum_pct: %3u }\n",
t, pct(t, tot), pct(cum, tot));
- if (cum == tot)
- break;
- }
+ if (cum == tot)
+ break;
+ }
}
static void rename_stats_show(struct seq_file *seq,
- struct rename_stats *rename_stats)
+ struct rename_stats *rename_stats)
{
- struct timespec64 now;
-
/* 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]);
- display_rename_stats(seq, "crossdir_src",
- &rename_stats->hist[RENAME_CROSSDIR_SRC_SIZE]);
- display_rename_stats(seq, "crossdir_tgt",
- &rename_stats->hist[RENAME_CROSSDIR_TGT_SIZE]);
+ seq_puts(seq, "rename_stats:\n- ");
+ lprocfs_stats_header(seq, ktime_get(), rename_stats->rs_init, 15, ":",
+ false);
+
+ display_rename_stats(seq, "same_dir",
+ &rename_stats->rs_hist[RENAME_SAMEDIR_SIZE]);
+ display_rename_stats(seq, "crossdir_src",
+ &rename_stats->rs_hist[RENAME_CROSSDIR_SRC_SIZE]);
+ display_rename_stats(seq, "crossdir_tgt",
+ &rename_stats->rs_hist[RENAME_CROSSDIR_TGT_SIZE]);
}
static int mdt_rename_stats_seq_show(struct seq_file *seq, void *v)
{
- struct mdt_device *mdt = seq->private;
+ struct mdt_device *mdt = seq->private;
- rename_stats_show(seq, &mdt->mdt_rename_stats);
+ rename_stats_show(seq, &mdt->mdt_rename_stats);
- return 0;
+ return 0;
}
static ssize_t
mdt_rename_stats_seq_write(struct file *file, const char __user *buf,
size_t len, loff_t *off)
{
- struct seq_file *seq = file->private_data;
- struct mdt_device *mdt = seq->private;
- int i;
+ struct seq_file *seq = file->private_data;
+ struct mdt_device *mdt = seq->private;
+ int i;
- for (i = 0; i < RENAME_LAST; i++)
- lprocfs_oh_clear(&mdt->mdt_rename_stats.hist[i]);
+ for (i = 0; i < RENAME_LAST; i++)
+ lprocfs_oh_clear(&mdt->mdt_rename_stats.rs_hist[i]);
+ mdt->mdt_rename_stats.rs_init = ktime_get();
- return len;
+ return len;
}
LPROC_SEQ_FOPS(mdt_rename_stats);
int i;
for (i = 0; i < RENAME_LAST; i++)
- spin_lock_init(&mdt->mdt_rename_stats.hist[i].oh_lock);
+ spin_lock_init(&mdt->mdt_rename_stats.rs_hist[i].oh_lock);
return lprocfs_obd_seq_create(mdt2obd_dev(mdt), "rename_stats", 0644,
&mdt_rename_stats_fops, mdt);
struct mdt_device *mdt,
struct ptlrpc_request *req,
struct mdt_object *src,
- struct mdt_object *tgt)
+ struct mdt_object *tgt, long count)
{
- struct md_attr *ma = &info->mti_attr;
- struct rename_stats *rstats = &mdt->mdt_rename_stats;
- int rc;
+ struct md_attr *ma = &info->mti_attr;
+ struct rename_stats *rstats = &mdt->mdt_rename_stats;
+ int rc;
- ma->ma_need = MA_INODE;
- ma->ma_valid = 0;
- rc = mo_attr_get(info->mti_env, mdt_object_child(src), ma);
- if (rc) {
- CERROR("%s: "DFID" attr_get, rc = %d\n",
+ ma->ma_need = MA_INODE;
+ ma->ma_valid = 0;
+ rc = mo_attr_get(info->mti_env, mdt_object_child(src), ma);
+ if (rc) {
+ CERROR("%s: "DFID" attr_get, rc = %d\n",
mdt_obd_name(mdt), PFID(mdt_object_fid(src)), rc);
- return;
- }
-
- if (src == tgt) {
- mdt_counter_incr(req, LPROC_MDT_SAMEDIR_RENAME);
- lprocfs_oh_tally_log2(&rstats->hist[RENAME_SAMEDIR_SIZE],
- (unsigned int)ma->ma_attr.la_size);
- return;
- }
-
- mdt_counter_incr(req, LPROC_MDT_CROSSDIR_RENAME);
- lprocfs_oh_tally_log2(&rstats->hist[RENAME_CROSSDIR_SRC_SIZE],
- (unsigned int)ma->ma_attr.la_size);
-
- ma->ma_need = MA_INODE;
- ma->ma_valid = 0;
- rc = mo_attr_get(info->mti_env, mdt_object_child(tgt), ma);
- if (rc) {
- CERROR("%s: "DFID" attr_get, rc = %d\n",
+ return;
+ }
+
+ if (src == tgt) {
+ mdt_counter_incr(req, LPROC_MDT_SAMEDIR_RENAME, count);
+ lprocfs_oh_tally_log2(&rstats->rs_hist[RENAME_SAMEDIR_SIZE],
+ (unsigned int)ma->ma_attr.la_size);
+ return;
+ }
+
+ mdt_counter_incr(req, LPROC_MDT_CROSSDIR_RENAME, count);
+ lprocfs_oh_tally_log2(&rstats->rs_hist[RENAME_CROSSDIR_SRC_SIZE],
+ (unsigned int)ma->ma_attr.la_size);
+
+ ma->ma_need = MA_INODE;
+ ma->ma_valid = 0;
+ rc = mo_attr_get(info->mti_env, mdt_object_child(tgt), ma);
+ if (rc) {
+ CERROR("%s: "DFID" attr_get, rc = %d\n",
mdt_obd_name(mdt), PFID(mdt_object_fid(tgt)), rc);
- return;
- }
+ return;
+ }
- lprocfs_oh_tally_log2(&rstats->hist[RENAME_CROSSDIR_TGT_SIZE],
- (unsigned int)ma->ma_attr.la_size);
+ lprocfs_oh_tally_log2(&rstats->rs_hist[RENAME_CROSSDIR_TGT_SIZE],
+ (unsigned int)ma->ma_attr.la_size);
}
-static int mdt_identity_expire_seq_show(struct seq_file *m, void *data)
+static ssize_t identity_expire_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 mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
- seq_printf(m, "%lld\n", mdt->mdt_identity_cache->uc_entry_expire);
- return 0;
+ return scnprintf(buf, PAGE_SIZE, "%lld\n",
+ mdt->mdt_identity_cache->uc_entry_expire);
}
-static ssize_t
-mdt_identity_expire_seq_write(struct file *file, const char __user *buffer,
- size_t count, loff_t *off)
+static ssize_t identity_expire_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 mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
time64_t val;
int rc;
- rc = kstrtoll_from_user(buffer, count, 0, &val);
+ rc = kstrtoll(buffer, 10, &val);
if (rc)
return rc;
return count;
}
-LPROC_SEQ_FOPS(mdt_identity_expire);
+LUSTRE_RW_ATTR(identity_expire);
-static int mdt_identity_acquire_expire_seq_show(struct seq_file *m, void *data)
+static ssize_t identity_acquire_expire_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 mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
- seq_printf(m, "%lld\n", mdt->mdt_identity_cache->uc_acquire_expire);
- return 0;
+ return scnprintf(buf, PAGE_SIZE, "%lld\n",
+ mdt->mdt_identity_cache->uc_acquire_expire);
}
-static ssize_t
-mdt_identity_acquire_expire_seq_write(struct file *file,
- const char __user *buffer,
- size_t count, loff_t *off)
+static ssize_t identity_acquire_expire_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 mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
time64_t val;
int rc;
- rc = kstrtoll_from_user(buffer, count, 0, &val);
+ rc = kstrtoll(buffer, 0, &val);
if (rc)
return rc;
return count;
}
-LPROC_SEQ_FOPS(mdt_identity_acquire_expire);
+LUSTRE_RW_ATTR(identity_acquire_expire);
-static int mdt_identity_upcall_seq_show(struct seq_file *m, void *data)
+static ssize_t identity_upcall_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 mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
struct upcall_cache *hash = mdt->mdt_identity_cache;
+ int rc;
down_read(&hash->uc_upcall_rwsem);
- seq_printf(m, "%s\n", hash->uc_upcall);
+ rc = scnprintf(buf, PAGE_SIZE, "%s\n", hash->uc_upcall);
up_read(&hash->uc_upcall_rwsem);
- return 0;
+ return rc;
}
-static ssize_t
-mdt_identity_upcall_seq_write(struct file *file, const char __user *buffer,
- size_t count, loff_t *off)
+static ssize_t identity_upcall_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 mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
- struct upcall_cache *hash = mdt->mdt_identity_cache;
- int rc;
- char *kernbuf;
+ struct obd_device *obd = container_of(kobj, struct obd_device,
+ obd_kset.kobj);
+ struct mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
+ struct upcall_cache *hash = mdt->mdt_identity_cache;
if (count >= UC_CACHE_UPCALL_MAXPATH) {
CERROR("%s: identity upcall too long\n", mdt_obd_name(mdt));
return -EINVAL;
}
- OBD_ALLOC(kernbuf, count + 1);
- if (kernbuf == NULL)
- GOTO(failed, rc = -ENOMEM);
- if (copy_from_user(kernbuf, buffer, count))
- GOTO(failed, rc = -EFAULT);
/* Remove any extraneous bits from the upcall (e.g. linefeeds) */
down_write(&hash->uc_upcall_rwsem);
- sscanf(kernbuf, "%s", hash->uc_upcall);
+ sscanf(buffer, "%s", hash->uc_upcall);
up_write(&hash->uc_upcall_rwsem);
if (strcmp(hash->uc_name, mdt_obd_name(mdt)) != 0)
CDEBUG(D_CONFIG, "%s: identity upcall set to %s\n", mdt_obd_name(mdt),
hash->uc_upcall);
- OBD_FREE(kernbuf, count + 1);
RETURN(count);
-
- failed:
- if (kernbuf)
- OBD_FREE(kernbuf, count + 1);
- RETURN(rc);
}
-LPROC_SEQ_FOPS(mdt_identity_upcall);
+LUSTRE_RW_ATTR(identity_upcall);
-static ssize_t
-lprocfs_identity_flush_seq_write(struct file *file, const char __user *buffer,
- size_t count, void *data)
+static ssize_t identity_flush_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 mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
int uid;
int rc;
- rc = kstrtoint_from_user(buffer, count, 0, &uid);
+ rc = kstrtoint(buffer, 0, &uid);
if (rc)
return rc;
mdt_flush_identity(mdt->mdt_identity_cache, uid);
return count;
}
-LPROC_SEQ_FOPS_WR_ONLY(mdt, identity_flush);
+LUSTRE_WO_ATTR(identity_flush);
static ssize_t
lprocfs_identity_info_seq_write(struct file *file, const char __user *buffer,
*/
if (copy_from_user(kbuf, buf, min_t(unsigned long, BUFLEN - 1, count)))
GOTO(out, rc = -EFAULT);
- tmpbuf = cfs_firststr(kbuf, min_t(unsigned long, BUFLEN - 1, count));
+ tmpbuf = skip_spaces(kbuf);
+ tmpbuf = strsep(&tmpbuf, " \t\n\f\v\r");
if (strncmp(tmpbuf, "nid:", 4) != 0) {
count = lprocfs_evict_client_seq_write(file, buf, count, off);
#undef BUFLEN
-static int mdt_evict_tgt_nids_seq_show(struct seq_file *m, void *data)
+static ssize_t evict_tgt_nids_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 mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
- seq_printf(m, "%u\n", mdt->mdt_opts.mo_evict_tgt_nids);
- return 0;
+ return scnprintf(buf, PAGE_SIZE, "%u\n",
+ mdt->mdt_opts.mo_evict_tgt_nids);
}
-static ssize_t
-mdt_evict_tgt_nids_seq_write(struct file *file, const char __user *buffer,
- size_t count, loff_t *off)
+static ssize_t evict_tgt_nids_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 mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
bool val;
int rc;
- rc = kstrtobool_from_user(buffer, count, &val);
+ rc = kstrtobool(buffer, &val);
if (rc)
return rc;
mdt->mdt_opts.mo_evict_tgt_nids = val;
return count;
}
-LPROC_SEQ_FOPS(mdt_evict_tgt_nids);
+LUSTRE_RW_ATTR(evict_tgt_nids);
-static int mdt_cos_seq_show(struct seq_file *m, void *data)
+static ssize_t commit_on_sharing_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 mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
- seq_printf(m, "%u\n", mdt_cos_is_enabled(mdt));
- return 0;
+ return scnprintf(buf, PAGE_SIZE, "%u\n", mdt_cos_is_enabled(mdt));
}
-static ssize_t
-mdt_cos_seq_write(struct file *file, const char __user *buffer,
- size_t count, loff_t *off)
+static ssize_t commit_on_sharing_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 mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
bool val;
int rc;
- rc = kstrtobool_from_user(buffer, count, &val);
+ rc = kstrtobool(buffer, &val);
if (rc)
return rc;
mdt_enable_cos(mdt, val);
return count;
}
-LPROC_SEQ_FOPS(mdt_cos);
+LUSTRE_RW_ATTR(commit_on_sharing);
+
+static ssize_t local_recovery_show(struct kobject *kobj,
+ struct attribute *attr, char *buf)
+{
+ struct obd_device *obd = container_of(kobj, struct obd_device,
+ obd_kset.kobj);
+
+ return scnprintf(buf, PAGE_SIZE, "%u\n",
+ obd->u.obt.obt_lut->lut_local_recovery);
+}
+
+static ssize_t local_recovery_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);
+ bool val;
+ int rc;
+
+ rc = kstrtobool(buffer, &val);
+ if (rc)
+ return rc;
+
+ obd->u.obt.obt_lut->lut_local_recovery = !!val;
+ return count;
+}
+LUSTRE_RW_ATTR(local_recovery);
static int mdt_root_squash_seq_show(struct seq_file *m, void *data)
{
}
LPROC_SEQ_FOPS(mdt_nosquash_nids);
-static int mdt_enable_remote_dir_seq_show(struct seq_file *m, void *data)
+static ssize_t enable_remote_dir_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 mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
- seq_printf(m, "%u\n", mdt->mdt_enable_remote_dir);
- return 0;
+ return scnprintf(buf, PAGE_SIZE, "%u\n", mdt->mdt_enable_remote_dir);
}
-static ssize_t
-mdt_enable_remote_dir_seq_write(struct file *file, const char __user *buffer,
- size_t count, loff_t *off)
+static ssize_t enable_remote_dir_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 mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
bool val;
int rc;
- rc = kstrtobool_from_user(buffer, count, &val);
+ rc = kstrtobool(buffer, &val);
if (rc)
return rc;
mdt->mdt_enable_remote_dir = val;
return count;
}
-LPROC_SEQ_FOPS(mdt_enable_remote_dir);
+LUSTRE_RW_ATTR(enable_remote_dir);
-static int mdt_enable_remote_dir_gid_seq_show(struct seq_file *m, void *data)
+static ssize_t enable_remote_dir_gid_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 mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
- seq_printf(m, "%d\n",
- (int)mdt->mdt_enable_remote_dir_gid);
- return 0;
+ return scnprintf(buf, PAGE_SIZE, "%d\n",
+ (int)mdt->mdt_enable_remote_dir_gid);
}
-static ssize_t
-mdt_enable_remote_dir_gid_seq_write(struct file *file,
- const char __user *buffer,
- size_t count, loff_t *off)
+static ssize_t enable_remote_dir_gid_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 mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
int val;
int rc;
- rc = kstrtoint_from_user(buffer, count, 0, &val);
+ rc = kstrtoint(buffer, 0, &val);
if (rc)
return rc;
mdt->mdt_enable_remote_dir_gid = val;
return count;
}
-LPROC_SEQ_FOPS(mdt_enable_remote_dir_gid);
+LUSTRE_RW_ATTR(enable_remote_dir_gid);
-static int mdt_enable_striped_dir_seq_show(struct seq_file *m, void *data)
+static ssize_t enable_chprojid_gid_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 mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
- seq_printf(m, "%u\n", mdt->mdt_enable_striped_dir);
- return 0;
+ return scnprintf(buf, PAGE_SIZE, "%d\n",
+ (int)mdt->mdt_enable_chprojid_gid);
}
-static ssize_t
-mdt_enable_striped_dir_seq_write(struct file *file, const char __user *buffer,
- size_t count, loff_t *off)
+static ssize_t enable_chprojid_gid_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 mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
+ int val;
+ int rc;
+
+ rc = kstrtoint(buffer, 0, &val);
+ if (rc)
+ return rc;
+
+ mdt->mdt_enable_chprojid_gid = val;
+ return count;
+}
+LUSTRE_RW_ATTR(enable_chprojid_gid);
+
+static ssize_t enable_striped_dir_show(struct kobject *kobj,
+ struct attribute *attr, char *buf)
+{
+ struct obd_device *obd = container_of(kobj, struct obd_device,
+ obd_kset.kobj);
+ struct mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
+
+ return scnprintf(buf, PAGE_SIZE, "%u\n", mdt->mdt_enable_striped_dir);
+}
+
+static ssize_t enable_striped_dir_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 mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
bool val;
int rc;
- rc = kstrtobool_from_user(buffer, count, &val);
+ rc = kstrtobool(buffer, &val);
if (rc)
return rc;
mdt->mdt_enable_striped_dir = val;
return count;
}
-LPROC_SEQ_FOPS(mdt_enable_striped_dir);
+LUSTRE_RW_ATTR(enable_striped_dir);
-static int mdt_enable_dir_migration_seq_show(struct seq_file *m, void *data)
+static ssize_t enable_dir_migration_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 mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
- seq_printf(m, "%u\n", mdt->mdt_enable_dir_migration);
- return 0;
+ return scnprintf(buf, PAGE_SIZE, "%u\n", mdt->mdt_enable_dir_migration);
}
-static ssize_t
-mdt_enable_dir_migration_seq_write(struct file *file, const char __user *buffer,
- size_t count, loff_t *off)
+static ssize_t enable_dir_migration_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 mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
bool val;
int rc;
- rc = kstrtobool_from_user(buffer, count, &val);
+ rc = kstrtobool(buffer, &val);
if (rc)
return rc;
mdt->mdt_enable_dir_migration = val;
return count;
}
-LPROC_SEQ_FOPS(mdt_enable_dir_migration);
+LUSTRE_RW_ATTR(enable_dir_migration);
+
+static ssize_t enable_dir_restripe_show(struct kobject *kobj,
+ struct attribute *attr, char *buf)
+{
+ struct obd_device *obd = container_of(kobj, struct obd_device,
+ obd_kset.kobj);
+ struct mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
+
+ return scnprintf(buf, PAGE_SIZE, "%u\n", mdt->mdt_enable_dir_restripe);
+}
+
+static ssize_t enable_dir_restripe_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 mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
+ bool val;
+ int rc;
+
+ rc = kstrtobool(buffer, &val);
+ if (rc)
+ return rc;
+
+ mdt->mdt_enable_dir_restripe = val;
+ return count;
+}
+LUSTRE_RW_ATTR(enable_dir_restripe);
+
+static ssize_t enable_dir_auto_split_show(struct kobject *kobj,
+ struct attribute *attr, char *buf)
+{
+ struct obd_device *obd = container_of(kobj, struct obd_device,
+ obd_kset.kobj);
+ struct mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
+
+ return scnprintf(buf, PAGE_SIZE, "%u\n",
+ mdt->mdt_enable_dir_auto_split);
+}
+
+static ssize_t enable_dir_auto_split_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 mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
+ bool val;
+ int rc;
+
+ rc = kstrtobool(buffer, &val);
+ if (rc)
+ return rc;
+
+ mdt->mdt_enable_dir_auto_split = val;
+ return count;
+}
+LUSTRE_RW_ATTR(enable_dir_auto_split);
/**
* Show MDT async commit count.
*
- * \param[in] m seq_file handle
- * \param[in] data unused for single entry
+ * @m seq_file handle
+ * @data unused for single entry
*
- * \retval 0 on success
- * \retval negative value on error
+ * Return: 0 on success
+ * negative value on error
*/
-static int mdt_async_commit_count_seq_show(struct seq_file *m, void *data)
+static ssize_t async_commit_count_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 mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
- seq_printf(m, "%d\n", atomic_read(&mdt->mdt_async_commit_count));
- return 0;
+ return scnprintf(buf, PAGE_SIZE, "%d\n",
+ atomic_read(&mdt->mdt_async_commit_count));
}
-static ssize_t
-mdt_async_commit_count_seq_write(struct file *file, const char __user *buffer,
- size_t count, loff_t *off)
+static ssize_t async_commit_count_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 mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
int val;
int rc;
- rc = kstrtoint_from_user(buffer, count, 0, &val);
+ rc = kstrtoint(buffer, 10, &val);
if (rc)
return rc;
return count;
}
-LPROC_SEQ_FOPS(mdt_async_commit_count);
+LUSTRE_RW_ATTR(async_commit_count);
/**
* Show MDT sync count.
* \retval 0 on success
* \retval negative value on error
*/
-static int mdt_sync_count_seq_show(struct seq_file *m, void *data)
+static ssize_t sync_count_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 lu_target *tgt = obd->u.obt.obt_lut;
- seq_printf(m, "%d\n", atomic_read(&tgt->lut_sync_count));
- return 0;
+ return scnprintf(buf, PAGE_SIZE, "%d\n",
+ atomic_read(&tgt->lut_sync_count));
}
-static ssize_t
-mdt_sync_count_seq_write(struct file *file, const char __user *buffer,
- size_t count, loff_t *off)
+static ssize_t sync_count_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 lu_target *tgt = obd->u.obt.obt_lut;
int val;
int rc;
- rc = kstrtoint_from_user(buffer, count, 0, &val);
+ rc = kstrtoint(buffer, 0, &val);
if (rc)
return rc;
return count;
}
-LPROC_SEQ_FOPS(mdt_sync_count);
+LUSTRE_RW_ATTR(sync_count);
-static char *dom_open_lock_modes[NUM_DOM_LOCK_ON_OPEN_MODES] = {
+static const 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",
* \retval 0 on success
* \retval negative value on error
*/
-static int mdt_dom_lock_seq_show(struct seq_file *m, void *data)
+static ssize_t dom_lock_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 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;
+ return scnprintf(buf, PAGE_SIZE, "%s\n",
+ dom_open_lock_modes[mdt->mdt_opts.mo_dom_lock]);
}
/**
* \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)
+static ssize_t dom_lock_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 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))
+ if (count == 0 || count >= DOM_LOCK_MODES_MAXLEN)
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) {
+ /* buffer might have '\n' but using strlen() avoids it */
+ if (strncmp(buffer, dom_open_lock_modes[i],
+ strlen(dom_open_lock_modes[i])) == 0) {
val = i;
break;
}
/* Legacy numeric codes */
if (val == -1) {
- rc = kstrtoint_from_user(buffer, count, 0, &val);
+ rc = kstrtoint(buffer, 0, &val);
if (rc)
return rc;
}
+ if (val == ALWAYS_DOM_LOCK_ON_OPEN)
+ val = TRYLOCK_DOM_ON_OPEN;
+
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);
+LUSTRE_RW_ATTR(dom_lock);
/**
* Show MDT policy for data prefetch on open for DoM files..
* \retval 0 on success
* \retval negative value on error
*/
-static int mdt_dom_read_open_seq_show(struct seq_file *m, void *data)
+static ssize_t dom_read_open_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 mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
- seq_printf(m, "%u\n", !!mdt->mdt_opts.mo_dom_read_open);
- return 0;
+ return scnprintf(buf, PAGE_SIZE, "%u\n",
+ !!mdt->mdt_opts.mo_dom_read_open);
}
/**
* \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)
+static ssize_t dom_read_open_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 mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
bool val;
int rc;
- rc = kstrtobool_from_user(buffer, count, &val);
+ rc = kstrtobool(buffer, &val);
if (rc)
return rc;
mdt->mdt_opts.mo_dom_read_open = !!val;
return count;
}
-LPROC_SEQ_FOPS(mdt_dom_read_open);
+LUSTRE_RW_ATTR(dom_read_open);
-static int mdt_migrate_hsm_allowed_seq_show(struct seq_file *m, void *data)
+static ssize_t migrate_hsm_allowed_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 mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
- seq_printf(m, "%u\n", (mdt->mdt_opts.mo_migrate_hsm_allowed != 0));
- return 0;
+ return scnprintf(buf, PAGE_SIZE, "%u\n",
+ mdt->mdt_opts.mo_migrate_hsm_allowed);
}
-static ssize_t
-mdt_migrate_hsm_allowed_seq_write(struct file *file, const char __user *buffer,
- size_t count, loff_t *off)
+static ssize_t migrate_hsm_allowed_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 mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
bool val;
int rc;
- rc = kstrtobool_from_user(buffer, count, &val);
+ rc = kstrtobool(buffer, &val);
if (rc)
return rc;
mdt->mdt_opts.mo_migrate_hsm_allowed = val;
return count;
}
-LPROC_SEQ_FOPS(mdt_migrate_hsm_allowed);
+LUSTRE_RW_ATTR(migrate_hsm_allowed);
-static int mdt_readonly_seq_show(struct seq_file *m, void *data)
+static ssize_t readonly_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 mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
- seq_printf(m, "%u\n", mdt->mdt_readonly);
- return 0;
+ return scnprintf(buf, PAGE_SIZE, "%u\n", mdt->mdt_readonly);
}
-static ssize_t
-mdt_readonly_seq_write(struct file *file, const char __user *buffer,
- size_t count, loff_t *off)
+static ssize_t readonly_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 mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
bool val;
int rc;
- rc = kstrtobool_from_user(buffer, count, &val);
+ rc = kstrtobool(buffer, &val);
if (rc)
return rc;
mdt->mdt_readonly = val;
return count;
}
-LPROC_SEQ_FOPS(mdt_readonly);
+LUSTRE_RW_ATTR(readonly);
-static int mdt_enable_remote_rename_seq_show(struct seq_file *m, void *data)
+static ssize_t enable_remote_rename_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 mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
- seq_printf(m, "%u\n", mdt->mdt_enable_remote_rename);
- return 0;
+ return scnprintf(buf, PAGE_SIZE, "%u\n",
+ mdt->mdt_enable_remote_rename);
}
-static ssize_t
-mdt_enable_remote_rename_seq_write(struct file *file, const char __user *buffer,
- size_t count, loff_t *off)
+static ssize_t enable_remote_rename_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 mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
bool val;
int rc;
- rc = kstrtobool_from_user(buffer, count, &val);
+ rc = kstrtobool(buffer, &val);
if (rc)
return rc;
mdt->mdt_enable_remote_rename = val;
return count;
}
-LPROC_SEQ_FOPS(mdt_enable_remote_rename);
+LUSTRE_RW_ATTR(enable_remote_rename);
+
+static ssize_t dir_split_count_show(struct kobject *kobj,
+ struct attribute *attr,
+ char *buf)
+{
+ struct obd_device *obd = container_of(kobj, struct obd_device,
+ obd_kset.kobj);
+ struct mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
+
+ return scnprintf(buf, PAGE_SIZE, "%llu\n",
+ mdt->mdt_restriper.mdr_dir_split_count);
+}
+
+static ssize_t dir_split_count_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 mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
+ s64 val;
+ int rc;
+
+ rc = sysfs_memparse(buffer, count, &val, "B");
+ if (rc < 0)
+ return rc;
+
+ if (val < 0)
+ return -ERANGE;
+
+ mdt->mdt_restriper.mdr_dir_split_count = val;
+
+ return count;
+}
+LUSTRE_RW_ATTR(dir_split_count);
+
+static ssize_t dir_split_delta_show(struct kobject *kobj,
+ struct attribute *attr,
+ char *buf)
+{
+ struct obd_device *obd = container_of(kobj, struct obd_device,
+ obd_kset.kobj);
+ struct mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
+
+ return scnprintf(buf, PAGE_SIZE, "%u\n",
+ mdt->mdt_restriper.mdr_dir_split_delta);
+}
+
+static ssize_t dir_split_delta_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 mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
+ u32 val;
+ int rc;
+
+ rc = kstrtouint(buffer, 0, &val);
+ if (rc)
+ return rc;
+
+ mdt->mdt_restriper.mdr_dir_split_delta = val;
+
+ return count;
+}
+LUSTRE_RW_ATTR(dir_split_delta);
+
+static ssize_t dir_restripe_nsonly_show(struct kobject *kobj,
+ struct attribute *attr, char *buf)
+{
+ struct obd_device *obd = container_of(kobj, struct obd_device,
+ obd_kset.kobj);
+ struct mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
+
+ return scnprintf(buf, PAGE_SIZE, "%u\n", mdt->mdt_dir_restripe_nsonly);
+}
+
+static ssize_t dir_restripe_nsonly_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 mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
+ bool val;
+ int rc;
+
+ rc = kstrtobool(buffer, &val);
+ if (rc)
+ return rc;
+
+ mdt->mdt_dir_restripe_nsonly = val;
+ return count;
+}
+LUSTRE_RW_ATTR(dir_restripe_nsonly);
+
+static ssize_t enable_remote_subdir_mount_show(struct kobject *kobj,
+ struct attribute *attr,
+ char *buf)
+{
+ struct obd_device *obd = container_of(kobj, struct obd_device,
+ obd_kset.kobj);
+ struct mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
+
+ return scnprintf(buf, PAGE_SIZE, "%u\n",
+ mdt->mdt_enable_remote_subdir_mount);
+}
+
+static ssize_t enable_remote_subdir_mount_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 mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
+ bool val;
+ int rc;
+
+ rc = kstrtobool(buffer, &val);
+ if (rc)
+ return rc;
+
+ mdt->mdt_enable_remote_subdir_mount = val;
+ return count;
+}
+LUSTRE_RW_ATTR(enable_remote_subdir_mount);
+
+/**
+ * Show if the OFD enforces T10PI checksum.
+ *
+ * \param[in] m seq_file handle
+ * \param[in] data unused for single entry
+ *
+ * \retval 0 on success
+ * \retval negative value on error
+ */
+static ssize_t checksum_t10pi_enforce_show(struct kobject *kobj,
+ struct attribute *attr,
+ char *buf)
+{
+ struct obd_device *obd = container_of(kobj, struct obd_device,
+ obd_kset.kobj);
+ struct lu_target *lut = obd->u.obt.obt_lut;
+
+ return scnprintf(buf, PAGE_SIZE, "%u\n", lut->lut_cksum_t10pi_enforce);
+}
+
+/**
+ * Force specific T10PI checksum modes to be enabled
+ *
+ * If T10PI *is* supported in hardware, allow only the supported T10PI type
+ * to be used. If T10PI is *not* supported by the OSD, setting the enforce
+ * parameter forces all T10PI types to be enabled (even if slower) for
+ * testing.
+ *
+ * The final determination of which algorithm to be used depends whether
+ * the client supports T10PI or not, and is handled at client connect time.
+ *
+ * \param[in] file proc file
+ * \param[in] buffer string which represents mode
+ * 1: set T10PI checksums enforced
+ * 0: unset T10PI checksums enforced
+ * \param[in] count \a buffer length
+ * \param[in] off unused for single entry
+ *
+ * \retval \a count on success
+ * \retval negative number on error
+ */
+static ssize_t checksum_t10pi_enforce_store(struct kobject *kobj,
+ struct attribute *attr,
+ const char *buffer, size_t count)
+{
+ struct obd_device *obd = container_of(kobj, struct obd_device,
+ obd_kset.kobj);
+ struct lu_target *lut = obd->u.obt.obt_lut;
+ bool enforce;
+ int rc;
+
+ rc = kstrtobool(buffer, &enforce);
+ if (rc)
+ return rc;
+
+ spin_lock(&lut->lut_flags_lock);
+ lut->lut_cksum_t10pi_enforce = enforce;
+ spin_unlock(&lut->lut_flags_lock);
+ return count;
+}
+LUSTRE_RW_ATTR(checksum_t10pi_enforce);
+
+/*
+ * mdt_checksum_type(server) proc handling
+ */
+DECLARE_CKSUM_NAME;
+
+static int mdt_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 = obd->u.obt.obt_lut;
+
+ /* select fastest checksum type on the server */
+ pref = obd_cksum_type_select(obd->obd_name,
+ lut->lut_cksum_types_supported, 0);
+
+ 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(mdt_checksum_type);
-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_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, checksum_dump);
+LUSTRE_RW_ATTR(job_cleanup_interval);
LPROC_SEQ_FOPS_RW_TYPE(mdt, nid_stats_clear);
-LPROC_SEQ_FOPS(mdt_hsm_cdt_control);
-
-LPROC_SEQ_FOPS_RW_TYPE(mdt, recovery_time_hard);
-LPROC_SEQ_FOPS_RW_TYPE(mdt, recovery_time_soft);
+LUSTRE_RW_ATTR(hsm_control);
-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);
+LPROC_SEQ_FOPS_RO_TYPE(mdt, recovery_status);
+LUSTRE_RW_ATTR(recovery_time_hard);
+LUSTRE_RW_ATTR(recovery_time_soft);
+LUSTRE_RW_ATTR(ir_factor);
+
+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);
+
+static struct attribute *mdt_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_identity_expire.attr,
+ &lustre_attr_identity_acquire_expire.attr,
+ &lustre_attr_identity_upcall.attr,
+ &lustre_attr_identity_flush.attr,
+ &lustre_attr_evict_tgt_nids.attr,
+ &lustre_attr_enable_remote_dir.attr,
+ &lustre_attr_enable_remote_dir_gid.attr,
+ &lustre_attr_enable_chprojid_gid.attr,
+ &lustre_attr_enable_striped_dir.attr,
+ &lustre_attr_enable_dir_migration.attr,
+ &lustre_attr_enable_dir_restripe.attr,
+ &lustre_attr_enable_dir_auto_split.attr,
+ &lustre_attr_enable_remote_rename.attr,
+ &lustre_attr_commit_on_sharing.attr,
+ &lustre_attr_local_recovery.attr,
+ &lustre_attr_async_commit_count.attr,
+ &lustre_attr_sync_count.attr,
+ &lustre_attr_dom_lock.attr,
+ &lustre_attr_dom_read_open.attr,
+ &lustre_attr_migrate_hsm_allowed.attr,
+ &lustre_attr_hsm_control.attr,
+ &lustre_attr_job_cleanup_interval.attr,
+ &lustre_attr_readonly.attr,
+ &lustre_attr_dir_split_count.attr,
+ &lustre_attr_dir_split_delta.attr,
+ &lustre_attr_dir_restripe_nsonly.attr,
+ &lustre_attr_checksum_t10pi_enforce.attr,
+ &lustre_attr_enable_remote_subdir_mount.attr,
+ NULL,
+};
static struct lprocfs_vars lprocfs_mdt_obd_vars[] = {
- { .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_num_exports_fops },
- { .name = "identity_expire",
- .fops = &mdt_identity_expire_fops },
- { .name = "identity_acquire_expire",
- .fops = &mdt_identity_acquire_expire_fops },
- { .name = "identity_upcall",
- .fops = &mdt_identity_upcall_fops },
- { .name = "identity_flush",
- .fops = &mdt_identity_flush_fops },
{ .name = "identity_info",
.fops = &mdt_identity_info_fops },
{ .name = "site_stats",
.fops = &mdt_site_stats_fops },
{ .name = "evict_client",
.fops = &mdt_mds_evict_client_fops },
- { .name = "evict_tgt_nids",
- .fops = &mdt_evict_tgt_nids_fops },
+ { .name = "checksum_dump",
+ .fops = &mdt_checksum_dump_fops },
{ .name = "hash_stats",
.fops = &mdt_hash_fops },
- { .name = "commit_on_sharing",
- .fops = &mdt_cos_fops },
{ .name = "root_squash",
.fops = &mdt_root_squash_fops },
{ .name = "nosquash_nids",
.fops = &mdt_nosquash_nids_fops },
- { .name = "instance",
- .fops = &mdt_target_instance_fops },
- { .name = "ir_factor",
- .fops = &mdt_ir_factor_fops },
- { .name = "job_cleanup_interval",
- .fops = &mdt_job_interval_fops },
- { .name = "enable_remote_dir",
- .fops = &mdt_enable_remote_dir_fops },
- { .name = "enable_remote_dir_gid",
- .fops = &mdt_enable_remote_dir_gid_fops },
- { .name = "enable_striped_dir",
- .fops = &mdt_enable_striped_dir_fops },
- { .name = "enable_dir_migration",
- .fops = &mdt_enable_dir_migration_fops },
- { .name = "enable_remote_rename",
- .fops = &mdt_enable_remote_rename_fops },
- { .name = "hsm_control",
- .fops = &mdt_hsm_cdt_control_fops },
- { .name = "recovery_time_hard",
- .fops = &mdt_recovery_time_hard_fops },
- { .name = "recovery_time_soft",
- .fops = &mdt_recovery_time_soft_fops },
- { .name = "async_commit_count",
- .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 },
- { .name = "readonly",
- .fops = &mdt_readonly_fops },
+ { .name = "checksum_type",
+ .fops = &mdt_checksum_type_fops },
{ NULL }
};
static int
-lprocfs_mdt_print_open_files(struct cfs_hash *hs, struct cfs_hash_bd *bd,
- struct hlist_node *hnode, void *v)
+lprocfs_mdt_print_open_files(struct obd_export *exp, void *v)
{
- struct obd_export *exp = cfs_hash_object(hs, hnode);
struct seq_file *seq = v;
if (exp->exp_lock_hash != NULL) {
static int lprocfs_mdt_open_files_seq_show(struct seq_file *seq, void *v)
{
struct nid_stat *stats = seq->private;
- struct obd_device *obd = stats->nid_obd;
-
- cfs_hash_for_each_key(obd->obd_nid_hash, &stats->nid,
- lprocfs_mdt_print_open_files, seq);
- return 0;
+ return obd_nid_export_for_each(stats->nid_obd, stats->nid,
+ lprocfs_mdt_print_open_files, seq);
}
int lprocfs_mdt_open_files_seq_open(struct inode *inode, struct file *file)
return 0;
}
-void mdt_counter_incr(struct ptlrpc_request *req, int opcode)
+void mdt_counter_incr(struct ptlrpc_request *req, int opcode, long amount)
{
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 + LPROC_MD_LAST_OPC);
+ lprocfs_counter_add(exp->exp_obd->obd_md_stats,
+ opcode + LPROC_MD_LAST_OPC, amount);
if (exp->exp_nid_stats && exp->exp_nid_stats->nid_stats != NULL)
- lprocfs_counter_incr(exp->exp_nid_stats->nid_stats, opcode);
+ lprocfs_counter_add(exp->exp_nid_stats->nid_stats, opcode,
+ amount);
if (exp->exp_obd && exp->exp_obd->u.obt.obt_jobstats.ojs_hash &&
(exp_connect_flags(exp) & OBD_CONNECT_JOBSTATS))
lprocfs_job_stats_log(exp->exp_obd,
lustre_msg_get_jobid(req->rq_reqmsg),
- opcode, 1);
+ opcode, amount);
}
static const char * const mdt_stats[] = {
[LPROC_MDT_IO_READ] = "read_bytes",
[LPROC_MDT_IO_WRITE] = "write_bytes",
[LPROC_MDT_IO_PUNCH] = "punch",
+ [LPROC_MDT_MIGRATE] = "migrate",
+ [LPROC_MDT_FALLOCATE] = "fallocate",
};
-void mdt_stats_counter_init(struct lprocfs_stats *stats)
+void mdt_stats_counter_init(struct lprocfs_stats *stats, unsigned int offset)
{
- 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 array_size = ARRAY_SIZE(mdt_stats);
+ int oidx; /* obd_md_stats index */
+ int midx; /* mdt_stats index */
+
+ LASSERT(stats && stats->ls_num >= offset + array_size);
+
+ for (midx = 0; midx < array_size; midx++) {
+ oidx = midx + offset;
+ if (midx == LPROC_MDT_IO_READ || midx == LPROC_MDT_IO_WRITE)
+ lprocfs_counter_init(stats, oidx,
+ LPROCFS_TYPE_BYTES_FULL,
+ mdt_stats[midx], "bytes");
+ else
+ lprocfs_counter_init(stats, oidx,
+ LPROCFS_TYPE_LATENCY,
+ mdt_stats[midx], "usecs");
}
}
-int mdt_procfs_init(struct mdt_device *mdt, const char *name)
+int mdt_tunables_init(struct mdt_device *mdt, const char *name)
{
struct obd_device *obd = mdt2obd_dev(mdt);
int rc;
- int i;
ENTRY;
LASSERT(name != NULL);
+ obd->obd_ktype.default_attrs = mdt_attrs;
obd->obd_vars = lprocfs_mdt_obd_vars;
rc = lprocfs_obd_setup(obd, true);
if (rc) {
return rc;
}
- rc = hsm_cdt_procfs_init(mdt);
+ rc = hsm_cdt_tunables_init(mdt);
if (rc) {
CERROR("%s: cannot create hsm proc entries: rc = %d\n",
mdt_obd_name(mdt), rc);
return rc;
/* 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");
- }
-
+ mdt_stats_counter_init(obd->obd_md_stats, LPROC_MD_LAST_OPC);
rc = lprocfs_job_stats_init(obd, ARRAY_SIZE(mdt_stats),
mdt_stats_counter_init);
RETURN(rc);
}
-void mdt_procfs_fini(struct mdt_device *mdt)
+void mdt_tunables_fini(struct mdt_device *mdt)
{
struct obd_device *obd = mdt2obd_dev(mdt);
}
lprocfs_free_per_client_stats(obd);
- hsm_cdt_procfs_fini(mdt);
+ /* hsm_cdt_tunables is disabled earlier than this to avoid
+ * coordinator restart.
+ */
+ hsm_cdt_tunables_fini(mdt);
tgt_tunables_fini(&mdt->mdt_lut);
lprocfs_obd_cleanup(obd);
lprocfs_free_md_stats(obd);
git://git.whamcloud.com / fs / lustre-release.git / blobdiff