From nobody Fri Apr 26 15:17:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1631114309; cv=none; d=zohomail.com; s=zohoarc; b=PMGfzQl1JFMVq0GlyaB6AeRpIBzBvt2EQL0wKkr3e/Axu7b2qManpx37CH4BM6jOdfTgwp9iGbmD+H9LLPdWhibxfuo+4FOZkMmhKSCqeynOAGkbNSDmwtQFzWMDwePNgGt1F6iKxC6Jz1I/5uEBiKaHHbp7nEuK92sbgBsqQi0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631114309; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=su9EUCbZFe2pi3Ye33fSk2MMrCsTNeqMu91YwgfBU9Q=; b=d4+CfXZycA8klI04FeI8pMTvyZBG9LACgwnwEhsYqOh0vvd8nHKXrHOJaFkaO4wP5k3wIBjW6GY/ALR1HCuwUzTiPtfrT+Rh8OZzjOtHSKfRszF1Dkm/9J63jqsc3JETNiQkKGQ5LeOvRNWs7JaR8TE3LA+YmIMLEWOktD19kq4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1631114309641879.6570628304947; Wed, 8 Sep 2021 08:18:29 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.182225.329701 (Exim 4.92) (envelope-from ) id 1mNzL5-0003KO-Dn; Wed, 08 Sep 2021 15:18:15 +0000 Received: by outflank-mailman (output) from mailman id 182225.329701; Wed, 08 Sep 2021 15:18:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mNzL5-0003KH-Aa; Wed, 08 Sep 2021 15:18:15 +0000 Received: by outflank-mailman (input) for mailman id 182225; Wed, 08 Sep 2021 15:18:14 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mNzL4-0003KB-0v for xen-devel@lists.xenproject.org; Wed, 08 Sep 2021 15:18:14 +0000 Received: from esa6.hc3370-68.iphmx.com (unknown [216.71.155.175]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id fb8a7c60-10b7-11ec-b166-12813bfff9fa; Wed, 08 Sep 2021 15:18:13 +0000 (UTC) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: fb8a7c60-10b7-11ec-b166-12813bfff9fa DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1631114293; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=vgbADa/BeAfDLA5gMI6dcJmJzTZlZecMN4BBfA2o+do=; b=HyZw9NFBdPvPM0/VSxa7UVFPERa4Q0F1taC1/E1YXE8j4m1KJcqzyfbs WeYM+26Sb2+BU8nZxObb8RwTtqdtYGSVG0NVO9tQo/49C1+B0OALK3YFp UDHKRY7v3fwjWizu5Qg9epflxPgu3qv1N4pJahIwBc2D+o5pgycgq55p5 o=; Authentication-Results: esa6.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: ownEoTcax3yoAnjo4Fg+7GcwxJRSwkBrSCKNQS14/hryjFi9waoALThHEU97k4SAemyRvltmDr UrQB+4iRhj8RS9C6XN1GY7nrleoYc6hesBCMpi2KQ0G+10qWmZHYOO/02XRP1tnNiBGGgMxcrb 6i0L1uli1UprUyiw9Yk7wfnoHkhyy9r+8rgFjhjOpuq1yROk/BmQ9FmXIaSBT0UuzYrpLj9aaT nxA0XApjpC0vx+umPjefposb5zDSUdgbiCDBYMqaa37cGMIqbUCXZz3GkjJjmVrQD7guI9RLKu e49VuMhW3tovnAB0OJQRhinZ X-SBRS: 5.1 X-MesageID: 52268475 X-Ironport-Server: esa6.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-HdrOrdr: A9a23:0xa1Makx2GgY7NzTBpYDLHeniR3pDfK33DAbv31ZSRFFG/Fw9v rEoB1173HJYVoqN03I+urrBEDoexq1yXcf2+Qs1NmZMDUOw1HIEKhSqbH6xiHmGWnX7/c179 YDT4FOTOfoCER8j4LQ/Am8Hr8bsb+62ZHtv/7a03BuCSZjb60I1WdEIzfeKFRyWA5FQbwmE5 aGj/A3xAaISDAsd8GmAXtAZcjvzue78a7OUFo9Hhs67wvLtz+y97LgNBCd0n4lIldy6IZny3 HBjwv6opquqOu6zBi07R6106hr X-IronPort-AV: E=Sophos;i="5.85,278,1624334400"; d="scan'208";a="52268475" From: Andrew Cooper To: Xen-devel CC: Andrew Cooper , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Wei Liu Subject: [PATCH for-4.13] x86/PVH: Fix build following XSA-378 bugfix Date: Wed, 8 Sep 2021 16:17:54 +0100 Message-ID: <20210908151754.9593-1-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1631114310751100001 Fixes: 8d8b4bde3e1c ("x86/PVH: de-duplicate mappings for first Mb of Dom0 m= emory") Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- CC: Jan Beulich CC: Roger Pau Monn=C3=A9 CC: Wei Liu --- xen/arch/x86/hvm/dom0_build.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/hvm/dom0_build.c b/xen/arch/x86/hvm/dom0_build.c index 62958bf82cbe..c6eb86bfb7ee 100644 --- a/xen/arch/x86/hvm/dom0_build.c +++ b/xen/arch/x86/hvm/dom0_build.c @@ -467,7 +467,7 @@ static int __init pvh_populate_p2m(struct domain *d) p2m_type_t p2mt; =20 if ( mfn_eq(get_gfn_query(d, i, &p2mt), INVALID_MFN) ) - rc =3D set_mmio_p2m_entry(d, _gfn(i), _mfn(i), PAGE_ORDER_4K, + rc =3D set_mmio_p2m_entry(d, i, _mfn(i), PAGE_ORDER_4K, p2m_get_hostp2m(d)->default_access); else ASSERT(p2mt =3D=3D p2m_ram_rw); --=20 2.11.0