X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fobdclass%2Flinux%2Flinux-sysctl.c;h=b7e14b7d41a4f65f7bdcdfc60232634c1fbc6f16;hb=8529011d926fa99c0d37ac644e998f83567b4439;hp=c7d7ef00515ab2e2ceb92fa759481da97407dd98;hpb=71e20cf1b01ea7da372858dd114d47005324153b;p=fs%2Flustre-release.git diff --git a/lustre/obdclass/linux/linux-sysctl.c b/lustre/obdclass/linux/linux-sysctl.c index c7d7ef0..b7e14b7 100644 --- a/lustre/obdclass/linux/linux-sysctl.c +++ b/lustre/obdclass/linux/linux-sysctl.c @@ -1,30 +1,40 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: +/* + * GPL HEADER START * - * Copyright (C) 2001, 2002 Cluster File Systems, Inc. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * This file is part of the Lustre file system, http://www.lustre.org - * Lustre is a trademark of Cluster File Systems, Inc. + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 only, + * as published by the Free Software Foundation. * - * You may have signed or agreed to another license before downloading - * this software. If so, you are bound by the terms and conditions - * of that agreement, and the following does not apply to you. See the - * LICENSE file included with this distribution for more information. + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License version 2 for more details (a copy is included + * in the LICENSE file that accompanied this code). * - * If you did not agree to a different license, then this copy of Lustre - * is open source software; you can redistribute it and/or modify it - * under the terms of version 2 of the GNU General Public License as - * published by the Free Software Foundation. + * You should have received a copy of the GNU General Public License + * version 2 along with this program; If not, see + * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf * - * In either case, Lustre is distributed in the hope that it will be - * useful, but WITHOUT ANY WARRANTY; without even the implied warranty - * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * license text for more details. + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. * + * GPL HEADER END + */ +/* + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. + * Use is subject to license terms. + * + * Copyright (c) 2011, Whamcloud, Inc. + */ +/* + * This file is part of Lustre, http://www.lustre.org/ + * Lustre is a trademark of Sun Microsystems, Inc. */ #include -#include #include #include #include @@ -35,7 +45,6 @@ #include #include #include -#include #include #include @@ -44,14 +53,16 @@ #include #include +#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 */ @@ -62,18 +73,39 @@ enum { 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 */ + OBD_AT_MIN, /* Adaptive timeouts params */ + OBD_AT_MAX, + OBD_AT_EXTRA, + OBD_AT_EARLY_MARGIN, + OBD_AT_HISTORY, }; -int LL_PROC_PROTO(proc_fail_loc) -{ - int rc; - long old_fail_loc = obd_fail_loc; +#else - rc = ll_proc_dointvec(table, write, filp, buffer, lenp, ppos); - if (old_fail_loc != obd_fail_loc) - wake_up(&obd_race_waitq); - return rc; -} +#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_set_timeout) { @@ -95,14 +127,14 @@ int LL_PROC_PROTO(proc_memory_alloc) *lenp = 0; return 0; } - if (write) + if (write) return -EINVAL; - + len = snprintf(buf, sizeof(buf), LPU64"\n", obd_memory_sum()); 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; @@ -126,7 +158,7 @@ int LL_PROC_PROTO(proc_pages_alloc) 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; @@ -150,7 +182,7 @@ int LL_PROC_PROTO(proc_mem_max) 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; @@ -174,13 +206,55 @@ int LL_PROC_PROTO(proc_pages_max) 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; return 0; } +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; +} + #ifdef RANDOM_FAIL_ALLOC int LL_PROC_PROTO(proc_alloc_fail_rate) { @@ -192,7 +266,7 @@ int LL_PROC_PROTO(proc_alloc_fail_rate) return 0; } if (write) { - rc = lprocfs_write_frac_helper(buffer, *lenp, + rc = lprocfs_write_frac_helper(buffer, *lenp, (unsigned int*)table->data, OBD_ALLOC_FAIL_MULT); } else { @@ -205,7 +279,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 (cfs_copy_to_user(buffer, buf, len)) return -EFAULT; *lenp = len; } @@ -214,25 +288,31 @@ int LL_PROC_PROTO(proc_alloc_fail_rate) } #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), - .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), @@ -240,7 +320,7 @@ static cfs_sysctl_table_t obd_table[] = { .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), @@ -248,7 +328,7 @@ static cfs_sysctl_table_t obd_table[] = { .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), @@ -256,7 +336,7 @@ static cfs_sysctl_table_t obd_table[] = { .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), @@ -264,7 +344,7 @@ static cfs_sysctl_table_t obd_table[] = { .proc_handler = &proc_dointvec }, { - .ctl_name = OBD_MEMUSED, + INIT_CTL_NAME(OBD_MEMUSED) .procname = "memused", .data = NULL, .maxlen = 0, @@ -272,7 +352,7 @@ static cfs_sysctl_table_t obd_table[] = { .proc_handler = &proc_memory_alloc }, { - .ctl_name = OBD_PAGESUSED, + INIT_CTL_NAME(OBD_PAGESUSED) .procname = "pagesused", .data = NULL, .maxlen = 0, @@ -280,7 +360,7 @@ static cfs_sysctl_table_t obd_table[] = { .proc_handler = &proc_pages_alloc }, { - .ctl_name = OBD_MAXMEMUSED, + INIT_CTL_NAME(OBD_MAXMEMUSED) .procname = "memused_max", .data = NULL, .maxlen = 0, @@ -288,7 +368,7 @@ static cfs_sysctl_table_t obd_table[] = { .proc_handler = &proc_mem_max }, { - .ctl_name = OBD_MAXPAGESUSED, + INIT_CTL_NAME(OBD_MAXPAGESUSED) .procname = "pagesused_max", .data = NULL, .maxlen = 0, @@ -296,16 +376,16 @@ static cfs_sysctl_table_t obd_table[] = { .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), .mode = 0644, .proc_handler = &proc_set_timeout }, -#ifdef RANDOM_FAIL_LOC +#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), @@ -313,20 +393,69 @@ static cfs_sysctl_table_t obd_table[] = { .proc_handler = &proc_alloc_fail_rate }, #endif - { 0 } + { + INIT_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 + }, + { + INIT_CTL_NAME(OBD_AT_MIN) + .procname = "at_min", + .data = &at_min, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &proc_at_min + }, + { + INIT_CTL_NAME(OBD_AT_MAX) + .procname = "at_max", + .data = &at_max, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &proc_at_max + }, + { + INIT_CTL_NAME(OBD_AT_EXTRA) + .procname = "at_extra", + .data = &at_extra, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &proc_at_extra + }, + { + INIT_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 + }, + { + INIT_CTL_NAME(OBD_AT_HISTORY) + .procname = "at_history", + .data = &at_history, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &proc_at_history + }, + { 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) {