From patchwork Thu Sep 26 09:45:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xia, Hongyan" X-Patchwork-Id: 11162125 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 DACE41709 for ; Thu, 26 Sep 2019 09:50:15 +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 B6BA8222C0 for ; Thu, 26 Sep 2019 09:50:15 +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="hjGDIHYB" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B6BA8222C0 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 1iDQOv-0006Iq-BR; Thu, 26 Sep 2019 09:49:29 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iDQOu-0006GJ-65 for xen-devel@lists.xenproject.org; Thu, 26 Sep 2019 09:49:28 +0000 X-Inumbo-ID: eb644908-e042-11e9-97fb-bc764e2007e4 Received: from smtp-fw-33001.amazon.com (unknown [207.171.190.10]) by localhost (Halon) with ESMTPS id eb644908-e042-11e9-97fb-bc764e2007e4; Thu, 26 Sep 2019 09:49:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1569491367; x=1601027367; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=2UYyndybd/u2L8eu6I/OvdFYJWjbmvXRD7Ecm6dmF+Q=; b=hjGDIHYB8E3OtG7sWZj7V1ZhWTIZB7M1voLM/fnZ59AkrJl5ow1412Ao Go9ZSBjRVtdHFzES3By6C/Da9PMl2F/zkSr/WrYn/XiyrErXGcZ/LGxEF VqydEayO62uHa37NhfRC5RilLJsKxpTqk2heJQJZH9ZgEAUi75k/lWxmz s=; X-IronPort-AV: E=Sophos;i="5.64,551,1559520000"; d="scan'208";a="836988813" Received: from sea3-co-svc-lb6-vlan2.sea.amazon.com (HELO email-inbound-relay-1d-74cf8b49.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:20 +0000 Received: from EX13MTAUWA001.ant.amazon.com (iad55-ws-svc-p15-lb9-vlan2.iad.amazon.com [10.40.159.162]) by email-inbound-relay-1d-74cf8b49.us-east-1.amazon.com (Postfix) with ESMTPS id 4402DC1333; Thu, 26 Sep 2019 09:48:09 +0000 (UTC) Received: from EX13P01UWA003.ant.amazon.com (10.43.160.197) by EX13MTAUWA001.ant.amazon.com (10.43.160.58) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Thu, 26 Sep 2019 09:47:38 +0000 Received: from EX13MTAUWA001.ant.amazon.com (10.43.160.58) by EX13P01UWA003.ant.amazon.com (10.43.160.197) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Thu, 26 Sep 2019 09:47:38 +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:47:37 +0000 From: To: Date: Thu, 26 Sep 2019 10:45:47 +0100 Message-ID: <24536847bce6e0d42440990abaa617e80fe08af8.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 24/84] x86_64/mm: drop l4e_to_l3e invocation from paging_init 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/x86_64/mm.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/x86_64/mm.c b/xen/arch/x86/x86_64/mm.c index a9c2b5ca54..945ae123a6 100644 --- a/xen/arch/x86/x86_64/mm.c +++ b/xen/arch/x86/x86_64/mm.c @@ -649,8 +649,10 @@ void __init paging_init(void) /* Create user-accessible L2 directory to map the MPT for compat guests. */ BUILD_BUG_ON(l4_table_offset(RDWR_MPT_VIRT_START) != l4_table_offset(HIRO_COMPAT_MPT_VIRT_START)); - l3_ro_mpt = l4e_to_l3e(idle_pg_table[l4_table_offset( - HIRO_COMPAT_MPT_VIRT_START)]); + + l3_ro_mpt_mfn = l4e_get_mfn(idle_pg_table[l4_table_offset( + HIRO_COMPAT_MPT_VIRT_START)]); + l3_ro_mpt = map_xen_pagetable_new(l3_ro_mpt_mfn); l2_ro_mpt_mfn = alloc_xen_pagetable_new(); if ( mfn_eq(l2_ro_mpt_mfn, INVALID_MFN) ) @@ -702,6 +704,7 @@ void __init paging_init(void) #undef MFN UNMAP_XEN_PAGETABLE_NEW(l2_ro_mpt); + UNMAP_XEN_PAGETABLE_NEW(l3_ro_mpt); machine_to_phys_mapping_valid = 1;