From patchwork Mon Sep 30 10:33:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xia, Hongyan" X-Patchwork-Id: 11166483 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 157FC16B1 for ; Mon, 30 Sep 2019 10:37:37 +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 E653620679 for ; Mon, 30 Sep 2019 10:37:36 +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="lsFELa8M" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E653620679 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 1iEt2w-0002OW-7Y; Mon, 30 Sep 2019 10:36:50 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iEt2u-0002MC-VZ for xen-devel@lists.xenproject.org; Mon, 30 Sep 2019 10:36:49 +0000 X-Inumbo-ID: 1fc7b422-e36e-11e9-97fb-bc764e2007e4 Received: from smtp-fw-33001.amazon.com (unknown [207.171.190.10]) by localhost (Halon) with ESMTPS id 1fc7b422-e36e-11e9-97fb-bc764e2007e4; Mon, 30 Sep 2019 10:36:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1569839773; x=1601375773; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=ac2eimXv3IPFD3HqKUmOTeHhR84IFbsA9dhs2/WCnXI=; b=lsFELa8M3P7Dql2TrMRjKhf00mcLB3BMNFD0XyfJKgZW7YiJBdOPgQBG e9vDLUoVZcA0tjLIklR67gVl+16ndYQJvnA7+NGTvt8r/YOkmTzDJBeFv fNbMEbFyl6+ooSujR9H5doNM5TtjsT5jE+0mLo4+8JaZJTo218XttfsQu o=; X-IronPort-AV: E=Sophos;i="5.64,565,1559520000"; d="scan'208";a="838005697" Received: from sea3-co-svc-lb6-vlan2.sea.amazon.com (HELO email-inbound-relay-1a-807d4a99.us-east-1.amazon.com) ([10.47.22.34]) by smtp-border-fw-out-33001.sea14.amazon.com with ESMTP; 30 Sep 2019 10:35:13 +0000 Received: from EX13MTAUEA001.ant.amazon.com (iad55-ws-svc-p15-lb9-vlan2.iad.amazon.com [10.40.159.162]) by email-inbound-relay-1a-807d4a99.us-east-1.amazon.com (Postfix) with ESMTPS id 42D59A306A; Mon, 30 Sep 2019 10:34:59 +0000 (UTC) Received: from EX13D21UEE004.ant.amazon.com (10.43.62.91) by EX13MTAUEA001.ant.amazon.com (10.43.61.243) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Mon, 30 Sep 2019 10:34:39 +0000 Received: from EX13MTAUEE001.ant.amazon.com (10.43.62.200) by EX13D21UEE004.ant.amazon.com (10.43.62.91) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Mon, 30 Sep 2019 10:34:38 +0000 Received: from u9d785c4ba99158.ant.amazon.com (10.125.106.78) by mail-relay.amazon.com (10.43.62.226) with Microsoft SMTP Server id 15.0.1367.3 via Frontend Transport; Mon, 30 Sep 2019 10:34:38 +0000 From: Hongyan Xia To: Date: Mon, 30 Sep 2019 11:33:44 +0100 Message-ID: <8e25d1ca1b754a9e368ccf12375730ae7b76ca57.1569833766.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] [PATCH v2 52/55] x86: remove lXe_to_lYe in __start_xen 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 , Jan Beulich , =?utf-8?q?Roger_Pau_Monn=C3=A9?= Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" From: Wei Liu Properly map and unmap page tables where necessary. Signed-off-by: Wei Liu --- xen/arch/x86/setup.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index dec60d0301..d27bcf1724 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1095,13 +1095,17 @@ void __init noreturn __start_xen(unsigned long mbi_p) pl4e = __va(__pa(idle_pg_table)); for ( i = 0 ; i < L4_PAGETABLE_ENTRIES; i++, pl4e++ ) { + l3_pgentry_t *l3t; + if ( !(l4e_get_flags(*pl4e) & _PAGE_PRESENT) ) continue; *pl4e = l4e_from_intpte(l4e_get_intpte(*pl4e) + xen_phys_start); - pl3e = l4e_to_l3e(*pl4e); + pl3e = l3t = map_xen_pagetable_new(l4e_get_mfn(*pl4e)); for ( j = 0; j < L3_PAGETABLE_ENTRIES; j++, pl3e++ ) { + l2_pgentry_t *l2t; + /* Not present, 1GB mapping, or already relocated? */ if ( !(l3e_get_flags(*pl3e) & _PAGE_PRESENT) || (l3e_get_flags(*pl3e) & _PAGE_PSE) || @@ -1109,7 +1113,7 @@ void __init noreturn __start_xen(unsigned long mbi_p) continue; *pl3e = l3e_from_intpte(l3e_get_intpte(*pl3e) + xen_phys_start); - pl2e = l3e_to_l2e(*pl3e); + pl2e = l2t = map_xen_pagetable_new(l3e_get_mfn(*pl3e)); for ( k = 0; k < L2_PAGETABLE_ENTRIES; k++, pl2e++ ) { /* Not present, PSE, or already relocated? */ @@ -1120,7 +1124,9 @@ void __init noreturn __start_xen(unsigned long mbi_p) *pl2e = l2e_from_intpte(l2e_get_intpte(*pl2e) + xen_phys_start); } + UNMAP_XEN_PAGETABLE_NEW(l2t); } + UNMAP_XEN_PAGETABLE_NEW(l3t); } /* The only data mappings to be relocated are in the Xen area. */