* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2012, 2016, Intel Corporation.
+ * Copyright (c) 2012, 2017, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
#include <obd.h>
#include <obd_class.h>
#include <lprocfs_status.h>
-#include <lustre/lustre_idl.h>
+#include <lustre_scrub.h>
#include "osd_internal.h"
#ifdef CONFIG_PROC_FS
-#define pct(a, b) (b ? a * 100 / b : 0)
-
static void display_brw_stats(struct seq_file *seq, char *name, char *units,
struct obd_histogram *read,
struct obd_histogram *write, int scale)
else
seq_printf(seq, "%uM", scale << (i-20));
- seq_printf(seq, ":\t\t%10lu %3lu %3lu | %4lu %3lu %3lu\n",
+ seq_printf(seq, ":\t\t%10lu %3u %3u | %4lu %3u %3u\n",
r, pct(r, read_tot), pct(read_cum, read_tot),
w, pct(w, write_tot), pct(write_cum, write_tot));
static void brw_stats_show(struct seq_file *seq, struct brw_stats *brw_stats)
{
- struct timeval now;
+ struct timespec64 now;
/* this sampling races with updates */
- do_gettimeofday(&now);
- seq_printf(seq, "snapshot_time: %lu.%lu (secs.usecs)\n",
- now.tv_sec, now.tv_usec);
+ ktime_get_real_ts64(&now);
+ seq_printf(seq, "snapshot_time: %llu.%09lu (secs.nsecs)\n",
+ (s64)now.tv_sec, now.tv_nsec);
display_brw_stats(seq, "pages per bulk r/w", "rpcs",
&brw_stats->hist[BRW_R_PAGES],
display_brw_stats(seq, "I/O time (1/1000s)", "ios",
&brw_stats->hist[BRW_R_IO_TIME],
- &brw_stats->hist[BRW_W_IO_TIME], 1000 / HZ);
+ &brw_stats->hist[BRW_W_IO_TIME], 1);
display_brw_stats(seq, "disk I/O size", "ios",
&brw_stats->hist[BRW_R_DISK_IOSIZE],
&brw_stats->hist[BRW_W_DISK_IOSIZE], 1);
}
-#undef pct
-
static int osd_brw_stats_seq_show(struct seq_file *seq, void *v)
{
struct osd_device *osd = seq->private;
RETURN(result);
}
-static int zfs_osd_fstype_seq_show(struct seq_file *m, void *data)
+static int zfs_osd_oi_scrub_seq_show(struct seq_file *m, void *data)
{
- seq_puts(m, "zfs\n");
+ struct osd_device *dev = osd_dt_dev((struct dt_device *)m->private);
+
+ LASSERT(dev != NULL);
+ if (!dev->od_os)
+ return -EINPROGRESS;
+
+ scrub_dump(m, &dev->od_scrub);
return 0;
}
-LPROC_SEQ_FOPS_RO(zfs_osd_fstype);
+LDEBUGFS_SEQ_FOPS_RO(zfs_osd_oi_scrub);
-static int zfs_osd_mntdev_seq_show(struct seq_file *m, void *data)
+static ssize_t auto_scrub_show(struct kobject *kobj, struct attribute *attr,
+ char *buf)
{
- struct osd_device *osd = osd_dt_dev((struct dt_device *)m->private);
+ struct dt_device *dt = container_of(kobj, struct dt_device,
+ dd_kobj);
+ struct osd_device *dev = osd_dt_dev(dt);
- LASSERT(osd != NULL);
- seq_printf(m, "%s\n", osd->od_mntdev);
- return 0;
+ LASSERT(dev);
+ if (!dev->od_os)
+ return -EINPROGRESS;
+
+ return sprintf(buf, "%lld\n", dev->od_auto_scrub_interval);
}
-LPROC_SEQ_FOPS_RO(zfs_osd_mntdev);
-static ssize_t
-lprocfs_osd_force_sync_seq_write(struct file *file, const char __user *buffer,
- size_t count, loff_t *off)
+static ssize_t auto_scrub_store(struct kobject *kobj, struct attribute *attr,
+ const char *buffer, size_t count)
{
- struct seq_file *m = file->private_data;
- struct dt_device *dt = m->private;
- struct lu_env env;
+ struct dt_device *dt = container_of(kobj, struct dt_device,
+ dd_kobj);
+ struct osd_device *dev = osd_dt_dev(dt);
+ s64 val;
+ int rc;
+
+ LASSERT(dev);
+ if (!dev->od_os)
+ return -EINPROGRESS;
+
+ rc = kstrtoull(buffer, 0, &val);
+ if (rc)
+ return rc;
+
+ dev->od_auto_scrub_interval = val;
+ return count;
+}
+LUSTRE_RW_ATTR(auto_scrub);
+
+static ssize_t fstype_show(struct kobject *kobj, struct attribute *attr,
+ char *buf)
+{
+ return sprintf(buf, "zfs\n");
+}
+LUSTRE_RO_ATTR(fstype);
+
+static ssize_t mntdev_show(struct kobject *kobj, struct attribute *attr,
+ char *buf)
+{
+ struct dt_device *dt = container_of(kobj, struct dt_device,
+ dd_kobj);
+ struct osd_device *osd = osd_dt_dev(dt);
+
+ LASSERT(osd);
+
+ return sprintf(buf, "%s\n", osd->od_mntdev);
+}
+LUSTRE_RO_ATTR(mntdev);
+
+ssize_t force_sync_store(struct kobject *kobj, struct attribute *attr,
+ const char *buffer, size_t count)
+{
+ struct dt_device *dt = container_of(kobj, struct dt_device,
+ dd_kobj);
+ struct lu_env env;
int rc;
rc = lu_env_init(&env, LCT_LOCAL);
if (rc)
return rc;
+
rc = dt_sync(&env, dt);
lu_env_fini(&env);
return rc == 0 ? count : rc;
}
-LPROC_SEQ_FOPS_WO_TYPE(zfs, osd_force_sync);
+LUSTRE_WO_ATTR(force_sync);
-static int zfs_osd_iused_est_seq_show(struct seq_file *m, void *data)
+static ssize_t nonrotational_show(struct kobject *kobj, struct attribute *attr,
+ char *buf)
+{
+ struct dt_device *dt = container_of(kobj, struct dt_device,
+ dd_kobj);
+ struct osd_device *osd = osd_dt_dev(dt);
+
+ LASSERT(osd);
+ if (!osd->od_os)
+ return -EINPROGRESS;
+
+ return sprintf(buf, "%u\n", osd->od_nonrotational);
+}
+
+static ssize_t nonrotational_store(struct kobject *kobj,
+ struct attribute *attr, const char *buffer,
+ size_t count)
+{
+ struct dt_device *dt = container_of(kobj, struct dt_device,
+ dd_kobj);
+ struct osd_device *osd = osd_dt_dev(dt);
+ bool val;
+ int rc;
+
+ LASSERT(osd);
+ if (!osd->od_os)
+ return -EINPROGRESS;
+
+ rc = kstrtobool(buffer, &val);
+ if (rc)
+ return rc;
+
+ osd->od_nonrotational = val;
+ return count;
+}
+LUSTRE_RW_ATTR(nonrotational);
+
+static ssize_t index_backup_show(struct kobject *kobj, struct attribute *attr,
+ char *buf)
+{
+ struct dt_device *dt = container_of(kobj, struct dt_device,
+ dd_kobj);
+ struct osd_device *dev = osd_dt_dev(dt);
+
+ LASSERT(dev);
+ if (!dev->od_os)
+ return -EINPROGRESS;
+
+ return sprintf(buf, "%d\n", dev->od_index_backup_policy);
+}
+
+ssize_t index_backup_store(struct kobject *kobj, struct attribute *attr,
+ const char *buffer, size_t count)
+{
+ struct dt_device *dt = container_of(kobj, struct dt_device,
+ dd_kobj);
+ struct osd_device *dev = osd_dt_dev(dt);
+ int val;
+ int rc;
+
+ LASSERT(dev);
+ if (!dev->od_os)
+ return -EINPROGRESS;
+
+ rc = kstrtoint(buffer, 0, &val);
+ if (rc)
+ return rc;
+
+ dev->od_index_backup_policy = val;
+ return count;
+}
+LUSTRE_RW_ATTR(index_backup);
+
+static int zfs_osd_readcache_seq_show(struct seq_file *m, void *data)
{
struct osd_device *osd = osd_dt_dev((struct dt_device *)m->private);
+
LASSERT(osd != NULL);
+ if (unlikely(osd->od_os == NULL))
+ return -EINPROGRESS;
- seq_printf(m, "%d\n", osd->od_quota_iused_est);
+ seq_printf(m, "%llu\n", osd->od_readcache_max_filesize);
return 0;
}
static ssize_t
-zfs_osd_iused_est_seq_write(struct file *file, const char __user *buffer,
- size_t count, loff_t *off)
+zfs_osd_readcache_seq_write(struct file *file, const char __user *buffer,
+ size_t count, loff_t *off)
{
struct seq_file *m = file->private_data;
struct dt_device *dt = m->private;
struct osd_device *osd = osd_dt_dev(dt);
+ u64 val;
int rc;
- __s64 val;
LASSERT(osd != NULL);
+ if (unlikely(osd->od_os == NULL))
+ return -EINPROGRESS;
- rc = lprocfs_str_to_s64(buffer, count, &val);
+ rc = lprocfs_str_with_units_to_u64(buffer, count, &val, '1');
if (rc)
return rc;
- osd->od_quota_iused_est = !!val;
-
+ osd->od_readcache_max_filesize = val > OSD_MAX_CACHE_SIZE ?
+ OSD_MAX_CACHE_SIZE : val;
return count;
}
-LPROC_SEQ_FOPS(zfs_osd_iused_est);
-
-LPROC_SEQ_FOPS_RO_TYPE(zfs, dt_blksize);
-LPROC_SEQ_FOPS_RO_TYPE(zfs, dt_kbytestotal);
-LPROC_SEQ_FOPS_RO_TYPE(zfs, dt_kbytesfree);
-LPROC_SEQ_FOPS_RO_TYPE(zfs, dt_kbytesavail);
-LPROC_SEQ_FOPS_RO_TYPE(zfs, dt_filestotal);
-LPROC_SEQ_FOPS_RO_TYPE(zfs, dt_filesfree);
+LDEBUGFS_SEQ_FOPS(zfs_osd_readcache);
+
+static struct attribute *zfs_attrs[] = {
+ &lustre_attr_fstype.attr,
+ &lustre_attr_mntdev.attr,
+ &lustre_attr_force_sync.attr,
+ &lustre_attr_nonrotational.attr,
+ &lustre_attr_index_backup.attr,
+ &lustre_attr_auto_scrub.attr,
+ NULL,
+};
struct lprocfs_vars lprocfs_osd_obd_vars[] = {
- { .name = "blocksize",
- .fops = &zfs_dt_blksize_fops },
- { .name = "kbytestotal",
- .fops = &zfs_dt_kbytestotal_fops },
- { .name = "kbytesfree",
- .fops = &zfs_dt_kbytesfree_fops },
- { .name = "kbytesavail",
- .fops = &zfs_dt_kbytesavail_fops },
- { .name = "filestotal",
- .fops = &zfs_dt_filestotal_fops },
- { .name = "filesfree",
- .fops = &zfs_dt_filesfree_fops },
- { .name = "fstype",
- .fops = &zfs_osd_fstype_fops },
- { .name = "mntdev",
- .fops = &zfs_osd_mntdev_fops },
- { .name = "force_sync",
- .fops = &zfs_osd_force_sync_fops },
- { .name = "quota_iused_estimate",
- .fops = &zfs_osd_iused_est_fops },
+ { .name = "oi_scrub",
+ .fops = &zfs_osd_oi_scrub_fops },
+ { .name = "readcache_max_filesize",
+ .fops = &zfs_osd_readcache_fops },
{ 0 }
};
int osd_procfs_init(struct osd_device *osd, const char *name)
{
struct obd_type *type;
- int rc;
- ENTRY;
+ int rc;
- if (osd->od_proc_entry)
- RETURN(0);
+ ENTRY;
/* at the moment there is no linkage between lu_type
- * and obd_type, so we lookup obd_type this way */
+ * and obd_type, so we lookup obd_type this way
+ */
type = class_search_type(LUSTRE_OSD_ZFS_NAME);
- LASSERT(name != NULL);
- LASSERT(type != NULL);
+ LASSERT(type);
+ LASSERT(name);
+
+ /* put reference taken by class_search_type */
+ kobject_put(&type->typ_kobj);
+
+ osd->od_dt_dev.dd_ktype.default_attrs = zfs_attrs;
+ rc = dt_tunables_init(&osd->od_dt_dev, type, name,
+ lprocfs_osd_obd_vars);
+ if (rc) {
+ CERROR("%s: cannot setup sysfs / debugfs entry: %d\n",
+ name, rc);
+ GOTO(out, rc);
+ }
+
+ if (osd->od_proc_entry)
+ RETURN(0);
osd->od_proc_entry = lprocfs_register(name, type->typ_procroot,
- lprocfs_osd_obd_vars,
- &osd->od_dt_dev);
+ NULL, &osd->od_dt_dev);
if (IS_ERR(osd->od_proc_entry)) {
rc = PTR_ERR(osd->od_proc_entry);
CERROR("Error %d setting up lprocfs for %s\n", rc, name);
osd->od_proc_entry = NULL;
}
- RETURN(0);
+ return dt_tunables_fini(&osd->od_dt_dev);
}
#endif
git://git.whamcloud.com / fs / lustre-release.git / blobdiff