Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758090AbXFMK1v (ORCPT ); Wed, 13 Jun 2007 06:27:51 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757148AbXFMK1m (ORCPT ); Wed, 13 Jun 2007 06:27:42 -0400 Received: from TYO201.gate.nec.co.jp ([202.32.8.193]:56043 "EHLO tyo201.gate.nec.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756898AbXFMK1k (ORCPT ); Wed, 13 Jun 2007 06:27:40 -0400 Message-ID: <466FC681.5060501@bx.jp.nec.com> Date: Wed, 13 Jun 2007 19:27:13 +0900 From: Keiichi KII User-Agent: Thunderbird 2.0.0.0 (Windows/20070326) MIME-Version: 1.0 To: Matt Mackall CC: Andrew Morton , David Miller , linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [RFC][PATCH -mm take5 2/7] support multiple logging References: <466FC455.5060001@bx.jp.nec.com> In-Reply-To: <466FC455.5060001@bx.jp.nec.com> Content-Type: text/plain; charset=ISO-2022-JP Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 6692 Lines: 249 From: Keiichi KII This patch contains the following changes for supporting multiple logging agents. 1. extend netconsole to multiple netpolls To send kernel messages to multiple logging agents, extend netcosnole to be able to use multiple netpolls. Each netpoll sends kernel messages to its own logging agent. 2. change config parameter format We change config parameter format from single configuration to multiple configurations separated by ';'. ex) sending kernel messages to destination1 and destination2 using eth0. modprobe netconsole \ netconsole="@/eth0,@[destination1]/;@/eth0,@[destination2]/" 3. introduce CONFIG_NETCONSOLE_DYNCON config to change between existing netconsole and netconsole applying the above function. Signed-off-by: Keiichi KII Signed-off-by: Takayoshi Kochi --- Index: mm/drivers/net/netconsole.c =================================================================== --- mm.orig/drivers/net/netconsole.c +++ mm/drivers/net/netconsole.c @@ -61,21 +61,104 @@ static struct netpoll np = { .remote_port = 6666, .remote_mac = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}, }; -static int configured = 0; #define MAX_PRINT_CHUNK 1000 +#ifdef CONFIG_NETCONSOLE_DYNCON +struct netconsole_target { + struct list_head list; + int id; + struct netpoll np; +}; + +static LIST_HEAD(target_list); +static DEFINE_SPINLOCK(target_list_lock); + +static void remove_target(struct netconsole_target *nt) +{ + unsigned long flags; + + spin_lock_irqsave(&target_list_lock, flags); + list_del(&nt->list); + if (list_empty(&target_list)) + netpoll_cleanup(&nt->np); + spin_unlock_irqrestore(&target_list_lock, flags); + kfree(nt); +} + +static int add_target(char* target_config) +{ + int retval = 0; + unsigned long flags; + static atomic_t target_count = ATOMIC_INIT(0); + struct netconsole_target *new_target; + + new_target = kzalloc(sizeof(*new_target), GFP_KERNEL); + if (!new_target) { + printk(KERN_ERR "netconsole: kmalloc() failed!\n"); + retval = -ENOMEM; + goto out; + } + + new_target->np = np; + if (netpoll_parse_options(&new_target->np, target_config)) { + printk(KERN_ERR "netconsole: can't parse config:%s\n", + target_config); + kfree(new_target); + retval = -EINVAL; + goto out; + } + if (netpoll_setup(&new_target->np)) { + printk(KERN_ERR "netconsole: can't setup netpoll:%s\n", + target_config); + kfree(new_target); + retval = -EINVAL; + goto out; + } + + new_target->id = atomic_inc_return(&target_count); + + printk(KERN_INFO "netconsole: add target: " + "remote ip_addr=%d.%d.%d.%d remote port=%d\n", + HIPQUAD(new_target->np.remote_ip), new_target->np.remote_port); + + spin_lock_irqsave(&target_list_lock, flags); + list_add(&new_target->list, &target_list); + spin_unlock_irqrestore(&target_list_lock, flags); + + out: + return retval; +} +#endif /* CONFIG_NETCONSOLE_DYNCON */ + static void write_msg(struct console *con, const char *msg, unsigned int len) { int frag, left; unsigned long flags; +#ifdef CONFIG_NETCONSOLE_DYNCON + struct netconsole_target *target; + + if (list_empty(&target_list)) + return; + + spin_lock_irqsave(&target_list_lock, flags); + for (left = len; left; ) { + frag = min(left, MAX_PRINT_CHUNK); + list_for_each_entry(target, &target_list, list) + netpoll_send_udp(&target->np, msg, frag); + msg += frag; + left -= frag; + } + + spin_unlock_irqrestore(&target_list_lock, flags); +#else if (!np.dev) return; local_irq_save(flags); - for(left = len; left; ) { + for (left = len; left; ) { frag = min(left, MAX_PRINT_CHUNK); netpoll_send_udp(&np, msg, frag); msg += frag; @@ -83,6 +166,7 @@ static void write_msg(struct console *co } local_irq_restore(flags); +#endif /* CONFIG_NETCONSOLE_DYNCON */ } static struct console netconsole = { @@ -91,40 +175,59 @@ static struct console netconsole = { .write = write_msg }; +#ifndef MODULE static int __init option_setup(char *opt) { - configured = !netpoll_parse_options(&np, opt); + strncpy(config, opt, 256); return 1; } __setup("netconsole=", option_setup); +#endif -static int __init init_netconsole(void) +static void cleanup_netconsole(void) { - int err; +#ifdef CONFIG_NETCONSOLE_DYNCON + struct netconsole_target *nt, *tmp; - if(strlen(config)) - option_setup(config); + unregister_console(&netconsole); + list_for_each_entry_safe(nt, tmp, &target_list, list) + remove_target(nt); +#else + unregister_console(&netconsole); + netpoll_cleanup(&np); +#endif /* CONFIG_NETCONSOLE_DYNCON */ +} - if(!configured) { - printk("netconsole: not configured, aborting\n"); +static int __init init_netconsole(void) +{ + char *tmp = config; +#ifdef CONFIG_NETCONSOLE_DYNCON + char *p; + + register_console(&netconsole); + if (!strlen(config)) { + printk(KERN_ERR "netconsole: not configured\n"); return 0; } - - err = netpoll_setup(&np); - if (err) - return err; - + while ((p = strsep(&tmp, ";")) != NULL) + if (add_target(p)) { + printk(KERN_ERR + "netconsole: can't add target to netconsole\n"); + cleanup_netconsole(); + return -EINVAL; + } +#else + if (!strlen(config) || + netpoll_parse_options(&np, tmp) || netpoll_setup(&np)) { + printk(KERN_ERR "netconsole: can't parse config:%s\n", tmp); + return -EINVAL; + } register_console(&netconsole); +#endif /* CONFIG_NETCONSOLE_DYNCON */ printk(KERN_INFO "netconsole: network logging started\n"); return 0; } -static void cleanup_netconsole(void) -{ - unregister_console(&netconsole); - netpoll_cleanup(&np); -} - module_init(init_netconsole); module_exit(cleanup_netconsole); Index: mm/drivers/net/Kconfig =================================================================== --- mm.orig/drivers/net/Kconfig +++ mm/drivers/net/Kconfig @@ -3019,6 +3019,16 @@ config NETCONSOLE If you want to log kernel messages over the network, enable this. See for details. +config NETCONSOLE_DYNCON + default y + bool "Support for multiple logging and UI for netconsole" + depends on NETCONSOLE + ---help--- + This option enables multiple logging and changing dynamically + configurations (e.g. IP adderss, port number and so on) + by using sysfs and ioctl. + See for details. + config NETPOLL def_bool NETCONSOLE -- - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/