From patchwork Thu Feb 18 18:03:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 8353181 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 D021D9F38B for ; Thu, 18 Feb 2016 18:06:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BE97D20306 for ; Thu, 18 Feb 2016 18:06:35 +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 AA84420268 for ; Thu, 18 Feb 2016 18:06:34 +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 1aWSvf-000734-Dk; Thu, 18 Feb 2016 18:03:51 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aWSve-00072c-6V for xen-devel@lists.xen.org; Thu, 18 Feb 2016 18:03:50 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id 74/0C-04025-58706C65; Thu, 18 Feb 2016 18:03:49 +0000 X-Env-Sender: prvs=8491ce0b8=Andrew.Cooper3@citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1455818625!23409893!3 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9833 invoked from network); 18 Feb 2016 18:03:48 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-4.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 18 Feb 2016 18:03:48 -0000 X-IronPort-AV: E=Sophos;i="5.22,466,1449532800"; d="scan'208";a="339217786" From: Andrew Cooper To: Xen-devel Date: Thu, 18 Feb 2016 18:03:41 +0000 Message-ID: <1455818622-30625-4-git-send-email-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1455818622-30625-1-git-send-email-andrew.cooper3@citrix.com> References: <1455818622-30625-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: Use 2M superpages for text/data/bss mappings 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 This balloons the size of Xen in memory from 3.4MB to 12MB, because of the required alignment adjustments. However * All mappings are 2M superpages. * .text (and .init at boot) are the only sections marked executable. * .text and .rodata are marked read-only. Signed-off-by: Andrew Cooper --- CC: Jan Beulich --- xen/arch/x86/setup.c | 44 +++++++++++++++++++++++++++++++++++++++++--- xen/arch/x86/xen.lds.S | 33 +++++++++++++++++++++++++++++++++ xen/include/xen/kernel.h | 6 ++++++ 3 files changed, 80 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index cddf954..c360fbc 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -921,13 +921,51 @@ void __init noreturn __start_xen(unsigned long mbi_p) /* The only data mappings to be relocated are in the Xen area. */ pl2e = __va(__pa(l2_xenmap)); *pl2e++ = l2e_from_pfn(xen_phys_start >> PAGE_SHIFT, - PAGE_HYPERVISOR_RWX | _PAGE_PSE); + PAGE_HYPERVISOR_RX | _PAGE_PSE); for ( i = 1; i < L2_PAGETABLE_ENTRIES; i++, pl2e++ ) { + unsigned int flags; + if ( !(l2e_get_flags(*pl2e) & _PAGE_PRESENT) ) continue; - *pl2e = l2e_from_intpte(l2e_get_intpte(*pl2e) + - xen_phys_start); + + if ( /* + * Should be: + * + * i >= l2_table_offset((unsigned long)&__2M_text_start) && + * + * but the EFI build can't manage the relocation. It + * evaluates to 0, so just use the upper bound. + */ + i < l2_table_offset((unsigned long)&__2M_text_end) ) + { + flags = PAGE_HYPERVISOR_RX | _PAGE_PSE; + } + else if ( i >= l2_table_offset((unsigned long)&__2M_rodata_start) && + i < l2_table_offset((unsigned long)&__2M_rodata_end) ) + { + flags = PAGE_HYPERVISOR_RO | _PAGE_PSE; + } + else if ( (i >= l2_table_offset((unsigned long)&__2M_data_start) && + i < l2_table_offset((unsigned long)&__2M_data_end)) || + (i >= l2_table_offset((unsigned long)&__2M_bss_start) && + i < l2_table_offset((unsigned long)&__2M_bss_end)) ) + { + flags = PAGE_HYPERVISOR_RW | _PAGE_PSE; + } + else if ( i >= l2_table_offset((unsigned long)&__2M_init_start) && + i < l2_table_offset((unsigned long)&__2M_init_end) ) + { + flags = PAGE_HYPERVISOR_RWX | _PAGE_PSE; + } + else + { + *pl2e = l2e_empty(); + continue; + } + + *pl2e = l2e_from_paddr( + l2e_get_paddr(*pl2e) + xen_phys_start, flags); } /* Re-sync the stack and then switch to relocated pagetables. */ diff --git a/xen/arch/x86/xen.lds.S b/xen/arch/x86/xen.lds.S index 9fde1db..6c23c02 100644 --- a/xen/arch/x86/xen.lds.S +++ b/xen/arch/x86/xen.lds.S @@ -38,6 +38,9 @@ SECTIONS . = __XEN_VIRT_START; __image_base__ = .; #endif + + __2M_text_start = .; /* Start of 2M superpages, mapped RX. */ + . = __XEN_VIRT_START + MB(1); _start = .; .text : { @@ -50,6 +53,10 @@ SECTIONS _etext = .; /* End of text section */ } :text = 0x9090 + . = ALIGN(MB(2)); + __2M_text_end = .; + + __2M_rodata_start = .; /* Start of 2M superpages, mapped RO. */ .rodata : { /* Bug frames table */ . = ALIGN(4); @@ -67,6 +74,10 @@ SECTIONS *(.rodata.*) } :text + . = ALIGN(MB(2)); + __2M_rodata_end = .; + + __2M_data_start = .; /* Start of 2M superpages, mapped RW. */ . = ALIGN(SMP_CACHE_BYTES); .data.read_mostly : { /* Exception table */ @@ -104,6 +115,10 @@ SECTIONS __lock_profile_end = .; #endif + . = ALIGN(MB(2)); + __2M_data_end = .; + + __2M_init_start = .; /* Start of 2M superpages, mapped RWX (boot only). */ . = ALIGN(PAGE_SIZE); /* Init code and data */ __init_begin = .; .init.text : { @@ -166,6 +181,10 @@ SECTIONS . = ALIGN(STACK_SIZE); __init_end = .; + . = ALIGN(MB(2)); + __2M_init_end = .; + + __2M_bss_start = .; /* Start of 2M superpages, mapped RW. */ .bss : { /* BSS */ __bss_start = .; *(.bss.stack_aligned) @@ -183,6 +202,9 @@ SECTIONS } :text _end = . ; + . = ALIGN(MB(2)); + __2M_bss_end = .; + #ifdef EFI . = ALIGN(4); .reloc : { @@ -229,4 +251,15 @@ ASSERT(__image_base__ > XEN_VIRT_START || ASSERT(kexec_reloc_size - kexec_reloc <= PAGE_SIZE, "kexec_reloc is too large") #endif +ASSERT(IS_ALIGNED(__2M_text_start, MB(2)), "__2M_text_start misaligned") +ASSERT(IS_ALIGNED(__2M_text_end, MB(2)), "__2M_text_end misaligned") +ASSERT(IS_ALIGNED(__2M_rodata_start, MB(2)), "__2M_rodata_start misaligned") +ASSERT(IS_ALIGNED(__2M_rodata_end, MB(2)), "__2M_rodata_end misaligned") +ASSERT(IS_ALIGNED(__2M_data_start, MB(2)), "__2M_data_start misaligned") +ASSERT(IS_ALIGNED(__2M_data_end, MB(2)), "__2M_data_end misaligned") +ASSERT(IS_ALIGNED(__2M_init_start, MB(2)), "__2M_init_start misaligned") +ASSERT(IS_ALIGNED(__2M_init_end, MB(2)), "__2M_init_end misaligned") +ASSERT(IS_ALIGNED(__2M_bss_start, MB(2)), "__2M_bss_start misaligned") +ASSERT(IS_ALIGNED(__2M_bss_end, MB(2)), "__2M_bss_end misaligned") + ASSERT(IS_ALIGNED(cpu0_stack, STACK_SIZE), "cpu0_stack misaligned") diff --git a/xen/include/xen/kernel.h b/xen/include/xen/kernel.h index 548b64d..8d08eca 100644 --- a/xen/include/xen/kernel.h +++ b/xen/include/xen/kernel.h @@ -65,6 +65,12 @@ 1; \ }) +extern unsigned long __2M_text_start[], __2M_text_end[]; +extern unsigned long __2M_rodata_start[], __2M_rodata_end[]; +extern unsigned long __2M_data_start[], __2M_data_end[]; +extern unsigned long __2M_init_start[], __2M_init_end[]; +extern unsigned long __2M_bss_start[], __2M_bss_end[]; + extern char _start[], _end[], start[]; #define is_kernel(p) ({ \ char *__p = (char *)(unsigned long)(p); \