From: Andres Salomon <dilinger@queued.net>
To: Grant Likely <grant.likely@secretlab.ca>
Cc: "H. Peter Anvin" <hpa@zytor.com>, Ingo Molnar <mingo@elte.hu>,
Milton Miller <miltonm@bga.com>,
devicetree-discuss@lists.ozlabs.org,
Thomas Gleixner <tglx@linutronix.de>,
linux-kernel@vger.kernel.org
Subject: [PATCH 3/3] x86: OLPC: speed up device tree creation during boot (v4)
Date: Mon, 29 Nov 2010 15:39:51 -0800 [thread overview]
Message-ID: <20101129153951.74202a84@queued.net> (raw)
In-Reply-To: <20101116221241.21419250@queued.net>
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.)
v4: clarify comment, requested by hpa
v3: fix wasted memory buglet found by Milton Miller, and style fix.
v2: reorder prom_early_alloc as suggested by Grant.
Signed-off-by: Andres Salomon <dilinger@queued.net>
---
arch/x86/platform/olpc/olpc_dt.c | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/arch/x86/platform/olpc/olpc_dt.c b/arch/x86/platform/olpc/olpc_dt.c
index 7054697..dab8746 100644
--- a/arch/x86/platform/olpc/olpc_dt.c
+++ b/arch/x86/platform/olpc/olpc_dt.c
@@ -126,14 +126,32 @@ static unsigned int prom_early_allocated __initdata;
void * __init prom_early_alloc(unsigned long size)
{
+ static u8 *mem;
+ static size_t free_mem;
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
+ * PAGE_SIZE of memory (that's an arbitrary choice that's
+ * fast enough on the platforms we care about while minimizing
+ * wasted bootmem) and hand off chunks of it to callers.
+ */
+ res = alloc_bootmem(chunk_size);
+ if (!res)
+ return NULL;
+ prom_early_allocated += chunk_size;
+ memset(res, 0, chunk_size);
+ free_mem = chunk_size;
+ mem = res;
+ }
+ /* allocate from the local cache */
+ free_mem -= size;
+ res = mem;
+ mem += size;
return res;
}
--
1.7.2.3
next prev parent reply other threads:[~2010-11-29 23:39 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
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
2010-11-12 8:27 ` Andres Salomon
2010-11-14 9:50 ` Ingo Molnar
2010-11-15 4:21 ` H. Peter Anvin
2010-11-15 7:02 ` Ingo Molnar
2010-11-15 17:43 ` H. Peter Anvin
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 ` Andres Salomon [this message]
2010-12-16 2:58 ` [tip:x86/olpc] x86, olpc: Speed up device tree creation during boot tip-bot for Andres Salomon
2010-11-18 8:34 ` [PATCH 3/3] x86: OLPC: speed up device tree creation during boot (v2) Ingo Molnar
2010-11-18 11:02 ` Michael Ellerman
2010-11-18 15:04 ` H. Peter Anvin
2010-11-18 17:41 ` Andres Salomon
2010-11-18 17:48 ` H. Peter Anvin
2010-11-19 20:24 ` Andres Salomon
2010-12-23 11:57 ` Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20101129153951.74202a84@queued.net \
--to=dilinger@queued.net \
--cc=devicetree-discuss@lists.ozlabs.org \
--cc=grant.likely@secretlab.ca \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=miltonm@bga.com \
--cc=mingo@elte.hu \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).