Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2d6ffcca authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Linus Torvalds
Browse files

inflate: refactor inflate malloc code 



Inflate requires some dynamic memory allocation very early in the boot
process and this is provided with a set of four functions:
malloc/free/gzip_mark/gzip_release.

The old inflate code used a mark/release strategy rather than implement
free.  This new version instead keeps a count on the number of outstanding
allocations and when it hits zero, it resets the malloc arena.

This allows removing all the mark and release implementations and unifying
all the malloc/free implementations.

The architecture-dependent code must define two addresses:
 - free_mem_ptr, the address of the beginning of the area in which
   allocations should be made
 - free_mem_end_ptr, the address of the end of the area in which
   allocations should be made. If set to 0, then no check is made on
   the number of allocations, it just grows as much as needed

The architecture-dependent code can also provide an arch_decomp_wdog()
function call.  This function will be called several times during the
decompression process, and allow to notify the watchdog that the system is
still running.  If an architecture provides such a call, then it must
define ARCH_HAS_DECOMP_WDOG so that the generic inflate code calls
arch_decomp_wdog().

Work initially done by Matt Mackall, updated to a recent version of the
kernel and improved by me.

[akpm@linux-foundation.org: coding-style fixes]
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Matt Mackall <mpm@selenic.com>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Mikael Starvik <mikael.starvik@axis.com>
Cc: Jesper Nilsson <jesper.nilsson@axis.com>
Cc: Haavard Skinnemoen <hskinnemoen@atmel.com>
Cc: David Howells <dhowells@redhat.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Acked-by: default avatarPaul Mundt <lethal@linux-sh.org>
Acked-by: default avatarYoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ba92a43d

arch/alpha/boot/misc.c

+2 −37
Original line number Original line Diff line number Diff line
@@ -78,8 +78,6 @@ static unsigned outcnt; /* bytes in output buffer */ 
static int  fill_inbuf(void);

static int  fill_inbuf(void);

static void flush_window(void);

static void flush_window(void);

static void error(char *m);

static void error(char *m);

static void gzip_mark(void **);

static void gzip_release(void **);





static char *input_data;

static char *input_data;

static int  input_data_size;

static int  input_data_size;
@@ -88,51 +86,18 @@ static uch *output_data; 
static ulg output_ptr;

static ulg output_ptr;

static ulg bytes_out;

static ulg bytes_out;





static void *malloc(int size);

static void free(void *where);

static void error(char *m);

static void error(char *m);

static void gzip_mark(void **);

static void gzip_mark(void **);

static void gzip_release(void **);

static void gzip_release(void **);





extern int end;

extern int end;

static ulg free_mem_ptr;

static ulg free_mem_ptr;

static ulg free_mem_ptr_end;

static ulg free_mem_end_ptr;





#define HEAP_SIZE 0x3000

#define HEAP_SIZE 0x3000





#include "../../../lib/inflate.c"

#include "../../../lib/inflate.c"





static void *malloc(int size)

{

	void *p;



	if (size <0) error("Malloc error");

	if (free_mem_ptr <= 0) error("Memory error");



	free_mem_ptr = (free_mem_ptr + 3) & ~3;	/* Align */



	p = (void *)free_mem_ptr;

	free_mem_ptr += size;



	if (free_mem_ptr >= free_mem_ptr_end)

		error("Out of memory");

	return p;

}



static void free(void *where)

{ /* gzip_mark & gzip_release do the free */

}



static void gzip_mark(void **ptr)

{

	*ptr = (void *) free_mem_ptr;

}



static void gzip_release(void **ptr)

{

	free_mem_ptr = (long) *ptr;

}



/* ===========================================================================

/* ===========================================================================

 * Fill the input buffer. This is called only when the buffer is empty

 * Fill the input buffer. This is called only when the buffer is empty

 * and at least one byte is really needed.

 * and at least one byte is really needed.
@@ -193,7 +158,7 @@ decompress_kernel(void *output_start, 




	/* FIXME FIXME FIXME */

	/* FIXME FIXME FIXME */

	free_mem_ptr		= (ulg)output_start + ksize;

	free_mem_ptr		= (ulg)output_start + ksize;

	free_mem_ptr_end	= (ulg)output_start + ksize + 0x200000;

	free_mem_end_ptr	= (ulg)output_start + ksize + 0x200000;

	/* FIXME FIXME FIXME */

	/* FIXME FIXME FIXME */





	/* put in temp area to reduce initial footprint */

	/* put in temp area to reduce initial footprint */

arch/arm/boot/compressed/misc.c

+7 −52
Original line number Original line Diff line number Diff line
@@ -217,8 +217,6 @@ static unsigned outcnt; /* bytes in output buffer */ 
static int  fill_inbuf(void);

static int  fill_inbuf(void);

static void flush_window(void);

static void flush_window(void);

static void error(char *m);

static void error(char *m);

static void gzip_mark(void **);

static void gzip_release(void **);





extern char input_data[];

extern char input_data[];

extern char input_data_end[];

extern char input_data_end[];
@@ -227,64 +225,21 @@ static uch *output_data; 
static ulg output_ptr;

static ulg output_ptr;

static ulg bytes_out;

static ulg bytes_out;





static void *malloc(int size);

static void free(void *where);

static void error(char *m);

static void error(char *m);

static void gzip_mark(void **);

static void gzip_release(void **);





static void putstr(const char *);

static void putstr(const char *);





extern int end;

extern int end;

static ulg free_mem_ptr;

static ulg free_mem_ptr;

static ulg free_mem_ptr_end;

static ulg free_mem_end_ptr;





#define HEAP_SIZE 0x3000

#ifdef STANDALONE_DEBUG



#define NO_INFLATE_MALLOC

#include "../../../../lib/inflate.c"

#endif



#ifndef STANDALONE_DEBUG

static void *malloc(int size)

{

	void *p;



	if (size <0) error("Malloc error");

	if (free_mem_ptr <= 0) error("Memory error");



	free_mem_ptr = (free_mem_ptr + 3) & ~3;	/* Align */



	p = (void *)free_mem_ptr;

	free_mem_ptr += size;



	if (free_mem_ptr >= free_mem_ptr_end)

		error("Out of memory");

	return p;

}



static void free(void *where)

{ /* gzip_mark & gzip_release do the free */

}



static void gzip_mark(void **ptr)

{

	arch_decomp_wdog();

	*ptr = (void *) free_mem_ptr;

}





static void gzip_release(void **ptr)

#define ARCH_HAS_DECOMP_WDOG

{

	arch_decomp_wdog();

	free_mem_ptr = (long) *ptr;

}

#else

static void gzip_mark(void **ptr)

{

}





static void gzip_release(void **ptr)

#include "../../../../lib/inflate.c"

{

}

#endif





/* ===========================================================================

/* ===========================================================================

 * Fill the input buffer. This is called only when the buffer is empty

 * Fill the input buffer. This is called only when the buffer is empty
@@ -348,7 +303,7 @@ decompress_kernel(ulg output_start, ulg free_mem_ptr_p, ulg free_mem_ptr_end_p, 
{

{

	output_data		= (uch *)output_start;	/* Points to kernel start */

	output_data		= (uch *)output_start;	/* Points to kernel start */

	free_mem_ptr		= free_mem_ptr_p;

	free_mem_ptr		= free_mem_ptr_p;

	free_mem_ptr_end	= free_mem_ptr_end_p;

	free_mem_end_ptr	= free_mem_ptr_end_p;

	__machine_arch_type	= arch_id;

	__machine_arch_type	= arch_id;





	arch_decomp_setup();

	arch_decomp_setup();

arch/cris/arch-v10/boot/compressed/misc.c

+1 −35
Original line number Original line Diff line number Diff line
@@ -102,50 +102,16 @@ extern char *input_data; /* lives in head.S */ 
static long bytes_out = 0;

static long bytes_out = 0;

static uch *output_data;

static uch *output_data;

static unsigned long output_ptr = 0;

static unsigned long output_ptr = 0;



static void *malloc(int size);

static void free(void *where);

static void gzip_mark(void **);

static void gzip_release(void **);



static void puts(const char *);

static void puts(const char *);





/* the "heap" is put directly after the BSS ends, at end */

/* the "heap" is put directly after the BSS ends, at end */





extern int _end;

extern int _end;

static long free_mem_ptr = (long)&_end;

static long free_mem_ptr = (long)&_end;

static long free_mem_end_ptr;





#include "../../../../../lib/inflate.c"

#include "../../../../../lib/inflate.c"





static void *malloc(int size)

{

	void *p;



	if (size < 0)

		error("Malloc error");



	free_mem_ptr = (free_mem_ptr + 3) & ~3;	/* Align */



	p = (void *)free_mem_ptr;

	free_mem_ptr += size;



	return p;

}



static void free(void *where)

{	/* Don't care */

}



static void gzip_mark(void **ptr)

{

	*ptr = (void *) free_mem_ptr;

}



static void gzip_release(void **ptr)

{

	free_mem_ptr = (long) *ptr;

}



/* decompressor info and error messages to serial console */

/* decompressor info and error messages to serial console */





static void

static void

arch/cris/arch-v32/boot/compressed/misc.c

+3 −36
Original line number Original line Diff line number Diff line
@@ -89,20 +89,14 @@ static unsigned outcnt = 0; /* bytes in output buffer */ 




static void flush_window(void);

static void flush_window(void);

static void error(char *m);

static void error(char *m);

static void gzip_mark(void **);

static void gzip_release(void **);





extern char *input_data;  /* lives in head.S */

extern char *input_data;  /* lives in head.S */





static long bytes_out = 0;

static long bytes_out;

static uch *output_data;

static uch *output_data;

static unsigned long output_ptr = 0;

static unsigned long output_ptr;





static void *malloc(int size);

static void free(void *where);

static void error(char *m);

static void error(char *m);

static void gzip_mark(void **);

static void gzip_release(void **);





static void puts(const char *);

static void puts(const char *);
@@ -110,37 +104,10 @@ static void puts(const char *); 




extern int _end;

extern int _end;

static long free_mem_ptr = (long)&_end;

static long free_mem_ptr = (long)&_end;

static long free_mem_end_ptr;





#include "../../../../../lib/inflate.c"

#include "../../../../../lib/inflate.c"





static void *malloc(int size)

{

	void *p;



	if (size <0) error("Malloc error");



	free_mem_ptr = (free_mem_ptr + 3) & ~3;	/* Align */



	p = (void *)free_mem_ptr;

	free_mem_ptr += size;



	return p;

}



static void free(void *where)

{	/* Don't care */

}



static void gzip_mark(void **ptr)

{

	*ptr = (void *) free_mem_ptr;

}



static void gzip_release(void **ptr)

{

	free_mem_ptr = (long) *ptr;

}



/* decompressor info and error messages to serial console */

/* decompressor info and error messages to serial console */





static inline void

static inline void

arch/h8300/boot/compressed/misc.c

+0 −38
Original line number Original line Diff line number Diff line
@@ -67,8 +67,6 @@ static unsigned outcnt = 0; /* bytes in output buffer */ 
static int  fill_inbuf(void);

static int  fill_inbuf(void);

static void flush_window(void);

static void flush_window(void);

static void error(char *m);

static void error(char *m);

static void gzip_mark(void **);

static void gzip_release(void **);





extern char input_data[];

extern char input_data[];

extern int input_len;

extern int input_len;
@@ -77,11 +75,7 @@ static long bytes_out = 0; 
static uch *output_data;

static uch *output_data;

static unsigned long output_ptr = 0;

static unsigned long output_ptr = 0;





static void *malloc(int size);

static void free(void *where);

static void error(char *m);

static void error(char *m);

static void gzip_mark(void **);

static void gzip_release(void **);





int puts(const char *);

int puts(const char *);
@@ -98,38 +92,6 @@ static unsigned long free_mem_end_ptr; 
#define TDR *((volatile unsigned char *)0xffff8b)

#define TDR *((volatile unsigned char *)0xffff8b)

#define SSR *((volatile unsigned char *)0xffff8c)

#define SSR *((volatile unsigned char *)0xffff8c)





static void *malloc(int size)

{

	void *p;



	if (size <0) error("Malloc error");

	if (free_mem_ptr == 0) error("Memory error");



	free_mem_ptr = (free_mem_ptr + 3) & ~3;	/* Align */



	p = (void *)free_mem_ptr;

	free_mem_ptr += size;



	if (free_mem_ptr >= free_mem_end_ptr)

		error("Out of memory");



	return p;

}



static void free(void *where)

{	/* Don't care */

}



static void gzip_mark(void **ptr)

{

	*ptr = (void *) free_mem_ptr;

}



static void gzip_release(void **ptr)

{

	free_mem_ptr = (long) *ptr;

}



int puts(const char *s)

int puts(const char *s)

{

{

	return 0;

	return 0;