wok annotate linux/stuff/linux-freeinitrd-2.6.30.6.u @ rev 5159

linux: fix stacked initrd desallocation
author Pascal Bellard <pascal.bellard@slitaz.org>
date Wed Mar 24 20:46:57 2010 +0100 (2010-03-24)
parents 7589496c772c
children 9b243bbfa976
rev   line source
pankso@4056 1 --- linux-2.6.30.4/arch/x86/mm/init.c
pankso@4056 2 +++ linux-2.6.30.4/arch/x86/mm/init.c
pankso@4056 3 @@ -381,7 +381,7 @@
pankso@4056 4 */
pankso@4056 5 set_memory_rw(begin, (end - begin) >> PAGE_SHIFT);
pankso@4056 6
pankso@4056 7 - printk(KERN_INFO "Freeing %s: %luk freed\n", what, (end - begin) >> 10);
pankso@4056 8 + if (what) printk(KERN_INFO "Freeing %s: %luk freed\n", what, (end - begin) >> 10);
pankso@4056 9
pankso@4056 10 for (; addr < end; addr += PAGE_SIZE) {
pankso@4056 11 ClearPageReserved(virt_to_page(addr));
pankso@4056 12
pankso@4056 13 --- linux-2.6.30.4/init/initramfs.c
pankso@4056 14 +++ linux-2.6.30.4/init/initramfs.c
pascal@5159 15 @@ -374,6 +374,52 @@
pankso@4056 16 [Reset] = do_reset,
pankso@4056 17 };
pankso@4056 18
pankso@4056 19 +#include <linux/initrd.h>
pascal@5159 20 +#define INITRD_PAGE ((PAGE_SIZE > 64*1024) ? PAGE_SIZE : 64*1024)
pascal@5159 21 +#define INITRD_DOT (1024*1024)
pankso@4056 22 +
pankso@4056 23 +static void free_rootfs_mem(unsigned long start, unsigned long end)
pankso@4056 24 +{
pankso@4056 25 + free_init_pages(NULL, start, end);
pankso@4056 26 +}
pankso@4056 27 +
pankso@4056 28 +static void _free_initrd(unsigned long initrd_start, unsigned long initrd_end,
pankso@4056 29 + void (*free_initrd_mem)(unsigned long, unsigned long));
pankso@4056 30 +
pankso@4056 31 +static struct {
pascal@5159 32 + int offset, last, inptr, freed;
pankso@4056 33 + char *max;
pankso@4056 34 +} fill;
pankso@4056 35 +
pankso@4056 36 +static void release_inbuf(void)
pankso@4056 37 +{
pankso@4056 38 + if (fill.offset >= INITRD_PAGE) {
pankso@4056 39 + unsigned rem = fill.offset % INITRD_PAGE;
pankso@4056 40 + unsigned end = initrd_start + fill.offset - rem;
pankso@4056 41 + _free_initrd(initrd_start, end, free_rootfs_mem);
pascal@5159 42 + fill.freed += fill.offset - rem;
pascal@5159 43 + if (fill.freed >= INITRD_DOT) {
pascal@5159 44 + fill.freed -= INITRD_DOT;
pascal@5159 45 + printk(".");
pascal@5159 46 + }
pankso@4056 47 + initrd_start = end;
pankso@4056 48 + fill.offset = rem;
pankso@4056 49 + }
pankso@4056 50 +}
pankso@4056 51 +
pankso@4056 52 +static int fill_buffer(void *buffer, unsigned size)
pankso@4056 53 +{
pankso@4056 54 + int max = fill.max - (char *) initrd_start - fill.offset;
pankso@4056 55 + if (max > size) max = size;
pankso@4056 56 + if (max > INITRD_PAGE) max = INITRD_PAGE;
pankso@4056 57 + memcpy(buffer, (void *)(initrd_start + fill.offset), max);
pascal@5159 58 + release_inbuf();
pankso@4056 59 + fill.offset += max;
pankso@4056 60 + fill.inptr += fill.last;
pankso@4056 61 + fill.last = max;
pankso@4056 62 + return max;
pankso@4056 63 +}
pankso@4056 64 +
pankso@4056 65 static int __init write_buffer(char *buf, unsigned len)
pankso@4056 66 {
pankso@4056 67 count = len;
pascal@5159 68 @@ -418,6 +464,7 @@
pankso@4056 69 decompress_fn decompress;
pankso@4056 70 const char *compress_name;
pankso@4056 71 static __initdata char msg_buf[64];
pankso@4056 72 + int early_free_initrd = (buf == (char *) initrd_start);
pankso@4056 73
pankso@4056 74 header_buf = kmalloc(110, GFP_KERNEL);
pankso@4056 75 symlink_buf = kmalloc(PATH_MAX + N_ALIGN(PATH_MAX) + 1, GFP_KERNEL);
pascal@5159 76 @@ -431,8 +478,31 @@
pankso@4056 77 message = NULL;
pankso@4056 78 while (!message && len) {
pankso@4056 79 loff_t saved_offset = this_header;
pankso@4056 80 + fill.offset = buf - (char *) initrd_start;
pankso@4056 81 + fill.max = buf + len;
pascal@5159 82 + fill.inptr = fill.last = fill.freed = 0;
pankso@4056 83 if (*buf == '0' && !(this_header & 3)) {
pankso@4056 84 state = Start;
pankso@4056 85 + if (early_free_initrd) {
pankso@4056 86 + while (len) {
pankso@4056 87 + unsigned n = len, tofree;
pankso@4056 88 + if (n > INITRD_PAGE)
pankso@4056 89 + n = INITRD_PAGE;
pankso@4056 90 + flush_buffer(buf, n);
pankso@4056 91 + buf += n;
pankso@4056 92 + len -= n;
pankso@4056 93 + n = buf - (char *) initrd_start;
pankso@4056 94 + tofree = n - (n % INITRD_PAGE);
pankso@4056 95 + if (!tofree)
pankso@4056 96 + continue;
pankso@4056 97 + _free_initrd(initrd_start,
pankso@4056 98 + initrd_start + tofree,
pankso@4056 99 + free_rootfs_mem);
pankso@4056 100 + initrd_start += tofree;
pankso@4056 101 + printk(".");
pankso@4056 102 + }
pankso@4056 103 + continue;
pankso@4056 104 + }
pankso@4056 105 written = write_buffer(buf, len);
pankso@4056 106 buf += written;
pankso@4056 107 len -= written;
pascal@5159 108 @@ -446,9 +516,15 @@
pankso@4056 109 }
pankso@4056 110 this_header = 0;
pankso@4056 111 decompress = decompress_method(buf, len, &compress_name);
pankso@4056 112 - if (decompress)
pankso@4056 113 - decompress(buf, len, NULL, flush_buffer, NULL,
pankso@4056 114 + if (decompress) {
pankso@4056 115 + if (early_free_initrd) {
pankso@4056 116 + decompress(NULL, 0, fill_buffer, flush_buffer,
pankso@4056 117 + NULL, &my_inptr, error);
pankso@4056 118 + my_inptr += fill.inptr;
pankso@4056 119 + }
pankso@4056 120 + else decompress(buf, len, NULL, flush_buffer, NULL,
pankso@4056 121 &my_inptr, error);
pankso@4056 122 + }
pankso@4056 123 else if (compress_name) {
pankso@4056 124 if (!message) {
pankso@4056 125 snprintf(msg_buf, sizeof msg_buf,
pascal@5159 126 @@ -485,7 +561,8 @@
pankso@4056 127 #include <linux/initrd.h>
pankso@4056 128 #include <linux/kexec.h>
pankso@4056 129
pankso@4056 130 -static void __init free_initrd(void)
pankso@4056 131 +static void _free_initrd(unsigned long initrd_start, unsigned long initrd_end,
pankso@4056 132 + void (*free_initrd_mem)(unsigned long, unsigned long))
pankso@4056 133 {
pankso@4056 134 #ifdef CONFIG_KEXEC
pankso@4056 135 unsigned long crashk_start = (unsigned long)__va(crashk_res.start);
pascal@5159 136 @@ -513,6 +590,12 @@
pankso@4056 137 #endif
pankso@4056 138 free_initrd_mem(initrd_start, initrd_end);
pankso@4056 139 skip:
pankso@4056 140 + ;
pankso@4056 141 +}
pankso@4056 142 +
pankso@4056 143 +static void __init free_initrd(void)
pankso@4056 144 +{
pankso@4056 145 + _free_initrd(initrd_start, initrd_end, free_initrd_mem);
pankso@4056 146 initrd_start = 0;
pankso@4056 147 initrd_end = 0;
pankso@4056 148 }