* Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2011, Intel Corporation.
+ * Copyright (c) 2011, 2015, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
#include <obd_support.h>
#include <lprocfs_status.h>
+#include <obd_class.h>
#ifdef CONFIG_SYSCTL
-struct ctl_table_header *obd_table_header = NULL;
+static struct ctl_table_header *obd_table_header;
#endif
-int LL_PROC_PROTO(proc_set_timeout)
+static int
+proc_set_timeout(struct ctl_table *table, int write, void __user *buffer,
+ size_t *lenp, loff_t *ppos)
{
int rc;
return rc;
}
-int LL_PROC_PROTO(proc_memory_alloc)
+static int
+proc_memory_alloc(struct ctl_table *table, int write, void __user *buffer,
+ size_t *lenp, loff_t *ppos)
{
char buf[22];
int len;
return 0;
}
-int LL_PROC_PROTO(proc_pages_alloc)
-{
- char buf[22];
- int len;
-
- if (!*lenp || (*ppos && !write)) {
- *lenp = 0;
- return 0;
- }
- if (write)
- return -EINVAL;
-
- len = snprintf(buf, sizeof(buf), LPU64"\n", obd_pages_sum());
- if (len > *lenp)
- len = *lenp;
- buf[len] = '\0';
- if (copy_to_user(buffer, buf, len))
- return -EFAULT;
- *lenp = len;
- *ppos += *lenp;
- return 0;
-}
-
-int LL_PROC_PROTO(proc_mem_max)
+static int
+proc_mem_max(struct ctl_table *table, int write, void __user *buffer,
+ size_t *lenp, loff_t *ppos)
{
char buf[22];
int len;
return 0;
}
-int LL_PROC_PROTO(proc_pages_max)
-{
- char buf[22];
- int len;
-
- if (!*lenp || (*ppos && !write)) {
- *lenp = 0;
- return 0;
- }
- if (write)
- return -EINVAL;
-
- len = snprintf(buf, sizeof(buf), LPU64"\n", obd_pages_max());
- if (len > *lenp)
- len = *lenp;
- buf[len] = '\0';
- if (copy_to_user(buffer, buf, len))
- return -EFAULT;
- *lenp = len;
- *ppos += *lenp;
- return 0;
-}
-
-int LL_PROC_PROTO(proc_max_dirty_pages_in_mb)
+static int
+proc_max_dirty_pages_in_mb(struct ctl_table *table, int write,
+ void __user *buffer, size_t *lenp, loff_t *ppos)
{
+ __s64 val;
int rc = 0;
if (!table->data || !table->maxlen || !*lenp || (*ppos && !write)) {
return 0;
}
if (write) {
- rc = lprocfs_write_frac_helper(buffer, *lenp,
- (unsigned int *)table->data,
- 1 << (20 - PAGE_CACHE_SHIFT));
+ rc = lprocfs_str_with_units_to_s64(buffer, *lenp, &val, 'M');
+ if (rc)
+ return rc;
+
+ if (val < 0)
+ return -ERANGE;
+
+ val >>= PAGE_CACHE_SHIFT;
+
/* Don't allow them to let dirty pages exceed 90% of system
* memory and set a hard minimum of 4MB. */
- if (obd_max_dirty_pages > ((totalram_pages / 10) * 9)) {
- CERROR("Refusing to set max dirty pages to %u, which "
- "is more than 90%% of available RAM; setting "
- "to %lu\n", obd_max_dirty_pages,
+ if (val > ((totalram_pages / 10) * 9)) {
+ CERROR("Refusing to set max dirty pages to "LPD64", "
+ "which is more than 90%% of available RAM; "
+ "setting to %lu\n", val,
((totalram_pages / 10) * 9));
obd_max_dirty_pages = ((totalram_pages / 10) * 9);
- } else if (obd_max_dirty_pages < 4 << (20 - PAGE_CACHE_SHIFT)) {
+ } else if (val < 4 << (20 - PAGE_CACHE_SHIFT)) {
obd_max_dirty_pages = 4 << (20 - PAGE_CACHE_SHIFT);
+ } else {
+ obd_max_dirty_pages = val;
}
} else {
char buf[21];
int len;
len = lprocfs_read_frac_helper(buf, sizeof(buf),
- *(unsigned int *)table->data,
+ *(unsigned long *)table->data,
1 << (20 - PAGE_CACHE_SHIFT));
if (len > *lenp)
len = *lenp;
return rc;
}
-#ifdef RANDOM_FAIL_ALLOC
-int proc_alloc_fail_rate(struct ctl_table *table, int write,
- void __user *buffer, size_t *lenp, loff_t *ppos)
-{
- int rc = 0;
-
- if (!table->data || !table->maxlen || !*lenp || (*ppos && !write)) {
- *lenp = 0;
- return 0;
- }
- if (write) {
- rc = lprocfs_write_frac_helper(buffer, *lenp,
- (unsigned int*)table->data,
- OBD_ALLOC_FAIL_MULT);
- } else {
- char buf[21];
- int len;
-
- len = lprocfs_read_frac_helper(buf, 21,
- *(unsigned int*)table->data,
- OBD_ALLOC_FAIL_MULT);
- if (len > *lenp)
- len = *lenp;
- buf[len] = '\0';
- if (copy_to_user(buffer, buf, len))
- return -EFAULT;
- *lenp = len;
- }
- *ppos += *lenp;
- return rc;
-}
-#endif
-
-int LL_PROC_PROTO(proc_at_min)
-{
- return proc_dointvec(table, write, buffer, lenp, ppos);
-}
-int LL_PROC_PROTO(proc_at_max)
-{
- return proc_dointvec(table, write, buffer, lenp, ppos);
-}
-int LL_PROC_PROTO(proc_at_extra)
-{
- return proc_dointvec(table, write, buffer, lenp, ppos);
-}
-int LL_PROC_PROTO(proc_at_early_margin)
-{
- return proc_dointvec(table, write, buffer, lenp, ppos);
-}
-int LL_PROC_PROTO(proc_at_history)
-{
- return proc_dointvec(table, write, buffer, lenp, ppos);
-}
-
#ifdef CONFIG_SYSCTL
static struct ctl_table obd_table[] = {
{
},
{
INIT_CTL_NAME
- .procname = "pagesused",
- .data = NULL,
- .maxlen = 0,
- .mode = 0444,
- .proc_handler = &proc_pages_alloc
- },
- {
- INIT_CTL_NAME
.procname = "memused_max",
.data = NULL,
.maxlen = 0,
},
{
INIT_CTL_NAME
- .procname = "pagesused_max",
- .data = NULL,
- .maxlen = 0,
- .mode = 0444,
- .proc_handler = &proc_pages_max
- },
- {
- INIT_CTL_NAME
.procname = "ldlm_timeout",
.data = &ldlm_timeout,
.maxlen = sizeof(int),
.mode = 0644,
.proc_handler = &proc_set_timeout
},
-#ifdef RANDOM_FAIL_ALLOC
{
INIT_CTL_NAME
- .procname = "alloc_fail_rate",
- .data = &obd_alloc_fail_rate,
- .maxlen = sizeof(int),
+ .procname = "max_dirty_mb",
+ .data = &obd_max_dirty_pages,
+ .maxlen = sizeof(unsigned long),
.mode = 0644,
- .proc_handler = &proc_alloc_fail_rate
+ .proc_handler = &proc_max_dirty_pages_in_mb
},
-#endif
{
INIT_CTL_NAME
- .procname = "max_dirty_mb",
- .data = &obd_max_dirty_pages,
+ .procname = "bulk_timeout",
+ .data = &bulk_timeout,
.maxlen = sizeof(int),
.mode = 0644,
- .proc_handler = &proc_max_dirty_pages_in_mb
+ .proc_handler = &proc_dointvec
},
{
INIT_CTL_NAME
.data = &at_min,
.maxlen = sizeof(int),
.mode = 0644,
- .proc_handler = &proc_at_min
+ .proc_handler = &proc_dointvec
},
{
INIT_CTL_NAME
.data = &at_max,
.maxlen = sizeof(int),
.mode = 0644,
- .proc_handler = &proc_at_max
+ .proc_handler = &proc_dointvec
},
{
INIT_CTL_NAME
.data = &at_extra,
.maxlen = sizeof(int),
.mode = 0644,
- .proc_handler = &proc_at_extra
+ .proc_handler = &proc_dointvec
},
{
INIT_CTL_NAME
.data = &at_early_margin,
.maxlen = sizeof(int),
.mode = 0644,
- .proc_handler = &proc_at_early_margin
+ .proc_handler = &proc_dointvec
},
{
INIT_CTL_NAME
.data = &at_history,
.maxlen = sizeof(int),
.mode = 0644,
- .proc_handler = &proc_at_history
+ .proc_handler = &proc_dointvec
},
{ 0 }
};
git://git.whamcloud.com / fs / lustre-release.git / blobdiff