val *= 1 << (20 - PAGE_SHIFT); /* convert to pages */
- if (val > ((totalram_pages / 10) * 9)) {
+ if (val > ((cfs_totalram_pages() / 10) * 9)) {
/* Somebody wants to assign too much memory to dirty pages */
return -EINVAL;
}
size_t len = 0;
int i;
- if (libcfs_catastrophe) {
- len = sprintf(buf, "LBUG\n");
- healthy = false;
- }
+ if (libcfs_catastrophe)
+ return sprintf(buf, "LBUG\n");
read_lock(&obd_dev_lock);
for (i = 0; i < class_devno_max(); i++) {
if (obd->obd_stopping)
continue;
- class_incref(obd, __FUNCTION__, current);
+ class_incref(obd, __func__, current);
read_unlock(&obd_dev_lock);
- if (obd_health_check(NULL, obd)) {
- len = sprintf(buf, "device %s reported unhealthy\n",
- obd->obd_name);
+ if (obd_health_check(NULL, obd))
healthy = false;
- }
- class_decref(obd, __FUNCTION__, current);
+
+ class_decref(obd, __func__, current);
read_lock(&obd_dev_lock);
+
+ if (!healthy)
+ break;
}
read_unlock(&obd_dev_lock);
return count;
}
+static ssize_t jobid_this_session_show(struct kobject *kobj,
+ struct attribute *attr,
+ char *buf)
+{
+ char *jid;
+ int ret = -ENOENT;
+
+ rcu_read_lock();
+ jid = jobid_current();
+ if (jid)
+ ret = snprintf(buf, PAGE_SIZE, "%s\n", jid);
+ rcu_read_unlock();
+ return ret;
+}
+
+static ssize_t jobid_this_session_store(struct kobject *kobj,
+ struct attribute *attr,
+ const char *buffer,
+ size_t count)
+{
+ char *jobid;
+ int len;
+ int ret;
+
+ if (!count || count > LUSTRE_JOBID_SIZE)
+ return -EINVAL;
+
+ jobid = kstrndup(buffer, count, GFP_KERNEL);
+ if (!jobid)
+ return -ENOMEM;
+ len = strcspn(jobid, "\n ");
+ jobid[len] = '\0';
+ ret = jobid_set_current(jobid);
+ kfree(jobid);
+
+ return ret ?: count;
+}
+
/* Root for /sys/kernel/debug/lustre */
struct dentry *debugfs_lustre_root;
EXPORT_SYMBOL_GPL(debugfs_lustre_root);
#ifdef CONFIG_PROC_FS
/* Root for /proc/fs/lustre */
-struct proc_dir_entry *proc_lustre_root = NULL;
+struct proc_dir_entry *proc_lustre_root;
EXPORT_SYMBOL(proc_lustre_root);
#else
#define lprocfs_base NULL
LUSTRE_RO_ATTR(health_check);
LUSTRE_RW_ATTR(jobid_var);
LUSTRE_RW_ATTR(jobid_name);
+LUSTRE_RW_ATTR(jobid_this_session);
static struct attribute *lustre_attrs[] = {
&lustre_attr_version.attr,
&lustre_attr_health_check.attr,
&lustre_attr_jobid_name.attr,
&lustre_attr_jobid_var.attr,
+ &lustre_attr_jobid_this_session.attr,
&lustre_sattr_timeout.u.attr,
&lustre_attr_max_dirty_mb.attr,
&lustre_sattr_debug_peer_on_timeout.u.attr,
static void *obd_device_list_seq_start(struct seq_file *p, loff_t *pos)
{
- if (*pos >= class_devno_max())
- return NULL;
+ if (*pos >= class_devno_max())
+ return NULL;
- return pos;
+ return pos;
}
static void obd_device_list_seq_stop(struct seq_file *p, void *v)
static void *obd_device_list_seq_next(struct seq_file *p, void *v, loff_t *pos)
{
- ++*pos;
- if (*pos >= class_devno_max())
- return NULL;
+ ++*pos;
+ if (*pos >= class_devno_max())
+ return NULL;
- return pos;
+ return pos;
}
static int obd_device_list_seq_show(struct seq_file *p, void *v)
{
- loff_t index = *(loff_t *)v;
- struct obd_device *obd = class_num2obd((int)index);
- char *status;
-
- if (obd == NULL)
- return 0;
-
- LASSERT(obd->obd_magic == OBD_DEVICE_MAGIC);
- if (obd->obd_stopping)
- status = "ST";
- else if (obd->obd_inactive)
- status = "IN";
- else if (obd->obd_set_up)
- status = "UP";
- else if (obd->obd_attached)
- status = "AT";
- else
- status = "--";
+ loff_t index = *(loff_t *)v;
+ struct obd_device *obd = class_num2obd((int)index);
+ char *status;
+
+ if (obd == NULL)
+ return 0;
+
+ LASSERT(obd->obd_magic == OBD_DEVICE_MAGIC);
+ if (obd->obd_stopping)
+ status = "ST";
+ else if (obd->obd_inactive)
+ status = "IN";
+ else if (obd->obd_set_up)
+ status = "UP";
+ else if (obd->obd_attached)
+ status = "AT";
+ else
+ status = "--";
seq_printf(p, "%3d %s %s %s %s %d\n",
(int)index, status, obd->obd_type->typ_name,
}
static const struct seq_operations obd_device_list_sops = {
- .start = obd_device_list_seq_start,
- .stop = obd_device_list_seq_stop,
- .next = obd_device_list_seq_next,
- .show = obd_device_list_seq_show,
+ .start = obd_device_list_seq_start,
+ .stop = obd_device_list_seq_stop,
+ .next = obd_device_list_seq_next,
+ .show = obd_device_list_seq_show,
};
static int obd_device_list_open(struct inode *inode, struct file *file)
}
static const struct file_operations obd_device_list_fops = {
- .owner = THIS_MODULE,
- .open = obd_device_list_open,
- .read = seq_read,
- .llseek = seq_lseek,
- .release = seq_release,
+ .owner = THIS_MODULE,
+ .open = obd_device_list_open,
+ .read = seq_read,
+ .llseek = seq_lseek,
+ .release = seq_release,
};
+static int
+health_check_seq_show(struct seq_file *m, void *unused)
+{
+ int i;
+
+ read_lock(&obd_dev_lock);
+ for (i = 0; i < class_devno_max(); i++) {
+ struct obd_device *obd;
+
+ obd = class_num2obd(i);
+ if (obd == NULL || !obd->obd_attached || !obd->obd_set_up)
+ continue;
+
+ LASSERT(obd->obd_magic == OBD_DEVICE_MAGIC);
+ if (obd->obd_stopping)
+ continue;
+
+ class_incref(obd, __func__, current);
+ read_unlock(&obd_dev_lock);
+
+ if (obd_health_check(NULL, obd)) {
+ seq_printf(m, "device %s reported unhealthy\n",
+ obd->obd_name);
+ }
+ class_decref(obd, __func__, current);
+ read_lock(&obd_dev_lock);
+ }
+ read_unlock(&obd_dev_lock);
+
+ return 0;
+}
+
+LDEBUGFS_SEQ_FOPS_RO(health_check);
+
struct kset *lustre_kset;
EXPORT_SYMBOL_GPL(lustre_kset);
struct proc_dir_entry *entry;
struct dentry *file;
int rc = -ENOMEM;
+
ENTRY;
lustre_kset = kset_create_and_add("lustre", NULL, fs_kobj);
goto out;
}
+ file = debugfs_create_file("health_check", 0444, debugfs_lustre_root,
+ NULL, &health_check_fops);
+ if (IS_ERR_OR_NULL(file)) {
+ rc = file ? PTR_ERR(file) : -ENOMEM;
+ debugfs_remove_recursive(debugfs_lustre_root);
+ kset_unregister(lustre_kset);
+ goto out;
+ }
+
entry = lprocfs_register("fs/lustre", NULL, NULL, NULL);
if (IS_ERR(entry)) {
rc = PTR_ERR(entry);