*
* 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
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
*
* GPL HEADER END
*/
* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2011, 2014, Intel Corporation.
+ * Copyright (c) 2011, 2015, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
#define DEBUG_SUBSYSTEM S_OSD
#include <lprocfs_status.h>
-#include <lustre/lustre_idl.h>
#include "osd_internal.h"
void osd_brw_stats_update(struct osd_device *osd, struct osd_iobuf *iobuf)
{
struct brw_stats *s = &osd->od_brw_stats;
- unsigned long *last_block = NULL;
+ sector_t *last_block = NULL;
struct page **pages = iobuf->dr_pages;
struct page *last_page = NULL;
unsigned long discont_pages = 0;
unsigned long discont_blocks = 0;
- unsigned long *blocks = iobuf->dr_blocks;
+ sector_t *blocks = iobuf->dr_blocks;
int i, nr_pages = iobuf->dr_npages;
int blocks_per_page;
int rw = iobuf->dr_rw;
if (unlikely(nr_pages == 0))
return;
- blocks_per_page = PAGE_CACHE_SIZE >> osd_sb(osd)->s_blocksize_bits;
+ blocks_per_page = PAGE_SIZE >> osd_sb(osd)->s_blocksize_bits;
lprocfs_oh_tally_log2(&s->hist[BRW_R_PAGES+rw], nr_pages);
lprocfs_oh_tally(&s->hist[BRW_R_DISCONT_BLOCKS+rw], discont_blocks);
}
-#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: %lld.%09ld (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],
- jiffies_to_msecs(1000) / MSEC_PER_SEC);
+ &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 0;
}
-static ssize_t osd_brw_stats_seq_write(struct file *file, const char *buf,
- size_t len, loff_t *off)
+static ssize_t osd_brw_stats_seq_write(struct file *file,
+ const char __user *buf,
+ size_t len, loff_t *off)
{
- struct seq_file *seq = file->private_data;
+ struct seq_file *seq = file->private_data;
struct osd_device *osd = seq->private;
int i;
struct osd_device *osd = osd_dt_dev((struct dt_device *)m->private);
LASSERT(osd != NULL);
- return seq_printf(m, "ldiskfs\n");
+ seq_puts(m, "ldiskfs\n");
+ return 0;
}
LPROC_SEQ_FOPS_RO(ldiskfs_osd_fstype);
if (unlikely(osd->od_mnt == NULL))
return -EINPROGRESS;
- return seq_printf(m, "%s\n", osd->od_mntdev);
+ seq_printf(m, "%s\n", osd->od_mntdev);
+ return 0;
}
LPROC_SEQ_FOPS_RO(ldiskfs_osd_mntdev);
if (unlikely(osd->od_mnt == NULL))
return -EINPROGRESS;
- return seq_printf(m, "%u\n", osd->od_read_cache);
+ seq_printf(m, "%u\n", osd->od_read_cache);
+ return 0;
}
static ssize_t
-ldiskfs_osd_cache_seq_write(struct file *file, const char *buffer,
+ldiskfs_osd_cache_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 seq_file *m = file->private_data;
+ struct dt_device *dt = m->private;
struct osd_device *osd = osd_dt_dev(dt);
- int val, rc;
+ bool val;
+ int rc;
LASSERT(osd != NULL);
if (unlikely(osd->od_mnt == NULL))
return -EINPROGRESS;
- rc = lprocfs_write_helper(buffer, count, &val);
+ rc = kstrtobool_from_user(buffer, count, &val);
if (rc)
return rc;
- osd->od_read_cache = !!val;
+ osd->od_read_cache = val;
return count;
}
LPROC_SEQ_FOPS(ldiskfs_osd_cache);
if (unlikely(osd->od_mnt == NULL))
return -EINPROGRESS;
- return seq_printf(m, "%u\n", osd->od_writethrough_cache);
+ seq_printf(m, "%u\n", osd->od_writethrough_cache);
+ return 0;
}
static ssize_t
-ldiskfs_osd_wcache_seq_write(struct file *file, const char *buffer,
+ldiskfs_osd_wcache_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 seq_file *m = file->private_data;
+ struct dt_device *dt = m->private;
struct osd_device *osd = osd_dt_dev(dt);
- int val, rc;
+ bool val;
+ int rc;
LASSERT(osd != NULL);
if (unlikely(osd->od_mnt == NULL))
return -EINPROGRESS;
- rc = lprocfs_write_helper(buffer, count, &val);
+ rc = kstrtobool_from_user(buffer, count, &val);
if (rc)
return rc;
- osd->od_writethrough_cache = !!val;
+ osd->od_writethrough_cache = val;
return count;
}
LPROC_SEQ_FOPS(ldiskfs_osd_wcache);
static ssize_t
-lprocfs_osd_force_sync_seq_write(struct file *file, const char *buffer,
+lprocfs_osd_force_sync_seq_write(struct file *file, const char __user *buffer,
size_t count, loff_t *off)
{
struct seq_file *m = file->private_data;
return rc == 0 ? count : rc;
}
-LPROC_SEQ_FOPS_WO_TYPE(ldiskfs, osd_force_sync);
+LPROC_SEQ_FOPS_WR_ONLY(ldiskfs, osd_force_sync);
static int ldiskfs_osd_pdo_seq_show(struct seq_file *m, void *data)
{
- return seq_printf(m, "%s\n", ldiskfs_pdo ? "ON" : "OFF");
+ seq_printf(m, "%s\n", ldiskfs_pdo ? "ON" : "OFF");
+ return 0;
}
static ssize_t
-ldiskfs_osd_pdo_seq_write(struct file *file, const char *buffer,
+ldiskfs_osd_pdo_seq_write(struct file *file, const char __user *buffer,
size_t count, loff_t *off)
{
- int pdo, rc;
+ bool pdo;
+ int rc;
- rc = lprocfs_write_helper(buffer, count, &pdo);
- if (rc != 0)
- return rc;
+ rc = kstrtobool_from_user(buffer, count, &pdo);
+ if (rc != 0)
+ return rc;
- ldiskfs_pdo = !!pdo;
+ ldiskfs_pdo = pdo;
- return count;
+ return count;
}
LPROC_SEQ_FOPS(ldiskfs_osd_pdo);
if (unlikely(dev->od_mnt == NULL))
return -EINPROGRESS;
- return seq_printf(m, "%d\n", !dev->od_noscrub);
+ seq_printf(m, "%lld\n", dev->od_auto_scrub_interval);
+ return 0;
}
static ssize_t
-ldiskfs_osd_auto_scrub_seq_write(struct file *file, const char *buffer,
+ldiskfs_osd_auto_scrub_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 seq_file *m = file->private_data;
+ struct dt_device *dt = m->private;
struct osd_device *dev = osd_dt_dev(dt);
- int val, rc;
+ s64 val;
+ int rc;
LASSERT(dev != NULL);
if (unlikely(dev->od_mnt == NULL))
return -EINPROGRESS;
- rc = lprocfs_write_helper(buffer, count, &val);
+ rc = kstrtoll_from_user(buffer, count, 0, &val);
if (rc)
return rc;
- dev->od_noscrub = !val;
+ dev->od_auto_scrub_interval = val;
return count;
}
LPROC_SEQ_FOPS(ldiskfs_osd_auto_scrub);
if (unlikely(dev->od_mnt == NULL))
return -EINPROGRESS;
- return seq_printf(m, LPU64"\n", dev->od_full_scrub_ratio);
+ seq_printf(m, "%llu\n", dev->od_full_scrub_ratio);
+ return 0;
}
static ssize_t
-ldiskfs_osd_full_scrub_ratio_seq_write(struct file *file, const char *buffer,
+ldiskfs_osd_full_scrub_ratio_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 seq_file *m = file->private_data;
+ struct dt_device *dt = m->private;
struct osd_device *dev = osd_dt_dev(dt);
- int val, rc;
+ s64 val;
+ int rc;
LASSERT(dev != NULL);
if (unlikely(dev->od_mnt == NULL))
return -EINPROGRESS;
- rc = lprocfs_write_helper(buffer, count, &val);
+ rc = kstrtoll_from_user(buffer, count, 0, &val);
if (rc != 0)
return rc;
if (unlikely(dev->od_mnt == NULL))
return -EINPROGRESS;
- return seq_printf(m, LPU64" (bad OI mappings/minute)\n",
- dev->od_full_scrub_threshold_rate);
+ seq_printf(m, "%llu (bad OI mappings/minute)\n",
+ dev->od_full_scrub_threshold_rate);
+ return 0;
}
static ssize_t
ldiskfs_osd_full_scrub_threshold_rate_seq_write(struct file *file,
- const char *buffer,
+ const char __user *buffer,
size_t count, loff_t *off)
{
- struct seq_file *m = file->private_data;
- struct dt_device *dt = m->private;
+ struct seq_file *m = file->private_data;
+ struct dt_device *dt = m->private;
struct osd_device *dev = osd_dt_dev(dt);
- int val, rc;
+ u64 val;
+ int rc;
LASSERT(dev != NULL);
if (unlikely(dev->od_mnt == NULL))
return -EINPROGRESS;
- rc = lprocfs_write_helper(buffer, count, &val);
+ rc = kstrtoull_from_user(buffer, count, 0, &val);
if (rc != 0)
return rc;
- if (val < 0)
- return -EINVAL;
-
dev->od_full_scrub_threshold_rate = val;
return count;
}
static int
ldiskfs_osd_track_declares_assert_seq_show(struct seq_file *m, void *data)
{
- return seq_printf(m, "%d\n", ldiskfs_track_declares_assert);
+ seq_printf(m, "%d\n", ldiskfs_track_declares_assert);
+ return 0;
}
static ssize_t
ldiskfs_osd_track_declares_assert_seq_write(struct file *file,
- const char *buffer,
+ const char __user *buffer,
size_t count, loff_t *off)
{
- int track_declares_assert;
- int rc;
+ bool track_declares_assert;
+ int rc;
- rc = lprocfs_write_helper(buffer, count, &track_declares_assert);
- if (rc != 0)
+ rc = kstrtobool_from_user(buffer, count, &track_declares_assert);
+ if (rc)
return rc;
- ldiskfs_track_declares_assert = !!track_declares_assert;
+ ldiskfs_track_declares_assert = track_declares_assert;
return count;
}
if (unlikely(dev->od_mnt == NULL))
return -EINPROGRESS;
- return osd_scrub_dump(m, dev);
+ osd_scrub_dump(m, dev);
+ return 0;
}
LPROC_SEQ_FOPS_RO(ldiskfs_osd_oi_scrub);
if (unlikely(osd->od_mnt == NULL))
return -EINPROGRESS;
- return seq_printf(m, LPU64"\n", osd->od_readcache_max_filesize);
+ seq_printf(m, "%llu\n", osd->od_readcache_max_filesize);
+ return 0;
}
static ssize_t
-ldiskfs_osd_readcache_seq_write(struct file *file, const char *buffer,
+ldiskfs_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 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;
+ int rc;
LASSERT(osd != NULL);
if (unlikely(osd->od_mnt == NULL))
return -EINPROGRESS;
- rc = lprocfs_write_u64_helper(buffer, count, &val);
+ rc = lprocfs_str_with_units_to_s64(buffer, count, &val, '1');
if (rc)
return rc;
+ if (val < 0)
+ return -ERANGE;
osd->od_readcache_max_filesize = val > OSD_MAX_CACHE_SIZE ?
OSD_MAX_CACHE_SIZE : val;
}
LPROC_SEQ_FOPS(ldiskfs_osd_readcache);
-static int ldiskfs_osd_lma_self_repair_seq_show(struct seq_file *m, void *data)
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 52, 0)
+static int ldiskfs_osd_index_in_idif_seq_show(struct seq_file *m, void *data)
{
struct osd_device *dev = osd_dt_dev((struct dt_device *)m->private);
if (unlikely(dev->od_mnt == NULL))
return -EINPROGRESS;
- return seq_printf(m, "%d\n", !!dev->od_lma_self_repair);
+ seq_printf(m, "%d\n", (int)(dev->od_index_in_idif));
+ return 0;
}
static ssize_t
-ldiskfs_osd_lma_self_repair_seq_write(struct file *file, const char *buffer,
- size_t count, loff_t *off)
+ldiskfs_osd_index_in_idif_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 lu_env env;
+ struct seq_file *m = file->private_data;
+ struct dt_device *dt = m->private;
struct osd_device *dev = osd_dt_dev(dt);
- int val;
- int rc;
+ struct lu_target *tgt;
+ bool val;
+ int rc;
+
+ LASSERT(dev != NULL);
+ if (unlikely(dev->od_mnt == NULL))
+ return -EINPROGRESS;
+
+ rc = kstrtobool_from_user(buffer, count, &val);
+ if (rc != 0)
+ return rc;
+
+ if (dev->od_index_in_idif) {
+ if (val)
+ return count;
+
+ LCONSOLE_WARN("%s: OST-index in IDIF has been enabled, "
+ "it cannot be reverted back.\n", osd_name(dev));
+ return -EPERM;
+ }
+
+ if (!val)
+ return count;
+
+ rc = lu_env_init(&env, LCT_DT_THREAD);
+ if (rc != 0)
+ return rc;
+
+ tgt = dev->od_dt_dev.dd_lu_dev.ld_site->ls_tgt;
+ tgt->lut_lsd.lsd_feature_rocompat |= OBD_ROCOMPAT_IDX_IN_IDIF;
+ rc = tgt_server_data_update(&env, tgt, 1);
+ lu_env_fini(&env);
+ if (rc < 0)
+ return rc;
+
+ LCONSOLE_INFO("%s: enable OST-index in IDIF successfully, "
+ "it cannot be reverted back.\n", osd_name(dev));
+
+ dev->od_index_in_idif = 1;
+ return count;
+}
+LPROC_SEQ_FOPS(ldiskfs_osd_index_in_idif);
+
+int osd_register_proc_index_in_idif(struct osd_device *osd)
+{
+ struct proc_dir_entry *proc;
+
+ proc = proc_create_data("index_in_idif", 0, osd->od_proc_entry,
+ &ldiskfs_osd_index_in_idif_fops,
+ &osd->od_dt_dev);
+ if (proc == NULL)
+ return -ENOMEM;
+
+ return 0;
+}
+#endif
+
+static int ldiskfs_osd_index_backup_seq_show(struct seq_file *m, void *data)
+{
+ struct osd_device *dev = osd_dt_dev((struct dt_device *)m->private);
+
+ LASSERT(dev != NULL);
+ if (unlikely(dev->od_mnt == NULL))
+ return -EINPROGRESS;
+
+ seq_printf(m, "%d\n", dev->od_index_backup_policy);
+ return 0;
+}
+
+static ssize_t ldiskfs_osd_index_backup_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 *dev = osd_dt_dev(dt);
+ int val;
+ int rc;
LASSERT(dev != NULL);
if (unlikely(dev->od_mnt == NULL))
return -EINPROGRESS;
- rc = lprocfs_write_helper(buffer, count, &val);
+ rc = kstrtoint_from_user(buffer, count, 0, &val);
if (rc)
return rc;
- dev->od_lma_self_repair = !!val;
+ dev->od_index_backup_policy = val;
return count;
}
-LPROC_SEQ_FOPS(ldiskfs_osd_lma_self_repair);
+LPROC_SEQ_FOPS(ldiskfs_osd_index_backup);
LPROC_SEQ_FOPS_RO_TYPE(ldiskfs, dt_blksize);
LPROC_SEQ_FOPS_RO_TYPE(ldiskfs, dt_kbytestotal);
.fops = &ldiskfs_osd_wcache_fops },
{ .name = "readcache_max_filesize",
.fops = &ldiskfs_osd_readcache_fops },
- { .name = "lma_self_repair",
- .fops = &ldiskfs_osd_lma_self_repair_fops },
+ { .name = "index_backup",
+ .fops = &ldiskfs_osd_index_backup_fops },
{ NULL }
};
git://git.whamcloud.com / fs / lustre-release.git / blobdiff