Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S968819AbWLGFdV (ORCPT ); Thu, 7 Dec 2006 00:33:21 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S968820AbWLGFdV (ORCPT ); Thu, 7 Dec 2006 00:33:21 -0500 Received: from ozlabs.org ([203.10.76.45]:48524 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S968819AbWLGFdU (ORCPT ); Thu, 7 Dec 2006 00:33:20 -0500 From: Michael Neuling To: linux-kernel@vger.kernel.org cc: H Peter Anvin , Andrew Morton , Al Viro , Randy Dunlap X-GPG-Fingerprint: 9B25 DC2A C58D 2C8D 47C2 457E 0887 E86F 32E6 BE16 MIME-Version: 1.0 Subject: [PATCH] Add retain_initrd boot option X-Mailer: MH-E 8.0; nmh 1.1; GNU Emacs 21.4.1 Date: Thu, 07 Dec 2006 16:33:17 +1100 Message-ID: <20614.1165469597@neuling.org> Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2712 Lines: 82 Add retain_initrd option to control freeing of initrd memory after extraction. By default, free memory as previously. The first boot will need to hold a copy of the in memory fs for the second boot. This image can be large (much larger than the kernel), hence we can save time when the memory loader is slow. Also, it reduces the memory footprint while extracting the first boot since you don't need another copy of the fs. Signed-off-by: Michael Neuling --- Removed unnecessary init of do_retain_initrd as suggested by Randy Dunlap. Documentation/kernel-parameters.txt | 2 ++ init/initramfs.c | 18 ++++++++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) Index: linux-2.6-ozlabs/Documentation/kernel-parameters.txt =================================================================== --- linux-2.6-ozlabs.orig/Documentation/kernel-parameters.txt +++ linux-2.6-ozlabs/Documentation/kernel-parameters.txt @@ -1366,6 +1366,8 @@ and is between 256 and 4096 characters. resume= [SWSUSP] Specify the partition device for software suspend + retain_initrd [RAM] Keep initrd memory after extraction + rhash_entries= [KNL,NET] Set number of hash buckets for route cache Index: linux-2.6-ozlabs/init/initramfs.c =================================================================== --- linux-2.6-ozlabs.orig/init/initramfs.c +++ linux-2.6-ozlabs/init/initramfs.c @@ -487,6 +487,17 @@ static char * __init unpack_to_rootfs(ch return message; } +static int do_retain_initrd; + +static int __init retain_initrd_param(char *str) +{ + if (*str) + return 0; + do_retain_initrd = 1; + return 1; +} +__setup("retain_initrd", retain_initrd_param); + extern char __initramfs_start[], __initramfs_end[]; #ifdef CONFIG_BLK_DEV_INITRD #include @@ -494,10 +505,13 @@ extern char __initramfs_start[], __initr static void __init free_initrd(void) { -#ifdef CONFIG_KEXEC unsigned long crashk_start = (unsigned long)__va(crashk_res.start); unsigned long crashk_end = (unsigned long)__va(crashk_res.end); + if (do_retain_initrd) + goto skip; + +#ifdef CONFIG_KEXEC /* * If the initrd region is overlapped with crashkernel reserved region, * free only memory that is not part of crashkernel region. @@ -515,7 +529,7 @@ static void __init free_initrd(void) } else #endif free_initrd_mem(initrd_start, initrd_end); - +skip: initrd_start = 0; initrd_end = 0; } - 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/