-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
* GPL HEADER START
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* 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.
+ *
+ * Copyright (c) 2011, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
*/
#include <linux/module.h>
-#include <linux/autoconf.h>
#include <linux/sysctl.h>
#include <linux/sched.h>
#include <linux/mm.h>
#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
enum {
- OBD_FAIL_LOC = 1, /* control test failures instrumentation */
- OBD_FAIL_VAL, /* userdata for fail loc */
- OBD_TIMEOUT, /* RPC timeout before recovery/intr */
+ OBD_TIMEOUT = 3, /* RPC timeout before recovery/intr */
OBD_DUMP_ON_TIMEOUT, /* dump kernel debug log upon eviction */
OBD_MEMUSED, /* bytes currently OBD_ALLOCated */
OBD_PAGESUSED, /* pages currently OBD_PAGE_ALLOCated */
#endif
-
-int LL_PROC_PROTO(proc_fail_loc)
-{
- int rc;
- long old_fail_loc = obd_fail_loc;
-
- rc = ll_proc_dolongvec(table, write, filp, buffer, lenp, ppos);
- if (old_fail_loc != obd_fail_loc)
- cfs_waitq_signal(&obd_race_waitq);
- return rc;
-}
-
int LL_PROC_PROTO(proc_set_timeout)
{
int rc;
if (len > *lenp)
len = *lenp;
buf[len] = '\0';
- if (cfs_copy_to_user(buffer, buf, len))
+ if (copy_to_user(buffer, buf, len))
return -EFAULT;
*lenp = len;
*ppos += *lenp;
if (len > *lenp)
len = *lenp;
buf[len] = '\0';
- if (cfs_copy_to_user(buffer, buf, len))
+ if (copy_to_user(buffer, buf, len))
return -EFAULT;
*lenp = len;
*ppos += *lenp;
if (len > *lenp)
len = *lenp;
buf[len] = '\0';
- if (cfs_copy_to_user(buffer, buf, len))
+ if (copy_to_user(buffer, buf, len))
return -EFAULT;
*lenp = len;
*ppos += *lenp;
if (len > *lenp)
len = *lenp;
buf[len] = '\0';
- if (cfs_copy_to_user(buffer, buf, len))
+ if (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;
- return 0;
- }
- if (write) {
- 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 > ((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,
- ((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);
- }
- } else {
- char buf[21];
- int len;
-
- len = lprocfs_read_frac_helper(buf, sizeof(buf),
- *(unsigned int*)table->data,
- 1 << (20 - CFS_PAGE_SHIFT));
- if (len > *lenp)
- len = *lenp;
- buf[len] = '\0';
- if (cfs_copy_to_user(buffer, buf, len))
- return -EFAULT;
- *lenp = len;
- }
- *ppos += *lenp;
- return rc;
+ int rc = 0;
+ DECLARE_LL_PROC_PPOS_DECL;
+
+ 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,
+ 1 << (20 - 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 > ((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);
+ } else if (obd_max_dirty_pages < 4 << (20 - PAGE_CACHE_SHIFT)) {
+ obd_max_dirty_pages = 4 << (20 - PAGE_CACHE_SHIFT);
+ }
+ } else {
+ char buf[21];
+ int len;
+
+ len = lprocfs_read_frac_helper(buf, sizeof(buf),
+ *(unsigned int *)table->data,
+ 1 << (20 - PAGE_CACHE_SHIFT));
+ if (len > *lenp)
+ len = *lenp;
+ buf[len] = '\0';
+ if (copy_to_user(buffer, buf, len))
+ return -EFAULT;
+ *lenp = len;
+ }
+ *ppos += *lenp;
+ return rc;
}
#ifdef RANDOM_FAIL_ALLOC
if (len > *lenp)
len = *lenp;
buf[len] = '\0';
- if (cfs_copy_to_user(buffer, buf, len))
+ if (copy_to_user(buffer, buf, len))
return -EFAULT;
*lenp = len;
}
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(obd_fail_loc),
- .mode = 0644,
- .proc_handler = &proc_fail_loc
- },
- {
- .ctl_name = OBD_FAIL_VAL,
- .procname = "fail_val",
- .data = &obd_fail_val,
- .maxlen = sizeof(int),
- .mode = 0644,
- .proc_handler = &proc_dointvec
- },
- {
- .ctl_name = OBD_TIMEOUT,
+ INIT_CTL_NAME(OBD_TIMEOUT)
.procname = "timeout",
.data = &obd_timeout,
.maxlen = sizeof(int),
.proc_handler = &proc_set_timeout
},
{
- .ctl_name = OBD_DEBUG_PEER_ON_TIMEOUT,
+ INIT_CTL_NAME(OBD_DEBUG_PEER_ON_TIMEOUT)
.procname = "debug_peer_on_timeout",
.data = &obd_debug_peer_on_timeout,
.maxlen = sizeof(int),
.proc_handler = &proc_dointvec
},
{
- .ctl_name = OBD_DUMP_ON_TIMEOUT,
+ INIT_CTL_NAME(OBD_DUMP_ON_TIMEOUT)
.procname = "dump_on_timeout",
.data = &obd_dump_on_timeout,
.maxlen = sizeof(int),
.proc_handler = &proc_dointvec
},
{
- .ctl_name = OBD_DUMP_ON_EVICTION,
+ INIT_CTL_NAME(OBD_DUMP_ON_EVICTION)
.procname = "dump_on_eviction",
.data = &obd_dump_on_eviction,
.maxlen = sizeof(int),
.proc_handler = &proc_dointvec
},
{
- .ctl_name = OBD_MEMUSED,
+ INIT_CTL_NAME(OBD_MEMUSED)
.procname = "memused",
.data = NULL,
.maxlen = 0,
.proc_handler = &proc_memory_alloc
},
{
- .ctl_name = OBD_PAGESUSED,
+ INIT_CTL_NAME(OBD_PAGESUSED)
.procname = "pagesused",
.data = NULL,
.maxlen = 0,
.proc_handler = &proc_pages_alloc
},
{
- .ctl_name = OBD_MAXMEMUSED,
+ INIT_CTL_NAME(OBD_MAXMEMUSED)
.procname = "memused_max",
.data = NULL,
.maxlen = 0,
.proc_handler = &proc_mem_max
},
{
- .ctl_name = OBD_MAXPAGESUSED,
+ INIT_CTL_NAME(OBD_MAXPAGESUSED)
.procname = "pagesused_max",
.data = NULL,
.maxlen = 0,
.proc_handler = &proc_pages_max
},
{
- .ctl_name = OBD_LDLM_TIMEOUT,
+ INIT_CTL_NAME(OBD_LDLM_TIMEOUT)
.procname = "ldlm_timeout",
.data = &ldlm_timeout,
.maxlen = sizeof(int),
},
#ifdef RANDOM_FAIL_ALLOC
{
- .ctl_name = OBD_ALLOC_FAIL_RATE,
+ INIT_CTL_NAME(OBD_ALLOC_FAIL_RATE)
.procname = "alloc_fail_rate",
.data = &obd_alloc_fail_rate,
.maxlen = sizeof(int),
},
#endif
{
- .ctl_name = OBD_MAX_DIRTY_PAGES,
+ INIT_CTL_NAME(OBD_MAX_DIRTY_PAGES)
.procname = "max_dirty_mb",
.data = &obd_max_dirty_pages,
.maxlen = sizeof(int),
.proc_handler = &proc_max_dirty_pages_in_mb
},
{
- .ctl_name = OBD_AT_MIN,
+ INIT_CTL_NAME(OBD_AT_MIN)
.procname = "at_min",
.data = &at_min,
.maxlen = sizeof(int),
.proc_handler = &proc_at_min
},
{
- .ctl_name = OBD_AT_MAX,
+ INIT_CTL_NAME(OBD_AT_MAX)
.procname = "at_max",
.data = &at_max,
.maxlen = sizeof(int),
.proc_handler = &proc_at_max
},
{
- .ctl_name = OBD_AT_EXTRA,
+ INIT_CTL_NAME(OBD_AT_EXTRA)
.procname = "at_extra",
.data = &at_extra,
.maxlen = sizeof(int),
.proc_handler = &proc_at_extra
},
{
- .ctl_name = OBD_AT_EARLY_MARGIN,
+ INIT_CTL_NAME(OBD_AT_EARLY_MARGIN)
.procname = "at_early_margin",
.data = &at_early_margin,
.maxlen = sizeof(int),
.proc_handler = &proc_at_early_margin
},
{
- .ctl_name = OBD_AT_HISTORY,
+ INIT_CTL_NAME(OBD_AT_HISTORY)
.procname = "at_history",
.data = &at_history,
.maxlen = sizeof(int),
.mode = 0644,
.proc_handler = &proc_at_history
},
- { 0 }
+ { INIT_CTL_NAME(0) }
};
static cfs_sysctl_table_t parent_table[] = {
{
- .ctl_name = OBD_SYSCTL,
+ INIT_CTL_NAME(OBD_SYSCTL)
.procname = "lustre",
.data = NULL,
.maxlen = 0,
.mode = 0555,
.child = obd_table
},
- {0}
+ { INIT_CTL_NAME(0) }
};
+#endif
void obd_sysctl_init (void)
{
git://git.whamcloud.com / fs / lustre-release.git / blobdiff