From patchwork Thu Sep 26 09:46:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xia, Hongyan" X-Patchwork-Id: 11162193 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 019C513B1 for ; Thu, 26 Sep 2019 09:51:34 +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 D2657222C2 for ; Thu, 26 Sep 2019 09:51: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="kFbCHezO" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D2657222C2 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 1iDQQ8-0000vk-7O; Thu, 26 Sep 2019 09:50:44 +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 1iDQQ4-0000oS-T7 for xen-devel@lists.xenproject.org; Thu, 26 Sep 2019 09:50:40 +0000 X-Inumbo-ID: 125132ce-e043-11e9-964c-12813bfff9fa Received: from smtp-fw-33001.amazon.com (unknown [207.171.190.10]) by localhost (Halon) with ESMTPS id 125132ce-e043-11e9-964c-12813bfff9fa; Thu, 26 Sep 2019 09:50:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1569491429; x=1601027429; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=EQfXGAiYAwwkWDZDwPbXdH4ATyLi8r4fPivSmtdu1wY=; b=kFbCHezOU+E9LWbAVyIkhb/jcQgGodPKsRs1PcGdp3gm0r+Vqoz74XXJ m92y2VtSEyiz5BivMowVzePaqfGzt8/H8tunF7HlDdJNCzcoygRn8LCfz m9/dxE9SsSQAtwbrBGgGVxzjOCeq7FFqDxHC1NvokUv1B7/9azBp9kU1L 4=; X-IronPort-AV: E=Sophos;i="5.64,551,1559520000"; d="scan'208";a="836989102" Received: from sea3-co-svc-lb6-vlan2.sea.amazon.com (HELO email-inbound-relay-1e-62350142.us-east-1.amazon.com) ([10.47.22.34]) by smtp-border-fw-out-33001.sea14.amazon.com with ESMTP; 26 Sep 2019 09:49:40 +0000 Received: from EX13MTAUEA001.ant.amazon.com (iad55-ws-svc-p15-lb9-vlan3.iad.amazon.com [10.40.159.166]) by email-inbound-relay-1e-62350142.us-east-1.amazon.com (Postfix) with ESMTPS id 58834A1F10; Thu, 26 Sep 2019 09:49:27 +0000 (UTC) Received: from EX13D28EUB004.ant.amazon.com (10.43.166.176) by EX13MTAUEA001.ant.amazon.com (10.43.61.243) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Thu, 26 Sep 2019 09:49:07 +0000 Received: from EX13MTAUWA001.ant.amazon.com (10.43.160.58) by EX13D28EUB004.ant.amazon.com (10.43.166.176) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Thu, 26 Sep 2019 09:49:06 +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:49:03 +0000 From: To: Date: Thu, 26 Sep 2019 10:46:28 +0100 Message-ID: <0aa271bfe3670f7058128c728d392faa69418a49.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 65/84] x86: fix some wrong assumptions on direct map. Increase PMAP slots to 8. 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 , =?utf-8?q?Roger_Pau_Monn?= =?utf-8?q?=C3=A9?= , Wei Liu , Jan Beulich , Hongyan Xia Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" From: Hongyan Xia Signed-off-by: Hongyan Xia --- xen/arch/x86/domain_page.c | 8 -------- xen/arch/x86/x86_64/mm.c | 3 ++- xen/include/asm-x86/pmap.h | 4 ++-- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/domain_page.c b/xen/arch/x86/domain_page.c index 4a3995ccef..f4f53a2a33 100644 --- a/xen/arch/x86/domain_page.c +++ b/xen/arch/x86/domain_page.c @@ -328,11 +328,6 @@ void *map_domain_page_global(mfn_t mfn) system_state < SYS_STATE_active) || local_irq_is_enabled())); -#ifdef NDEBUG - if ( mfn_x(mfn) <= PFN_DOWN(__pa(HYPERVISOR_VIRT_END - 1)) ) - return mfn_to_virt(mfn_x(mfn)); -#endif - return vmap(&mfn, 1); } @@ -340,9 +335,6 @@ void unmap_domain_page_global(const void *ptr) { unsigned long va = (unsigned long)ptr; - if ( va >= DIRECTMAP_VIRT_START ) - return; - ASSERT(va >= VMAP_VIRT_START && va < VMAP_VIRT_END); vunmap(ptr); diff --git a/xen/arch/x86/x86_64/mm.c b/xen/arch/x86/x86_64/mm.c index 37e8d59e5d..40f29f8ddc 100644 --- a/xen/arch/x86/x86_64/mm.c +++ b/xen/arch/x86/x86_64/mm.c @@ -712,7 +712,8 @@ void __init paging_init(void) if ( mfn_eq(l2_ro_mpt_mfn, INVALID_MFN) ) goto nomem; l2_ro_mpt = map_xen_pagetable(l2_ro_mpt_mfn); - compat_idle_pg_table_l2 = l2_ro_mpt; + /* compat_idle_pg_table_l2 is used globally. */ + compat_idle_pg_table_l2 = map_domain_page_global(l2_ro_mpt_mfn); clear_page(l2_ro_mpt); l3e_write(&l3_ro_mpt[l3_table_offset(HIRO_COMPAT_MPT_VIRT_START)], l3e_from_mfn(l2_ro_mpt_mfn, __PAGE_HYPERVISOR_RO)); diff --git a/xen/include/asm-x86/pmap.h b/xen/include/asm-x86/pmap.h index feab1e9170..34d4f2bb38 100644 --- a/xen/include/asm-x86/pmap.h +++ b/xen/include/asm-x86/pmap.h @@ -1,8 +1,8 @@ #ifndef __X86_PMAP_H__ #define __X86_PMAP_H__ -/* Large enough for mapping 5 levels of page tables */ -#define NUM_FIX_PMAP 5 +/* Large enough for mapping 5 levels of page tables with some headroom */ +#define NUM_FIX_PMAP 8 void pmap_lock(void); void pmap_unlock(void);