qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: Li Zhijian <lizhijian@cn.fujitsu.com>,
	Richard Henderson <rth@twiddle.net>,
	Eduardo Habkost <ehabkost@redhat.com>,
	"Michael S. Tsirkin" <mst@redhat.com>,
	Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
Subject: [Qemu-devel] [PULL 48/49] i386: allow to load initrd below 4 GB for recent linux
Date: Mon, 21 Jan 2019 19:06:19 +0100	[thread overview]
Message-ID: <1548093980-43088-49-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1548093980-43088-1-git-send-email-pbonzini@redhat.com>

From: Li Zhijian <lizhijian@cn.fujitsu.com>

Since linux commit: cf8fa920cb42 ("i386: handle an initrd in highmem (version 2)")
linux has supported initrd up to 4 GB, but the header field
ramdisk_max is still set to 2 GB to avoid "possible bootloader bugs".

When use '-kernel vmlinux -initrd initrd.cgz' to launch a VM,
the firmware(it could be linuxboot_dma.bin) helps to read initrd
contents into guest memory(below ramdisk_max) and jump to kernel.
that's similar with what bootloader does, like grub.

In addition, initrd_max is uint32_t simply because QEMU doesn't support
the 64-bit boot protocol (specifically the ext_ramdisk_image field).

Therefore here just limit initrd_max to UINT32_MAX simply as well to
allow initrd to be loaded below 4 GB.

NOTE: it's possible that linux protocol within [0x208, 0x20c]
supports up to 4 GB initrd as well.

CC: Paolo Bonzini <pbonzini@redhat.com>
CC: Richard Henderson <rth@twiddle.net>
CC: Eduardo Habkost <ehabkost@redhat.com>
CC: "Michael S. Tsirkin" <mst@redhat.com>
CC: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
Signed-off-by: Li Zhijian <lizhijian@cn.fujitsu.com>

Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 hw/i386/pc.c | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 90e684d..3d66f81 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1289,7 +1289,26 @@ static void load_linux(PCMachineState *pcms,
 #endif
 
     /* highest address for loading the initrd */
-    if (protocol >= 0x203) {
+    if (protocol >= 0x20c &&
+        lduw_p(header+0x236) & XLF_CAN_BE_LOADED_ABOVE_4G) {
+        /*
+         * Linux has supported initrd up to 4 GB for a very long time (2007,
+         * long before XLF_CAN_BE_LOADED_ABOVE_4G which was added in 2013),
+         * though it only sets initrd_max to 2 GB to "work around bootloader
+         * bugs". Luckily, QEMU firmware(which does something like bootloader)
+         * has supported this.
+         *
+         * It's believed that if XLF_CAN_BE_LOADED_ABOVE_4G is set, initrd can
+         * be loaded into any address.
+         *
+         * In addition, initrd_max is uint32_t simply because QEMU doesn't
+         * support the 64-bit boot protocol (specifically the ext_ramdisk_image
+         * field).
+         *
+         * Therefore here just limit initrd_max to UINT32_MAX simply as well.
+         */
+        initrd_max = UINT32_MAX;
+    } else if (protocol >= 0x203) {
         initrd_max = ldl_p(header+0x22c);
     } else {
         initrd_max = 0x37ffffff;
-- 
1.8.3.1

  parent reply	other threads:[~2019-01-21 18:07 UTC|newest]

Thread overview: 52+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-21 18:05 [Qemu-devel] [PULL 00/49] Misc patches for 2019-01-21 Paolo Bonzini
2019-01-21 18:05 ` [Qemu-devel] [PULL 01/49] scripts/update-linux-headers.sh: adjust for Linux 4.21-rc1 (or 5.0-rc1) Paolo Bonzini
2019-01-21 18:05 ` [Qemu-devel] [PULL 02/49] include: update Linux headers to 4.21-rc1/5.0-rc1 Paolo Bonzini
2019-01-21 18:05 ` [Qemu-devel] [PULL 03/49] vhost-net: move stubs to a separate file Paolo Bonzini
2019-01-21 18:05 ` [Qemu-devel] [PULL 04/49] vhost-net-user: add stubs for when no virtio-net device is present Paolo Bonzini
2019-01-21 18:05 ` [Qemu-devel] [PULL 05/49] vhost: restrict Linux dependency to kernel vhost Paolo Bonzini
2019-01-21 18:05 ` [Qemu-devel] [PULL 06/49] vhost-net: compile it on all targets that have virtio-net Paolo Bonzini
2019-01-21 18:05 ` [Qemu-devel] [PULL 07/49] vhost-net: revamp configure logic Paolo Bonzini
2019-01-21 18:05 ` [Qemu-devel] [PULL 08/49] vhost-user-test: use g_cond_broadcast Paolo Bonzini
2019-01-21 18:05 ` [Qemu-devel] [PULL 09/49] vhost-user-test: signal data_cond when s->rings changes Paolo Bonzini
2019-01-21 18:05 ` [Qemu-devel] [PULL 10/49] vhost-user: support cross-endian vnet headers Paolo Bonzini
2019-01-21 18:05 ` [Qemu-devel] [PULL 11/49] vhost-user-test: support VHOST_USER_PROTOCOL_F_CROSS_ENDIAN Paolo Bonzini
2019-01-21 18:05 ` [Qemu-devel] [PULL 12/49] vhost-user-test: skip if there is no memory at address 0 Paolo Bonzini
2019-01-21 18:05 ` [Qemu-devel] [PULL 13/49] vhost-user-test: reduce usage of global_qtest Paolo Bonzini
2019-01-21 18:05 ` [Qemu-devel] [PULL 14/49] vhost-user-test: create a main loop per TestServer Paolo Bonzini
2019-01-21 18:05 ` [Qemu-devel] [PULL 15/49] vhost-user-test: small changes to init_hugepagefs Paolo Bonzini
2019-01-21 18:05 ` [Qemu-devel] [PULL 16/49] vhost-user-test: create a temporary directory per TestServer Paolo Bonzini
2019-01-21 18:05 ` [Qemu-devel] [PULL 17/49] tap: flush STDOUT on newline Paolo Bonzini
2019-01-21 18:05 ` [Qemu-devel] [PULL 18/49] tests/hexloader-test: Don't pass -nographic to the QEMU under test Paolo Bonzini
2019-01-21 18:05 ` [Qemu-devel] [PULL 19/49] cpu-exec: add assert_no_pages_locked() after longjmp Paolo Bonzini
2019-01-21 18:05 ` [Qemu-devel] [PULL 20/49] cpu-exec: reset BQL after longjmp in cpu_exec_step_atomic Paolo Bonzini
2019-01-21 18:05 ` [Qemu-devel] [PULL 21/49] configure: Add a proper check for openpty() in libutil Paolo Bonzini
2019-01-21 18:05 ` [Qemu-devel] [PULL 22/49] cpus: ignore ESRCH in qemu_cpu_kick_thread() Paolo Bonzini
2019-01-21 18:05 ` [Qemu-devel] [PULL 23/49] elf: Add optional function ptr to load_elf() to parse ELF notes Paolo Bonzini
2019-01-21 18:05 ` [Qemu-devel] [PULL 24/49] elf-ops.h: Add get_elf_note_type() Paolo Bonzini
2019-01-21 18:05 ` [Qemu-devel] [PULL 25/49] pvh: Add x86/HVM direct boot ABI header file Paolo Bonzini
2019-01-21 18:05 ` [Qemu-devel] [PULL 26/49] pvh: Boot uncompressed kernel using direct boot ABI Paolo Bonzini
2019-01-21 18:05 ` [Qemu-devel] [PULL 27/49] pvh: load initrd and expose it through fw_cfg Paolo Bonzini
2019-01-21 18:05 ` [Qemu-devel] [PULL 28/49] linuxboot_dma: remove duplicate definitions of FW_CFG Paolo Bonzini
2019-01-21 18:06 ` [Qemu-devel] [PULL 29/49] linuxboot_dma: move common functions in a new header Paolo Bonzini
2019-01-21 18:06 ` [Qemu-devel] [PULL 30/49] hw/i386/pc: use PVH option rom Paolo Bonzini
2019-01-21 18:06 ` [Qemu-devel] [PULL 31/49] optionrom/pvh: load initrd from fw_cfg Paolo Bonzini
2019-01-21 18:06 ` [Qemu-devel] [PULL 32/49] i386: remove the new CPUID 'PCONFIG' from Icelake-Server CPU model Paolo Bonzini
2019-01-21 18:06 ` [Qemu-devel] [PULL 33/49] i386: remove the 'INTEL_PT' CPUID bit from named CPU models Paolo Bonzini
2019-01-21 18:06 ` [Qemu-devel] [PULL 34/49] Revert "i386: Add CPUID bit for PCONFIG" Paolo Bonzini
2019-01-21 18:06 ` [Qemu-devel] [PULL 35/49] target-i386: hvf: remove MPX support Paolo Bonzini
2019-01-21 18:06 ` [Qemu-devel] [PULL 36/49] contrib/elf2dmp: fix elf.h including Paolo Bonzini
2019-01-21 18:06 ` [Qemu-devel] [PULL 37/49] contrib/elf2dmp: use GLib in ELF processing Paolo Bonzini
2019-01-21 18:06 ` [Qemu-devel] [PULL 38/49] contrib/elf2dmp: use GLib in PDB processing Paolo Bonzini
2019-01-21 18:06 ` [Qemu-devel] [PULL 39/49] contrib/elf2dmp: fix structures definitions Paolo Bonzini
2019-01-21 18:06 ` [Qemu-devel] [PULL 41/49] configure: enable elf2dmp build for Windows hosts Paolo Bonzini
2019-01-21 18:06 ` [Qemu-devel] [PULL 42/49] monitor: do not use QTAILQ_FOREACH_SAFE across critical sections Paolo Bonzini
2019-01-21 18:06 ` [Qemu-devel] [PULL 43/49] crypto: finish removing TABs Paolo Bonzini
2019-01-21 18:06 ` [Qemu-devel] [PULL 44/49] ui: vnc: " Paolo Bonzini
2019-01-21 18:06 ` [Qemu-devel] [PULL 45/49] unify len and addr type for memory/address APIs Paolo Bonzini
2019-01-21 18:06 ` [Qemu-devel] [PULL 46/49] hw/core/loader.c: Read as long as possible in load_image_size() Paolo Bonzini
2019-01-21 18:06 ` [Qemu-devel] [PULL 47/49] i386: import & use bootparam.h Paolo Bonzini
2019-01-21 18:06 ` Paolo Bonzini [this message]
2019-01-21 18:06 ` [Qemu-devel] [PULL 49/49] docker: disable Xen on CentOS 7 Paolo Bonzini
2019-01-24 12:07   ` Daniel P. Berrangé
2019-01-22 17:19 ` [Qemu-devel] [PULL 00/49] Misc patches for 2019-01-21 Peter Maydell
2019-01-23 11:06   ` Stefano Garzarella

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=1548093980-43088-49-git-send-email-pbonzini@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=ehabkost@redhat.com \
    --cc=lizhijian@cn.fujitsu.com \
    --cc=marcel.apfelbaum@gmail.com \
    --cc=mst@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=rth@twiddle.net \
    /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).