From patchwork Mon Oct 28 08:56:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sergey Dyasli X-Patchwork-Id: 11215001 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3427813B1 for ; Mon, 28 Oct 2019 08:57:54 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0EF0920B7C for ; Mon, 28 Oct 2019 08:57:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=citrix.com header.i=@citrix.com header.b="PH2zHyF4" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0EF0920B7C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=citrix.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iP0p4-0000FI-Gi; Mon, 28 Oct 2019 08:56:22 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iP0p3-0000FD-4w for xen-devel@lists.xen.org; Mon, 28 Oct 2019 08:56:21 +0000 X-Inumbo-ID: cebe6b26-f960-11e9-beca-bc764e2007e4 Received: from esa3.hc3370-68.iphmx.com (unknown [216.71.145.155]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id cebe6b26-f960-11e9-beca-bc764e2007e4; Mon, 28 Oct 2019 08:56:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1572252981; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=A3yqLJaNeHYuV0CtjI/X78wIbwXhoOE8A3aqwUfMMsQ=; b=PH2zHyF4QBDQVneVPI/YmTkRkPmRSInzcbwAj6N6my87xZk6TgLNmjD7 bbu/B/w0YzsZKM3mIiIU7KkSVhoa87skc945gR5u9ZBRURPXpd4wTvAho fV0TOyuJymWpd/X+fTMzkXEiI4X8K0GsBcyeIZLHArSvIl3YDIoMZmVRs w=; Authentication-Results: esa3.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none; spf=None smtp.pra=sergey.dyasli@citrix.com; spf=Pass smtp.mailfrom=sergey.dyasli@citrix.com; spf=None smtp.helo=postmaster@mail.citrix.com Received-SPF: None (esa3.hc3370-68.iphmx.com: no sender authenticity information available from domain of sergey.dyasli@citrix.com) identity=pra; client-ip=162.221.158.21; receiver=esa3.hc3370-68.iphmx.com; envelope-from="sergey.dyasli@citrix.com"; x-sender="sergey.dyasli@citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa3.hc3370-68.iphmx.com: domain of sergey.dyasli@citrix.com designates 162.221.158.21 as permitted sender) identity=mailfrom; client-ip=162.221.158.21; receiver=esa3.hc3370-68.iphmx.com; envelope-from="sergey.dyasli@citrix.com"; x-sender="sergey.dyasli@citrix.com"; x-conformance=sidf_compatible; x-record-type="v=spf1"; x-record-text="v=spf1 ip4:209.167.231.154 ip4:178.63.86.133 ip4:195.66.111.40/30 ip4:85.115.9.32/28 ip4:199.102.83.4 ip4:192.28.146.160 ip4:192.28.146.107 ip4:216.52.6.88 ip4:216.52.6.188 ip4:162.221.158.21 ip4:162.221.156.83 ip4:168.245.78.127 ~all" Received-SPF: None (esa3.hc3370-68.iphmx.com: no sender authenticity information available from domain of postmaster@mail.citrix.com) identity=helo; client-ip=162.221.158.21; receiver=esa3.hc3370-68.iphmx.com; envelope-from="sergey.dyasli@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: QbYuGacpdowKG4ktexxiUBByE/SvCyuJCErMzfJ8i4DhX66Xm0HAuz0DQ2TbSLYZep9mSBjEg3 6AwayIka0eCweQIFAPF3WVhy8cD7xYYR/KcKoUF0dEe9i3J8x+aRIdvd9AhqmVZzt6eFQuVAbC fkq4HVexB06PVfK5bXJ7upSaJxYUyKfKH3AeasCDnIzEjXt3Tg8HspRN4uHeBSiHSrvFyVF5yd /eM5ehOnsi9NV7YA2G4irLkuNyO3xMI5RJpM2qWmSNdIgRwCEjQeyjfzSIAJlOejqg5br3H5aA aU0= X-SBRS: 2.7 X-MesageID: 7491467 X-Ironport-Server: esa3.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.68,239,1569297600"; d="scan'208";a="7491467" From: Sergey Dyasli To: Date: Mon, 28 Oct 2019 08:56:03 +0000 Message-ID: <20191028085603.32037-1-sergey.dyasli@citrix.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 Subject: [Xen-devel] [PATCH for 4.13] x86/shim: don't reserve 640k - 1M region in E820 X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Juergen Gross , Sergey Dyasli , Wei Liu , Andrew Cooper , Jan Beulich , =?utf-8?q?Roger_Pau_Monn=C3=A9?= Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Converting a guest from PV to PV-in-PVH makes the guest to have 384k less memory, which may confuse guest's balloon driver. This happens because Xen unconditionally reserves 640k - 1M region in E820 despite the fact that it's really a usable RAM in PVH boot mode. Fix this by skipping the region type change for pv-shim mode. Signed-off-by: Sergey Dyasli --- The condition can be relaxed to be just !pvh_boot if there are no plans to support VGA MMIO / ROMs for PVH guests. CC: Jan Beulich CC: Andrew Cooper CC: Wei Liu CC: "Roger Pau Monné" CC: Juergen Gross --- xen/arch/x86/e820.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/e820.c b/xen/arch/x86/e820.c index 8e8a2c4e1b..54c2ae70c4 100644 --- a/xen/arch/x86/e820.c +++ b/xen/arch/x86/e820.c @@ -318,9 +318,10 @@ static int __init copy_e820_map(struct e820entry * biosmap, unsigned int nr_map) /* * Some BIOSes claim RAM in the 640k - 1M region. - * Not right. Fix it up. + * Not right. Fix it up, except for pv-shim case. */ - if (type == E820_RAM) { + if ( !(pv_shim && pvh_boot) && type == E820_RAM ) + { if (start < 0x100000ULL && end > 0xA0000ULL) { if (start < 0xA0000ULL) add_memory_region(start, 0xA0000ULL-start, type);