X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fobdclass%2Flinux%2Flinux-sysctl.c;h=dd94b4614aca3782b762dc4614ed114dbce84f7a;hp=cfab30e83350318097e0061c1ac3a416a8424a70;hb=5655ee76f5c7573c9ad076a92df6388f27b65196;hpb=6ac14942797e32bee9fb24e126b0fb0cffd68c7b diff --git a/lustre/obdclass/linux/linux-sysctl.c b/lustre/obdclass/linux/linux-sysctl.c index cfab30e..dd94b46 100644 --- a/lustre/obdclass/linux/linux-sysctl.c +++ b/lustre/obdclass/linux/linux-sysctl.c @@ -1,6 +1,4 @@ -/* -*- 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. @@ -26,8 +24,10 @@ * 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/ @@ -35,7 +35,6 @@ */ #include -#include #include #include #include @@ -54,53 +53,28 @@ #include #include -cfs_sysctl_table_header_t *obd_table_header = NULL; - -#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_DUMP_ON_TIMEOUT, /* dump kernel debug log upon eviction */ - OBD_MEMUSED, /* bytes currently OBD_ALLOCated */ - OBD_PAGESUSED, /* pages currently OBD_PAGE_ALLOCated */ - OBD_MAXMEMUSED, /* maximum bytes OBD_ALLOCated concurrently */ - OBD_MAXPAGESUSED, /* maximum pages OBD_PAGE_ALLOCated concurrently */ - OBD_SYNCFILTER, /* XXX temporary, as we play with sync osts.. */ - OBD_LDLM_TIMEOUT, /* LDLM timeout for ASTs before client eviction */ - OBD_DUMP_ON_EVICTION, /* dump kernel debug log upon eviction */ - 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 */ -}; - -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); - if (old_fail_loc != obd_fail_loc) - wake_up(&obd_race_waitq); - return rc; -} +#ifdef CONFIG_SYSCTL +struct ctl_table_header *obd_table_header = NULL; +#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; - rc = ll_proc_dointvec(table, write, filp, buffer, lenp, ppos); + rc = proc_dointvec(table, write, buffer, lenp, ppos); if (ldlm_timeout >= obd_timeout) ldlm_timeout = max(obd_timeout / 3, 1U); 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; - DECLARE_LL_PROC_PPOS_DECL; if (!*lenp || (*ppos && !write)) { *lenp = 0; @@ -113,18 +87,19 @@ int LL_PROC_PROTO(proc_memory_alloc) if (len > *lenp) len = *lenp; buf[len] = '\0'; - if (copy_to_user(buffer, buf, len)) + if (copy_to_user(buffer, buf, len)) return -EFAULT; *lenp = len; *ppos += *lenp; return 0; } -int LL_PROC_PROTO(proc_pages_alloc) +static int +proc_pages_alloc(struct ctl_table *table, int write, void __user *buffer, + size_t *lenp, loff_t *ppos) { char buf[22]; int len; - DECLARE_LL_PROC_PPOS_DECL; if (!*lenp || (*ppos && !write)) { *lenp = 0; @@ -137,18 +112,19 @@ int LL_PROC_PROTO(proc_pages_alloc) if (len > *lenp) len = *lenp; buf[len] = '\0'; - if (copy_to_user(buffer, buf, len)) + 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; - DECLARE_LL_PROC_PPOS_DECL; if (!*lenp || (*ppos && !write)) { *lenp = 0; @@ -161,18 +137,19 @@ int LL_PROC_PROTO(proc_mem_max) if (len > *lenp) len = *lenp; buf[len] = '\0'; - if (copy_to_user(buffer, buf, len)) + if (copy_to_user(buffer, buf, len)) return -EFAULT; *lenp = len; *ppos += *lenp; return 0; } -int LL_PROC_PROTO(proc_pages_max) +static int +proc_pages_max(struct ctl_table *table, int write, void __user *buffer, + size_t *lenp, loff_t *ppos) { char buf[22]; int len; - DECLARE_LL_PROC_PPOS_DECL; if (!*lenp || (*ppos && !write)) { *lenp = 0; @@ -185,59 +162,61 @@ int LL_PROC_PROTO(proc_pages_max) if (len > *lenp) len = *lenp; buf[len] = '\0'; - if (copy_to_user(buffer, buf, len)) + 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) { - 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 > ((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 - 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 (copy_to_user(buffer, buf, len)) - return -EFAULT; - *lenp = len; - } - *ppos += *lenp; - return rc; + 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, + 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 > ((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, + ((totalram_pages / 10) * 9)); + obd_max_dirty_pages = ((totalram_pages / 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 -int LL_PROC_PROTO(proc_alloc_fail_rate) +int proc_alloc_fail_rate(struct ctl_table *table, int write, + void __user *buffer, size_t *lenp, loff_t *ppos) { int rc = 0; - DECLARE_LL_PROC_PPOS_DECL; if (!table->data || !table->maxlen || !*lenp || (*ppos && !write)) { *lenp = 0; @@ -257,7 +236,7 @@ int LL_PROC_PROTO(proc_alloc_fail_rate) if (len > *lenp) len = *lenp; buf[len] = '\0'; - if (copy_to_user(buffer, buf, len)) + if (copy_to_user(buffer, buf, len)) return -EFAULT; *lenp = len; } @@ -266,141 +245,175 @@ int LL_PROC_PROTO(proc_alloc_fail_rate) } #endif -static cfs_sysctl_table_t obd_table[] = { - { - .ctl_name = OBD_FAIL_LOC, - .procname = "fail_loc", - .data = &obd_fail_loc, - .maxlen = sizeof(int), - .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, - .procname = "timeout", - .data = &obd_timeout, - .maxlen = sizeof(int), - .mode = 0644, - .proc_handler = &proc_set_timeout - }, - { - .ctl_name = OBD_DEBUG_PEER_ON_TIMEOUT, - .procname = "debug_peer_on_timeout", - .data = &obd_debug_peer_on_timeout, - .maxlen = sizeof(int), - .mode = 0644, - .proc_handler = &proc_dointvec - }, - { - .ctl_name = OBD_DUMP_ON_TIMEOUT, - .procname = "dump_on_timeout", - .data = &obd_dump_on_timeout, - .maxlen = sizeof(int), - .mode = 0644, - .proc_handler = &proc_dointvec - }, - { - .ctl_name = OBD_DUMP_ON_EVICTION, - .procname = "dump_on_eviction", - .data = &obd_dump_on_eviction, - .maxlen = sizeof(int), - .mode = 0644, - .proc_handler = &proc_dointvec - }, - { - .ctl_name = OBD_MEMUSED, - .procname = "memused", - .data = NULL, - .maxlen = 0, - .mode = 0444, - .proc_handler = &proc_memory_alloc - }, - { - .ctl_name = OBD_PAGESUSED, - .procname = "pagesused", - .data = NULL, - .maxlen = 0, - .mode = 0444, - .proc_handler = &proc_pages_alloc - }, - { - .ctl_name = OBD_MAXMEMUSED, - .procname = "memused_max", - .data = NULL, - .maxlen = 0, - .mode = 0444, - .proc_handler = &proc_mem_max - }, - { - .ctl_name = OBD_MAXPAGESUSED, - .procname = "pagesused_max", - .data = NULL, - .maxlen = 0, - .mode = 0444, - .proc_handler = &proc_pages_max - }, - { - .ctl_name = OBD_LDLM_TIMEOUT, - .procname = "ldlm_timeout", - .data = &ldlm_timeout, - .maxlen = sizeof(int), - .mode = 0644, - .proc_handler = &proc_set_timeout - }, -#ifdef RANDOM_FAIL_LOC - { - .ctl_name = OBD_ALLOC_FAIL_RATE, - .procname = "alloc_fail_rate", - .data = &obd_alloc_fail_rate, - .maxlen = sizeof(int), - .mode = 0644, - .proc_handler = &proc_alloc_fail_rate - }, +#ifdef CONFIG_SYSCTL +static struct ctl_table obd_table[] = { + { + INIT_CTL_NAME + .procname = "timeout", + .data = &obd_timeout, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &proc_set_timeout + }, + { + INIT_CTL_NAME + .procname = "debug_peer_on_timeout", + .data = &obd_debug_peer_on_timeout, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &proc_dointvec + }, + { + INIT_CTL_NAME + .procname = "dump_on_timeout", + .data = &obd_dump_on_timeout, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &proc_dointvec + }, + { + INIT_CTL_NAME + .procname = "dump_on_eviction", + .data = &obd_dump_on_eviction, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &proc_dointvec + }, + { + INIT_CTL_NAME + .procname = "memused", + .data = NULL, + .maxlen = 0, + .mode = 0444, + .proc_handler = &proc_memory_alloc + }, + { + 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, + .mode = 0444, + .proc_handler = &proc_mem_max + }, + { + 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), + .mode = 0644, + .proc_handler = &proc_alloc_fail_rate + }, #endif - { - .ctl_name = OBD_MAX_DIRTY_PAGES, - .procname = "max_dirty_mb", - .data = &obd_max_dirty_pages, - .maxlen = sizeof(int), - .mode = 0644, - .proc_handler = &proc_max_dirty_pages_in_mb - }, - { 0 } + { + INIT_CTL_NAME + .procname = "max_dirty_mb", + .data = &obd_max_dirty_pages, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &proc_max_dirty_pages_in_mb + }, + { + INIT_CTL_NAME + .procname = "bulk_timeout", + .data = &bulk_timeout, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &proc_dointvec + }, + { + INIT_CTL_NAME + .procname = "at_min", + .data = &at_min, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &proc_dointvec + }, + { + INIT_CTL_NAME + .procname = "at_max", + .data = &at_max, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &proc_dointvec + }, + { + INIT_CTL_NAME + .procname = "at_extra", + .data = &at_extra, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &proc_dointvec + }, + { + INIT_CTL_NAME + .procname = "at_early_margin", + .data = &at_early_margin, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &proc_dointvec + }, + { + INIT_CTL_NAME + .procname = "at_history", + .data = &at_history, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &proc_dointvec + }, + { 0 } }; -static cfs_sysctl_table_t parent_table[] = { - { - .ctl_name = OBD_SYSCTL, - .procname = "lustre", - .data = NULL, - .maxlen = 0, - .mode = 0555, - .child = obd_table - }, - {0} +static struct ctl_table parent_table[] = { + { + INIT_CTL_NAME + .procname = "lustre", + .data = NULL, + .maxlen = 0, + .mode = 0555, + .child = obd_table + }, + { 0 } }; +#endif void obd_sysctl_init (void) { #ifdef CONFIG_SYSCTL - if ( !obd_table_header ) - obd_table_header = cfs_register_sysctl_table(parent_table, 0); + if ( !obd_table_header ) + obd_table_header = register_sysctl_table(parent_table); #endif } void obd_sysctl_clean (void) { #ifdef CONFIG_SYSCTL - if ( obd_table_header ) - cfs_unregister_sysctl_table(obd_table_header); - obd_table_header = NULL; + if ( obd_table_header ) + unregister_sysctl_table(obd_table_header); + obd_table_header = NULL; #endif }