From patchwork Wed Nov 21 02:06:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Li Zhijian X-Patchwork-Id: 10691541 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 80DFC14E2 for ; Wed, 21 Nov 2018 02:09:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6CDE22B19D for ; Wed, 21 Nov 2018 02:09:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 60BEB2B1A3; Wed, 21 Nov 2018 02:09:22 +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=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 10AEF2B19D for ; Wed, 21 Nov 2018 02:09:22 +0000 (UTC) Received: from localhost ([::1]:36848 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gPHxB-0000Xf-Bv for patchwork-qemu-devel@patchwork.kernel.org; Tue, 20 Nov 2018 21:09:21 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49915) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gPHtr-0005mO-Lv for qemu-devel@nongnu.org; Tue, 20 Nov 2018 21:05:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gPHtp-0002qO-RB for qemu-devel@nongnu.org; Tue, 20 Nov 2018 21:05:55 -0500 Received: from mga05.intel.com ([192.55.52.43]:12721) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gPHtp-0002mO-EL for qemu-devel@nongnu.org; Tue, 20 Nov 2018 21:05:53 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 Nov 2018 18:05:52 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,259,1539673200"; d="scan'208";a="90917014" Received: from bangyuan-mobl.ccr.corp.intel.com (HELO haswell-OptiPlex-9020.ccr.corp.intel.com) ([10.255.31.159]) by orsmga007.jf.intel.com with ESMTP; 20 Nov 2018 18:05:50 -0800 From: Li Zhijian To: qemu-devel@nongnu.org Date: Wed, 21 Nov 2018 10:06:06 +0800 Message-Id: <1542765966-20244-6-git-send-email-lizhijian@cn.fujitsu.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1542765966-20244-5-git-send-email-lizhijian@cn.fujitsu.com> References: <1542765966-20244-1-git-send-email-lizhijian@cn.fujitsu.com> <1542765966-20244-2-git-send-email-lizhijian@cn.fujitsu.com> <1542765966-20244-3-git-send-email-lizhijian@cn.fujitsu.com> <1542765966-20244-4-git-send-email-lizhijian@cn.fujitsu.com> <1542765966-20244-5-git-send-email-lizhijian@cn.fujitsu.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.43 Subject: [Qemu-devel] [PATCH v2 5/5] x86: allow load initrd below 4G for recent linux 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 , "Michael S. Tsirkin" , Philip Li , Li Zhijian , Paolo Bonzini , Richard Henderson Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP a new field xloadflags was added to recent x86 linux, and BIT 1: XLF_CAN_BE_LOADED_ABOVE_4G is used to tell bootload that where initrd can be loaded saftly. Current QEMU always load initrd below below_4g_mem_size which always less than 4G, so here limit initrd_max to 4G - 1 simply is enough if this bit is set. CC: Paolo Bonzini CC: Richard Henderson CC: Eduardo Habkost CC: "Michael S. Tsirkin" CC: Marcel Apfelbaum Signed-off-by: Li Zhijian --- hw/i386/pc.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 2ffe6fb..6d4b973 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -92,6 +92,7 @@ #define FW_CFG_HPET (FW_CFG_ARCH_LOCAL + 4) #define E820_NR_ENTRIES 16 +#define XLF_CAN_BE_LOADED_ABOVE_4G_MASK (1 << 1) struct e820_entry { uint64_t address; @@ -916,6 +917,17 @@ static void load_linux(PCMachineState *pcms, } else { initrd_max = 0x37ffffff; } + if (protocol >= 0x20c) { + unsigned int xloadflags = lduw_p(header+0x236); + if (xloadflags & XLF_CAN_BE_LOADED_ABOVE_4G_MASK) { + /* + * Although kernel allow initrd loading to above 4G, here we + * limit initrd_max to 4G -1 due to current QEMU always loads + * initrd below pcms->below_4g_mem_size + */ + initrd_max = UINT32_MAX; + } + } if (initrd_max >= pcms->below_4g_mem_size - pcmc->acpi_data_size) { initrd_max = pcms->below_4g_mem_size - pcmc->acpi_data_size - 1;