From patchwork Mon Sep 30 10:33:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xia, Hongyan" X-Patchwork-Id: 11166425 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 D0F801709 for ; Mon, 30 Sep 2019 10:36:14 +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 AD25120679 for ; Mon, 30 Sep 2019 10:36:14 +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="V6URGGHB" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AD25120679 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 1iEt1Z-0008C4-M6; Mon, 30 Sep 2019 10:35:25 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iEt1X-00089J-S2 for xen-devel@lists.xenproject.org; Mon, 30 Sep 2019 10:35:23 +0000 X-Inumbo-ID: f2b4fe68-e36d-11e9-b588-bc764e2007e4 Received: from smtp-fw-6001.amazon.com (unknown [52.95.48.154]) by localhost (Halon) with ESMTPS id f2b4fe68-e36d-11e9-b588-bc764e2007e4; Mon, 30 Sep 2019 10:34:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1569839697; x=1601375697; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=d/Cw5FF0vm0gT98yS1Zb7tJv/m7TKS2UrIp9mbKuaiY=; b=V6URGGHB5LyANKZBZbPHIAPHXbRfXcbyKjgowMbGa+5/Y1gLQ6qkTM02 /DpfceI/Gln1bIJ0OosCn6u+467NrMNgWcrxxiKS3W7orbvEl0mCRsRx0 JhQBqbbMzibNNVag82OM2ySVMYqgujscPzbrzaz028iA7dAZlIRu3GCqn o=; X-IronPort-AV: E=Sophos;i="5.64,565,1559520000"; d="scan'208";a="418649946" Received: from iad6-co-svc-p1-lb1-vlan3.amazon.com (HELO email-inbound-relay-1d-98acfc19.us-east-1.amazon.com) ([10.124.125.6]) by smtp-border-fw-out-6001.iad6.amazon.com with ESMTP; 30 Sep 2019 10:34:57 +0000 Received: from EX13MTAUEA001.ant.amazon.com (iad55-ws-svc-p15-lb9-vlan3.iad.amazon.com [10.40.159.166]) by email-inbound-relay-1d-98acfc19.us-east-1.amazon.com (Postfix) with ESMTPS id EB280A03AD; Mon, 30 Sep 2019 10:34:56 +0000 (UTC) Received: from EX13D14UEE004.ant.amazon.com (10.43.62.145) by EX13MTAUEA001.ant.amazon.com (10.43.61.82) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Mon, 30 Sep 2019 10:34:34 +0000 Received: from EX13MTAUEE001.ant.amazon.com (10.43.62.200) by EX13D14UEE004.ant.amazon.com (10.43.62.145) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Mon, 30 Sep 2019 10:34:34 +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:33 +0000 From: Hongyan Xia To: Date: Mon, 30 Sep 2019 11:33:39 +0100 Message-ID: <3cdfbe62e567747a8fa24ecc8bebfd9f0ffdb65f.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 47/55] x86_64/mm: map and unmap page tables in subarch_init_memory 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 Signed-off-by: Wei Liu --- xen/arch/x86/x86_64/mm.c | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/x86_64/mm.c b/xen/arch/x86/x86_64/mm.c index 8d13c994af..7a02fcee18 100644 --- a/xen/arch/x86/x86_64/mm.c +++ b/xen/arch/x86/x86_64/mm.c @@ -930,8 +930,8 @@ static int extend_frame_table(struct mem_hotadd_info *info) void __init subarch_init_memory(void) { unsigned long i, n, v, m2p_start_mfn; - l3_pgentry_t l3e; - l2_pgentry_t l2e; + l3_pgentry_t l3e, *l3t; + l2_pgentry_t l2e, *l2t; BUILD_BUG_ON(RDWR_MPT_VIRT_START & ((1UL << L3_PAGETABLE_SHIFT) - 1)); BUILD_BUG_ON(RDWR_MPT_VIRT_END & ((1UL << L3_PAGETABLE_SHIFT) - 1)); @@ -941,14 +941,22 @@ void __init subarch_init_memory(void) v += n << PAGE_SHIFT ) { n = L2_PAGETABLE_ENTRIES * L1_PAGETABLE_ENTRIES; - l3e = l4e_to_l3e(idle_pg_table[l4_table_offset(v)])[ - l3_table_offset(v)]; + + l3t = map_xen_pagetable_new( + l4e_get_mfn(idle_pg_table[l4_table_offset(v)])); + l3e = l3t[l3_table_offset(v)]; + UNMAP_XEN_PAGETABLE_NEW(l3t); + if ( !(l3e_get_flags(l3e) & _PAGE_PRESENT) ) continue; if ( !(l3e_get_flags(l3e) & _PAGE_PSE) ) { n = L1_PAGETABLE_ENTRIES; - l2e = l3e_to_l2e(l3e)[l2_table_offset(v)]; + + l2t = map_xen_pagetable_new(l3e_get_mfn(l3e)); + l2e = l2t[l2_table_offset(v)]; + UNMAP_XEN_PAGETABLE_NEW(l2t); + if ( !(l2e_get_flags(l2e) & _PAGE_PRESENT) ) continue; m2p_start_mfn = l2e_get_pfn(l2e); @@ -967,11 +975,18 @@ void __init subarch_init_memory(void) v != RDWR_COMPAT_MPT_VIRT_END; v += 1 << L2_PAGETABLE_SHIFT ) { - l3e = l4e_to_l3e(idle_pg_table[l4_table_offset(v)])[ - l3_table_offset(v)]; + l3t = map_xen_pagetable_new( + l4e_get_mfn(idle_pg_table[l4_table_offset(v)])); + l3e = l3t[l3_table_offset(v)]; + UNMAP_XEN_PAGETABLE_NEW(l3t); + if ( !(l3e_get_flags(l3e) & _PAGE_PRESENT) ) continue; - l2e = l3e_to_l2e(l3e)[l2_table_offset(v)]; + + l2t = map_xen_pagetable_new(l3e_get_mfn(l3e)); + l2e = l2t[l2_table_offset(v)]; + UNMAP_XEN_PAGETABLE_NEW(l2t); + if ( !(l2e_get_flags(l2e) & _PAGE_PRESENT) ) continue; m2p_start_mfn = l2e_get_pfn(l2e);