devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 3/3] x86: OLPC: speed up device tree creation during boot (v2)
@ 2010-11-12  5:45 Andres Salomon
  2010-11-12  7:48 ` Milton Miller
  0 siblings, 1 reply; 16+ messages in thread
From: Andres Salomon @ 2010-11-12  5:45 UTC (permalink / raw)
  To: Grant Likely
  Cc: linux-kernel-u79uwXL29TY76Z2rM5mHXA,
	devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ, Ingo Molnar,
	Thomas Gleixner, H. Peter Anvin


Calling alloc_bootmem() for tiny chunks of memory over and over is really
slow; on an XO-1, it caused the time between when the kernel started
booting and when the display came alive (post-lxfb probe) to increase
to 44s.  This patch optimizes the prom_early_alloc function by
calling alloc_bootmem for 4k-sized blocks of memory, and handing out
chunks of that to callers.  With this patch, the time between kernel load
and display initialization decreased to 23s.  If there's a better way to
do this early in the boot process, please let me know.

(Note: increasing the chunk size to 16k didn't noticably affect boot time,
and wasted 9k.)

v2: reorder function as suggested by Grant.

Signed-off-by: Andres Salomon <dilinger-pFFUokh25LWsTnJN9+BGXg@public.gmane.org>
---
 arch/x86/platform/olpc/olpc_dt.c |   27 ++++++++++++++++++++++-----
 1 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/arch/x86/platform/olpc/olpc_dt.c b/arch/x86/platform/olpc/olpc_dt.c
index b8c8ff9..0ab824d 100644
--- a/arch/x86/platform/olpc/olpc_dt.c
+++ b/arch/x86/platform/olpc/olpc_dt.c
@@ -126,14 +126,31 @@ static unsigned int prom_early_allocated __initdata;
 
 void * __init prom_early_alloc(unsigned long size)
 {
+	static u8 *mem = NULL;
+	static size_t free_mem = 0;
 	void *res;
 
-	res = alloc_bootmem(size);
-	if (res)
-		memset(res, 0, size);
-
-	prom_early_allocated += size;
+	if (free_mem < size) {
+		const size_t chunk_size = max(PAGE_SIZE, size);
+
+		/*
+		 * To mimimize the number of allocations, grab at least 4k of
+		 * memory (that's an arbitrary choice that matches PAGE_SIZE on
+		 * the platforms we care about, and minimizes wasted bootmem)
+		 * and hand off chunks of it to callers.
+		 */
+		res = mem = alloc_bootmem(chunk_size);
+		if (!res)
+			return NULL;
+		prom_early_allocated += chunk_size;
+		memset(res, 0, chunk_size);
+		free_mem = chunk_size;
+	}
 
+	/* allocate from the local cache */
+	free_mem -= size;
+	res = mem;
+	mem += size;
 	return res;
 }
 
-- 
1.7.2.3

^ permalink raw reply related	[flat|nested] 16+ messages in thread

end of thread, other threads:[~2010-12-23 11:57 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-11-12  5:45 [PATCH 3/3] x86: OLPC: speed up device tree creation during boot (v2) Andres Salomon
2010-11-12  7:48 ` Milton Miller
     [not found]   ` <reply-olpc-3-v2-kM9DGJe42AJBDgjK7y7TUQ@public.gmane.org>
2010-11-12  8:27     ` Andres Salomon
2010-11-14  9:50       ` Ingo Molnar
     [not found]         ` <20101114095013.GB24206-X9Un+BFzKDI@public.gmane.org>
2010-11-15  4:21           ` H. Peter Anvin
     [not found]             ` <4CE0B54E.6000101-YMNOUZJC4hwAvxtiuMwx3w@public.gmane.org>
2010-11-15  7:02               ` Ingo Molnar
     [not found]                 ` <20101115070254.GA25243-X9Un+BFzKDI@public.gmane.org>
2010-11-15 17:43                   ` H. Peter Anvin
     [not found]                     ` <4CE17133.2050101-YMNOUZJC4hwAvxtiuMwx3w@public.gmane.org>
2010-11-17  6:12                       ` [PATCH 3/3] x86: OLPC: speed up device tree creation during boot (v3) Andres Salomon
2010-11-29 23:39                         ` [PATCH 3/3] x86: OLPC: speed up device tree creation during boot (v4) Andres Salomon
2010-11-18  8:34                       ` [PATCH 3/3] x86: OLPC: speed up device tree creation during boot (v2) Ingo Molnar
     [not found]                         ` <20101118083420.GC26398-X9Un+BFzKDI@public.gmane.org>
2010-11-18 11:02                           ` Michael Ellerman
2010-11-18 15:04                             ` H. Peter Anvin
     [not found]                               ` <4CE54064.6010702-YMNOUZJC4hwAvxtiuMwx3w@public.gmane.org>
2010-11-18 17:41                                 ` Andres Salomon
     [not found]                                   ` <20101118094153.4515cbc2-pFFUokh25LWsTnJN9+BGXg@public.gmane.org>
2010-11-18 17:48                                     ` H. Peter Anvin
     [not found]                                       ` <4CE5670B.1060300-YMNOUZJC4hwAvxtiuMwx3w@public.gmane.org>
2010-11-19 20:24                                         ` Andres Salomon
2010-12-23 11:57                         ` Ingo Molnar

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).