From patchwork Fri Jan 20 01:34:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Kiper X-Patchwork-Id: 9527163 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 013DD6045D for ; Fri, 20 Jan 2017 01:37:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E57B228511 for ; Fri, 20 Jan 2017 01:37:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D89E028560; Fri, 20 Jan 2017 01:37:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id ACDEE28686 for ; Fri, 20 Jan 2017 01:37:49 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cUO6t-0000of-9i; Fri, 20 Jan 2017 01:35:23 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cUO6s-0000ng-EU for xen-devel@lists.xenproject.org; Fri, 20 Jan 2017 01:35:22 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id 00/05-25360-95961885; Fri, 20 Jan 2017 01:35:21 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupikeJIrShJLcpLzFFi42LpnVTnqhuW2Rh h0H5J2uL7lslMDowehz9cYQlgjGLNzEvKr0hgzZj17DRTwZ2VjBU7r99jbmC8VNHFyMUhJNDB JNG3+jQrhPOFUaLh+2dmCGcjo8Sv82eZIJwJjBJzH38CKuPkYBPQkbj45SE7iC0ioCRxb9Vks CJmgZlMEqfvnGQBSQgLuEi8XT+VGcRmEVCVmNX+DCzOK+AmMX/eKjBbQkBRovvZBDYQm1PAXW Ldtb9MILYQUE3PnGtsEDXGEn2z+lgmMPItYGRYxahenFpUllqka6KXVJSZnlGSm5iZo2toYKq Xm1pcnJiempOYVKyXnJ+7iREYLgxAsIPxVp/zIUZJDiYlUd7dHxsihPiS8lMqMxKLM+KLSnNS iw8xynBwKEnw8mc0RggJFqWmp1akZeYAAxcmLcHBoyTCKwSS5i0uSMwtzkyHSJ1i1OU4deP0S yYhlrz8vFQpcd676UBFAiBFGaV5cCNgUXSJUVZKmJcR6CghnoLUotzMElT5V4ziHIxKwrwrQK bwZOaVwG16BXQEE9ARVsr1IEeUJCKkpBoY+ZbZxa5a9/2Fk+r1jr44DfObP2TcFjofr9jboHz 02uPYoO+7jnmsnbV8yZVlxbzOjMt3nHEsDjtgK/7VeH/4tUsc6ftuKp6N8Nq/ydP4IlfX2/Ma mW59PsGl/hbT3nhnTTpuP2tV0rfNbUvPdb/K9ZOV5wufHKGj5PtWZRP76m5LZ82FJXw/lFiKM xINtZiLihMBQWwD4p0CAAA= X-Env-Sender: daniel.kiper@oracle.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1484876116!65314349!1 X-Originating-IP: [141.146.126.69] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuNjkgPT4gMjc3MjE4\n X-StarScan-Received: X-StarScan-Version: 9.1.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 56506 invoked from network); 20 Jan 2017 01:35:17 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-13.tower-206.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 20 Jan 2017 01:35:17 -0000 Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id v0K1Z4lG010423 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 20 Jan 2017 01:35:04 GMT Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by aserv0021.oracle.com (8.13.8/8.14.4) with ESMTP id v0K1Z3Vd023611 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 20 Jan 2017 01:35:04 GMT Received: from abhmp0013.oracle.com (abhmp0013.oracle.com [141.146.116.19]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id v0K1Z21o000756; Fri, 20 Jan 2017 01:35:03 GMT Received: from olila.local.net-space.pl (/10.175.176.50) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 19 Jan 2017 17:35:02 -0800 From: Daniel Kiper To: xen-devel@lists.xenproject.org Date: Fri, 20 Jan 2017 02:34:18 +0100 Message-Id: <1484876060-2236-9-git-send-email-daniel.kiper@oracle.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1484876060-2236-1-git-send-email-daniel.kiper@oracle.com> References: <1484876060-2236-1-git-send-email-daniel.kiper@oracle.com> X-Source-IP: aserv0021.oracle.com [141.146.126.233] Cc: jgross@suse.com, sstabellini@kernel.org, konrad.wilk@oracle.com, andrew.cooper3@citrix.com, cardoe@cardoe.com, pgnet.dev@gmail.com, ning.sun@intel.com, julien.grall@arm.com, jbeulich@suse.com, qiaowei.ren@intel.com, gang.wei@intel.com, fu.wei@linaro.org Subject: [Xen-devel] [PATCH v12 08/10] x86: make Xen early boot code relocatable X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Every multiboot protocol (regardless of version) compatible image must specify its load address (in ELF or multiboot header). Multiboot protocol compatible loader have to load image at specified address. However, there is no guarantee that the requested memory region (in case of Xen it starts at 2 MiB and ends at ~5 MiB) where image should be loaded initially is a RAM and it is free (legacy BIOS platforms are merciful for Xen but I found at least one EFI platform on which Xen load address conflicts with EFI boot services; it is Dell PowerEdge R820 with latest firmware). To cope with that problem we must make Xen early boot code relocatable and help boot loader to relocate image in proper way by suggesting, not requesting specific load addresses as it is right now, allowed address ranges. This patch does former. It does not add multiboot2 protocol interface which is done in "x86: add multiboot2 protocol support for relocatable images" patch. This patch changes following things: - %esi register is used as a storage for Xen image load base address; it is mostly unused in early boot code and preserved during C functions calls in 32-bit mode, - %fs is used as base for Xen data relative addressing in 32-bit code if it is possible; %esi is used for that thing during error printing because it is not always possible to properly and efficiently initialize %fs. Signed-off-by: Daniel Kiper --- v12 - suggestions/fixes: - store Xen image load base address directly into %esi, - store Xen image load base address after x86_32_switch (suggested by Doug Goldstein), - improve commit message. v8 - suggestions/fixes: - use shld instead of mov and shr in BOOT_FS segment descriptor base address initialization (suggested by Jan Beulich), - simplify code updating frame addresses in page tables (suggested by Jan Beulich), - print Xen image base addresses using "%#lx" format (suggested by Jan Beulich), - improve comments (suggested by Jan Beulich). v6 - suggestions/fixes: - leave static mapping of first 16 MiB in l2_identmap as is (suggested by Jan Beulich), - use xen_phys_start instead of xen_img_load_base_addr (suggested by Daniel Kiper and Jan Beulich), - simplify BOOT_FS segment descriptor base address initialization (suggested by Jan Beulich), - fix BOOT_FS segment limit (suggested by Jan Beulich), - do not rename sym_phys in this patch (suggested by Jan Beulich), - rename esi_offset/fs_offset to sym_esi/sym_fs respectively (suggested by Jan Beulich), - use add instead of lea in assembly error printing code (suggested by Jan Beulich), - improve comments (suggested by Jan Beulich), - improve commit message (suggested by Jan Beulich), - various minor cleanups and fixes (suggested by Jan Beulich). v4 - suggestions/fixes: - do not relocate Xen image if boot loader did work for us (suggested by Andrew Cooper and Jan Beulich), - initialize xen_img_load_base_addr in EFI boot code too, - properly initialize trampoline_xen_phys_start, - calculate Xen image load base address in x86_64 code ourselves, (suggested by Jan Beulich), - change how and when Xen image base address is printed, - use %fs instead of %esi for relative addressing (suggested by Andrew Cooper and Jan Beulich), - create esi_offset and fs_offset() macros in assembly, - calculate mkelf32 argument automatically, - optimize and cleanup code, - improve comments, - improve commit message. v3 - suggestions/fixes: - improve segment registers initialization (suggested by Jan Beulich), - simplify Xen image load base address calculation (suggested by Jan Beulich), - use %esi and %r15d instead of %ebp to store Xen image load base address, - use %esi instead of %fs for relative addressing; this way we get shorter and simpler code, - rename some variables and constants (suggested by Jan Beulich), - improve comments (suggested by Konrad Rzeszutek Wilk), - improve commit message (suggested by Jan Beulich). --- xen/arch/x86/boot/head.S | 157 +++++++++++++++++++++++++++++-------- xen/arch/x86/boot/trampoline.S | 5 ++ xen/arch/x86/boot/x86_64.S | 21 +++-- xen/arch/x86/setup.c | 14 ++-- xen/arch/x86/x86_64/asm-offsets.c | 3 + xen/include/asm-x86/page.h | 2 +- 6 files changed, 152 insertions(+), 50 deletions(-) diff --git a/xen/arch/x86/boot/head.S b/xen/arch/x86/boot/head.S index 22bd68d..f94a4ac 100644 --- a/xen/arch/x86/boot/head.S +++ b/xen/arch/x86/boot/head.S @@ -13,12 +13,15 @@ .code32 #define sym_phys(sym) ((sym) - __XEN_VIRT_START) +#define sym_esi(sym) sym_phys(sym)(%esi) +#define sym_fs(sym) %fs:sym_phys(sym) #define BOOT_CS32 0x0008 #define BOOT_CS64 0x0010 #define BOOT_DS 0x0018 #define BOOT_PSEUDORM_CS 0x0020 #define BOOT_PSEUDORM_DS 0x0028 +#define BOOT_FS 0x0030 #define MB2_HT(name) (MULTIBOOT2_HEADER_TAG_##name) #define MB2_TT(name) (MULTIBOOT2_TAG_TYPE_##name) @@ -105,7 +108,8 @@ multiboot2_header_start: .word 0 gdt_boot_descr: - .word 6*8-1 + .word 7*8-1 +gdt_boot_base: .long sym_phys(trampoline_gdt) .long 0 /* Needed for 64-bit lgdt */ @@ -126,27 +130,27 @@ efi_platform: .section .init.text, "ax", @progbits bad_cpu: - mov $(sym_phys(.Lbad_cpu_msg)),%esi # Error message + add $sym_phys(.Lbad_cpu_msg),%esi # Error message jmp .Lget_vtb not_multiboot: - mov $(sym_phys(.Lbad_ldr_msg)),%esi # Error message + add $sym_phys(.Lbad_ldr_msg),%esi # Error message jmp .Lget_vtb .Lmb2_no_st: - mov $(sym_phys(.Lbad_ldr_nst)),%esi # Error message + add $sym_phys(.Lbad_ldr_nst),%esi # Error message jmp .Lget_vtb .Lmb2_no_ih: - mov $(sym_phys(.Lbad_ldr_nih)),%esi # Error message + add $sym_phys(.Lbad_ldr_nih),%esi # Error message jmp .Lget_vtb .Lmb2_no_bs: - mov $(sym_phys(.Lbad_ldr_nbs)),%esi # Error message + add $sym_phys(.Lbad_ldr_nbs),%esi # Error message xor %edi,%edi # No VGA text buffer jmp .Lsend_chr .Lmb2_efi_ia_32: - mov $(sym_phys(.Lbad_efi_msg)),%esi # Error message + add $sym_phys(.Lbad_efi_msg),%esi # Error message xor %edi,%edi # No VGA text buffer jmp .Lsend_chr .Lget_vtb: - mov sym_phys(vga_text_buffer),%edi + mov sym_esi(vga_text_buffer),%edi .Lsend_chr: mov (%esi),%bl test %bl,%bl # Terminate on '\0' sentinel @@ -304,9 +308,13 @@ run_bs: lea trampoline_setup(%rip),%edi x86_32_switch: + /* Store Xen image load base address in place accessible for 32-bit code. */ + lea __image_base__(%rip),%esi + cli /* Initialize GDTR. */ + add %esi,gdt_boot_base(%rip) lgdt gdt_boot_descr(%rip) /* Reload code selector. */ @@ -342,12 +350,8 @@ __start: cld cli - /* Initialise GDT and basic data segments. */ - lgdt %cs:sym_phys(gdt_boot_descr) - mov $BOOT_DS,%ecx - mov %ecx,%ds - mov %ecx,%es - mov %ecx,%ss + /* Load default Xen image load base address. */ + mov $sym_phys(__image_base__),%esi /* Bootloaders may set multiboot{1,2}.mem_lower to a nonzero value. */ xor %edx,%edx @@ -404,6 +408,25 @@ __start: jmp .Lmb2_tsize trampoline_bios_setup: + /* + * Called on legacy BIOS platforms only. + * + * Initialize GDTR and basic data segments. + */ + add %esi,sym_esi(gdt_boot_base) + lgdt sym_esi(gdt_boot_descr) + + mov $BOOT_DS,%ecx + mov %ecx,%ds + mov %ecx,%es + mov %ecx,%ss + /* %esp is initialized later. */ + + /* Load null descriptor to unused segment registers. */ + xor %ecx,%ecx + mov %ecx,%fs + mov %ecx,%gs + /* Set up trampoline segment 64k below EBDA */ movzwl 0x40e,%ecx /* EBDA segment */ cmp $0xa000,%ecx /* sanity check (high) */ @@ -431,32 +454,64 @@ trampoline_bios_setup: xor %cl, %cl trampoline_setup: + /* + * Called on legacy BIOS and EFI platforms. + * + * Initialize 0-15 bits of BOOT_FS segment descriptor base address. + */ + mov %si,BOOT_FS+2+sym_esi(trampoline_gdt) + + /* Initialize 16-23 bits of BOOT_FS segment descriptor base address. */ + shld $16,%esi,%edx + mov %dl,BOOT_FS+4+sym_esi(trampoline_gdt) + + /* Initialize 24-31 bits of BOOT_FS segment descriptor base address. */ + mov %dh,BOOT_FS+7+sym_esi(trampoline_gdt) + + /* + * Initialize %fs and later use it to access Xen data if possible. + * According to Intel 64 and IA-32 Architectures Software Developer's + * Manual it is safe to do that without reloading GDTR before. + */ + mov $BOOT_FS,%edx + mov %edx,%fs + /* Save trampoline address for later use. */ shl $4, %ecx - mov %ecx,sym_phys(trampoline_phys) + mov %ecx,sym_fs(trampoline_phys) + + /* Save Xen image load base address for later use. */ + mov %esi,sym_fs(xen_phys_start) + mov %esi,sym_fs(trampoline_xen_phys_start) + + /* Setup stack. %ss was initialized earlier. */ + lea 1024+sym_esi(cpu0_stack),%esp /* Save the Multiboot info struct (after relocation) for later use. */ - mov $sym_phys(cpu0_stack)+1024,%esp push %ecx /* Boot trampoline address. */ push %ebx /* Multiboot information address. */ push %eax /* Multiboot magic. */ call reloc - mov %eax,sym_phys(multiboot_ptr) + mov %eax,sym_fs(multiboot_ptr) /* * Do not zero BSS on EFI platform here. * It was initialized earlier. */ - cmpb $0,sym_phys(efi_platform) + cmpb $0,sym_fs(efi_platform) jnz 1f /* Initialize BSS (no nasty surprises!). */ mov $sym_phys(__bss_start),%edi mov $sym_phys(__bss_end),%ecx + push %fs + pop %es sub %edi,%ecx xor %eax,%eax shr $2,%ecx rep stosl + push %ds + pop %es 1: /* Interrogate CPU extended features via CPUID. */ @@ -470,8 +525,8 @@ trampoline_setup: jbe 1f mov $0x80000001,%eax cpuid -1: mov %edx,sym_phys(cpuid_ext_features) - mov %edx,sym_phys(boot_cpu_data)+CPUINFO_FEATURE_OFFSET(X86_FEATURE_LM) +1: mov %edx,sym_fs(cpuid_ext_features) + mov %edx,sym_fs(boot_cpu_data)+CPUINFO_FEATURE_OFFSET(X86_FEATURE_LM) /* Check for availability of long mode. */ bt $cpufeat_bit(X86_FEATURE_LM),%edx @@ -479,15 +534,52 @@ trampoline_setup: /* Stash TSC to calculate a good approximation of time-since-boot */ rdtsc - mov %eax,sym_phys(boot_tsc_stamp) - mov %edx,sym_phys(boot_tsc_stamp+4) + mov %eax,sym_fs(boot_tsc_stamp) + mov %edx,sym_fs(boot_tsc_stamp)+4 + + /* + * Update frame addresses in page tables excluding l2_identmap + * without its first entry which points to l1_identmap. + */ + mov $((__page_tables_end-__page_tables_start)/8),%ecx + mov $(((l2_identmap-__page_tables_start)/8)+1),%edx +1: cmp $((l2_identmap+l2_identmap_sizeof-__page_tables_start)/8),%ecx + cmove %edx,%ecx + testl $_PAGE_PRESENT,sym_fs(__page_tables_start)-8(,%ecx,8) + jz 2f + add %esi,sym_fs(__page_tables_start)-8(,%ecx,8) +2: loop 1b + + /* Initialize L2 boot-map/direct map page table entries (16MB). */ + lea sym_esi(start),%ebx + lea (1<= end ) return NULL; - if ( end <= BOOTSTRAP_MAP_BASE ) - return (void *)(unsigned long)start; - ret = (void *)(map_cur + (unsigned long)(start & mask)); start &= ~mask; end = (end + mask) & ~mask; @@ -716,6 +713,8 @@ void __init noreturn __start_xen(unsigned long mbi_p) printk("Command line: %s\n", cmdline); + printk("Xen image load base address: %#lx\n", xen_phys_start); + printk("Video information:\n"); /* Print VGA display mode information. */ @@ -973,7 +972,7 @@ void __init noreturn __start_xen(unsigned long mbi_p) /* Not present, 1GB mapping, or already relocated? */ if ( !(l3e_get_flags(*pl3e) & _PAGE_PRESENT) || (l3e_get_flags(*pl3e) & _PAGE_PSE) || - (l3e_get_pfn(*pl3e) > 0x1000) ) + (l3e_get_pfn(*pl3e) > PFN_DOWN(xen_phys_start)) ) continue; *pl3e = l3e_from_intpte(l3e_get_intpte(*pl3e) + xen_phys_start); @@ -983,7 +982,7 @@ void __init noreturn __start_xen(unsigned long mbi_p) /* Not present, PSE, or already relocated? */ if ( !(l2e_get_flags(*pl2e) & _PAGE_PRESENT) || (l2e_get_flags(*pl2e) & _PAGE_PSE) || - (l2e_get_pfn(*pl2e) > 0x1000) ) + (l2e_get_pfn(*pl2e) > PFN_DOWN(xen_phys_start)) ) continue; *pl2e = l2e_from_intpte(l2e_get_intpte(*pl2e) + xen_phys_start); @@ -1006,7 +1005,8 @@ void __init noreturn __start_xen(unsigned long mbi_p) { unsigned int flags; - if ( !(l2e_get_flags(*pl2e) & _PAGE_PRESENT) ) + if ( !(l2e_get_flags(*pl2e) & _PAGE_PRESENT) || + (l2e_get_pfn(*pl2e) > PFN_DOWN(xen_phys_start)) ) continue; if ( !using_2M_mapping() ) @@ -1060,6 +1060,8 @@ void __init noreturn __start_xen(unsigned long mbi_p) : "memory" ); bootstrap_map(NULL); + + printk("New Xen image base address: %#lx\n", xen_phys_start); } /* Is the region suitable for relocating the multiboot modules? */ diff --git a/xen/arch/x86/x86_64/asm-offsets.c b/xen/arch/x86/x86_64/asm-offsets.c index f135654..87e573a 100644 --- a/xen/arch/x86/x86_64/asm-offsets.c +++ b/xen/arch/x86/x86_64/asm-offsets.c @@ -179,5 +179,8 @@ void __dummy__(void) OFFSET(MB2_efi64_ih, multiboot2_tag_efi64_ih_t, pointer); BLANK(); + DEFINE(l2_identmap_sizeof, sizeof(l2_identmap)); + BLANK(); + OFFSET(DOMAIN_vm_assist, struct domain, vm_assist); } diff --git a/xen/include/asm-x86/page.h b/xen/include/asm-x86/page.h index af7d3e8..a54fdd1 100644 --- a/xen/include/asm-x86/page.h +++ b/xen/include/asm-x86/page.h @@ -288,7 +288,7 @@ extern root_pgentry_t idle_pg_table[ROOT_PAGETABLE_ENTRIES]; extern l2_pgentry_t *compat_idle_pg_table_l2; extern unsigned int m2p_compat_vstart; extern l2_pgentry_t l2_xenmap[L2_PAGETABLE_ENTRIES], - l2_bootmap[L2_PAGETABLE_ENTRIES]; + l2_bootmap[4*L2_PAGETABLE_ENTRIES]; extern l3_pgentry_t l3_bootmap[L3_PAGETABLE_ENTRIES]; extern l2_pgentry_t l2_identmap[4*L2_PAGETABLE_ENTRIES]; extern l1_pgentry_t l1_fixmap[L1_PAGETABLE_ENTRIES];