From patchwork Thu Sep 26 09:46:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xia, Hongyan" X-Patchwork-Id: 11162151 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 34B0B13B1 for ; Thu, 26 Sep 2019 09:50:33 +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 108C0222C0 for ; Thu, 26 Sep 2019 09:50:33 +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="ojz5PpuG" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 108C0222C0 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 1iDQPD-0006uD-Ii; Thu, 26 Sep 2019 09:49:47 +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.89) (envelope-from ) id 1iDQPB-0006qk-UV for xen-devel@lists.xenproject.org; Thu, 26 Sep 2019 09:49:45 +0000 X-Inumbo-ID: de1c7900-e042-11e9-964c-12813bfff9fa Received: from smtp-fw-6002.amazon.com (unknown [52.95.49.90]) by localhost (Halon) with ESMTPS id de1c7900-e042-11e9-964c-12813bfff9fa; Thu, 26 Sep 2019 09:49: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=1569491340; x=1601027340; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=Wby/mGwNUuZMxWF138zkmrPdE1eRR8bcGajq5qTxSXc=; b=ojz5PpuGRvxVFs9oILFlpn54wH3wrQe5nl4jxS0Bx51meoAHfuq1TASw ns/aJTqJl80UEKlctCrvfqoHmhCd0q3lss7jNNI5KwwYVrtGl9NJByfuS QrhTad5tFKjauoSBuXAMazUOxqm04xp/a3KbM9g7jajIUf1rx1SAW9fMc 4=; X-IronPort-AV: E=Sophos;i="5.64,551,1559520000"; d="scan'208";a="423750630" Received: from iad6-co-svc-p1-lb1-vlan3.amazon.com (HELO email-inbound-relay-1e-97fdccfd.us-east-1.amazon.com) ([10.124.125.6]) by smtp-border-fw-out-6002.iad6.amazon.com with ESMTP; 26 Sep 2019 09:49:00 +0000 Received: from EX13MTAUWA001.ant.amazon.com (iad55-ws-svc-p15-lb9-vlan3.iad.amazon.com [10.40.159.166]) by email-inbound-relay-1e-97fdccfd.us-east-1.amazon.com (Postfix) with ESMTPS id DDA02A1F03; Thu, 26 Sep 2019 09:48:58 +0000 (UTC) Received: from EX13D24UWA004.ant.amazon.com (10.43.160.233) 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:31 +0000 Received: from EX13MTAUWA001.ant.amazon.com (10.43.160.58) by EX13D24UWA004.ant.amazon.com (10.43.160.233) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Thu, 26 Sep 2019 09:48:30 +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:29 +0000 From: To: Date: Thu, 26 Sep 2019 10:46:16 +0100 Message-ID: <32ae1461fb4177b1586bb7e735da6d58bbee5462.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 53/84] 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 , 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 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 27981adc0b..1c90559288 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. */