From patchwork Wed Feb 24 19:07:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 8411471 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id BED249F52D for ; Wed, 24 Feb 2016 19:10:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CF9952026C for ; Wed, 24 Feb 2016 19:10:48 +0000 (UTC) Received: from lists.xen.org (lists.xenproject.org [50.57.142.19]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E03E620266 for ; Wed, 24 Feb 2016 19:10:47 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aYemm-0002FM-Lb; Wed, 24 Feb 2016 19:07:44 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aYemk-0002Ef-3P for xen-devel@lists.xen.org; Wed, 24 Feb 2016 19:07:42 +0000 Received: from [85.158.137.68] by server-11.bemta-3.messagelabs.com id 95/7B-02978-D7FFDC65; Wed, 24 Feb 2016 19:07:41 +0000 X-Env-Sender: prvs=8552da0fd=Andrew.Cooper3@citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1456340859!24834267!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26060 invoked from network); 24 Feb 2016 19:07:40 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-5.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 24 Feb 2016 19:07:40 -0000 X-IronPort-AV: E=Sophos;i="5.22,494,1449532800"; d="scan'208";a="334263049" From: Andrew Cooper To: Xen-devel Date: Wed, 24 Feb 2016 19:07:30 +0000 Message-ID: <1456340856-3065-3-git-send-email-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1456340856-3065-1-git-send-email-andrew.cooper3@citrix.com> References: <1456340856-3065-1-git-send-email-andrew.cooper3@citrix.com> MIME-Version: 1.0 X-DLP: MIA1 Cc: Andrew Cooper , Jan Beulich Subject: [Xen-devel] [PATCH] xen/x86: Improvements to build-time pagetable generation X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP * Additional comments, including size and runtime use. * Consistent use of .quad, rather than a mix including .long. No change in runtime behaviour. Signed-off-by: Andrew Cooper --- CC: Jan Beulich v2: * New v3: * Drop the use of _PAGE_GLOBAL for intermediate levels. While it is safe (i.e. ignored) on Intel, it is reserved for non-leaf entries on AMD. --- xen/arch/x86/boot/x86_64.S | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/boot/x86_64.S b/xen/arch/x86/boot/x86_64.S index 94cf089..9df3902 100644 --- a/xen/arch/x86/boot/x86_64.S +++ b/xen/arch/x86/boot/x86_64.S @@ -86,32 +86,40 @@ GLOBAL(__page_tables_start) * Mapping of first 2 megabytes of memory. This is mapped with 4kB mappings * to avoid type conflicts with fixed-range MTRRs covering the lowest megabyte * of physical memory. In any case the VGA hole should be mapped with type UC. + * Uses 1x 4k page. */ GLOBAL(l1_identmap) pfn = 0 .rept L1_PAGETABLE_ENTRIES /* VGA hole (0xa0000-0xc0000) should be mapped UC. */ .if pfn >= 0xa0 && pfn < 0xc0 - .long (pfn << PAGE_SHIFT) | PAGE_HYPERVISOR_NOCACHE | MAP_SMALL_PAGES + .quad (pfn << PAGE_SHIFT) | PAGE_HYPERVISOR_NOCACHE | MAP_SMALL_PAGES .else - .long (pfn << PAGE_SHIFT) | PAGE_HYPERVISOR | MAP_SMALL_PAGES + .quad (pfn << PAGE_SHIFT) | PAGE_HYPERVISOR | MAP_SMALL_PAGES .endif - .long 0 pfn = pfn + 1 .endr .size l1_identmap, . - l1_identmap -/* Mapping of first 16 megabytes of memory. */ +/* + * Space for mapping the first 4GB of memory, with the first 16 megabytes + * actualy mapped (mostly using superpages). Uses 4x 4k pages. + */ GLOBAL(l2_identmap) .quad sym_phys(l1_identmap) + __PAGE_HYPERVISOR - pfn = 0 + idx = 1 .rept 7 - pfn = pfn + (1 << PAGETABLE_ORDER) - .quad (pfn << PAGE_SHIFT) | PAGE_HYPERVISOR | _PAGE_PSE + .quad (idx << L2_PAGETABLE_SHIFT) | PAGE_HYPERVISOR | _PAGE_PSE + idx = idx + 1 .endr .fill 4 * L2_PAGETABLE_ENTRIES - 8, 8, 0 .size l2_identmap, . - l2_identmap +/* + * L2 mapping the 1GB Xen text/data/bss region. At boot it maps 16MB from + * __image_base__, and is modified when Xen relocates itself. Uses 1x 4k + * page. + */ GLOBAL(l2_xenmap) idx = 0 .rept 8 @@ -121,6 +129,7 @@ GLOBAL(l2_xenmap) .fill L2_PAGETABLE_ENTRIES - 8, 8, 0 .size l2_xenmap, . - l2_xenmap +/* L2 mapping the fixmap. Uses 1x 4k page. */ l2_fixmap: idx = 0 .rept L2_PAGETABLE_ENTRIES @@ -133,6 +142,7 @@ l2_fixmap: .endr .size l2_fixmap, . - l2_fixmap +/* Identity map, covering the 4 l2_identmap tables. Uses 1x 4k page. */ GLOBAL(l3_identmap) idx = 0 .rept 4 @@ -142,6 +152,7 @@ GLOBAL(l3_identmap) .fill L3_PAGETABLE_ENTRIES - 4, 8, 0 .size l3_identmap, . - l3_identmap +/* L3 mapping the fixmap. Uses 1x 4k page. */ l3_xenmap: idx = 0 .rept L3_PAGETABLE_ENTRIES