* 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 [sun.com URL with a
- * copy of GPLv2].
+ * 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
* GPL HEADER END
*/
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*/
/*
#include <obd_support.h>
#include <lprocfs_status.h>
+#ifdef CONFIG_SYSCTL
cfs_sysctl_table_header_t *obd_table_header = NULL;
+#endif
+
+#ifndef HAVE_SYSCTL_UNNUMBERED
#define OBD_SYSCTL 300
OBD_DEBUG_PEER_ON_TIMEOUT, /* dump peer debug when RPC times out */
OBD_ALLOC_FAIL_RATE, /* memory allocation random failure rate */
OBD_MAX_DIRTY_PAGES, /* maximum dirty pages */
+ OBD_AT_MIN, /* Adaptive timeouts params */
+ OBD_AT_MAX,
+ OBD_AT_EXTRA,
+ OBD_AT_EARLY_MARGIN,
+ OBD_AT_HISTORY,
};
+#else
+
+#define OBD_SYSCTL CTL_UNNUMBERED
+
+#define OBD_FAIL_LOC CTL_UNNUMBERED
+#define OBD_FAIL_VAL CTL_UNNUMBERED
+#define OBD_TIMEOUT CTL_UNNUMBERED
+#define OBD_DUMP_ON_TIMEOUT CTL_UNNUMBERED
+#define OBD_MEMUSED CTL_UNNUMBERED
+#define OBD_PAGESUSED CTL_UNNUMBERED
+#define OBD_MAXMEMUSED CTL_UNNUMBERED
+#define OBD_MAXPAGESUSED CTL_UNNUMBERED
+#define OBD_SYNCFILTER CTL_UNNUMBERED
+#define OBD_LDLM_TIMEOUT CTL_UNNUMBERED
+#define OBD_DUMP_ON_EVICTION CTL_UNNUMBERED
+#define OBD_DEBUG_PEER_ON_TIMEOUT CTL_UNNUMBERED
+#define OBD_ALLOC_FAIL_RATE CTL_UNNUMBERED
+#define OBD_MAX_DIRTY_PAGES CTL_UNNUMBERED
+#define OBD_AT_MIN CTL_UNNUMBERED
+#define OBD_AT_MAX CTL_UNNUMBERED
+#define OBD_AT_EXTRA CTL_UNNUMBERED
+#define OBD_AT_EARLY_MARGIN CTL_UNNUMBERED
+#define OBD_AT_HISTORY CTL_UNNUMBERED
+
+#endif
+
+
int LL_PROC_PROTO(proc_fail_loc)
{
int rc;
long old_fail_loc = obd_fail_loc;
- rc = ll_proc_dointvec(table, write, filp, buffer, lenp, ppos);
+ rc = ll_proc_dolongvec(table, write, filp, buffer, lenp, ppos);
if (old_fail_loc != obd_fail_loc)
- wake_up(&obd_race_waitq);
+ cfs_waitq_signal(&obd_race_waitq);
return rc;
}
if (len > *lenp)
len = *lenp;
buf[len] = '\0';
- if (copy_to_user(buffer, buf, len))
+ if (cfs_copy_to_user(buffer, buf, len))
return -EFAULT;
*lenp = len;
*ppos += *lenp;
if (len > *lenp)
len = *lenp;
buf[len] = '\0';
- if (copy_to_user(buffer, buf, len))
+ if (cfs_copy_to_user(buffer, buf, len))
return -EFAULT;
*lenp = len;
*ppos += *lenp;
if (len > *lenp)
len = *lenp;
buf[len] = '\0';
- if (copy_to_user(buffer, buf, len))
+ if (cfs_copy_to_user(buffer, buf, len))
return -EFAULT;
*lenp = len;
*ppos += *lenp;
if (len > *lenp)
len = *lenp;
buf[len] = '\0';
- if (copy_to_user(buffer, buf, len))
+ if (cfs_copy_to_user(buffer, buf, len))
return -EFAULT;
*lenp = len;
*ppos += *lenp;
int LL_PROC_PROTO(proc_max_dirty_pages_in_mb)
{
int rc = 0;
+ DECLARE_LL_PROC_PPOS_DECL;
if (!table->data || !table->maxlen || !*lenp || (*ppos && !write)) {
*lenp = 0;
rc = lprocfs_write_frac_helper(buffer, *lenp,
(unsigned int*)table->data,
1 << (20 - CFS_PAGE_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 > ((num_physpages / 10) * 9)) {
+ /* 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 > ((cfs_num_physpages / 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, ((num_physpages / 10) * 9));
- obd_max_dirty_pages = ((num_physpages / 10) * 9);
+ "is more than 90%% of available RAM; setting "
+ "to %lu\n", obd_max_dirty_pages,
+ ((cfs_num_physpages / 10) * 9));
+ obd_max_dirty_pages = ((cfs_num_physpages / 10) * 9);
} else if (obd_max_dirty_pages < 4 << (20 - CFS_PAGE_SHIFT)) {
obd_max_dirty_pages = 4 << (20 - CFS_PAGE_SHIFT);
}
if (len > *lenp)
len = *lenp;
buf[len] = '\0';
- if (copy_to_user(buffer, buf, len))
+ if (cfs_copy_to_user(buffer, buf, len))
return -EFAULT;
*lenp = len;
}
if (len > *lenp)
len = *lenp;
buf[len] = '\0';
- if (copy_to_user(buffer, buf, len))
+ if (cfs_copy_to_user(buffer, buf, len))
return -EFAULT;
*lenp = len;
}
}
#endif
+int LL_PROC_PROTO(proc_at_min)
+{
+ return ll_proc_dointvec(table, write, filp, buffer, lenp, ppos);
+}
+int LL_PROC_PROTO(proc_at_max)
+{
+ return ll_proc_dointvec(table, write, filp, buffer, lenp, ppos);
+}
+int LL_PROC_PROTO(proc_at_extra)
+{
+ return ll_proc_dointvec(table, write, filp, buffer, lenp, ppos);
+}
+int LL_PROC_PROTO(proc_at_early_margin)
+{
+ return ll_proc_dointvec(table, write, filp, buffer, lenp, ppos);
+}
+int LL_PROC_PROTO(proc_at_history)
+{
+ return ll_proc_dointvec(table, write, filp, buffer, lenp, ppos);
+}
+
+#ifdef CONFIG_SYSCTL
static cfs_sysctl_table_t obd_table[] = {
{
.ctl_name = OBD_FAIL_LOC,
.procname = "fail_loc",
.data = &obd_fail_loc,
- .maxlen = sizeof(int),
+ .maxlen = sizeof(obd_fail_loc),
.mode = 0644,
.proc_handler = &proc_fail_loc
},
.mode = 0644,
.proc_handler = &proc_set_timeout
},
-#ifdef RANDOM_FAIL_LOC
+#ifdef RANDOM_FAIL_ALLOC
{
.ctl_name = OBD_ALLOC_FAIL_RATE,
.procname = "alloc_fail_rate",
.mode = 0644,
.proc_handler = &proc_max_dirty_pages_in_mb
},
+ {
+ .ctl_name = OBD_AT_MIN,
+ .procname = "at_min",
+ .data = &at_min,
+ .maxlen = sizeof(int),
+ .mode = 0644,
+ .proc_handler = &proc_at_min
+ },
+ {
+ .ctl_name = OBD_AT_MAX,
+ .procname = "at_max",
+ .data = &at_max,
+ .maxlen = sizeof(int),
+ .mode = 0644,
+ .proc_handler = &proc_at_max
+ },
+ {
+ .ctl_name = OBD_AT_EXTRA,
+ .procname = "at_extra",
+ .data = &at_extra,
+ .maxlen = sizeof(int),
+ .mode = 0644,
+ .proc_handler = &proc_at_extra
+ },
+ {
+ .ctl_name = OBD_AT_EARLY_MARGIN,
+ .procname = "at_early_margin",
+ .data = &at_early_margin,
+ .maxlen = sizeof(int),
+ .mode = 0644,
+ .proc_handler = &proc_at_early_margin
+ },
+ {
+ .ctl_name = OBD_AT_HISTORY,
+ .procname = "at_history",
+ .data = &at_history,
+ .maxlen = sizeof(int),
+ .mode = 0644,
+ .proc_handler = &proc_at_history
+ },
{ 0 }
};
},
{0}
};
+#endif
void obd_sysctl_init (void)
{
git://git.whamcloud.com / fs / lustre-release.git / blobdiff