X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=libcfs%2Flibcfs%2Flinux%2Flinux-proc.c;h=684423b31d2282caa8c6482783f3bdfafda5b144;hb=9fa85c69c9e582874f52473e2612407a82319cb6;hp=4efd8dcb536198ed2b01c455f056da3d492263ec;hpb=2d5e7dc801fcaa66f5fd2a3acdd5f8c150dc84d7;p=fs%2Flustre-release.git diff --git a/libcfs/libcfs/linux/linux-proc.c b/libcfs/libcfs/linux/linux-proc.c index 4efd8dc..684423b 100644 --- a/libcfs/libcfs/linux/linux-proc.c +++ b/libcfs/libcfs/linux/linux-proc.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) 2008, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. + * + * Copyright (c) 2011, 2012, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -40,25 +40,16 @@ * Author: Phil Schwan */ -#ifndef EXPORT_SYMTAB -# define EXPORT_SYMTAB -#endif - -#ifndef AUTOCONF_INCLUDED -#include -#endif #include #include #include #include #include #include -#include #include #include #include -#include #include #include @@ -76,7 +67,9 @@ #include #include "tracefile.h" +#ifdef CONFIG_SYSCTL static cfs_sysctl_table_header_t *lnet_table_header = NULL; +#endif extern char lnet_upcall[1024]; /** * The path of debug log dump upcall script. @@ -95,6 +88,7 @@ enum { PSDEV_CONSOLE_BACKOFF, /* delay increase factor */ PSDEV_DEBUG_PATH, /* crashdump log location */ PSDEV_DEBUG_DUMP_PATH, /* crashdump tracelog location */ + PSDEV_CPT_TABLE, /* information about cpu partitions */ PSDEV_LNET_UPCALL, /* User mode upcall script */ PSDEV_LNET_MEMUSED, /* bytes currently PORTAL_ALLOCated */ PSDEV_LNET_CATASTROPHE, /* if we have LBUGged or panic'd */ @@ -105,6 +99,8 @@ enum { PSDEV_LNET_DEBUG_LOG_UPCALL, /* debug log upcall script */ PSDEV_LNET_WATCHDOG_RATELIMIT, /* ratelimit watchdog messages */ PSDEV_LNET_FORCE_LBUG, /* hook to force an LBUG */ + PSDEV_LNET_FAIL_LOC, /* control test failures instrumentation */ + PSDEV_LNET_FAIL_VAL, /* userdata for fail loc */ }; #else #define CTL_LNET CTL_UNNUMBERED @@ -117,6 +113,7 @@ enum { #define PSDEV_CONSOLE_BACKOFF CTL_UNNUMBERED #define PSDEV_DEBUG_PATH CTL_UNNUMBERED #define PSDEV_DEBUG_DUMP_PATH CTL_UNNUMBERED +#define PSDEV_CPT_TABLE CTL_UNNUMBERED #define PSDEV_LNET_UPCALL CTL_UNNUMBERED #define PSDEV_LNET_MEMUSED CTL_UNNUMBERED #define PSDEV_LNET_CATASTROPHE CTL_UNNUMBERED @@ -127,9 +124,10 @@ enum { #define PSDEV_LNET_DEBUG_LOG_UPCALL CTL_UNNUMBERED #define PSDEV_LNET_WATCHDOG_RATELIMIT CTL_UNNUMBERED #define PSDEV_LNET_FORCE_LBUG CTL_UNNUMBERED +#define PSDEV_LNET_FAIL_LOC CTL_UNNUMBERED +#define PSDEV_LNET_FAIL_VAL CTL_UNNUMBERED #endif - int proc_call_handler(void *data, int write, loff_t *ppos, void *buffer, size_t *lenp, @@ -177,8 +175,10 @@ static int __proc_dobitmasks(void *data, int write, } } else { rc = cfs_trace_copyin_string(tmpstr, tmpstrlen, buffer, nob); - if (rc < 0) - return rc; + if (rc < 0) { + cfs_trace_free_string_buffer(tmpstr, tmpstrlen); + return rc; + } rc = libcfs_debug_str2mask(mask, tmpstr, is_subsys); /* Always print LBUG/LASSERT to console, so keep this mask */ @@ -340,13 +340,66 @@ int LL_PROC_PROTO(libcfs_force_lbug) return 0; } +int LL_PROC_PROTO(proc_fail_loc) +{ + int rc; + long old_fail_loc = cfs_fail_loc; + + rc = ll_proc_dolongvec(table, write, filp, buffer, lenp, ppos); + if (old_fail_loc != cfs_fail_loc) + cfs_waitq_signal(&cfs_race_waitq); + return rc; +} + +static int __proc_cpt_table(void *data, int write, + loff_t pos, void *buffer, int nob) +{ + char *buf = NULL; + int len = 4096; + int rc = 0; + + if (write) + return -EPERM; + + LASSERT(cfs_cpt_table != NULL); + + while (1) { + LIBCFS_ALLOC(buf, len); + if (buf == NULL) + return -ENOMEM; + + rc = cfs_cpt_table_print(cfs_cpt_table, buf, len); + if (rc >= 0) + break; + + LIBCFS_FREE(buf, len); + if (rc == -EFBIG) { + len <<= 1; + continue; + } + goto out; + } + + if (pos >= rc) { + rc = 0; + goto out; + } + + rc = cfs_trace_copyout_string(buffer, nob, buf + pos, NULL); + out: + if (buf != NULL) + LIBCFS_FREE(buf, len); + return rc; +} +DECLARE_PROC_HANDLER(proc_cpt_table) + static cfs_sysctl_table_t lnet_table[] = { /* * NB No .strategy entries have been provided since sysctl(8) prefers * to go via /proc for portability. */ { - .ctl_name = PSDEV_DEBUG, + INIT_CTL_NAME(PSDEV_DEBUG) .procname = "debug", .data = &libcfs_debug, .maxlen = sizeof(int), @@ -354,7 +407,7 @@ static cfs_sysctl_table_t lnet_table[] = { .proc_handler = &proc_dobitmasks, }, { - .ctl_name = PSDEV_SUBSYSTEM_DEBUG, + INIT_CTL_NAME(PSDEV_SUBSYSTEM_DEBUG) .procname = "subsystem_debug", .data = &libcfs_subsystem_debug, .maxlen = sizeof(int), @@ -362,7 +415,7 @@ static cfs_sysctl_table_t lnet_table[] = { .proc_handler = &proc_dobitmasks, }, { - .ctl_name = PSDEV_PRINTK, + INIT_CTL_NAME(PSDEV_PRINTK) .procname = "printk", .data = &libcfs_printk, .maxlen = sizeof(int), @@ -370,7 +423,7 @@ static cfs_sysctl_table_t lnet_table[] = { .proc_handler = &proc_dobitmasks, }, { - .ctl_name = PSDEV_CONSOLE_RATELIMIT, + INIT_CTL_NAME(PSDEV_CONSOLE_RATELIMIT) .procname = "console_ratelimit", .data = &libcfs_console_ratelimit, .maxlen = sizeof(int), @@ -378,21 +431,21 @@ static cfs_sysctl_table_t lnet_table[] = { .proc_handler = &proc_dointvec }, { - .ctl_name = PSDEV_CONSOLE_MAX_DELAY_CS, + INIT_CTL_NAME(PSDEV_CONSOLE_MAX_DELAY_CS) .procname = "console_max_delay_centisecs", .maxlen = sizeof(int), .mode = 0644, .proc_handler = &proc_console_max_delay_cs }, { - .ctl_name = PSDEV_CONSOLE_MIN_DELAY_CS, + INIT_CTL_NAME(PSDEV_CONSOLE_MIN_DELAY_CS) .procname = "console_min_delay_centisecs", .maxlen = sizeof(int), .mode = 0644, .proc_handler = &proc_console_min_delay_cs }, { - .ctl_name = PSDEV_CONSOLE_BACKOFF, + INIT_CTL_NAME(PSDEV_CONSOLE_BACKOFF) .procname = "console_backoff", .maxlen = sizeof(int), .mode = 0644, @@ -400,7 +453,7 @@ static cfs_sysctl_table_t lnet_table[] = { }, { - .ctl_name = PSDEV_DEBUG_PATH, + INIT_CTL_NAME(PSDEV_DEBUG_PATH) .procname = "debug_path", .data = libcfs_debug_file_path_arr, .maxlen = sizeof(libcfs_debug_file_path_arr), @@ -408,8 +461,16 @@ static cfs_sysctl_table_t lnet_table[] = { .proc_handler = &proc_dostring, }, + { + INIT_CTL_NAME(PSDEV_CPT_TABLE) + .procname = "cpu_partition_table", + .maxlen = 128, + .mode = 0444, + .proc_handler = &proc_cpt_table, + }, + { - .ctl_name = PSDEV_LNET_UPCALL, + INIT_CTL_NAME(PSDEV_LNET_UPCALL) .procname = "upcall", .data = lnet_upcall, .maxlen = sizeof(lnet_upcall), @@ -417,7 +478,7 @@ static cfs_sysctl_table_t lnet_table[] = { .proc_handler = &proc_dostring, }, { - .ctl_name = PSDEV_LNET_DEBUG_LOG_UPCALL, + INIT_CTL_NAME(PSDEV_LNET_DEBUG_LOG_UPCALL) .procname = "debug_log_upcall", .data = lnet_debug_log_upcall, .maxlen = sizeof(lnet_debug_log_upcall), @@ -425,54 +486,54 @@ static cfs_sysctl_table_t lnet_table[] = { .proc_handler = &proc_dostring, }, { - .ctl_name = PSDEV_LNET_MEMUSED, + INIT_CTL_NAME(PSDEV_LNET_MEMUSED) .procname = "lnet_memused", .data = (int *)&libcfs_kmemory.counter, .maxlen = sizeof(int), .mode = 0444, .proc_handler = &proc_dointvec, - .strategy = &sysctl_intvec, + INIT_STRATEGY(&sysctl_intvec) }, { - .ctl_name = PSDEV_LNET_CATASTROPHE, + INIT_CTL_NAME(PSDEV_LNET_CATASTROPHE) .procname = "catastrophe", .data = &libcfs_catastrophe, .maxlen = sizeof(int), .mode = 0444, .proc_handler = &proc_dointvec, - .strategy = &sysctl_intvec, + INIT_STRATEGY(&sysctl_intvec) }, { - .ctl_name = PSDEV_LNET_PANIC_ON_LBUG, + INIT_CTL_NAME(PSDEV_LNET_PANIC_ON_LBUG) .procname = "panic_on_lbug", .data = &libcfs_panic_on_lbug, .maxlen = sizeof(int), .mode = 0644, .proc_handler = &proc_dointvec, - .strategy = &sysctl_intvec, + INIT_STRATEGY(&sysctl_intvec) }, { - .ctl_name = PSDEV_LNET_DUMP_KERNEL, + INIT_CTL_NAME(PSDEV_LNET_DUMP_KERNEL) .procname = "dump_kernel", .maxlen = 256, .mode = 0200, .proc_handler = &proc_dump_kernel, }, { - .ctl_name = PSDEV_LNET_DAEMON_FILE, + INIT_CTL_NAME(PSDEV_LNET_DAEMON_FILE) .procname = "daemon_file", .mode = 0644, .maxlen = 256, .proc_handler = &proc_daemon_file, }, { - .ctl_name = PSDEV_LNET_DEBUG_MB, + INIT_CTL_NAME(PSDEV_LNET_DEBUG_MB) .procname = "debug_mb", .mode = 0644, .proc_handler = &proc_debug_mb, }, { - .ctl_name = PSDEV_LNET_WATCHDOG_RATELIMIT, + INIT_CTL_NAME(PSDEV_LNET_WATCHDOG_RATELIMIT) .procname = "watchdog_ratelimit", .data = &libcfs_watchdog_ratelimit, .maxlen = sizeof(int), @@ -481,19 +542,38 @@ static cfs_sysctl_table_t lnet_table[] = { .extra1 = &min_watchdog_ratelimit, .extra2 = &max_watchdog_ratelimit, }, - { .ctl_name = PSDEV_LNET_FORCE_LBUG, + { INIT_CTL_NAME(PSDEV_LNET_FORCE_LBUG) .procname = "force_lbug", .data = NULL, .maxlen = 0, .mode = 0200, .proc_handler = &libcfs_force_lbug }, - {0} + { + INIT_CTL_NAME(PSDEV_LNET_FAIL_LOC) + .procname = "fail_loc", + .data = &cfs_fail_loc, + .maxlen = sizeof(cfs_fail_loc), + .mode = 0644, + .proc_handler = &proc_fail_loc + }, + { + INIT_CTL_NAME(PSDEV_LNET_FAIL_VAL) + .procname = "fail_val", + .data = &cfs_fail_val, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &proc_dointvec + }, + { + INIT_CTL_NAME(0) + } }; +#ifdef CONFIG_SYSCTL static cfs_sysctl_table_t top_table[] = { { - .ctl_name = CTL_LNET, + INIT_CTL_NAME(CTL_LNET) .procname = "lnet", .mode = 0555, .data = NULL, @@ -501,13 +581,12 @@ static cfs_sysctl_table_t top_table[] = { .child = lnet_table, }, { - .ctl_name = 0 + INIT_CTL_NAME(0) } }; int insert_proc(void) { -#ifdef CONFIG_SYSCTL if (lnet_table_header == NULL) lnet_table_header = cfs_register_sysctl_table(top_table, 0); #endif