static ssize_t active_show(struct kobject *kobj, struct attribute *attr,
char *buf)
{
- struct obd_device *dev = container_of(kobj, struct obd_device,
+ struct obd_device *obd = container_of(kobj, struct obd_device,
obd_kset.kobj);
+ struct obd_import *imp;
int rc;
- LPROCFS_CLIMP_CHECK(dev);
- rc = sprintf(buf, "%d\n", !dev->u.cli.cl_import->imp_deactive);
- LPROCFS_CLIMP_EXIT(dev);
+ with_imp_locked(obd, imp, rc)
+ rc = sprintf(buf, "%d\n", !imp->imp_deactive);
+
return rc;
}
static ssize_t active_store(struct kobject *kobj, struct attribute *attr,
const char *buffer, size_t count)
{
- struct obd_device *dev = container_of(kobj, struct obd_device,
+ struct obd_device *obd = container_of(kobj, struct obd_device,
obd_kset.kobj);
bool val;
int rc;
return rc;
/* opposite senses */
- if (dev->u.cli.cl_import->imp_deactive == val)
- rc = ptlrpc_set_import_active(dev->u.cli.cl_import, val);
+ if (obd->u.cli.cl_import->imp_deactive == val)
+ rc = ptlrpc_set_import_active(obd->u.cli.cl_import, val);
else
CDEBUG(D_CONFIG, "activate %u: ignoring repeat request\n",
(unsigned int)val);
struct attribute *attr,
char *buf)
{
- struct obd_device *dev = container_of(kobj, struct obd_device,
+ struct obd_device *obd = container_of(kobj, struct obd_device,
obd_kset.kobj);
- struct client_obd *cli = &dev->u.cli;
- ssize_t len;
+ struct client_obd *cli = &obd->u.cli;
- spin_lock(&cli->cl_loi_list_lock);
- len = sprintf(buf, "%u\n", cli->cl_max_rpcs_in_flight);
- spin_unlock(&cli->cl_loi_list_lock);
- return len;
+ return scnprintf(buf, PAGE_SIZE, "%u\n", cli->cl_max_rpcs_in_flight);
}
static ssize_t max_rpcs_in_flight_store(struct kobject *kobj,
const char *buffer,
size_t count)
{
- struct obd_device *dev = container_of(kobj, struct obd_device,
+ struct obd_device *obd = container_of(kobj, struct obd_device,
obd_kset.kobj);
- struct client_obd *cli = &dev->u.cli;
+ struct client_obd *cli = &obd->u.cli;
int adding, added, req_count;
unsigned int val;
int rc;
if (val == 0 || val > OSC_MAX_RIF_MAX)
return -ERANGE;
- LPROCFS_CLIMP_CHECK(dev);
-
adding = (int)val - cli->cl_max_rpcs_in_flight;
req_count = atomic_read(&osc_pool_req_count);
if (adding > 0 && req_count < osc_reqpool_maxreqcount) {
client_adjust_max_dirty(cli);
spin_unlock(&cli->cl_loi_list_lock);
- LPROCFS_CLIMP_EXIT(dev);
return count;
}
LUSTRE_RW_ATTR(max_rpcs_in_flight);
struct attribute *attr,
char *buf)
{
- struct obd_device *dev = container_of(kobj, struct obd_device,
+ struct obd_device *obd = container_of(kobj, struct obd_device,
obd_kset.kobj);
- struct client_obd *cli = &dev->u.cli;
- long val;
- int mult;
-
- spin_lock(&cli->cl_loi_list_lock);
- val = cli->cl_dirty_max_pages;
- spin_unlock(&cli->cl_loi_list_lock);
+ struct client_obd *cli = &obd->u.cli;
- mult = 1 << (20 - PAGE_SHIFT);
- return lprocfs_read_frac_helper(buf, PAGE_SIZE, val, mult);
+ return scnprintf(buf, PAGE_SIZE, "%lu\n",
+ PAGES_TO_MiB(cli->cl_dirty_max_pages));
}
static ssize_t max_dirty_mb_store(struct kobject *kobj,
const char *buffer,
size_t count)
{
- struct obd_device *dev = container_of(kobj, struct obd_device,
+ struct obd_device *obd = container_of(kobj, struct obd_device,
obd_kset.kobj);
- struct client_obd *cli = &dev->u.cli;
- unsigned long pages_number;
+ struct client_obd *cli = &obd->u.cli;
+ unsigned long pages_number, max_dirty_mb;
int rc;
- rc = kstrtoul(buffer, 10, &pages_number);
+ rc = kstrtoul(buffer, 10, &max_dirty_mb);
if (rc)
return rc;
- pages_number *= 1 << (20 - PAGE_SHIFT); /* MB -> pages */
+ pages_number = MiB_TO_PAGES(max_dirty_mb);
- if (pages_number <= 0 ||
- pages_number >= OSC_MAX_DIRTY_MB_MAX << (20 - PAGE_SHIFT) ||
- pages_number > totalram_pages / 4) /* 1/4 of RAM */
+ if (pages_number >= MiB_TO_PAGES(OSC_MAX_DIRTY_MB_MAX) ||
+ pages_number > cfs_totalram_pages() / 4) /* 1/4 of RAM */
return -ERANGE;
spin_lock(&cli->cl_loi_list_lock);
static int osc_cached_mb_seq_show(struct seq_file *m, void *v)
{
- struct obd_device *dev = m->private;
- struct client_obd *cli = &dev->u.cli;
+ struct obd_device *obd = m->private;
+ struct client_obd *cli = &obd->u.cli;
int shift = 20 - PAGE_SHIFT;
seq_printf(m, "used_mb: %ld\n"
const char __user *buffer,
size_t count, loff_t *off)
{
- struct obd_device *dev = ((struct seq_file *)file->private_data)->private;
- struct client_obd *cli = &dev->u.cli;
- __s64 pages_number;
+ struct seq_file *m = file->private_data;
+ struct obd_device *obd = m->private;
+ struct client_obd *cli = &obd->u.cli;
+ u64 pages_number;
+ const char *tmp;
long rc;
char kernbuf[128];
return -EFAULT;
kernbuf[count] = 0;
- buffer += lprocfs_find_named_value(kernbuf, "used_mb:", &count) -
- kernbuf;
- rc = lprocfs_str_with_units_to_s64(buffer, count, &pages_number, 'M');
- if (rc)
+ tmp = lprocfs_find_named_value(kernbuf, "used_mb:", &count);
+ rc = sysfs_memparse(tmp, count, &pages_number, "MiB");
+ if (rc < 0)
return rc;
pages_number >>= PAGE_SHIFT;
- if (pages_number < 0)
- return -ERANGE;
-
rc = atomic_long_read(&cli->cl_lru_in_list) - pages_number;
if (rc > 0) {
struct lu_env *env;
struct attribute *attr,
char *buf)
{
- struct obd_device *dev = container_of(kobj, struct obd_device,
+ struct obd_device *obd = container_of(kobj, struct obd_device,
obd_kset.kobj);
- struct client_obd *cli = &dev->u.cli;
- ssize_t len;
-
- spin_lock(&cli->cl_loi_list_lock);
- len = sprintf(buf, "%lu\n", cli->cl_dirty_pages << PAGE_SHIFT);
- spin_unlock(&cli->cl_loi_list_lock);
+ struct client_obd *cli = &obd->u.cli;
- return len;
+ return scnprintf(buf, PAGE_SIZE, "%lu\n",
+ cli->cl_dirty_pages << PAGE_SHIFT);
}
LUSTRE_RO_ATTR(cur_dirty_bytes);
static int osc_cur_grant_bytes_seq_show(struct seq_file *m, void *v)
{
- struct obd_device *dev = m->private;
- struct client_obd *cli = &dev->u.cli;
+ struct obd_device *obd = m->private;
+ struct client_obd *cli = &obd->u.cli;
- spin_lock(&cli->cl_loi_list_lock);
seq_printf(m, "%lu\n", cli->cl_avail_grant);
- spin_unlock(&cli->cl_loi_list_lock);
return 0;
}
const char __user *buffer,
size_t count, loff_t *off)
{
- struct obd_device *obd = ((struct seq_file *)file->private_data)->private;
+ struct seq_file *m = file->private_data;
+ struct obd_device *obd = m->private;
struct client_obd *cli = &obd->u.cli;
- s64 val;
+ struct obd_import *imp;
+ char kernbuf[22] = "";
+ u64 val;
int rc;
if (obd == NULL)
return 0;
- rc = lprocfs_str_with_units_to_s64(buffer, count, &val, '1');
- if (rc)
+ 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");
+ if (rc < 0)
return rc;
- if (val < 0)
- return val;
/* this is only for shrinking grant */
- spin_lock(&cli->cl_loi_list_lock);
- if (val >= cli->cl_avail_grant) {
- spin_unlock(&cli->cl_loi_list_lock);
+ if (val >= cli->cl_avail_grant)
return 0;
- }
- spin_unlock(&cli->cl_loi_list_lock);
-
- LPROCFS_CLIMP_CHECK(obd);
- if (cli->cl_import->imp_state == LUSTRE_IMP_FULL)
- rc = osc_shrink_grant_to_target(cli, val);
- LPROCFS_CLIMP_EXIT(obd);
+ with_imp_locked(obd, imp, rc)
+ if (imp->imp_state == LUSTRE_IMP_FULL)
+ rc = osc_shrink_grant_to_target(cli, val);
return rc ? rc : count;
}
struct attribute *attr,
char *buf)
{
- struct obd_device *dev = container_of(kobj, struct obd_device,
+ struct obd_device *obd = container_of(kobj, struct obd_device,
obd_kset.kobj);
- struct client_obd *cli = &dev->u.cli;
- ssize_t len;
+ struct client_obd *cli = &obd->u.cli;
- spin_lock(&cli->cl_loi_list_lock);
- len = sprintf(buf, "%lu\n", cli->cl_lost_grant);
- spin_unlock(&cli->cl_loi_list_lock);
- return len;
+ return scnprintf(buf, PAGE_SIZE, "%lu\n", cli->cl_lost_grant);
}
LUSTRE_RO_ATTR(cur_lost_grant_bytes);
+static ssize_t cur_dirty_grant_bytes_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;
+
+ return scnprintf(buf, PAGE_SIZE, "%lu\n", cli->cl_dirty_grant);
+}
+LUSTRE_RO_ATTR(cur_dirty_grant_bytes);
+
static ssize_t grant_shrink_interval_show(struct kobject *kobj,
struct attribute *attr,
char *buf)
return 0;
for (i = 0; i < ARRAY_SIZE(cksum_name); i++) {
- if (((1 << i) & obd->u.cli.cl_supp_cksum_types) == 0)
+ if ((BIT(i) & obd->u.cli.cl_supp_cksum_types) == 0)
continue;
- if (obd->u.cli.cl_cksum_type == (1 << i))
+ if (obd->u.cli.cl_cksum_type == BIT(i))
seq_printf(m, "[%s] ", cksum_name[i]);
else
seq_printf(m, "%s ", cksum_name[i]);
const char __user *buffer,
size_t count, loff_t *off)
{
- struct obd_device *obd = ((struct seq_file *)file->private_data)->private;
+ 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 (obd == NULL)
+ return 0;
- if (count > sizeof(kernbuf) - 1)
- return -EINVAL;
+ 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 (((1 << i) & obd->u.cli.cl_supp_cksum_types) == 0)
- continue;
- if (!strcmp(kernbuf, cksum_name[i])) {
- obd->u.cli.cl_cksum_type = 1 << i;
- return count;
- }
- }
- return -EINVAL;
+ 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);
#ifdef CONFIG_PROC_FS
static int osc_unstable_stats_seq_show(struct seq_file *m, void *v)
{
- struct obd_device *dev = m->private;
- struct client_obd *cli = &dev->u.cli;
+ struct obd_device *obd = m->private;
+ struct client_obd *cli = &obd->u.cli;
long pages;
int mb;
{
struct obd_device *obd = container_of(kobj, struct obd_device,
obd_kset.kobj);
- struct client_obd *cli = &obd->u.cli;
+ struct obd_import *imp;
int ret;
- LPROCFS_CLIMP_CHECK(obd);
- ret = sprintf(buf, "%u\n", cli->cl_import->imp_idle_timeout);
- LPROCFS_CLIMP_EXIT(obd);
+ with_imp_locked(obd, imp, ret)
+ ret = sprintf(buf, "%u\n", imp->imp_idle_timeout);
return ret;
}
static ssize_t idle_timeout_store(struct kobject *kobj, struct attribute *attr,
const char *buffer, size_t count)
{
- struct obd_device *dev = container_of(kobj, struct obd_device,
+ struct obd_device *obd = container_of(kobj, struct obd_device,
obd_kset.kobj);
- struct client_obd *cli = &dev->u.cli;
+ struct obd_import *imp;
struct ptlrpc_request *req;
unsigned int idle_debug = 0;
unsigned int val;
return -ERANGE;
}
- LPROCFS_CLIMP_CHECK(dev);
- if (idle_debug) {
- cli->cl_import->imp_idle_debug = idle_debug;
- } else {
- if (!val) {
- /* initiate the connection if it's in IDLE state */
- req = ptlrpc_request_alloc(cli->cl_import,
- &RQF_OST_STATFS);
- if (req != NULL)
- ptlrpc_req_finished(req);
+ with_imp_locked(obd, imp, rc) {
+ if (idle_debug) {
+ imp->imp_idle_debug = idle_debug;
+ } else {
+ if (!val) {
+ /* initiate the connection if it's in IDLE state */
+ req = ptlrpc_request_alloc(imp,
+ &RQF_OST_STATFS);
+ if (req != NULL)
+ ptlrpc_req_finished(req);
+ }
+ imp->imp_idle_timeout = val;
}
- cli->cl_import->imp_idle_timeout = val;
}
- LPROCFS_CLIMP_EXIT(dev);
return count;
}
static ssize_t idle_connect_store(struct kobject *kobj, struct attribute *attr,
const char *buffer, size_t count)
{
- struct obd_device *dev = container_of(kobj, struct obd_device,
+ struct obd_device *obd = container_of(kobj, struct obd_device,
obd_kset.kobj);
- struct client_obd *cli = &dev->u.cli;
+ struct obd_import *imp;
struct ptlrpc_request *req;
+ int rc;
- LPROCFS_CLIMP_CHECK(dev);
- /* to initiate the connection if it's in IDLE state */
- req = ptlrpc_request_alloc(cli->cl_import, &RQF_OST_STATFS);
- if (req)
- ptlrpc_req_finished(req);
- ptlrpc_pinger_force(cli->cl_import);
- LPROCFS_CLIMP_EXIT(dev);
+ with_imp_locked(obd, imp, rc) {
+ /* 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_pinger_force(imp);
+ }
- return count;
+ return rc ?: count;
}
LUSTRE_WO_ATTR(idle_connect);
{
struct obd_device *obd = container_of(kobj, struct obd_device,
obd_kset.kobj);
- struct client_obd *cli = &obd->u.cli;
- struct obd_connect_data *ocd;
+ struct obd_import *imp;
ssize_t len;
- LPROCFS_CLIMP_CHECK(obd);
- ocd = &cli->cl_import->imp_connect_data;
-
- len = snprintf(buf, PAGE_SIZE, "%d\n",
- !!OCD_HAS_FLAG(ocd, GRANT_SHRINK));
- LPROCFS_CLIMP_EXIT(obd);
+ with_imp_locked(obd, imp, len)
+ len = scnprintf(buf, PAGE_SIZE, "%d\n",
+ !imp->imp_grant_shrink_disabled &&
+ OCD_HAS_FLAG(&imp->imp_connect_data,
+ GRANT_SHRINK));
return len;
}
static ssize_t grant_shrink_store(struct kobject *kobj, struct attribute *attr,
const char *buffer, size_t count)
{
- struct obd_device *dev = container_of(kobj, struct obd_device,
+ struct obd_device *obd = container_of(kobj, struct obd_device,
obd_kset.kobj);
- struct client_obd *cli = &dev->u.cli;
- struct obd_connect_data *ocd;
+ struct obd_import *imp;
bool val;
int rc;
- if (dev == NULL)
+ if (obd == NULL)
return 0;
rc = kstrtobool(buffer, &val);
if (rc)
return rc;
- LPROCFS_CLIMP_CHECK(dev);
- ocd = &cli->cl_import->imp_connect_data;
-
- if (!val) {
- if (OCD_HAS_FLAG(ocd, GRANT_SHRINK))
- ocd->ocd_connect_flags &= ~OBD_CONNECT_GRANT_SHRINK;
- } else {
- /**
- * server replied obd_connect_data is always bigger, so
- * client's imp_connect_flags_orig are always supported
- * by the server
- */
- if (!OCD_HAS_FLAG(ocd, GRANT_SHRINK) &&
- cli->cl_import->imp_connect_flags_orig &
- OBD_CONNECT_GRANT_SHRINK)
- ocd->ocd_connect_flags |= OBD_CONNECT_GRANT_SHRINK;
+ with_imp_locked(obd, imp, rc) {
+ spin_lock(&imp->imp_lock);
+ imp->imp_grant_shrink_disabled = !val;
+ spin_unlock(&imp->imp_lock);
}
- LPROCFS_CLIMP_EXIT(dev);
-
- return count;
+ return rc ?: count;
}
LUSTRE_RW_ATTR(grant_shrink);
static int osc_rpc_stats_seq_show(struct seq_file *seq, void *v)
{
struct timespec64 now;
- struct obd_device *dev = seq->private;
- struct client_obd *cli = &dev->u.cli;
+ 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;
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;
const char __user *buf,
size_t len, loff_t *off)
{
- struct seq_file *seq = file->private_data;
- struct obd_device *dev = seq->private;
- struct client_obd *cli = &dev->u.cli;
+ struct seq_file *seq = file->private_data;
+ struct obd_device *obd = seq->private;
+ struct client_obd *cli = &obd->u.cli;
- lprocfs_oh_clear(&cli->cl_read_rpc_hist);
- lprocfs_oh_clear(&cli->cl_write_rpc_hist);
- lprocfs_oh_clear(&cli->cl_read_page_hist);
- lprocfs_oh_clear(&cli->cl_write_page_hist);
- lprocfs_oh_clear(&cli->cl_read_offset_hist);
- lprocfs_oh_clear(&cli->cl_write_offset_hist);
+ lprocfs_oh_clear(&cli->cl_read_rpc_hist);
+ lprocfs_oh_clear(&cli->cl_write_rpc_hist);
+ lprocfs_oh_clear(&cli->cl_read_page_hist);
+ lprocfs_oh_clear(&cli->cl_write_page_hist);
+ lprocfs_oh_clear(&cli->cl_read_offset_hist);
+ lprocfs_oh_clear(&cli->cl_write_offset_hist);
- return len;
+ return len;
}
LPROC_SEQ_FOPS(osc_rpc_stats);
static int osc_stats_seq_show(struct seq_file *seq, void *v)
{
struct timespec64 now;
- struct obd_device *dev = seq->private;
- struct osc_stats *stats = &obd2osc_dev(dev)->od_stats;
+ struct obd_device *obd = seq->private;
+ struct osc_stats *stats = &obd2osc_dev(obd)->od_stats;
ktime_get_real_ts64(&now);
const char __user *buf,
size_t len, loff_t *off)
{
- struct seq_file *seq = file->private_data;
- struct obd_device *dev = seq->private;
- struct osc_stats *stats = &obd2osc_dev(dev)->od_stats;
+ struct seq_file *seq = file->private_data;
+ struct obd_device *obd = seq->private;
+ struct osc_stats *stats = &obd2osc_dev(obd)->od_stats;
- memset(stats, 0, sizeof(*stats));
- return len;
+ memset(stats, 0, sizeof(*stats));
+ return len;
}
LPROC_SEQ_FOPS(osc_stats);
-int lprocfs_osc_attach_seqstat(struct obd_device *dev)
+int lprocfs_osc_attach_seqstat(struct obd_device *obd)
{
int rc;
- rc = lprocfs_seq_create(dev->obd_proc_entry, "osc_stats", 0644,
- &osc_stats_fops, dev);
+ rc = lprocfs_seq_create(obd->obd_proc_entry, "osc_stats", 0644,
+ &osc_stats_fops, obd);
if (rc == 0)
- rc = lprocfs_obd_seq_create(dev, "rpc_stats", 0644,
- &osc_rpc_stats_fops, dev);
+ rc = lprocfs_obd_seq_create(obd, "rpc_stats", 0644,
+ &osc_rpc_stats_fops, obd);
return rc;
}
&lustre_attr_contention_seconds.attr,
&lustre_attr_cur_dirty_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,
int osc_tunables_init(struct obd_device *obd)
{
-#if defined(CONFIG_PROC_FS) && defined(HAVE_SERVER_SUPPORT)
- struct obd_type *type;
-#endif
int rc;
obd->obd_vars = lprocfs_osc_obd_vars;
-#if defined(CONFIG_PROC_FS) && defined(HAVE_SERVER_SUPPORT)
- /* If this is true then both client (osc) and server (osp) are on the
- * same node. The osp layer if loaded first will register the osc proc
- * directory. In that case this obd_device will be attached its proc
- * tree to type->typ_procsym instead of obd->obd_type->typ_procroot.
- */
- type = class_search_type(LUSTRE_OSP_NAME);
- if (type && type->typ_procsym) {
- obd->obd_proc_entry = lprocfs_register(obd->obd_name,
- type->typ_procsym,
- obd->obd_vars, obd);
- if (IS_ERR(obd->obd_proc_entry)) {
- rc = PTR_ERR(obd->obd_proc_entry);
- CERROR("error %d setting up lprocfs for %s\n", rc,
- obd->obd_name);
- obd->obd_proc_entry = NULL;
- }
- }
-#endif
obd->obd_ktype.default_attrs = osc_attrs;
rc = lprocfs_obd_setup(obd, false);
if (rc)
git://git.whamcloud.com / fs / lustre-release.git / blobdiff