*
* You should have received a copy of the GNU General Public License
* version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
+ * http://www.gnu.org/licenses/gpl-2.0.html
*
* GPL HEADER END
*/
* Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2014, 2015, Intel Corporation.
+ * Copyright (c) 2014, 2016, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
#define DEBUG_SUBSYSTEM S_CLASS
+#include <linux/kobject.h>
+#include <linux/sysfs.h>
#include <obd_class.h>
#include <lprocfs_status.h>
#include <lustre/lustre_idl.h>
#include <lustre_nodemap.h>
+static ssize_t uuid_show(struct kobject *kobj, struct attribute *attr,
+ char *buf)
+{
+ struct obd_device *obd = class_name2obd(kobj->name);
+
+ return sprintf(buf, "%s\n", obd->obd_uuid.uuid);
+}
+LUSTRE_RO_ATTR(uuid);
+
+static struct attribute *server_uuid_attrs[] = {
+ &lustre_attr_uuid.attr,
+ NULL,
+};
+
+static struct attribute_group server_def_attr_group = {
+ .attrs = server_uuid_attrs,
+};
+
+void lprocfs_kset_unregister(struct obd_device *obd, struct kset *kset)
+{
+ if (obd->obd_proc_entry) {
+ lprocfs_remove(&obd->obd_proc_entry);
+ obd->obd_proc_entry = NULL;
+ }
+
+ if (kset)
+ kset_unregister(kset);
+}
+EXPORT_SYMBOL(lprocfs_kset_unregister);
+
+int lprocfs_kset_register(struct obd_device *obd, struct kset **kset)
+{
+ struct kset *obd_kset;
+ int rc = 0;
+
+ obd_kset = kset_create_and_add(obd->obd_name, NULL,
+ obd->obd_type->typ_kobj);
+ if (!obd_kset) {
+ CERROR("%s: cannot add new kset: rc = %d\n", obd->obd_name, rc);
+ rc = -ENOMEM;
+ }
+
+ if (!obd->obd_attrs)
+ obd->obd_attrs = &server_def_attr_group;
+
+ rc = sysfs_create_group(&obd_kset->kobj, obd->obd_attrs);
+ if (rc) {
+ CERROR("%s: cannot create attr group: rc = %d\n", obd->obd_name,
+ rc);
+ kset_unregister(obd_kset);
+ obd_kset = NULL;
+ return rc;
+ }
+
+ obd->obd_proc_entry = lprocfs_register(obd->obd_name,
+ obd->obd_type->typ_procroot,
+ obd->obd_vars, obd);
+ if (IS_ERR(obd->obd_proc_entry)) {
+ rc = PTR_ERR(obd->obd_proc_entry);
+ CERROR("%s: error %d setting up lprocfs\n", obd->obd_name, rc);
+ obd->obd_proc_entry = NULL;
+
+ kset_unregister(obd_kset);
+ obd_kset = NULL;
+ }
+ *kset = obd_kset;
+ return rc;
+}
+EXPORT_SYMBOL(lprocfs_kset_register);
+
#ifdef CONFIG_PROC_FS
int lprocfs_evict_client_open(struct inode *inode, struct file *f)
{
- struct obd_device *obd = PDE_DATA(f->f_path.dentry->d_inode);
+ struct obd_device *obd = PDE_DATA(file_inode(f));
atomic_inc(&obd->obd_evict_inprogress);
return 0;
int lprocfs_evict_client_release(struct inode *inode, struct file *f)
{
- struct obd_device *obd = PDE_DATA(f->f_path.dentry->d_inode);
+ struct obd_device *obd = PDE_DATA(file_inode(f));
atomic_dec(&obd->obd_evict_inprogress);
wake_up(&obd->obd_evict_inprogress_waitq);
#define BUFLEN (UUID_MAX + 5)
ssize_t
-lprocfs_evict_client_seq_write(struct file *file, const char *buffer,
+lprocfs_evict_client_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 = data;
LASSERT(obd != NULL);
- return seq_printf(m, "%u\n", obd->obd_num_exports);
+ seq_printf(m, "%u\n", obd->obd_num_exports);
+ return 0;
}
EXPORT_SYMBOL(lprocfs_num_exports_seq_show);
struct tg_export_data *ted = &exp->exp_target_data;
seq_printf(m, "reply_cnt: %d\n"
- "reply_max: %d\n"
- "reply_released_by_xid: %d\n"
- "reply_released_by_tag: %d\n\n",
+ "reply_max: %d\n"
+ "reply_released_by_xid: %d\n"
+ "reply_released_by_tag: %d\n\n",
ted->ted_reply_cnt,
ted->ted_reply_max,
ted->ted_release_xid,
int lprocfs_nid_stats_clear_seq_show(struct seq_file *m, void *data)
{
- return seq_printf(m, "%s\n", "Write into this file to clear all nid "
- "stats and stale nid entries");
+ seq_puts(m, "Write into this file to clear all nid stats and stale nid entries\n");
+ return 0;
}
EXPORT_SYMBOL(lprocfs_nid_stats_clear_seq_show);
}
ssize_t
-lprocfs_nid_stats_clear_seq_write(struct file *file, const char *buffer,
+lprocfs_nid_stats_clear_seq_write(struct file *file, const char __user *buffer,
size_t count, loff_t *off)
{
struct seq_file *m = file->private_data;
int lprocfs_hash_seq_show(struct seq_file *m, void *data)
{
struct obd_device *obd = m->private;
- int c = 0;
if (obd == NULL)
return 0;
- c += cfs_hash_debug_header(m);
- c += cfs_hash_debug_str(obd->obd_uuid_hash, m);
- c += cfs_hash_debug_str(obd->obd_nid_hash, m);
- c += cfs_hash_debug_str(obd->obd_nid_stats_hash, m);
- return c;
+ cfs_hash_debug_header(m);
+ cfs_hash_debug_str(obd->obd_uuid_hash, m);
+ cfs_hash_debug_str(obd->obd_nid_hash, m);
+ cfs_hash_debug_str(obd->obd_nid_stats_hash, m);
+ return 0;
}
EXPORT_SYMBOL(lprocfs_hash_seq_show);
int lprocfs_recovery_status_seq_show(struct seq_file *m, void *data)
{
struct obd_device *obd = m->private;
+ struct target_distribute_txn_data *tdtd;
LASSERT(obd != NULL);
/* sampled unlocked, but really... */
if (obd->obd_recovering == 0) {
seq_printf(m, "COMPLETE\n");
- seq_printf(m, "recovery_start: %lu\n", obd->obd_recovery_start);
- seq_printf(m, "recovery_duration: %lu\n",
- obd->obd_recovery_end - obd->obd_recovery_start);
+ seq_printf(m, "recovery_start: %lld\n",
+ (s64)obd->obd_recovery_start);
+ seq_printf(m, "recovery_duration: %lld\n",
+ obd->obd_recovery_end ?
+ obd->obd_recovery_end - obd->obd_recovery_start :
+ ktime_get_real_seconds() - obd->obd_recovery_start);
/* Number of clients that have completed recovery */
seq_printf(m, "completed_clients: %d/%d\n",
obd->obd_max_recoverable_clients -
obd->obd_max_recoverable_clients);
seq_printf(m, "replayed_requests: %d\n",
obd->obd_replayed_requests);
- seq_printf(m, "last_transno: "LPD64"\n",
+ seq_printf(m, "last_transno: %lld\n",
obd->obd_next_recovery_transno - 1);
seq_printf(m, "VBR: %s\n", obd->obd_version_recov ?
"ENABLED" : "DISABLED");
goto out;
}
+ tdtd = obd->u.obt.obt_lut->lut_tdtd;
+ if (tdtd && tdtd->tdtd_show_update_logs_retrievers) {
+ char *buf;
+ int size = 0;
+ int count = 0;
+
+ buf = tdtd->tdtd_show_update_logs_retrievers(
+ tdtd->tdtd_show_retrievers_cbdata,
+ &size, &count);
+ if (count > 0) {
+ seq_printf(m, "WAITING\n");
+ seq_printf(m, "non-ready MDTs: %s\n",
+ buf ? buf : "unknown (not enough RAM)");
+ seq_printf(m, "recovery_start: %lld\n",
+ (s64)obd->obd_recovery_start);
+ seq_printf(m, "time_waited: %lld\n",
+ (s64)(ktime_get_real_seconds() -
+ obd->obd_recovery_start));
+ }
+
+ if (buf != NULL)
+ OBD_FREE(buf, size);
+
+ if (likely(count > 0))
+ return 0;
+ }
+
seq_printf(m, "RECOVERING\n");
- seq_printf(m, "recovery_start: %lu\n", obd->obd_recovery_start);
- seq_printf(m, "time_remaining: %lu\n",
- cfs_time_current_sec() >=
+ seq_printf(m, "recovery_start: %lld\n", (s64)obd->obd_recovery_start);
+ seq_printf(m, "time_remaining: %lld\n",
+ ktime_get_real_seconds() >=
obd->obd_recovery_start +
obd->obd_recovery_timeout ? 0 :
- obd->obd_recovery_start +
- obd->obd_recovery_timeout -
- cfs_time_current_sec());
+ (s64)(obd->obd_recovery_start +
+ obd->obd_recovery_timeout -
+ ktime_get_real_seconds()));
seq_printf(m, "connected_clients: %d/%d\n",
atomic_read(&obd->obd_connected_clients),
obd->obd_max_recoverable_clients);
seq_printf(m, "replayed_requests: %d\n", obd->obd_replayed_requests);
seq_printf(m, "queued_requests: %d\n",
obd->obd_requests_queued_for_recovery);
- seq_printf(m, "next_transno: "LPD64"\n",
+ seq_printf(m, "next_transno: %lld\n",
obd->obd_next_recovery_transno);
out:
return 0;
struct obd_device *obd = m->private;
LASSERT(obd != NULL);
- return seq_printf(m, "%d\n", obd->obd_recovery_ir_factor);
+ seq_printf(m, "%d\n", obd->obd_recovery_ir_factor);
+ return 0;
}
EXPORT_SYMBOL(lprocfs_ir_factor_seq_show);
ssize_t
-lprocfs_ir_factor_seq_write(struct file *file, const char *buffer,
+lprocfs_ir_factor_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;
- int val, rc;
+ int rc;
+ __s64 val;
LASSERT(obd != NULL);
- rc = lprocfs_write_helper(buffer, count, &val);
+ rc = lprocfs_str_to_s64(buffer, count, &val);
if (rc)
return rc;
}
EXPORT_SYMBOL(lprocfs_ir_factor_seq_write);
+int lprocfs_checksum_dump_seq_show(struct seq_file *m, void *data)
+{
+ struct obd_device *obd = m->private;
+
+ LASSERT(obd != NULL);
+ seq_printf(m, "%d\n", obd->obd_checksum_dump);
+ return 0;
+}
+EXPORT_SYMBOL(lprocfs_checksum_dump_seq_show);
+
+ssize_t
+lprocfs_checksum_dump_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;
+ int rc;
+ __s64 val;
+
+ LASSERT(obd != NULL);
+ rc = lprocfs_str_to_s64(buffer, count, &val);
+ if (rc)
+ return rc;
+
+ obd->obd_checksum_dump = !!val;
+ return count;
+}
+EXPORT_SYMBOL(lprocfs_checksum_dump_seq_write);
+
int lprocfs_recovery_time_soft_seq_show(struct seq_file *m, void *data)
{
struct obd_device *obd = m->private;
LASSERT(obd != NULL);
- return seq_printf(m, "%d\n", obd->obd_recovery_timeout);
+ seq_printf(m, "%llu\n", obd->obd_recovery_timeout);
+ return 0;
}
EXPORT_SYMBOL(lprocfs_recovery_time_soft_seq_show);
ssize_t
-lprocfs_recovery_time_soft_seq_write(struct file *file, const char *buffer,
- size_t count, loff_t *off)
+lprocfs_recovery_time_soft_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;
- int val, rc;
+ int rc;
+ __s64 val;
LASSERT(obd != NULL);
- rc = lprocfs_write_helper(buffer, count, &val);
+ rc = lprocfs_str_to_s64(buffer, count, &val);
if (rc)
return rc;
+ if (val < 0 || val > INT_MAX)
+ return -ERANGE;
obd->obd_recovery_timeout = val;
return count;
struct obd_device *obd = m->private;
LASSERT(obd != NULL);
- return seq_printf(m, "%u\n", obd->obd_recovery_time_hard);
+ seq_printf(m, "%lld\n", obd->obd_recovery_time_hard);
+ return 0;
}
EXPORT_SYMBOL(lprocfs_recovery_time_hard_seq_show);
ssize_t
-lprocfs_recovery_time_hard_seq_write(struct file *file, const char *buffer,
+lprocfs_recovery_time_hard_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;
- int val, rc;
+ int rc;
+ __s64 val;
LASSERT(obd != NULL);
- rc = lprocfs_write_helper(buffer, count, &val);
+ rc = lprocfs_str_to_s64(buffer, count, &val);
if (rc)
return rc;
+ if (val < 0 || val > INT_MAX)
+ return -ERANGE;
obd->obd_recovery_time_hard = val;
return count;
LASSERT(obd != NULL);
LASSERT(target->obt_magic == OBT_MAGIC);
- return seq_printf(m, "%u\n", obd->u.obt.obt_instance);
+ seq_printf(m, "%u\n", obd->u.obt.obt_instance);
+ return 0;
}
EXPORT_SYMBOL(lprocfs_target_instance_seq_show);
git://git.whamcloud.com / fs / lustre-release.git / blobdiff