X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fobdclass%2Flinux%2Flinux-sysctl.c;h=19f95b8187ca94cdfe6cd5e9e0d0021f87045734;hp=1e43e720d4d4c789c0837ea2591b8f3b99d980b6;hb=c39d13d3ccae15f99eb50b90aa4a5613fb59af8f;hpb=65701b4a30efdb695776bcf690a2b3cabc928da1 diff --git a/lustre/obdclass/linux/linux-sysctl.c b/lustre/obdclass/linux/linux-sysctl.c index 1e43e72..19f95b8 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. @@ -17,11 +15,7 @@ * * 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 - * - * 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. + * http://www.gnu.org/licenses/gpl-2.0.html * * GPL HEADER END */ @@ -29,7 +23,7 @@ * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2011, Whamcloud, Inc. + * Copyright (c) 2011, 2015, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -37,441 +31,160 @@ */ #include -#include #include #include -#include -#include -#include #include #include #include -#include -#include +#include +#include #include #define DEBUG_SUBSYSTEM S_CLASS #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_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 */ - 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 */ - OBD_AT_MIN, /* Adaptive timeouts params */ - OBD_AT_MAX, - OBD_AT_EXTRA, - OBD_AT_EARLY_MARGIN, - OBD_AT_HISTORY, +#include + +struct static_lustre_uintvalue_attr { + struct { + struct attribute attr; + ssize_t (*show)(struct kobject *kobj, struct attribute *attr, + char *buf); + ssize_t (*store)(struct kobject *kobj, struct attribute *attr, + const char *buf, size_t len); + } u; + int *value; }; -#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_set_timeout) +static ssize_t static_uintvalue_show(struct kobject *kobj, + struct attribute *attr, + char *buf) { - int rc; + struct static_lustre_uintvalue_attr *lattr = (void *)attr; - rc = ll_proc_dointvec(table, write, filp, buffer, lenp, ppos); - if (ldlm_timeout >= obd_timeout) - ldlm_timeout = max(obd_timeout / 3, 1U); - return rc; + return sprintf(buf, "%d\n", *lattr->value); } -int LL_PROC_PROTO(proc_memory_alloc) +static ssize_t static_uintvalue_store(struct kobject *kobj, + struct attribute *attr, + const char *buffer, size_t count) { - char buf[22]; - int len; - DECLARE_LL_PROC_PPOS_DECL; + struct static_lustre_uintvalue_attr *lattr = (void *)attr; + unsigned int val; + int rc; - if (!*lenp || (*ppos && !write)) { - *lenp = 0; - return 0; - } - if (write) - return -EINVAL; + rc = kstrtouint(buffer, 10, &val); + if (rc) + return rc; - len = snprintf(buf, sizeof(buf), LPU64"\n", obd_memory_sum()); - if (len > *lenp) - len = *lenp; - buf[len] = '\0'; - if (cfs_copy_to_user(buffer, buf, len)) - return -EFAULT; - *lenp = len; - *ppos += *lenp; - return 0; -} + *lattr->value = val; -int LL_PROC_PROTO(proc_pages_alloc) -{ - char buf[22]; - int len; - DECLARE_LL_PROC_PPOS_DECL; - - 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 (cfs_copy_to_user(buffer, buf, len)) - return -EFAULT; - *lenp = len; - *ppos += *lenp; - return 0; + return count; } -int LL_PROC_PROTO(proc_mem_max) -{ - char buf[22]; - int len; - DECLARE_LL_PROC_PPOS_DECL; - - if (!*lenp || (*ppos && !write)) { - *lenp = 0; - return 0; - } - if (write) - return -EINVAL; +#define LUSTRE_STATIC_UINT_ATTR(name, value) \ +static struct static_lustre_uintvalue_attr lustre_sattr_##name = \ + {__ATTR(name, 0644, \ + static_uintvalue_show, \ + static_uintvalue_store),\ + value } - len = snprintf(buf, sizeof(buf), LPU64"\n", obd_memory_max()); - if (len > *lenp) - len = *lenp; - buf[len] = '\0'; - if (cfs_copy_to_user(buffer, buf, len)) - return -EFAULT; - *lenp = len; - *ppos += *lenp; - return 0; -} +LUSTRE_STATIC_UINT_ATTR(timeout, &obd_timeout); -int LL_PROC_PROTO(proc_pages_max) +static ssize_t max_dirty_mb_show(struct kobject *kobj, struct attribute *attr, + char *buf) { - char buf[22]; - int len; - DECLARE_LL_PROC_PPOS_DECL; - - 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 (cfs_copy_to_user(buffer, buf, len)) - return -EFAULT; - *lenp = len; - *ppos += *lenp; - return 0; + return sprintf(buf, "%lu\n", + obd_max_dirty_pages / (1 << (20 - PAGE_SHIFT))); } -int LL_PROC_PROTO(proc_max_dirty_pages_in_mb) +static ssize_t max_dirty_mb_store(struct kobject *kobj, struct attribute *attr, + const char *buffer, size_t count) { - int rc = 0; - DECLARE_LL_PROC_PPOS_DECL; + unsigned long val; + int rc; - 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; + rc = kstrtoul(buffer, 10, &val); + if (rc) + return rc; - 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; -} + val *= 1 << (20 - PAGE_SHIFT); /* convert to pages */ -#ifdef RANDOM_FAIL_ALLOC -int LL_PROC_PROTO(proc_alloc_fail_rate) -{ - int rc = 0; - DECLARE_LL_PROC_PPOS_DECL; + if (val > ((totalram_pages / 10) * 9)) { + /* Somebody wants to assign too much memory to dirty pages */ + return -EINVAL; + } + + if (val < 4 << (20 - PAGE_SHIFT)) { + /* Less than 4 Mb for dirty cache is also bad */ + return -EINVAL; + } - 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; + obd_max_dirty_pages = val; - len = lprocfs_read_frac_helper(buf, 21, - *(unsigned int*)table->data, - OBD_ALLOC_FAIL_MULT); - if (len > *lenp) - len = *lenp; - buf[len] = '\0'; - if (cfs_copy_to_user(buffer, buf, len)) - return -EFAULT; - *lenp = len; - } - *ppos += *lenp; - return rc; + return count; } +LUSTRE_RW_ATTR(max_dirty_mb); + +LUSTRE_STATIC_UINT_ATTR(debug_peer_on_timeout, &obd_debug_peer_on_timeout); +LUSTRE_STATIC_UINT_ATTR(dump_on_timeout, &obd_dump_on_timeout); +LUSTRE_STATIC_UINT_ATTR(dump_on_eviction, &obd_dump_on_eviction); +LUSTRE_STATIC_UINT_ATTR(at_min, &at_min); +LUSTRE_STATIC_UINT_ATTR(at_max, &at_max); +LUSTRE_STATIC_UINT_ATTR(at_extra, &at_extra); +LUSTRE_STATIC_UINT_ATTR(at_early_margin, &at_early_margin); +LUSTRE_STATIC_UINT_ATTR(at_history, &at_history); + +#ifdef HAVE_SERVER_SUPPORT +LUSTRE_STATIC_UINT_ATTR(ldlm_timeout, &ldlm_timeout); +LUSTRE_STATIC_UINT_ATTR(bulk_timeout, &bulk_timeout); #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) +static ssize_t memused_show(struct kobject *kobj, struct attribute *attr, + char *buf) { - return ll_proc_dointvec(table, write, filp, buffer, lenp, ppos); + return sprintf(buf, "%llu\n", obd_memory_sum()); } -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) +LUSTRE_RO_ATTR(memused); + +static ssize_t memused_max_show(struct kobject *kobj, struct attribute *attr, + char *buf) { - return ll_proc_dointvec(table, write, filp, buffer, lenp, ppos); + return sprintf(buf, "%llu\n", obd_memory_max()); } - -#ifdef CONFIG_SYSCTL -static cfs_sysctl_table_t obd_table[] = { - { - INIT_CTL_NAME(OBD_TIMEOUT) - .procname = "timeout", - .data = &obd_timeout, - .maxlen = sizeof(int), - .mode = 0644, - .proc_handler = &proc_set_timeout - }, - { - INIT_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 - }, - { - INIT_CTL_NAME(OBD_DUMP_ON_TIMEOUT) - .procname = "dump_on_timeout", - .data = &obd_dump_on_timeout, - .maxlen = sizeof(int), - .mode = 0644, - .proc_handler = &proc_dointvec - }, - { - INIT_CTL_NAME(OBD_DUMP_ON_EVICTION) - .procname = "dump_on_eviction", - .data = &obd_dump_on_eviction, - .maxlen = sizeof(int), - .mode = 0644, - .proc_handler = &proc_dointvec - }, - { - INIT_CTL_NAME(OBD_MEMUSED) - .procname = "memused", - .data = NULL, - .maxlen = 0, - .mode = 0444, - .proc_handler = &proc_memory_alloc - }, - { - INIT_CTL_NAME(OBD_PAGESUSED) - .procname = "pagesused", - .data = NULL, - .maxlen = 0, - .mode = 0444, - .proc_handler = &proc_pages_alloc - }, - { - INIT_CTL_NAME(OBD_MAXMEMUSED) - .procname = "memused_max", - .data = NULL, - .maxlen = 0, - .mode = 0444, - .proc_handler = &proc_mem_max - }, - { - INIT_CTL_NAME(OBD_MAXPAGESUSED) - .procname = "pagesused_max", - .data = NULL, - .maxlen = 0, - .mode = 0444, - .proc_handler = &proc_pages_max - }, - { - 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_ALLOC - { - INIT_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 - }, +LUSTRE_RO_ATTR(memused_max); + +static struct attribute *lustre_attrs[] = { + &lustre_sattr_timeout.u.attr, + &lustre_attr_max_dirty_mb.attr, + &lustre_sattr_debug_peer_on_timeout.u.attr, + &lustre_sattr_dump_on_timeout.u.attr, + &lustre_sattr_dump_on_eviction.u.attr, + &lustre_sattr_at_min.u.attr, + &lustre_sattr_at_max.u.attr, + &lustre_sattr_at_extra.u.attr, + &lustre_sattr_at_early_margin.u.attr, + &lustre_sattr_at_history.u.attr, + &lustre_attr_memused_max.attr, + &lustre_attr_memused.attr, +#ifdef HAVE_SERVER_SUPPORT + &lustre_sattr_ldlm_timeout.u.attr, + &lustre_sattr_bulk_timeout.u.attr, #endif - { - 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) } + NULL, }; -static cfs_sysctl_table_t parent_table[] = { - { - INIT_CTL_NAME(OBD_SYSCTL) - .procname = "lustre", - .data = NULL, - .maxlen = 0, - .mode = 0555, - .child = obd_table - }, - { INIT_CTL_NAME(0) } +static struct attribute_group lustre_attr_group = { + .attrs = lustre_attrs, }; -#endif -void obd_sysctl_init (void) +int obd_sysctl_init(void) { -#ifdef CONFIG_SYSCTL - if ( !obd_table_header ) - obd_table_header = cfs_register_sysctl_table(parent_table, 0); -#endif + return sysfs_create_group(lustre_kobj, &lustre_attr_group); } -void obd_sysctl_clean (void) +void obd_sysctl_clean(void) { -#ifdef CONFIG_SYSCTL - if ( obd_table_header ) - cfs_unregister_sysctl_table(obd_table_header); - obd_table_header = NULL; -#endif + sysfs_remove_group(lustre_kobj, &lustre_attr_group); }