From patchwork Thu Sep 26 09:46:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xia, Hongyan" X-Patchwork-Id: 11162161 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 E6D8D13B1 for ; Thu, 26 Sep 2019 09:50:53 +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 C2166222C0 for ; Thu, 26 Sep 2019 09:50:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=amazon.com header.i=@amazon.com header.b="WP6mRyjY" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C2166222C0 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=amazon.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 1iDQPV-0007ZL-2g; Thu, 26 Sep 2019 09:50:05 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iDQPT-0007TK-IH for xen-devel@lists.xenproject.org; Thu, 26 Sep 2019 09:50:03 +0000 X-Inumbo-ID: 01f906c2-e043-11e9-b588-bc764e2007e4 Received: from smtp-fw-33001.amazon.com (unknown [207.171.190.10]) by localhost (Halon) with ESMTPS id 01f906c2-e043-11e9-b588-bc764e2007e4; Thu, 26 Sep 2019 09:50:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1569491402; x=1601027402; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=3SN61TJ04n0xBCYnr1+TtV3siYlmPBFZgsnjGBXinLs=; b=WP6mRyjY2GiytIQERe7mP/MS9yL3oLc1rcTQsx0KYM+MT37UhRVWSP67 VVGHLqzDXk4SKsq3MdsPFBePrTkAEvNHVhxI+dBP9010zuHmmMhS2zBtY dI6zKqRFa+Bqkk0T0s4Pfj/Z930gDAtu2BDcLae5HjT/3eVgmGlOjbAeF g=; X-IronPort-AV: E=Sophos;i="5.64,551,1559520000"; d="scan'208";a="836988949" Received: from sea3-co-svc-lb6-vlan2.sea.amazon.com (HELO email-inbound-relay-1d-2c665b5d.us-east-1.amazon.com) ([10.47.22.34]) by smtp-border-fw-out-33001.sea14.amazon.com with ESMTP; 26 Sep 2019 09:48:59 +0000 Received: from EX13MTAUWA001.ant.amazon.com (iad55-ws-svc-p15-lb9-vlan3.iad.amazon.com [10.40.159.166]) by email-inbound-relay-1d-2c665b5d.us-east-1.amazon.com (Postfix) with ESMTPS id 838ADA25D2; Thu, 26 Sep 2019 09:48:46 +0000 (UTC) Received: from EX13D06UWA003.ant.amazon.com (10.43.160.13) by EX13MTAUWA001.ant.amazon.com (10.43.160.58) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Thu, 26 Sep 2019 09:48:08 +0000 Received: from EX13MTAUWA001.ant.amazon.com (10.43.160.58) by EX13D06UWA003.ant.amazon.com (10.43.160.13) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Thu, 26 Sep 2019 09:48:08 +0000 Received: from u9d785c4ba99158.ant.amazon.com (10.125.106.58) by mail-relay.amazon.com (10.43.160.118) with Microsoft SMTP Server id 15.0.1367.3 via Frontend Transport; Thu, 26 Sep 2019 09:48:07 +0000 From: To: Date: Thu, 26 Sep 2019 10:46:04 +0100 Message-ID: <10ca381404695513eb89c2b5b155005439333bcf.1569489002.git.hongyax@amazon.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: Bulk Subject: [Xen-devel] [RFC PATCH 41/84] x86/shim: map and unmap page tables in replace_va_mapping X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Andrew Cooper , Wei Liu , Wei Liu , Jan Beulich , =?utf-8?q?Roger_Pau_?= =?utf-8?q?Monn=C3=A9?= Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" From: Wei Liu Signed-off-by: Wei Liu --- xen/arch/x86/pv/shim.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/pv/shim.c b/xen/arch/x86/pv/shim.c index 324ca27f93..cf638fa965 100644 --- a/xen/arch/x86/pv/shim.c +++ b/xen/arch/x86/pv/shim.c @@ -167,15 +167,25 @@ static void __init replace_va_mapping(struct domain *d, l4_pgentry_t *l4start, unsigned long va, mfn_t mfn) { l4_pgentry_t *pl4e = l4start + l4_table_offset(va); - l3_pgentry_t *pl3e = l4e_to_l3e(*pl4e) + l3_table_offset(va); - l2_pgentry_t *pl2e = l3e_to_l2e(*pl3e) + l2_table_offset(va); - l1_pgentry_t *pl1e = l2e_to_l1e(*pl2e) + l1_table_offset(va); - struct page_info *page = mfn_to_page(l1e_get_mfn(*pl1e)); + l3_pgentry_t *pl3e; + l2_pgentry_t *pl2e; + l1_pgentry_t *pl1e; - put_page_and_type(page); + pl3e = map_xen_pagetable_new(l4e_get_mfn(*pl4e)); + pl3e += l3_table_offset(va); + pl2e = map_xen_pagetable_new(l3e_get_mfn(*pl3e)); + pl2e += l2_table_offset(va); + pl1e = map_xen_pagetable_new(l2e_get_mfn(*pl2e)); + pl1e += l1_table_offset(va); + + put_page_and_type(mfn_to_page(l1e_get_mfn(*pl1e))); *pl1e = l1e_from_mfn(mfn, (!is_pv_32bit_domain(d) ? L1_PROT : COMPAT_L1_PROT)); + + UNMAP_XEN_PAGETABLE_NEW(pl1e); + UNMAP_XEN_PAGETABLE_NEW(pl2e); + UNMAP_XEN_PAGETABLE_NEW(pl3e); } static void evtchn_reserve(struct domain *d, unsigned int port)