From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from sc8-sf-mx2-b.sourceforge.net ([10.3.1.92] helo=mail.sourceforge.net) by sc8-sf-list1-new.sourceforge.net with esmtp (Exim 4.43) id 1GSdgU-0001Ih-HM for user-mode-linux-devel@lists.sourceforge.net; Wed, 27 Sep 2006 10:59:02 -0700 Received: from [198.99.130.12] (helo=saraswathi.solana.com) by mail.sourceforge.net with esmtps (TLSv1:AES256-SHA:256) (Exim 4.44) id 1GSdgT-0004c2-Kq for user-mode-linux-devel@lists.sourceforge.net; Wed, 27 Sep 2006 10:59:02 -0700 Message-Id: <200609271757.k8RHvvtK005747@ccure.user-mode-linux.org> Mime-Version: 1.0 Date: Wed, 27 Sep 2006 13:57:57 -0400 From: Jeff Dike Subject: [uml-devel] [PATCH 5/5] UML - Stack consumption reduction List-Id: The user-mode Linux development list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: user-mode-linux-devel-bounces@lists.sourceforge.net Errors-To: user-mode-linux-devel-bounces@lists.sourceforge.net To: akpm@osdl.org Cc: linux-kernel@vger.kernel.org, user-mode-linux-devel@lists.sourceforge.net Fix some stack abuse in the sysrq t path. Signed-off-by: Jeff Dike --- arch/um/drivers/mconsole_kern.c | 15 ++++++++++----- arch/um/drivers/mconsole_user.c | 4 ++++ 2 files changed, 14 insertions(+), 5 deletions(-) Index: linux-2.6.18-mm/arch/um/drivers/mconsole_kern.c =================================================================== --- linux-2.6.18-mm.orig/arch/um/drivers/mconsole_kern.c 2006-09-26 16:28:51.000000000 -0400 +++ linux-2.6.18-mm/arch/um/drivers/mconsole_kern.c 2006-09-26 16:39:37.000000000 -0400 @@ -598,6 +598,11 @@ out: mconsole_reply(req, err_msg, err, 0); } +struct mconsole_output { + struct list_head list; + struct mc_request *req; +}; + static DEFINE_SPINLOCK(console_lock); static LIST_HEAD(clients); static char console_buf[MCONSOLE_MAX_DATA]; @@ -622,10 +627,10 @@ static void console_write(struct console return; list_for_each(ele, &clients){ - struct mconsole_entry *entry; + struct mconsole_output *entry; - entry = list_entry(ele, struct mconsole_entry, list); - mconsole_reply_len(&entry->request, console_buf, + entry = list_entry(ele, struct mconsole_output, list); + mconsole_reply_len(entry->req, console_buf, console_index, 0, 1); } @@ -649,10 +654,10 @@ late_initcall(mc_add_console); static void with_console(struct mc_request *req, void (*proc)(void *), void *arg) { - struct mconsole_entry entry; + struct mconsole_output entry; unsigned long flags; - entry.request = *req; + entry.req = req; list_add(&entry.list, &clients); spin_lock_irqsave(&console_lock, flags); Index: linux-2.6.18-mm/arch/um/drivers/mconsole_user.c =================================================================== --- linux-2.6.18-mm.orig/arch/um/drivers/mconsole_user.c 2006-09-26 16:28:51.000000000 -0400 +++ linux-2.6.18-mm/arch/um/drivers/mconsole_user.c 2006-09-26 16:39:37.000000000 -0400 @@ -131,6 +131,10 @@ int mconsole_get_request(int fd, struct int mconsole_reply_len(struct mc_request *req, const char *str, int total, int err, int more) { + /* XXX This is a stack consumption problem. It'd be nice to + * make it global and serialize access to it, but there are a + * ton of callers to this function. + */ struct mconsole_reply reply; int len, n; ------------------------------------------------------------------------- Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV _______________________________________________ User-mode-linux-devel mailing list User-mode-linux-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel