From patchwork Thu Jan 17 12:49:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Li Zhijian X-Patchwork-Id: 10768021 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E0432746 for ; Thu, 17 Jan 2019 12:52:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D14DA2F694 for ; Thu, 17 Jan 2019 12:52:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CF5932F728; Thu, 17 Jan 2019 12:52:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6322B2F718 for ; Thu, 17 Jan 2019 12:52:07 +0000 (UTC) Received: from localhost ([127.0.0.1]:43523 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gk79S-0007dH-2s for patchwork-qemu-devel@patchwork.kernel.org; Thu, 17 Jan 2019 07:52:06 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45779) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gk778-0005l8-Is for qemu-devel@nongnu.org; Thu, 17 Jan 2019 07:49:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gk777-0001zW-8Z for qemu-devel@nongnu.org; Thu, 17 Jan 2019 07:49:42 -0500 Received: from mga11.intel.com ([192.55.52.93]:36270) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gk776-0001rr-Ue for qemu-devel@nongnu.org; Thu, 17 Jan 2019 07:49:41 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 17 Jan 2019 04:49:21 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,488,1539673200"; d="scan'208";a="115392164" Received: from sunausti-mobl.ccr.corp.intel.com (HELO haswell-OptiPlex-9020.ccr.corp.intel.com) ([10.255.29.222]) by fmsmga007.fm.intel.com with ESMTP; 17 Jan 2019 04:49:19 -0800 From: Li Zhijian To: qemu-devel@nongnu.org, mst@redhat.com, peter.maydell@linaro.org Date: Thu, 17 Jan 2019 20:49:00 +0800 Message-Id: <1547729344-3895-1-git-send-email-lizhijian@cn.fujitsu.com> X-Mailer: git-send-email 2.7.4 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.93 Subject: [Qemu-devel] [PATCH v6 0/4] allow to load initrd below 4G for recent kernel X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost , Li Zhijian , Peter Crosthwaite , philip.li@intel.com, zhijianx.li@intel.com, Paolo Bonzini , Stefano Garzarella , philmd@redhat.com, Richard Henderson Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Long long ago, linux kernel has supported up to 4G initrd, but it's header still hard code to allow loading initrd below 2G only. cutting from arch/boot/x86/header.S: # (Header version 0x0203 or later) the highest safe address for the contents # of an initrd. The current kernel allows up to 4 GB, but leave it at 2 GB to # avoid possible bootloader bugs. In order to support more than 2G initrd, qemu must allow loading initrd above 2G address. Luckly, recent kernel introduced a new field to linux header named xloadflags:XLF_CAN_BE_LOADED_ABOVE_4G which tells bootloader an optional and safe address to load initrd. It's believed that if XLF_CAN_BE_LOADED_ABOVE_4G is set, initrd can be loaded into any address. Default roms(Seabios + optionrom(linuxboot_dma)) works as expected with this patchset. I stole some comments from yours, fell free to let me know if you don't like this. changes: V6: no functional changes - Patch 3/4: Fix line over 80 characters && use double quates for all pathes (Stefano Garzarella) - Patch 4/4: update comments V5: add a few reviewed-tag and update 4/4 changelog and comments V4: - add Reviwed-by tag to 1/4 and 2/4 - use scripts/update-linux-headers.sh to import bootparam.h - minor fix at commit log V3: - rebase code basing on http://patchwork.ozlabs.org/cover/1005990 and https://patchew.org/QEMU/20181122133507.30950-1-peter.maydell@linaro.org - add new patch 3/4 to import header bootparam.h (Michael S. Tsirkin) V2: add 2 patches(3/5, 4/5) to fix potential loading issue. CC: Paolo Bonzini CC: Richard Henderson CC: Eduardo Habkost CC: "Michael S. Tsirkin" CC: Marcel Apfelbaum CC: Stefano Garzarella CC: Peter Crosthwaite CC: Peter Maydell Li Zhijian (4): unify len and addr type for memory/address APIs hw/core/loader.c: Read as long as possible in load_image_size() i386: import & use bootparam.h i386: allow to load initrd below 4 GB for recent linux exec.c | 47 ++++++++++++++-------------- hw/core/loader.c | 11 +++---- hw/i386/pc.c | 29 ++++++++++++----- include/exec/cpu-all.h | 2 +- include/exec/cpu-common.h | 8 ++--- include/exec/memory.h | 22 ++++++------- include/standard-headers/asm-x86/bootparam.h | 34 ++++++++++++++++++++ scripts/update-linux-headers.sh | 6 ++++ 8 files changed, 105 insertions(+), 54 deletions(-) create mode 100644 include/standard-headers/asm-x86/bootparam.h