linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Maarten Lankhorst <m.b.lankhorst@gmail.com>
To: Matt Fleming <matt@console-pimps.org>
Cc: "H. Peter Anvin" <hpa@linux.intel.com>,
	Matthew Garrett <mjg@redhat.com>,
	linux-kernel@vger.kernel.org, Ingo Molnar <mingo@elte.hu>,
	Thomas Gleixner <tglx@linutronix.de>,
	x86@kernel.org, Mike Waychison <mikew@google.com>,
	Andi Kleen <andi@firstfloor.org>, Peter Jones <pjones@redhat.com>
Subject: [PATCH] x86, efi: Break up large initrd reads
Date: Fri, 25 Nov 2011 02:37:08 +0100	[thread overview]
Message-ID: <4ECEF144.8020303@gmail.com> (raw)
In-Reply-To: <1322168216.24448.61.camel@mfleming-mobl1.ger.corp.intel.com>

The efi boot stub tries to read the entire initrd in 1 go,
however some efi implementations hang if too much if asked
to read too much data at the same time. After some
experimentation I found out that my asrock p67 board will
hang if asked to read chunks of 4mb, so use a safe value.

>From elilo source code:
/*
 * We load by chunks rather than a single big read because
 * early versions of EFI had troubles loading files
 * from floppies in a single big request.  Breaking
 * the read down into chunks of 4KB fixed that
 * problem. While this problem has been fixed, we still prefer
 * this method because it tells us whether or not we're making
 * forward progress.
 */

While the comment says 4KB, it's using 4 * EFI_PAGE_SIZE (16KB),
so I went by the safest route of following elilo here.

Signed-off-by: Maarten Lankhorst <m.b.lankhorst@gmail.com>
---
 arch/x86/boot/compressed/eboot.c |   20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c
index 8627a56..a26be50 100644
--- a/arch/x86/boot/compressed/eboot.c
+++ b/arch/x86/boot/compressed/eboot.c
@@ -695,14 +695,22 @@ grow:
 			u64 size;
 
 			size = initrds[j].size;
-			status = efi_call_phys3(fh->read, initrds[j].handle,
-						&size, addr);
-			if (status != EFI_SUCCESS)
-				goto free_initrd_total;
+			while (size) {
+				u64 chunksize;
+				if (size > 4 * EFI_PAGE_SIZE)
+					chunksize = 4 * EFI_PAGE_SIZE;
+				else
+					chunksize = size;
+				status = efi_call_phys3(fh->read,
+							initrds[j].handle,
+							&chunksize, addr);
+				if (status != EFI_SUCCESS)
+					goto free_initrd_total;
+				addr += chunksize;
+				size -= chunksize;
+			}
 
 			efi_call_phys1(fh->close, initrds[j].handle);
-
-			addr += size;
 		}
 
 	}
-- 
1.7.7.1




  parent reply	other threads:[~2011-11-25  1:37 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-10-17 10:40 [PATCH v5 00/10] x86 EFI boot stub Matt Fleming
2011-10-17 10:40 ` [PATCH 01/10] x86: Add missing bzImage fields to struct setup_header Matt Fleming
2011-10-17 10:40 ` [PATCH 02/10] x86, efi: Make efi_call_phys_prelog() CONFIG_RELOCATABLE-aware Matt Fleming
2011-10-17 10:40 ` [PATCH 03/10] x86: Don't use magic strings for EFI loader signature Matt Fleming
2011-10-17 10:40 ` [PATCH 04/10] efi.h: Add struct definition for boot time services Matt Fleming
2011-10-17 10:40 ` [PATCH v2 05/10] efi.h: Add efi_image_loaded_t Matt Fleming
2011-10-17 10:40 ` [PATCH 06/10] efi.h: Add allocation types for boottime->allocate_pages() Matt Fleming
2011-10-17 10:40 ` [PATCH v2 07/10] efi.h: Add graphics protocol guids Matt Fleming
2011-10-17 10:40 ` [PATCH 08/10] efi.h: Add boottime->locate_handle search types Matt Fleming
2011-10-17 10:40 ` [PATCH v2 09/10] efi: Add EFI file I/O data types Matt Fleming
2011-10-17 10:40 ` [PATCH v5 10/10] x86, efi: EFI boot stub support Matt Fleming
2011-10-17 16:39   ` Maarten Lankhorst
2011-10-17 18:28     ` Matt Fleming
2011-10-18  6:09     ` Ingo Molnar
2011-10-17 20:06   ` Maarten Lankhorst
2011-11-15 18:51     ` Matt Fleming
2011-11-23  0:44       ` Maarten Lankhorst
2011-11-23 19:27         ` Matt Fleming
2011-11-24 14:43           ` Maarten Lankhorst
2011-11-24 16:58             ` Maarten Lankhorst
2011-11-24 20:56             ` Matt Fleming
2011-11-24 21:07               ` Matthew Garrett
2011-11-24 21:31                 ` Matt Fleming
2011-11-25  1:37               ` Maarten Lankhorst [this message]
2011-11-25  8:48                 ` [PATCH] x86, efi: Break up large initrd reads Matt Fleming
2011-12-12 23:10                   ` H. Peter Anvin
2011-12-13 18:26                     ` H. Peter Anvin
2011-12-14 23:33                       ` Maarten Lankhorst
2011-12-14 23:36                         ` H. Peter Anvin
2011-12-16 12:30                           ` [PATCH v2] " Maarten Lankhorst
2011-12-16 18:43                             ` [tip:x86/efi] " tip-bot for Maarten Lankhorst
2011-12-10  2:37 ` [tip:x86/efi] x86: Add missing bzImage fields to struct setup_header tip-bot for Matt Fleming
2011-12-10  2:38 ` [tip:x86/efi] x86: Don't use magic strings for EFI loader signature tip-bot for Matt Fleming
2011-12-10  2:38 ` [tip:x86/efi] efi.h: Add struct definition for boot time services tip-bot for Matt Fleming
2011-12-10  2:39 ` [tip:x86/efi] efi.h: Add efi_image_loaded_t tip-bot for Matt Fleming
2011-12-10  2:40 ` [tip:x86/efi] efi.h: Add allocation types for boottime->allocate_pages() tip-bot for Matt Fleming
2011-12-10  2:41 ` [tip:x86/efi] efi.h: Add graphics protocol guids tip-bot for Matt Fleming
2011-12-10  2:42 ` [tip:x86/efi] efi.h: Add boottime->locate_handle search types tip-bot for Matt Fleming
2011-12-10  2:42 ` [tip:x86/efi] efi: Add EFI file I/O data types tip-bot for Matt Fleming

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=4ECEF144.8020303@gmail.com \
    --to=m.b.lankhorst@gmail.com \
    --cc=andi@firstfloor.org \
    --cc=hpa@linux.intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=matt@console-pimps.org \
    --cc=mikew@google.com \
    --cc=mingo@elte.hu \
    --cc=mjg@redhat.com \
    --cc=pjones@redhat.com \
    --cc=tglx@linutronix.de \
    --cc=x86@kernel.org \
    /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).