staging:lustre:libcfs: Merge linux-proc.c into module.c (87643abf) · Commits · jan.koester / Linux

drivers/staging/lustre/lustre/libcfs/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -3,7 +3,7 @@ obj-$(CONFIG_LUSTRE_FS) += libcfs.o
		libcfs-linux-objs := linux-tracefile.o linux-debug.o
		libcfs-linux-objs += linux-prim.o linux-cpu.o
		libcfs-linux-objs += linux-tcpip.o
		libcfs-linux-objs += linux-proc.o linux-curproc.o
		libcfs-linux-objs += linux-curproc.o
		libcfs-linux-objs += linux-module.o
		libcfs-linux-objs += linux-crypto.o
		libcfs-linux-objs += linux-crypto-adler.o

drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c

deleted100644 → 0

+0 −577

Original line number	Diff line number	Diff line
		/*
		* GPL HEADER START
		*
		* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
		*
		* 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.
		*
		* 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).
		*
		* 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.
		*
		* GPL HEADER END
		*/
		/*
		* 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/
		* Lustre is a trademark of Sun Microsystems, Inc.
		*
		* libcfs/libcfs/linux/linux-proc.c
		*
		* Author: Zach Brown <zab@zabbo.net>
		* Author: Peter J. Braam <braam@clusterfs.com>
		* Author: Phil Schwan <phil@clusterfs.com>
		*/

		#include <linux/module.h>
		#include <linux/kernel.h>
		#include <linux/mm.h>
		#include <linux/string.h>
		#include <linux/stat.h>
		#include <linux/errno.h>
		#include <linux/unistd.h>
		#include <net/sock.h>
		#include <linux/uio.h>

		#include <linux/uaccess.h>

		#include <linux/fs.h>
		#include <linux/file.h>
		#include <linux/list.h>

		#include <linux/proc_fs.h>
		#include <linux/sysctl.h>

		# define DEBUG_SUBSYSTEM S_LNET

		#include "../../../include/linux/libcfs/libcfs.h"
		#include <asm/div64.h>
		#include "../tracefile.h"

		static struct ctl_table_header *lnet_table_header = NULL;
		extern char lnet_upcall[1024];
		/**
		* The path of debug log dump upcall script.
		*/
		extern char lnet_debug_log_upcall[1024];

		#define CTL_LNET (0x100)
		enum {
		PSDEV_DEBUG = 1, /* control debugging */
		PSDEV_SUBSYSTEM_DEBUG, /* control debugging */
		PSDEV_PRINTK, /* force all messages to console */
		PSDEV_CONSOLE_RATELIMIT, /* ratelimit console messages */
		PSDEV_CONSOLE_MAX_DELAY_CS, /* maximum delay over which we skip messages */
		PSDEV_CONSOLE_MIN_DELAY_CS, /* initial delay over which we skip messages */
		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 */
		PSDEV_LNET_PANIC_ON_LBUG, /* flag to panic on LBUG */
		PSDEV_LNET_DUMP_KERNEL, /* snapshot kernel debug buffer to file */
		PSDEV_LNET_DAEMON_FILE, /* spool kernel debug buffer to file */
		PSDEV_LNET_DEBUG_MB, /* size of debug buffer */
		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 */
		};

		static int proc_call_handler(void data, int write, loff_t ppos,
		void __user buffer, size_t lenp,
		int (handler)(void data, int write,
		loff_t pos, void __user *buffer, int len))
		{
		int rc = handler(data, write, ppos, buffer, lenp);

		if (rc < 0)
		return rc;

		if (write) {
		ppos += lenp;
		} else {
		*lenp = rc;
		*ppos += rc;
		}
		return 0;
		}

		static int __proc_dobitmasks(void *data, int write,
		loff_t pos, void __user *buffer, int nob)
		{
		const int tmpstrlen = 512;
		char *tmpstr;
		int rc;
		unsigned int *mask = data;
		int is_subsys = (mask == &libcfs_subsystem_debug) ? 1 : 0;
		int is_printk = (mask == &libcfs_printk) ? 1 : 0;

		rc = cfs_trace_allocate_string_buffer(&tmpstr, tmpstrlen);
		if (rc < 0)
		return rc;

		if (!write) {
		libcfs_debug_mask2str(tmpstr, tmpstrlen, *mask, is_subsys);
		rc = strlen(tmpstr);

		if (pos >= rc) {
		rc = 0;
		} else {
		rc = cfs_trace_copyout_string(buffer, nob,
		tmpstr + pos, "\n");
		}
		} else {
		rc = cfs_trace_copyin_string(tmpstr, tmpstrlen, buffer, nob);
		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 */
		if (is_printk)
		*mask \|= D_EMERG;
		}

		cfs_trace_free_string_buffer(tmpstr, tmpstrlen);
		return rc;
		}

		static int proc_dobitmasks(struct ctl_table *table, int write,
		void __user buffer, size_t lenp, loff_t *ppos)
		{
		return proc_call_handler(table->data, write, ppos, buffer, lenp,
		__proc_dobitmasks);
		}

		static int min_watchdog_ratelimit; /* disable ratelimiting */
		static int max_watchdog_ratelimit = (246060); /* limit to once per day */

		static int __proc_dump_kernel(void *data, int write,
		loff_t pos, void __user *buffer, int nob)
		{
		if (!write)
		return 0;

		return cfs_trace_dump_debug_buffer_usrstr(buffer, nob);
		}

		static int proc_dump_kernel(struct ctl_table *table, int write,
		void __user buffer, size_t lenp, loff_t *ppos)
		{
		return proc_call_handler(table->data, write, ppos, buffer, lenp,
		__proc_dump_kernel);
		}

		static int __proc_daemon_file(void *data, int write,
		loff_t pos, void __user *buffer, int nob)
		{
		if (!write) {
		int len = strlen(cfs_tracefile);

		if (pos >= len)
		return 0;

		return cfs_trace_copyout_string(buffer, nob,
		cfs_tracefile + pos, "\n");
		}

		return cfs_trace_daemon_command_usrstr(buffer, nob);
		}

		static int proc_daemon_file(struct ctl_table *table, int write,
		void __user buffer, size_t lenp, loff_t *ppos)
		{
		return proc_call_handler(table->data, write, ppos, buffer, lenp,
		__proc_daemon_file);
		}

		static int __proc_debug_mb(void *data, int write,
		loff_t pos, void __user *buffer, int nob)
		{
		if (!write) {
		char tmpstr[32];
		int len = snprintf(tmpstr, sizeof(tmpstr), "%d",
		cfs_trace_get_debug_mb());

		if (pos >= len)
		return 0;

		return cfs_trace_copyout_string(buffer, nob, tmpstr + pos,
		"\n");
		}

		return cfs_trace_set_debug_mb_usrstr(buffer, nob);
		}

		static int proc_debug_mb(struct ctl_table *table, int write,
		void __user buffer, size_t lenp, loff_t *ppos)
		{
		return proc_call_handler(table->data, write, ppos, buffer, lenp,
		__proc_debug_mb);
		}

		static int proc_console_max_delay_cs(struct ctl_table *table, int write,
		void __user buffer, size_t lenp,
		loff_t *ppos)
		{
		int rc, max_delay_cs;
		struct ctl_table dummy = *table;
		long d;

		dummy.data = &max_delay_cs;
		dummy.proc_handler = &proc_dointvec;

		if (!write) { /* read */
		max_delay_cs = cfs_duration_sec(libcfs_console_max_delay * 100);
		rc = proc_dointvec(&dummy, write, buffer, lenp, ppos);
		return rc;
		}

		/* write */
		max_delay_cs = 0;
		rc = proc_dointvec(&dummy, write, buffer, lenp, ppos);
		if (rc < 0)
		return rc;
		if (max_delay_cs <= 0)
		return -EINVAL;

		d = cfs_time_seconds(max_delay_cs) / 100;
		if (d == 0 \|\| d < libcfs_console_min_delay)
		return -EINVAL;
		libcfs_console_max_delay = d;

		return rc;
		}

		static int proc_console_min_delay_cs(struct ctl_table *table, int write,
		void __user buffer, size_t lenp,
		loff_t *ppos)
		{
		int rc, min_delay_cs;
		struct ctl_table dummy = *table;
		long d;

		dummy.data = &min_delay_cs;
		dummy.proc_handler = &proc_dointvec;

		if (!write) { /* read */
		min_delay_cs = cfs_duration_sec(libcfs_console_min_delay * 100);
		rc = proc_dointvec(&dummy, write, buffer, lenp, ppos);
		return rc;
		}

		/* write */
		min_delay_cs = 0;
		rc = proc_dointvec(&dummy, write, buffer, lenp, ppos);
		if (rc < 0)
		return rc;
		if (min_delay_cs <= 0)
		return -EINVAL;

		d = cfs_time_seconds(min_delay_cs) / 100;
		if (d == 0 \|\| d > libcfs_console_max_delay)
		return -EINVAL;
		libcfs_console_min_delay = d;

		return rc;
		}

		static int proc_console_backoff(struct ctl_table *table, int write,
		void __user buffer, size_t lenp, loff_t *ppos)
		{
		int rc, backoff;
		struct ctl_table dummy = *table;

		dummy.data = &backoff;
		dummy.proc_handler = &proc_dointvec;

		if (!write) { /* read */
		backoff= libcfs_console_backoff;
		rc = proc_dointvec(&dummy, write, buffer, lenp, ppos);
		return rc;
		}

		/* write */
		backoff = 0;
		rc = proc_dointvec(&dummy, write, buffer, lenp, ppos);
		if (rc < 0)
		return rc;
		if (backoff <= 0)
		return -EINVAL;

		libcfs_console_backoff = backoff;

		return rc;
		}

		static int libcfs_force_lbug(struct ctl_table *table, int write,
		void __user *buffer,
		size_t lenp, loff_t ppos)
		{
		if (write)
		LBUG();
		return 0;
		}

		static int proc_fail_loc(struct ctl_table *table, int write,
		void __user *buffer,
		size_t lenp, loff_t ppos)
		{
		int rc;
		long old_fail_loc = cfs_fail_loc;

		rc = proc_doulongvec_minmax(table, write, buffer, lenp, ppos);
		if (old_fail_loc != cfs_fail_loc)
		wake_up(&cfs_race_waitq);
		return rc;
		}

		static int __proc_cpt_table(void *data, int write,
		loff_t pos, void __user *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;

		if (rc == -EFBIG) {
		LIBCFS_FREE(buf, len);
		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;
		}

		static int proc_cpt_table(struct ctl_table *table, int write,
		void __user buffer, size_t lenp, loff_t *ppos)
		{
		return proc_call_handler(table->data, write, ppos, buffer, lenp,
		__proc_cpt_table);
		}

		static struct ctl_table lnet_table[] = {
		/*
		* NB No .strategy entries have been provided since sysctl(8) prefers
		* to go via /proc for portability.
		*/
		{
		.procname = "debug",
		.data = &libcfs_debug,
		.maxlen = sizeof(int),
		.mode = 0644,
		.proc_handler = &proc_dobitmasks,
		},
		{
		.procname = "subsystem_debug",
		.data = &libcfs_subsystem_debug,
		.maxlen = sizeof(int),
		.mode = 0644,
		.proc_handler = &proc_dobitmasks,
		},
		{
		.procname = "printk",
		.data = &libcfs_printk,
		.maxlen = sizeof(int),
		.mode = 0644,
		.proc_handler = &proc_dobitmasks,
		},
		{
		.procname = "console_ratelimit",
		.data = &libcfs_console_ratelimit,
		.maxlen = sizeof(int),
		.mode = 0644,
		.proc_handler = &proc_dointvec
		},
		{
		.procname = "console_max_delay_centisecs",
		.maxlen = sizeof(int),
		.mode = 0644,
		.proc_handler = &proc_console_max_delay_cs
		},
		{
		.procname = "console_min_delay_centisecs",
		.maxlen = sizeof(int),
		.mode = 0644,
		.proc_handler = &proc_console_min_delay_cs
		},
		{
		.procname = "console_backoff",
		.maxlen = sizeof(int),
		.mode = 0644,
		.proc_handler = &proc_console_backoff
		},

		{
		.procname = "debug_path",
		.data = libcfs_debug_file_path_arr,
		.maxlen = sizeof(libcfs_debug_file_path_arr),
		.mode = 0644,
		.proc_handler = &proc_dostring,
		},

		{
		.procname = "cpu_partition_table",
		.maxlen = 128,
		.mode = 0444,
		.proc_handler = &proc_cpt_table,
		},

		{
		.procname = "upcall",
		.data = lnet_upcall,
		.maxlen = sizeof(lnet_upcall),
		.mode = 0644,
		.proc_handler = &proc_dostring,
		},
		{
		.procname = "debug_log_upcall",
		.data = lnet_debug_log_upcall,
		.maxlen = sizeof(lnet_debug_log_upcall),
		.mode = 0644,
		.proc_handler = &proc_dostring,
		},
		{
		.procname = "lnet_memused",
		.data = (int *)&libcfs_kmemory.counter,
		.maxlen = sizeof(int),
		.mode = 0444,
		.proc_handler = &proc_dointvec,
		},
		{
		.procname = "catastrophe",
		.data = &libcfs_catastrophe,
		.maxlen = sizeof(int),
		.mode = 0444,
		.proc_handler = &proc_dointvec,
		},
		{
		.procname = "panic_on_lbug",
		.data = &libcfs_panic_on_lbug,
		.maxlen = sizeof(int),
		.mode = 0644,
		.proc_handler = &proc_dointvec,
		},
		{
		.procname = "dump_kernel",
		.maxlen = 256,
		.mode = 0200,
		.proc_handler = &proc_dump_kernel,
		},
		{
		.procname = "daemon_file",
		.mode = 0644,
		.maxlen = 256,
		.proc_handler = &proc_daemon_file,
		},
		{
		.procname = "debug_mb",
		.mode = 0644,
		.proc_handler = &proc_debug_mb,
		},
		{
		.procname = "watchdog_ratelimit",
		.data = &libcfs_watchdog_ratelimit,
		.maxlen = sizeof(int),
		.mode = 0644,
		.proc_handler = &proc_dointvec_minmax,
		.extra1 = &min_watchdog_ratelimit,
		.extra2 = &max_watchdog_ratelimit,
		},
		{
		.procname = "force_lbug",
		.data = NULL,
		.maxlen = 0,
		.mode = 0200,
		.proc_handler = &libcfs_force_lbug
		},
		{
		.procname = "fail_loc",
		.data = &cfs_fail_loc,
		.maxlen = sizeof(cfs_fail_loc),
		.mode = 0644,
		.proc_handler = &proc_fail_loc
		},
		{
		.procname = "fail_val",
		.data = &cfs_fail_val,
		.maxlen = sizeof(int),
		.mode = 0644,
		.proc_handler = &proc_dointvec
		},
		{
		}
		};

		static struct ctl_table top_table[] = {
		{
		.procname = "lnet",
		.mode = 0555,
		.data = NULL,
		.maxlen = 0,
		.child = lnet_table,
		},
		{
		}
		};

		int insert_proc(void)
		{
		if (lnet_table_header == NULL)
		lnet_table_header = register_sysctl_table(top_table);
		return 0;
		}

		void remove_proc(void)
		{
		if (lnet_table_header != NULL)
		unregister_sysctl_table(lnet_table_header);

		lnet_table_header = NULL;
		}

drivers/staging/lustre/lustre/libcfs/module.c

+547 −14

File changed.

Preview size limit exceeded, changes collapsed.