* 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/
* 16kB: { samples: 12, pct: 3, cum_pct: 81 }
**/
-#define pct(a, b) (b ? a * 100 / b : 0)
-
static void display_rename_stats(struct seq_file *seq, char *name,
struct obd_histogram *hist)
{
else
seq_printf(seq, "%6s%d%s", " ", 1<<(i-20), "MB:");
- seq_printf(seq, " { sample: %3lu, pct: %3lu, cum_pct: %3lu }\n",
- t, pct(t, tot), pct(cum, tot));
+ seq_printf(seq, " { sample: %3lu, pct: %3u, cum_pct: %3u }\n",
+ t, pct(t, tot), pct(cum, tot));
if (cum == tot)
break;
&rename_stats->hist[RENAME_CROSSDIR_TGT_SIZE]);
}
-#undef pct
-
static int mdt_rename_stats_seq_show(struct seq_file *seq, void *v)
{
struct mdt_device *mdt = seq->private;
(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, "%u\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;
- __s64 val;
- rc = lprocfs_str_to_s64(buffer, count, &val);
+ rc = kstrtoll(buffer, 10, &val);
if (rc)
return rc;
- if (val < 0 || val > INT_MAX)
+
+ if (val < 0)
return -ERANGE;
mdt->mdt_identity_cache->uc_entry_expire = val;
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, "%u\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;
- __s64 val;
- rc = lprocfs_str_to_s64(buffer, count, &val);
+ rc = kstrtoll(buffer, 0, &val);
if (rc)
return rc;
+
if (val < 0 || val > INT_MAX)
return -ERANGE;
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;
- __s64 uid;
- rc = lprocfs_str_to_s64(buffer, count, &uid);
+ rc = kstrtoint(buffer, 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_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,
#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);
- __s64 val;
+ bool val;
int rc;
- rc = lprocfs_str_to_s64(buffer, count, &val);
+ rc = kstrtobool(buffer, &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);
+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;
- __s64 val;
- rc = lprocfs_str_to_s64(buffer, count, &val);
+ rc = kstrtobool(buffer, &val);
if (rc)
return rc;
- if (val < INT_MIN || val > INT_MAX)
- return -ERANGE;
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)
{
struct root_squash_info *squash = &mdt->mdt_squash;
int len = 0;
- down_read(&squash->rsi_sem);
+ spin_lock(&squash->rsi_lock);
if (!list_empty(&squash->rsi_nosquash_nids)) {
len = cfs_print_nidlist(m->buf + m->count, m->size - m->count,
&squash->rsi_nosquash_nids);
seq_putc(m, '\n');
} else
seq_puts(m, "NONE\n");
- up_read(&squash->rsi_sem);
+ spin_unlock(&squash->rsi_lock);
return 0;
}
}
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);
- __s64 val;
+ bool val;
int rc;
- rc = lprocfs_str_to_s64(buffer, count, &val);
+ rc = kstrtobool(buffer, &val);
if (rc)
return rc;
- if (val > 1 || val < 0)
- return -ERANGE;
-
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);
- __s64 val;
+ int val;
int rc;
- rc = lprocfs_str_to_s64(buffer, count, &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 ssize_t enable_chprojid_gid_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, "%d\n",
+ (int)mdt->mdt_enable_chprojid_gid);
+}
+
+static ssize_t enable_chprojid_gid_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);
+ 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(buffer, &val);
+ if (rc)
+ return rc;
+
+ mdt->mdt_enable_striped_dir = val;
+ return count;
+}
+LUSTRE_RW_ATTR(enable_striped_dir);
+
+static ssize_t enable_dir_migration_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_migration);
+}
+
+static ssize_t enable_dir_migration_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_migration = val;
+ return count;
+}
+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.
+ *
+ * @m seq_file handle
+ * @data unused for single entry
+ *
+ * Return: 0 on success
+ * negative value on error
+ */
+static ssize_t async_commit_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, "%d\n",
+ atomic_read(&mdt->mdt_async_commit_count));
+}
+
+static ssize_t async_commit_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);
+ int val;
+ int rc;
+
+ rc = kstrtoint(buffer, 10, &val);
+ if (rc)
+ return rc;
+
+ atomic_set(&mdt->mdt_async_commit_count, val);
+
+ return count;
+}
+LUSTRE_RW_ATTR(async_commit_count);
/**
- * Show MDT policy for handling dirty metadata under a lock being cancelled.
+ * Show MDT sync count.
*
* \param[in] m seq_file handle
* \param[in] data unused for single entry
* \retval 0 on success
* \retval negative value on error
*/
-static int mdt_slc_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;
- char *slc_states[] = {"never", "blocking", "always" };
- seq_printf(m, "%s\n", slc_states[tgt->lut_sync_lock_cancel]);
- return 0;
+ return scnprintf(buf, PAGE_SIZE, "%d\n",
+ atomic_read(&tgt->lut_sync_count));
+}
+
+static ssize_t sync_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 lu_target *tgt = obd->u.obt.obt_lut;
+ int val;
+ int rc;
+
+ rc = kstrtoint(buffer, 0, &val);
+ if (rc)
+ return rc;
+
+ atomic_set(&tgt->lut_sync_count, val);
+
+ return count;
}
-LPROC_SEQ_FOPS_RO(mdt_slc);
+LUSTRE_RW_ATTR(sync_count);
+
+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",
+};
+
+/* This must be longer than the longest string above */
+#define DOM_LOCK_MODES_MAXLEN 16
/**
- * Show MDT async commit count.
+ * Show MDT policy for data prefetch on open for DoM files..
*
* \param[in] m seq_file handle
- * \param[in] data unused for single entry
+ * \param[in] data unused
*
* \retval 0 on success
* \retval negative value on error
*/
-static int mdt_async_commit_count_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, "%d\n", atomic_read(&mdt->mdt_async_commit_count));
- return 0;
+ return scnprintf(buf, PAGE_SIZE, "%s\n",
+ dom_open_lock_modes[mdt->mdt_opts.mo_dom_lock]);
}
-static ssize_t
-mdt_async_commit_count_seq_write(struct file *file, const char __user *buffer,
- size_t count, loff_t *off)
+/**
+ * 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 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);
- __s64 val;
- int rc;
+ int val = -1;
+ int i, rc;
- rc = lprocfs_str_to_s64(buffer, count, &val);
- if (rc)
- return rc;
+ if (count == 0 || count >= DOM_LOCK_MODES_MAXLEN)
+ return -EINVAL;
- if (val < INT_MIN || val > INT_MAX)
- return -ERANGE;
+ for (i = 0 ; i < NUM_DOM_LOCK_ON_OPEN_MODES; i++) {
+ /* 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;
+ }
+ }
- atomic_set(&mdt->mdt_async_commit_count, val);
+ /* Legacy numeric codes */
+ if (val == -1) {
+ rc = kstrtoint(buffer, 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_async_commit_count);
+LUSTRE_RW_ATTR(dom_lock);
/**
- * Show MDT sync count.
+ * Show MDT policy for data prefetch on open for DoM files..
*
* \param[in] m seq_file handle
- * \param[in] data unused for single entry
+ * \param[in] data unused
*
* \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 dom_read_open_show(struct kobject *kobj,
+ struct attribute *attr, char *buf)
{
- struct obd_device *obd = m->private;
- struct lu_target *tgt = obd->u.obt.obt_lut;
+ 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(&tgt->lut_sync_count));
- return 0;
+ return scnprintf(buf, PAGE_SIZE, "%u\n",
+ !!mdt->mdt_opts.mo_dom_read_open);
}
-static ssize_t
-mdt_sync_count_seq_write(struct file *file, const char __user *buffer,
- size_t count, loff_t *off)
+/**
+ * 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 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 lu_target *tgt = obd->u.obt.obt_lut;
- __s64 val;
+ 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_opts.mo_dom_read_open = !!val;
+ return count;
+}
+LUSTRE_RW_ATTR(dom_read_open);
+
+static ssize_t migrate_hsm_allowed_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_opts.mo_migrate_hsm_allowed);
+}
+
+static ssize_t migrate_hsm_allowed_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_opts.mo_migrate_hsm_allowed = val;
+ return count;
+}
+LUSTRE_RW_ATTR(migrate_hsm_allowed);
+
+static ssize_t readonly_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_readonly);
+}
+
+static ssize_t readonly_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_readonly = val;
+ return count;
+}
+LUSTRE_RW_ATTR(readonly);
+
+static ssize_t enable_remote_rename_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_rename);
+}
+
+static ssize_t enable_remote_rename_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 = lprocfs_str_to_s64(buffer, count, &val);
+ rc = kstrtobool(buffer, &val);
if (rc)
return rc;
- if (val < INT_MIN || val > INT_MAX)
+ mdt->mdt_enable_remote_rename = val;
+ return count;
+}
+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;
- atomic_set(&tgt->lut_sync_count, val);
+ mdt->mdt_restriper.mdr_dir_split_count = val;
return count;
}
-LPROC_SEQ_FOPS(mdt_sync_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);
-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);
+LUSTRE_RW_ATTR(job_cleanup_interval);
LPROC_SEQ_FOPS_RW_TYPE(mdt, nid_stats_clear);
-LPROC_SEQ_FOPS(mdt_hsm_cdt_control);
+LUSTRE_RW_ATTR(hsm_control);
-LPROC_SEQ_FOPS_RW_TYPE(mdt, recovery_time_hard);
-LPROC_SEQ_FOPS_RW_TYPE(mdt, recovery_time_soft);
+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,
+ NULL,
+};
static struct lprocfs_vars lprocfs_mdt_obd_vars[] = {
{ .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 = "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 = "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 = "sync_lock_cancel",
- .fops = &mdt_slc_fops },
- { .name = "async_commit_count",
- .fops = &mdt_async_commit_count_fops },
- { .name = "sync_count",
- .fops = &mdt_sync_count_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)
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",
+ [LPROC_MDT_MIGRATE] = "migrate",
+};
+
void mdt_stats_counter_init(struct lprocfs_stats *stats)
{
- LASSERT(stats && stats->ls_num >= LPROC_MDT_LAST);
-
- 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");
- lprocfs_counter_init(stats, LPROC_MDT_IO_READ,
- LPROCFS_CNTR_AVGMINMAX, "read_bytes", "bytes");
- lprocfs_counter_init(stats, LPROC_MDT_IO_WRITE,
- LPROCFS_CNTR_AVGMINMAX, "write_bytes", "bytes");
- lprocfs_counter_init(stats, LPROC_MDT_IO_PUNCH, 0, "punch", "reqs");
-}
-
-int mdt_procfs_init(struct mdt_device *mdt, const char *name)
-{
- struct obd_device *obd = mdt2obd_dev(mdt);
- int rc;
- ENTRY;
+ 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_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 = tgt_tunables_init(&mdt->mdt_lut);
+ if (rc) {
+ CERROR("%s: failed to init target tunables: rc = %d\n",
+ mdt_obd_name(mdt), rc);
+ return rc;
+ }
+
+ rc = hsm_cdt_tunables_init(mdt);
if (rc) {
CERROR("%s: cannot create hsm 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);
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);
lprocfs_free_obd_stats(obd);
git://git.whamcloud.com / fs / lustre-release.git / blobdiff