-/*
- * GPL HEADER START
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 only,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License version 2 for more details (a copy is included
- * in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU General Public License
- * version 2 along with this program; If not, see
- * http://www.gnu.org/licenses/gpl-2.0.html
- *
- * GPL HEADER END
- */
+// SPDX-License-Identifier: GPL-2.0
+
/*
* Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
* Copyright (c) 2011, 2017, Intel Corporation.
*/
+
/*
* This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
*/
+
#define DEBUG_SUBSYSTEM S_CLASS
#include <linux/version.h>
{
struct obd_device *obd = container_of(kobj, struct obd_device,
obd_kset.kobj);
+ struct obd_import *imp, *imp0;
bool val;
int rc;
if (rc)
return rc;
+ with_imp_locked(obd, imp0, rc)
+ imp = class_import_get(imp0);
+ if (rc)
+ return rc;
/* opposite senses */
- if (obd->u.cli.cl_import->imp_deactive == val)
- rc = ptlrpc_set_import_active(obd->u.cli.cl_import, val);
+ if (imp->imp_deactive == val)
+ rc = ptlrpc_set_import_active(imp, val);
else
CDEBUG(D_CONFIG, "activate %u: ignoring repeat request\n",
(unsigned int)val);
+ class_import_put(imp);
- return count;
+ return rc ?: count;
}
LUSTRE_RW_ATTR(active);
struct obd_device *obd = container_of(kobj, struct obd_device,
obd_kset.kobj);
struct client_obd *cli = &obd->u.cli;
- unsigned long pages_number, max_dirty_mb;
+ u64 pages_number;
int rc;
- rc = kstrtoul(buffer, 10, &max_dirty_mb);
- if (rc)
+ rc = sysfs_memparse(buffer, count, &pages_number, "MiB");
+ if (rc < 0)
return rc;
- pages_number = MiB_TO_PAGES(max_dirty_mb);
-
+ pages_number = round_up(pages_number, 1024 * 1024) >> PAGE_SHIFT;
if (pages_number >= MiB_TO_PAGES(OSC_MAX_DIRTY_MB_MAX) ||
pages_number > cfs_totalram_pages() / 4) /* 1/4 of RAM */
return -ERANGE;
LUSTRE_ATTR(ost_conn_uuid, 0444, conn_uuid_show, NULL);
LUSTRE_RO_ATTR(conn_uuid);
+LUSTRE_RW_ATTR(pinger_recov);
LUSTRE_RW_ATTR(ping);
static int osc_cached_mb_seq_show(struct seq_file *m, void *v)
seq_printf(m, "used_mb: %ld\n"
"busy_cnt: %ld\n"
+ "unevict_cnt: %ld\n"
"reclaim: %llu\n",
(atomic_long_read(&cli->cl_lru_in_list) +
atomic_long_read(&cli->cl_lru_busy)) >> shift,
- atomic_long_read(&cli->cl_lru_busy),
+ atomic_long_read(&cli->cl_lru_busy),
+ atomic_long_read(&cli->cl_unevict_lru_in_list),
cli->cl_lru_reclaim);
return 0;
return count;
}
-LPROC_SEQ_FOPS(osc_cached_mb);
+LDEBUGFS_SEQ_FOPS(osc_cached_mb);
+
+static ssize_t osc_unevict_cached_mb_show(struct kobject *kobj,
+ struct attribute *attr,
+ char *buf)
+{
+ struct obd_device *obd = container_of(kobj, struct obd_device,
+ obd_kset.kobj);
+ struct client_obd *cli = &obd->u.cli;
+ int shift = 20 - PAGE_SHIFT;
+
+ return scnprintf(buf, PAGE_SIZE, "%ld\n",
+ atomic_long_read(&cli->cl_unevict_lru_in_list) >> shift);
+}
+
+static ssize_t osc_unevict_cached_mb_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 client_obd *cli = &obd->u.cli;
+
+ if (count == 5 && strncmp(buffer, "clear", 5) == 0) {
+ struct lu_env *env;
+ u16 refcheck;
+
+ env = cl_env_get(&refcheck);
+ if (!IS_ERR(env)) {
+ (void)osc_unevict_cache_shrink(env, cli);
+ /*
+ * Scan the LRU list, discard the LRU pages or move
+ * the unevictable/mlock()ed pages into the unevictable
+ * list.
+ */
+ (void)osc_lru_shrink(env, cli,
+ atomic_long_read(&cli->cl_lru_in_list), true);
+ cl_env_put(env, &refcheck);
+ }
+ return count;
+ }
+
+ return -EINVAL;
+}
+LUSTRE_RW_ATTR(osc_unevict_cached_mb);
static ssize_t cur_dirty_bytes_show(struct kobject *kobj,
struct attribute *attr,
}
LUSTRE_RO_ATTR(cur_dirty_bytes);
-static int osc_cur_grant_bytes_seq_show(struct seq_file *m, void *v)
+static ssize_t cur_grant_bytes_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 client_obd *cli = &obd->u.cli;
- seq_printf(m, "%lu\n", cli->cl_avail_grant);
- return 0;
+ return scnprintf(buf, PAGE_SIZE, "%lu\n", cli->cl_avail_grant);
}
-static ssize_t osc_cur_grant_bytes_seq_write(struct file *file,
- const char __user *buffer,
- size_t count, loff_t *off)
+static ssize_t cur_grant_bytes_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 client_obd *cli = &obd->u.cli;
struct obd_import *imp;
- char kernbuf[22] = "";
u64 val;
int rc;
- if (obd == NULL)
- return 0;
-
- if (count >= sizeof(kernbuf))
- return -EINVAL;
-
- if (copy_from_user(kernbuf, buffer, count))
- return -EFAULT;
- kernbuf[count] = 0;
-
- rc = sysfs_memparse(kernbuf, count, &val, "MiB");
+ rc = sysfs_memparse(buffer, count, &val, "MiB");
if (rc < 0)
return rc;
return rc ? rc : count;
}
-LPROC_SEQ_FOPS(osc_cur_grant_bytes);
+LUSTRE_RW_ATTR(cur_grant_bytes);
static ssize_t cur_lost_grant_bytes_show(struct kobject *kobj,
struct attribute *attr,
}
LUSTRE_RW_ATTR(grant_shrink_interval);
+static ssize_t enable_page_cache_shrink_show(struct kobject *kobj,
+ struct attribute *attr,
+ char *buf)
+{
+ return scnprintf(buf, PAGE_SIZE, "%d\n", osc_page_cache_shrink_enabled);
+}
+
+static ssize_t enable_page_cache_shrink_store(struct kobject *kobj,
+ struct attribute *attr,
+ const char *buffer,
+ size_t count)
+{
+ bool val;
+ int rc;
+
+ rc = kstrtobool(buffer, &val);
+ if (rc)
+ return rc;
+
+ osc_page_cache_shrink_enabled = val;
+ return count;
+}
+LUSTRE_RW_ATTR(enable_page_cache_shrink);
+
static ssize_t checksums_show(struct kobject *kobj,
struct attribute *attr,
char *buf)
struct obd_device *obd = container_of(kobj, struct obd_device,
obd_kset.kobj);
- return sprintf(buf, "%d\n", obd->u.cli.cl_checksum ? 1 : 0);
+ return scnprintf(buf, PAGE_SIZE, "%d\n", !!obd->u.cli.cl_checksum);
}
static ssize_t checksums_store(struct kobject *kobj,
}
LUSTRE_RW_ATTR(checksums);
-static int osc_checksum_type_seq_show(struct seq_file *m, void *v)
-{
- struct obd_device *obd = m->private;
- int i;
- DECLARE_CKSUM_NAME;
-
- if (obd == NULL)
- return 0;
-
- for (i = 0; i < ARRAY_SIZE(cksum_name); i++) {
- if ((BIT(i) & obd->u.cli.cl_supp_cksum_types) == 0)
- continue;
- if (obd->u.cli.cl_cksum_type == BIT(i))
- seq_printf(m, "[%s] ", cksum_name[i]);
- else
- seq_printf(m, "%s ", cksum_name[i]);
- }
- seq_printf(m, "\n");
- return 0;
-}
-
-static ssize_t osc_checksum_type_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 i;
- DECLARE_CKSUM_NAME;
- char kernbuf[10];
- int rc = -EINVAL;
-
- if (obd == NULL)
- return 0;
-
- if (count > sizeof(kernbuf) - 1)
- return -EINVAL;
- if (copy_from_user(kernbuf, buffer, count))
- return -EFAULT;
-
- if (count > 0 && kernbuf[count - 1] == '\n')
- kernbuf[count - 1] = '\0';
- else
- kernbuf[count] = '\0';
-
- for (i = 0; i < ARRAY_SIZE(cksum_name); i++) {
- if (strcmp(kernbuf, cksum_name[i]) == 0) {
- obd->u.cli.cl_preferred_cksum_type = BIT(i);
- if (obd->u.cli.cl_supp_cksum_types & BIT(i)) {
- obd->u.cli.cl_cksum_type = BIT(i);
- rc = count;
- } else {
- rc = -ENOTSUPP;
- }
- break;
- }
- }
- return rc;
-}
-LPROC_SEQ_FOPS(osc_checksum_type);
+LUSTRE_RW_ATTR(checksum_type);
static ssize_t resend_count_show(struct kobject *kobj,
struct attribute *attr,
struct obd_device *obd = container_of(kobj, struct obd_device,
obd_kset.kobj);
- return sprintf(buf, "%d\n", obd->u.cli.cl_checksum_dump ? 1 : 0);
+ return scnprintf(buf, PAGE_SIZE, "%d\n", !!obd->u.cli.cl_checksum_dump);
}
static ssize_t checksum_dump_store(struct kobject *kobj,
}
LUSTRE_RW_ATTR(checksum_dump);
-static ssize_t contention_seconds_show(struct kobject *kobj,
- struct attribute *attr,
- char *buf)
-{
- struct obd_device *obd = container_of(kobj, struct obd_device,
- obd_kset.kobj);
- struct osc_device *od = obd2osc_dev(obd);
-
- return sprintf(buf, "%lld\n", od->od_contention_time);
-}
-
-static ssize_t contention_seconds_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 osc_device *od = obd2osc_dev(obd);
- unsigned int val;
- int rc;
-
- rc = kstrtouint(buffer, 0, &val);
- if (rc)
- return rc;
-
- od->od_contention_time = val;
-
- return count;
-}
-LUSTRE_RW_ATTR(contention_seconds);
-
-static ssize_t lockless_truncate_show(struct kobject *kobj,
- struct attribute *attr,
- char *buf)
-{
- struct obd_device *obd = container_of(kobj, struct obd_device,
- obd_kset.kobj);
- struct osc_device *od = obd2osc_dev(obd);
-
- return sprintf(buf, "%u\n", od->od_lockless_truncate);
-}
-
-static ssize_t lockless_truncate_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 osc_device *od = obd2osc_dev(obd);
- bool val;
- int rc;
-
- rc = kstrtobool(buffer, &val);
- if (rc)
- return rc;
-
- od->od_lockless_truncate = val;
-
- return count;
-}
-LUSTRE_RW_ATTR(lockless_truncate);
-
static ssize_t destroys_in_flight_show(struct kobject *kobj,
struct attribute *attr,
char *buf)
}
LUSTRE_RO_ATTR(destroys_in_flight);
-LPROC_SEQ_FOPS_RW_TYPE(osc, obd_max_pages_per_rpc);
-
+LUSTRE_RW_ATTR(max_pages_per_rpc);
LUSTRE_RW_ATTR(short_io_bytes);
-#ifdef CONFIG_PROC_FS
static int osc_unstable_stats_seq_show(struct seq_file *m, void *v)
{
struct obd_device *obd = m->private;
pages, mb);
return 0;
}
-LPROC_SEQ_FOPS_RO(osc_unstable_stats);
+
+LDEBUGFS_SEQ_FOPS_RO(osc_unstable_stats);
static ssize_t idle_timeout_show(struct kobject *kobj, struct attribute *attr,
char *buf)
req = ptlrpc_request_alloc(imp,
&RQF_OST_STATFS);
if (req != NULL)
- ptlrpc_req_finished(req);
+ ptlrpc_req_put(req);
}
imp->imp_idle_timeout = val;
}
/* to initiate the connection if it's in IDLE state */
req = ptlrpc_request_alloc(imp, &RQF_OST_STATFS);
if (req)
- ptlrpc_req_finished(req);
+ ptlrpc_req_put(req);
ptlrpc_pinger_force(imp);
}
}
LUSTRE_RW_ATTR(grant_shrink);
-LPROC_SEQ_FOPS_RO_TYPE(osc, connect_flags);
-LPROC_SEQ_FOPS_RO_TYPE(osc, server_uuid);
-LPROC_SEQ_FOPS_RO_TYPE(osc, timeouts);
-LPROC_SEQ_FOPS_RO_TYPE(osc, state);
+LDEBUGFS_SEQ_FOPS_RO_TYPE(osc, connect_flags);
+LDEBUGFS_SEQ_FOPS_RO_TYPE(osc, server_uuid);
+LDEBUGFS_SEQ_FOPS_RO_TYPE(osc, timeouts);
+LDEBUGFS_SEQ_FOPS_RO_TYPE(osc, state);
+LDEBUGFS_SEQ_FOPS_RW_TYPE(osc, import);
-LPROC_SEQ_FOPS_RW_TYPE(osc, import);
-LPROC_SEQ_FOPS_RW_TYPE(osc, pinger_recov);
-
-struct lprocfs_vars lprocfs_osc_obd_vars[] = {
+static struct ldebugfs_vars ldebugfs_osc_obd_vars[] = {
{ .name = "connect_flags",
.fops = &osc_connect_flags_fops },
{ .name = "ost_server_uuid",
.fops = &osc_server_uuid_fops },
- { .name = "max_pages_per_rpc",
- .fops = &osc_obd_max_pages_per_rpc_fops },
{ .name = "osc_cached_mb",
.fops = &osc_cached_mb_fops },
- { .name = "cur_grant_bytes",
- .fops = &osc_cur_grant_bytes_fops },
- { .name = "checksum_type",
- .fops = &osc_checksum_type_fops },
{ .name = "timeouts",
.fops = &osc_timeouts_fops },
{ .name = "import",
.fops = &osc_import_fops },
{ .name = "state",
.fops = &osc_state_fops },
- { .name = "pinger_recov",
- .fops = &osc_pinger_recov_fops },
{ .name = "unstable_stats",
.fops = &osc_unstable_stats_fops },
{ NULL }
static int osc_rpc_stats_seq_show(struct seq_file *seq, void *v)
{
- struct timespec64 now;
struct obd_device *obd = seq->private;
struct client_obd *cli = &obd->u.cli;
unsigned long read_tot = 0, write_tot = 0, read_cum, write_cum;
int i;
- ktime_get_real_ts64(&now);
-
spin_lock(&cli->cl_loi_list_lock);
- seq_printf(seq, "snapshot_time: %lld.%09lu (secs.nsecs)\n",
- (s64)now.tv_sec, now.tv_nsec);
+ lprocfs_stats_header(seq, ktime_get_real(), cli->cl_stats_init, 25,
+ ":", true, "");
seq_printf(seq, "read RPCs in flight: %d\n",
cli->cl_r_in_flight);
seq_printf(seq, "write RPCs in flight: %d\n",
cli->cl_w_in_flight);
+ seq_printf(seq, "DIO RPCs in flight: %d\n",
+ cli->cl_d_in_flight);
seq_printf(seq, "pending write pages: %d\n",
atomic_read(&cli->cl_pending_w_pages));
seq_printf(seq, "pending read pages: %d\n",
read_cum = 0;
write_cum = 0;
- for (i = 0; i < OBD_HIST_MAX; i++) {
+ for (i = 1; i < OBD_HIST_MAX; i++) {
unsigned long r = cli->cl_read_rpc_hist.oh_buckets[i];
unsigned long w = cli->cl_write_rpc_hist.oh_buckets[i];
read_cum += r;
static ssize_t osc_rpc_stats_seq_write(struct file *file,
const char __user *buf,
- size_t len, loff_t *off)
+ size_t len, loff_t *off)
{
struct seq_file *seq = file->private_data;
struct obd_device *obd = seq->private;
lprocfs_oh_clear(&cli->cl_write_page_hist);
lprocfs_oh_clear(&cli->cl_read_offset_hist);
lprocfs_oh_clear(&cli->cl_write_offset_hist);
+ cli->cl_stats_init = ktime_get_real();
return len;
}
-LPROC_SEQ_FOPS(osc_rpc_stats);
+LDEBUGFS_SEQ_FOPS(osc_rpc_stats);
static int osc_stats_seq_show(struct seq_file *seq, void *v)
{
- struct timespec64 now;
struct obd_device *obd = seq->private;
- struct osc_stats *stats = &obd2osc_dev(obd)->od_stats;
+ struct osc_stats *stats = &obd2osc_dev(obd)->osc_stats;
- ktime_get_real_ts64(&now);
-
- seq_printf(seq, "snapshot_time: %lld.%09lu (secs.nsecs)\n",
- (s64)now.tv_sec, now.tv_nsec);
+ lprocfs_stats_header(seq, ktime_get_real(), stats->os_init, 25, ":",
+ true, "");
seq_printf(seq, "lockless_write_bytes\t\t%llu\n",
stats->os_lockless_writes);
seq_printf(seq, "lockless_read_bytes\t\t%llu\n",
stats->os_lockless_reads);
- seq_printf(seq, "lockless_truncate\t\t%llu\n",
- stats->os_lockless_truncates);
return 0;
}
{
struct seq_file *seq = file->private_data;
struct obd_device *obd = seq->private;
- struct osc_stats *stats = &obd2osc_dev(obd)->od_stats;
+ struct osc_stats *stats = &obd2osc_dev(obd)->osc_stats;
memset(stats, 0, sizeof(*stats));
+ stats->os_init = ktime_get_real();
+
return len;
}
-LPROC_SEQ_FOPS(osc_stats);
+LDEBUGFS_SEQ_FOPS(osc_stats);
-int lprocfs_osc_attach_seqstat(struct obd_device *obd)
+static void ldebugfs_osc_attach_seqstat(struct obd_device *obd)
{
- int rc;
-
- rc = lprocfs_seq_create(obd->obd_proc_entry, "osc_stats", 0644,
- &osc_stats_fops, obd);
- if (rc == 0)
- rc = lprocfs_obd_seq_create(obd, "rpc_stats", 0644,
- &osc_rpc_stats_fops, obd);
-
- return rc;
+ debugfs_create_file("osc_stats", 0644, obd->obd_debugfs_entry, obd,
+ &osc_stats_fops);
+ debugfs_create_file("rpc_stats", 0644, obd->obd_debugfs_entry, obd,
+ &osc_rpc_stats_fops);
}
-#endif /* CONFIG_PROC_FS */
+
+LUSTRE_OBD_UINT_PARAM_ATTR(at_min);
+LUSTRE_OBD_UINT_PARAM_ATTR(at_max);
+LUSTRE_OBD_UINT_PARAM_ATTR(at_history);
+LUSTRE_OBD_UINT_PARAM_ATTR(ldlm_enqueue_min);
static struct attribute *osc_attrs[] = {
&lustre_attr_active.attr,
+ &lustre_attr_enable_page_cache_shrink.attr,
&lustre_attr_checksums.attr,
+ &lustre_attr_checksum_type.attr,
&lustre_attr_checksum_dump.attr,
- &lustre_attr_contention_seconds.attr,
&lustre_attr_cur_dirty_bytes.attr,
+ &lustre_attr_cur_grant_bytes.attr,
&lustre_attr_cur_lost_grant_bytes.attr,
&lustre_attr_cur_dirty_grant_bytes.attr,
&lustre_attr_destroys_in_flight.attr,
&lustre_attr_grant_shrink_interval.attr,
- &lustre_attr_lockless_truncate.attr,
&lustre_attr_max_dirty_mb.attr,
+ &lustre_attr_max_pages_per_rpc.attr,
&lustre_attr_max_rpcs_in_flight.attr,
+ &lustre_attr_osc_unevict_cached_mb.attr,
&lustre_attr_short_io_bytes.attr,
&lustre_attr_resend_count.attr,
&lustre_attr_ost_conn_uuid.attr,
&lustre_attr_conn_uuid.attr,
+ &lustre_attr_pinger_recov.attr,
&lustre_attr_ping.attr,
&lustre_attr_idle_timeout.attr,
&lustre_attr_idle_connect.attr,
&lustre_attr_grant_shrink.attr,
+ &lustre_attr_at_max.attr,
+ &lustre_attr_at_min.attr,
+ &lustre_attr_at_history.attr,
+ &lustre_attr_ldlm_enqueue_min.attr,
NULL,
};
+KOBJ_ATTRIBUTE_GROUPS(osc); /* creates osc_groups */
+
int osc_tunables_init(struct obd_device *obd)
{
int rc;
- obd->obd_vars = lprocfs_osc_obd_vars;
- obd->obd_ktype.default_attrs = osc_attrs;
+ obd->obd_debugfs_vars = ldebugfs_osc_obd_vars;
+ obd->obd_ktype.default_groups = KOBJ_ATTR_GROUPS(osc);
rc = lprocfs_obd_setup(obd, false);
if (rc)
return rc;
-#ifdef CONFIG_PROC_FS
- /* If the basic OSC proc tree construction succeeded then
- * lets do the rest.
- */
- rc = lprocfs_osc_attach_seqstat(obd);
- if (rc)
- goto obd_cleanup;
-#endif /* CONFIG_PROC_FS */
+ ldebugfs_osc_attach_seqstat(obd);
+
rc = sptlrpc_lprocfs_cliobd_attach(obd);
- if (rc)
- goto obd_cleanup;
+ if (rc) {
+ lprocfs_obd_cleanup(obd);
+ return rc;
+ }
ptlrpc_lprocfs_register_obd(obd);
-obd_cleanup:
- if (rc)
- lprocfs_obd_cleanup(obd);
- return rc;
+ return 0;
}
git://git.whamcloud.com / fs / lustre-release.git / blobdiff