From patchwork Wed Apr 19 17:13:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 97670 Delivered-To: patch@linaro.org Received: by 10.140.109.52 with SMTP id k49csp420173qgf; Wed, 19 Apr 2017 10:15:26 -0700 (PDT) X-Received: by 10.157.60.105 with SMTP id j38mr2365253ote.183.1492622126393; Wed, 19 Apr 2017 10:15:26 -0700 (PDT) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org. [192.237.175.120]) by mx.google.com with ESMTPS id l63si1702483oig.196.2017.04.19.10.15.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Apr 2017 10:15:26 -0700 (PDT) Received-SPF: neutral (google.com: 192.237.175.120 is neither permitted nor denied by best guess record for domain of xen-devel-bounces@lists.xen.org) client-ip=192.237.175.120; Authentication-Results: mx.google.com; spf=neutral (google.com: 192.237.175.120 is neither permitted nor denied by best guess record for domain of xen-devel-bounces@lists.xen.org) smtp.mailfrom=xen-devel-bounces@lists.xen.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d0tAQ-0001JN-1I; Wed, 19 Apr 2017 17:13:22 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d0tAO-0001IY-6N for xen-devel@lists.xen.org; Wed, 19 Apr 2017 17:13:20 +0000 Received: from [193.109.254.147] by server-3.bemta-6.messagelabs.com id E1/73-03058-FAA97F85; Wed, 19 Apr 2017 17:13:19 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrMLMWRWlGSWpSXmKPExsVysyfVTXf9rO8 RBrPWMlos+biYxYHR4+ju30wBjFGsmXlJ+RUJrBkrr71lKZjMXnH07WqmBsY+ti5GLg4hgc2M EtOnX2aFcE4zSvRfWcfSxcjJwSagKXHn8ycmEFtEQFri2ufLjCA2s4CDxJuP98BqhAWCJJZ/W cQKYrMIqEpMW9wOVsMrYCHxffMnNhBbQkBeYlfbRbAaTgFLiZObj4PVCAHV3Dq1m2UCI/cCRo ZVjBrFqUVlqUW6RuZ6SUWZ6RkluYmZObqGBmZ6uanFxYnpqTmJScV6yfm5mxiBHmYAgh2Mi9c GHmKU5GBSEuUtq/8eIcSXlJ9SmZFYnBFfVJqTWnyIUYaDQ0mC98BMoJxgUWp6akVaZg4w1GDS Ehw8SiK810DSvMUFibnFmekQqVOMuhxz7n19zyTEkpeflyolztsFUiQAUpRRmgc3Ahb2lxhlp YR5GYGOEuIpSC3KzSxBlX/FKM7BqCTMOwtkCk9mXgncpldARzABHRER8AXkiJJEhJRUA+Pp30 vcQ5M6XobP4i+7ZcZxr/jangzv+1vKvwn8jD1954CLwVPJp+Viybd+Gv/dEvY5QkpF75zJU66 4H36d/RX6QncTVM71324+9e3xnoaokxP3XZb2XOka0FO456Da96YlCXpLAnzkr+Trb1hQa3nj 4L05CpfcxCebvks5vn76ntdV99c+eGKjxFKckWioxVxUnAgAGqsBMXYCAAA= X-Env-Sender: julien.grall@arm.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1492621998!87712323!1 X-Originating-IP: [217.140.101.70] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 9.4.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28649 invoked from network); 19 Apr 2017 17:13:18 -0000 Received: from foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-8.tower-27.messagelabs.com with SMTP; 19 Apr 2017 17:13:18 -0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 44330169E; Wed, 19 Apr 2017 10:13:18 -0700 (PDT) Received: from e108454-lin.cambridge.arm.com (e108454-lin.cambridge.arm.com [10.1.206.53]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id A6F653F4FF; Wed, 19 Apr 2017 10:13:17 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Date: Wed, 19 Apr 2017 18:13:08 +0100 Message-Id: <20170419171311.3243-2-julien.grall@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170419171311.3243-1-julien.grall@arm.com> References: <20170419171311.3243-1-julien.grall@arm.com> Cc: Julien Grall , sstabellini@kernel.org Subject: [Xen-devel] [PATCH for-4.9 1/4] xen/arm: Add BOOT_FDT_VIRT_END and BOOT_FDT_SLOT_SIZE 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" The 2 new defines will help to avoid hardcoding the size and the end of the slot in the code. The newlines are added for clarity. Signed-off-by: Julien Grall Reviewed-by: Stefano Stabellini --- xen/include/asm-arm/config.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/xen/include/asm-arm/config.h b/xen/include/asm-arm/config.h index b2edf95f72..9c14a385e7 100644 --- a/xen/include/asm-arm/config.h +++ b/xen/include/asm-arm/config.h @@ -111,7 +111,11 @@ #define XEN_VIRT_START _AT(vaddr_t,0x00200000) #define FIXMAP_ADDR(n) (_AT(vaddr_t,0x00400000) + (n) * PAGE_SIZE) + #define BOOT_FDT_VIRT_START _AT(vaddr_t,0x00600000) +#define BOOT_FDT_SLOT_SIZE MB(2) +#define BOOT_FDT_VIRT_END (BOOT_FDT_VIRT_START + BOOT_FDT_SLOT_SIZE) + #define BOOT_RELOC_VIRT_START _AT(vaddr_t,0x00800000) #ifdef CONFIG_LIVEPATCH #define LIVEPATCH_VMAP_START _AT(vaddr_t,0x00800000) From patchwork Wed Apr 19 17:13:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 97673 Delivered-To: patch@linaro.org Received: by 10.140.109.52 with SMTP id k49csp420324qgf; Wed, 19 Apr 2017 10:15:47 -0700 (PDT) X-Received: by 10.107.56.198 with SMTP id f189mr4376511ioa.104.1492622147895; Wed, 19 Apr 2017 10:15:47 -0700 (PDT) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org. [192.237.175.120]) by mx.google.com with ESMTPS id u9si3778793ioi.68.2017.04.19.10.15.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Apr 2017 10:15:47 -0700 (PDT) Received-SPF: neutral (google.com: 192.237.175.120 is neither permitted nor denied by best guess record for domain of xen-devel-bounces@lists.xen.org) client-ip=192.237.175.120; Authentication-Results: mx.google.com; spf=neutral (google.com: 192.237.175.120 is neither permitted nor denied by best guess record for domain of xen-devel-bounces@lists.xen.org) smtp.mailfrom=xen-devel-bounces@lists.xen.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d0tAQ-0001K3-Ii; Wed, 19 Apr 2017 17:13:22 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d0tAP-0001JG-GT for xen-devel@lists.xen.org; Wed, 19 Apr 2017 17:13:21 +0000 Received: from [85.158.143.35] by server-7.bemta-6.messagelabs.com id C4/8C-03620-0BA97F85; Wed, 19 Apr 2017 17:13:20 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrMLMWRWlGSWpSXmKPExsVysyfVTXfDrO8 RBkc+cFgs+biYxYHR4+ju30wBjFGsmXlJ+RUJrBmXd29jLOjQrJi24x5rA+MPuS5GLg4hgc2M Et1/mlkhnNOMEm0Lv7J0MXJysAloStz5/IkJxBYRkJa49vkyI4jNLOAg8ebjPbAaYYEUiVnv2 9hBbBYBVYmTnx+B2bwCFhL//9xkBbElBOQldrVdBLM5BSwlTm4+DjZHCKjm1qndLBMYuRcwMq xi1ChOLSpLLdI1NNNLKspMzyjJTczM0TU0MNPLTS0uTkxPzUlMKtZLzs/dxAj0MAMQ7GC8vzH gEKMkB5OSKG9Z/fcIIb6k/JTKjMTijPii0pzU4kOMMhwcShK8T2cA5QSLUtNTK9Iyc4ChBpOW 4OBREuGNnwmU5i0uSMwtzkyHSJ1i1OU49PzneyYhlrz8vFQpcV5RkCIBkKKM0jy4EbCwv8QoK yXMywh0lBBPQWpRbmYJqvwrRnEORiVhXiWQKTyZeSVwm14BHcEEdEREwBeQI0oSEVJSDYzhs1 urWNdUqc2xMlUW4TBYdmrtL0sTITOzaP2+r0xf3Y49/8XteHv1tZsqXdML9ukx6NqHrKwxW/l Tgvdtwcbfm8R4jlfMdLWbVSd53v+QeNacVy+VUz/KO50NP2mz1LS1Jmd6ULuO1FK5e5Fbqs18 oj8u2LrIafL36BP3WpZdbzi3MuXNSV4lluKMREMt5qLiRAAMxIQzdgIAAA== X-Env-Sender: julien.grall@arm.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1492621999!58507987!1 X-Originating-IP: [217.140.101.70] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27258 invoked from network); 19 Apr 2017 17:13:19 -0000 Received: from foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-13.tower-21.messagelabs.com with SMTP; 19 Apr 2017 17:13:19 -0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 1E02B169F; Wed, 19 Apr 2017 10:13:19 -0700 (PDT) Received: from e108454-lin.cambridge.arm.com (e108454-lin.cambridge.arm.com [10.1.206.53]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 7F62B3F4FF; Wed, 19 Apr 2017 10:13:18 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Date: Wed, 19 Apr 2017 18:13:09 +0100 Message-Id: <20170419171311.3243-3-julien.grall@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170419171311.3243-1-julien.grall@arm.com> References: <20170419171311.3243-1-julien.grall@arm.com> Cc: Julien Grall , sstabellini@kernel.org Subject: [Xen-devel] [PATCH for-4.9 2/4] xen/arm: Move the code to map FDT in the boot tables from assembly to C 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" The FDT will not be accessed before start_xen (begining of C code) is called and it will be easier to maintain as the code could be common between AArch32 and AArch64. A new function early_fdt_map is introduced to map the FDT in the boot page table. Note that create_mapping will flush the TLBs for us so no need to add an extra on in case the entry was previously used by the 1:1 mapping. Signed-off-by: Julien Grall Reviewed-by: Stefano Stabellini --- I can move the function create_mappings at the beginning of the function instead of adding a static declaration. But I thought it was not Xen 4.9 material. Any opinions? --- xen/arch/arm/arm32/head.S | 14 -------------- xen/arch/arm/arm64/head.S | 13 ------------- xen/arch/arm/mm.c | 20 ++++++++++++++++++++ xen/arch/arm/setup.c | 4 +--- xen/include/asm-arm/mm.h | 2 ++ 5 files changed, 23 insertions(+), 30 deletions(-) diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S index ec63ba4c04..4090f4a744 100644 --- a/xen/arch/arm/arm32/head.S +++ b/xen/arch/arm/arm32/head.S @@ -389,20 +389,6 @@ paging: /* Use a virtual address to access the UART. */ ldr r11, =EARLY_UART_VIRTUAL_ADDRESS #endif - /* Map the DTB in the boot misc slot */ - teq r12, #0 /* Only on boot CPU */ - bne 1f - - ldr r1, =boot_second - mov r3, #0x0 - lsr r2, r8, #SECOND_SHIFT - lsl r2, r2, #SECOND_SHIFT /* r2: 2MB-aligned paddr of DTB */ - orr r2, r2, #PT_UPPER(MEM) - orr r2, r2, #PT_LOWER(MEM) /* r2:r3 := 2MB RAM incl. DTB */ - ldr r4, =BOOT_FDT_VIRT_START - mov r4, r4, lsr #(SECOND_SHIFT - 3) /* Slot for BOOT_FDT_VIRT_START */ - strd r2, r3, [r1, r4] /* Map it in the early fdt slot */ -1: /* * Flush the TLB in case the 1:1 mapping happens to clash with diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S index 72ea4e0233..78292f4396 100644 --- a/xen/arch/arm/arm64/head.S +++ b/xen/arch/arm/arm64/head.S @@ -550,19 +550,6 @@ paging: ldr x23, =EARLY_UART_VIRTUAL_ADDRESS #endif - /* Map the DTB in the boot misc slot */ - cbnz x22, 1f /* Only on boot CPU */ - - ldr x4, =boot_second /* x4 := vaddr (boot_second) */ - lsr x2, x21, #SECOND_SHIFT - lsl x2, x2, #SECOND_SHIFT /* x2 := 2MB-aligned paddr of DTB */ - mov x3, #PT_MEM /* x2 := 2MB RAM incl. DTB */ - orr x2, x2, x3 - ldr x1, =BOOT_FDT_VIRT_START - lsr x1, x1, #(SECOND_SHIFT - 3) /* x4 := Slot for BOOT_FDT_VIRT_START */ - str x2, [x4, x1] /* Map it in the early fdt slot */ -1: - /* * Flush the TLB in case the 1:1 mapping happens to clash with * the virtual addresses used by the fixmap or DTB. diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index f0a2eddaaf..0d076489c6 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -38,6 +38,13 @@ #include #include #include +#include + +static void __init create_mappings(lpae_t *second, + unsigned long virt_offset, + unsigned long base_mfn, + unsigned long nr_mfns, + unsigned int mapping_size); struct domain *dom_xen, *dom_io, *dom_cow; @@ -434,6 +441,19 @@ static inline lpae_t pte_of_xenaddr(vaddr_t va) return mfn_to_xen_entry(mfn, WRITEALLOC); } + +/* Map the FDT in the early boot page table */ +void * __init early_fdt_map(paddr_t fdt_paddr) +{ + /* We are using 2MB superpage for mapping the FDT */ + paddr_t base_paddr = fdt_paddr & SECOND_MASK; + + create_mappings(boot_second, BOOT_FDT_VIRT_START, paddr_to_pfn(base_paddr), + SZ_2M >> PAGE_SHIFT, SZ_2M); + + return (void *)BOOT_FDT_VIRT_START + (fdt_paddr % SECOND_SIZE); +} + void __init remove_early_mappings(void) { lpae_t pte = {0}; diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 92a2de6b70..986398970f 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -724,9 +724,7 @@ void __init start_xen(unsigned long boot_phys_offset, smp_clear_cpu_maps(); - /* This is mapped by head.S */ - device_tree_flattened = (void *)BOOT_FDT_VIRT_START - + (fdt_paddr & ((1 << SECOND_SHIFT) - 1)); + device_tree_flattened = early_fdt_map(fdt_paddr); fdt_size = boot_fdt_info(device_tree_flattened, fdt_paddr); cmdline = boot_fdt_cmdline(device_tree_flattened); diff --git a/xen/include/asm-arm/mm.h b/xen/include/asm-arm/mm.h index 0fef612f42..f6915ad882 100644 --- a/xen/include/asm-arm/mm.h +++ b/xen/include/asm-arm/mm.h @@ -160,6 +160,8 @@ extern unsigned long total_pages; /* Boot-time pagetable setup */ extern void setup_pagetables(unsigned long boot_phys_offset, paddr_t xen_paddr); +/* Map FDT in boot pagetable */ +extern void *early_fdt_map(paddr_t fdt_paddr); /* Remove early mappings */ extern void remove_early_mappings(void); /* Allocate and initialise pagetables for a secondary CPU. Sets init_ttbr to the From patchwork Wed Apr 19 17:13:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 97669 Delivered-To: patch@linaro.org Received: by 10.140.109.52 with SMTP id k49csp420169qgf; Wed, 19 Apr 2017 10:15:26 -0700 (PDT) X-Received: by 10.157.48.120 with SMTP id w53mr282533otd.55.1492622125966; Wed, 19 Apr 2017 10:15:25 -0700 (PDT) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org. [192.237.175.120]) by mx.google.com with ESMTPS id t6si1703193oie.179.2017.04.19.10.15.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Apr 2017 10:15:25 -0700 (PDT) Received-SPF: neutral (google.com: 192.237.175.120 is neither permitted nor denied by best guess record for domain of xen-devel-bounces@lists.xen.org) client-ip=192.237.175.120; Authentication-Results: mx.google.com; spf=neutral (google.com: 192.237.175.120 is neither permitted nor denied by best guess record for domain of xen-devel-bounces@lists.xen.org) smtp.mailfrom=xen-devel-bounces@lists.xen.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d0tAQ-0001KE-QG; Wed, 19 Apr 2017 17:13:22 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d0tAP-0001JH-Vv for xen-devel@lists.xen.org; Wed, 19 Apr 2017 17:13:22 +0000 Received: from [85.158.143.35] by server-4.bemta-6.messagelabs.com id 37/9B-02956-1BA97F85; Wed, 19 Apr 2017 17:13:21 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrGLMWRWlGSWpSXmKPExsVysyfVTXfDrO8 RBi9fG1ss+biYxYHR4+ju30wBjFGsmXlJ+RUJrBm3prsWrJWt+NfzgrmBcbV4FyMXh5DAJkaJ i6desUI4pxkl1mw7CORwcrAJaErc+fyJCcQWEZCWuPb5MiOIzSzgIPHm4z0WEFtYIELi8p+ZY PUsAqoSj1rOsoPYvAIWEjseTASzJQTkJXa1XQSr4RSwlDi5+TjYHCGgmlundrNMYORewMiwil GjOLWoLLVI18hAL6koMz2jJDcxM0fX0MBMLze1uDgxPTUnMalYLzk/dxMj0L8MQLCD8deygEO MkhxMSqK8ZfXfI4T4kvJTKjMSizPii0pzUosPMcpwcChJ8IbOBMoJFqWmp1akZeYAAw0mLcHB oyTCqwiS5i0uSMwtzkyHSJ1iVJQS5+0CSQiAJDJK8+DaYMF9iVFWSpiXEegQIZ6C1KLczBJU+ VeM4hyMSsK8r2YATeHJzCuBm/4KaDET0OKIgC8gi0sSEVJSDYw2nlOeO23ofu7CM4s750HQyU V7jLkvftJ0PclqVZfFkhNqvcNTZ/3HTpX6pk9/tnzInqe4YFmQ65L96uK2nPamRy3Tq578/zK /q9yr8/9+13Cx/eESxwS5GJQc53118s66cr6i7AoT///S60u2Pk+53Bp1YU3WUxftCQYXD65+ Z/g86tBus+NKLMUZiYZazEXFiQBUV6ZlaQIAAA== X-Env-Sender: julien.grall@arm.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1492622000!58208060!1 X-Originating-IP: [217.140.101.70] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 51783 invoked from network); 19 Apr 2017 17:13:20 -0000 Received: from foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-4.tower-21.messagelabs.com with SMTP; 19 Apr 2017 17:13:20 -0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id EE0C1CFC; Wed, 19 Apr 2017 10:13:19 -0700 (PDT) Received: from e108454-lin.cambridge.arm.com (e108454-lin.cambridge.arm.com [10.1.206.53]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 595253F4FF; Wed, 19 Apr 2017 10:13:19 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Date: Wed, 19 Apr 2017 18:13:10 +0100 Message-Id: <20170419171311.3243-4-julien.grall@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170419171311.3243-1-julien.grall@arm.com> References: <20170419171311.3243-1-julien.grall@arm.com> Cc: Julien Grall , sstabellini@kernel.org Subject: [Xen-devel] [PATCH for-4.9 3/4] xen/arm: Check if the FDT passed by the bootloader is valid 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" There is currently no sanity check on the FDT passed by the bootloader. Whilst they are stricly not necessary, it will avoid us to spend hours to try to find out why it does not work. >From the booting documentation for AArch32 [1] and AArch64 [2] must : - be placed on 8-byte boundary - not exceed 2MB (only on AArch64) Even if AArch32 does not seem to limit the size, Xen is not currently able to support more the 2MB FDT. It is better to crash rather with a nice error message than claiming we are supporting any size of FDT. The checks are mostly borrowed from the Linux code (see fixmap_remap_fdt in arch/arm64/mm/mmu.c). [1] Section 2 in linux/Documentation/arm64/booting.txt [2] Section 4b in linux/Documentation/arm/Booting Signed-off-by: Julien Grall Reviewed-by: Stefano Stabellini --- xen/arch/arm/mm.c | 29 ++++++++++++++++++++++++++++- xen/arch/arm/setup.c | 6 ++++++ xen/include/asm-arm/setup.h | 3 +++ 3 files changed, 37 insertions(+), 1 deletion(-) diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 0d076489c6..53d36e2ce2 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -39,6 +39,8 @@ #include #include #include +#include +#include static void __init create_mappings(lpae_t *second, unsigned long virt_offset, @@ -447,11 +449,36 @@ void * __init early_fdt_map(paddr_t fdt_paddr) { /* We are using 2MB superpage for mapping the FDT */ paddr_t base_paddr = fdt_paddr & SECOND_MASK; + paddr_t offset; + void *fdt_virt; + + /* + * Check whether the physical FDT address is set and meets the minimum + * alignment requirement. Since we are relying on MIN_FDT_ALIGN to be at + * least 8 bytes so that we always access the magic and size fields + * of the FDT header after mapping the first chunk, double check if + * that is indeed the case. + */ + BUILD_BUG_ON(MIN_FDT_ALIGN < 8); + if ( !fdt_paddr || fdt_paddr % MIN_FDT_ALIGN ) + return NULL; + + /* The FDT is mapped using 2MB superpage */ + BUILD_BUG_ON(BOOT_FDT_VIRT_START % SZ_2M); create_mappings(boot_second, BOOT_FDT_VIRT_START, paddr_to_pfn(base_paddr), SZ_2M >> PAGE_SHIFT, SZ_2M); - return (void *)BOOT_FDT_VIRT_START + (fdt_paddr % SECOND_SIZE); + offset = fdt_paddr % SECOND_SIZE; + fdt_virt = (void *)BOOT_FDT_VIRT_START + offset; + + if ( fdt_magic(fdt_virt) != FDT_MAGIC ) + return NULL; + + if ( fdt_totalsize(fdt_virt) > MAX_FDT_SIZE ) + return NULL; + + return fdt_virt; } void __init remove_early_mappings(void) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 986398970f..8f72f31fb5 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -725,6 +725,12 @@ void __init start_xen(unsigned long boot_phys_offset, smp_clear_cpu_maps(); device_tree_flattened = early_fdt_map(fdt_paddr); + if ( !device_tree_flattened ) + panic("Invalid device tree blob at physical address %#lx\n" + "The DTB must be 8-byte aligned and must not exceed 2 MB in size\n" + "\nPlease check your bootloader.", + fdt_paddr); + fdt_size = boot_fdt_info(device_tree_flattened, fdt_paddr); cmdline = boot_fdt_cmdline(device_tree_flattened); diff --git a/xen/include/asm-arm/setup.h b/xen/include/asm-arm/setup.h index 7c761851d2..7ff2c34dab 100644 --- a/xen/include/asm-arm/setup.h +++ b/xen/include/asm-arm/setup.h @@ -3,6 +3,9 @@ #include +#define MIN_FDT_ALIGN 8 +#define MAX_FDT_SIZE SZ_2M + #define NR_MEM_BANKS 64 #define MAX_MODULES 5 /* Current maximum useful modules */ From patchwork Wed Apr 19 17:13:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 97672 Delivered-To: patch@linaro.org Received: by 10.140.109.52 with SMTP id k49csp420196qgf; Wed, 19 Apr 2017 10:15:29 -0700 (PDT) X-Received: by 10.36.173.19 with SMTP id c19mr4452534itf.76.1492622129230; Wed, 19 Apr 2017 10:15:29 -0700 (PDT) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org. [192.237.175.120]) by mx.google.com with ESMTPS id t82si3759071iod.145.2017.04.19.10.15.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Apr 2017 10:15:29 -0700 (PDT) Received-SPF: neutral (google.com: 192.237.175.120 is neither permitted nor denied by best guess record for domain of xen-devel-bounces@lists.xen.org) client-ip=192.237.175.120; Authentication-Results: mx.google.com; spf=neutral (google.com: 192.237.175.120 is neither permitted nor denied by best guess record for domain of xen-devel-bounces@lists.xen.org) smtp.mailfrom=xen-devel-bounces@lists.xen.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d0tAS-0001Km-2Q; Wed, 19 Apr 2017 17:13:24 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d0tAQ-0001Jk-Rj for xen-devel@lists.xen.org; Wed, 19 Apr 2017 17:13:22 +0000 Received: from [85.158.143.35] by server-10.bemta-6.messagelabs.com id 62/5F-13192-2BA97F85; Wed, 19 Apr 2017 17:13:22 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrILMWRWlGSWpSXmKPExsVysyfVTXfjrO8 RBk8viFos+biYxYHR4+ju30wBjFGsmXlJ+RUJrBnLN0oWTHKt+NS9n7mB8aplFyMXh5DAZkaJ vZe3sUA4pxkljs94CeRwcrAJaErc+fyJCcQWEZCWuPb5MiOIzSzgIPHm4z2wGmGBQIkzrxYB1 XBwsAioSrQ36oCEeQUsJFYtWQdWIiEgL7Gr7SIriM0pYClxcvNxsDFCQDW3Tu1mmcDIvYCRYR WjRnFqUVlqka6hmV5SUWZ6RkluYmaOrqGBmV5uanFxYnpqTmJSsV5yfu4mRqB3GYBgB+P9jQG HGCU5mJREecvqv0cI8SXlp1RmJBZnxBeV5qQWH2KU4eBQkuB9OgMoJ1iUmp5akZaZAwwzmLQE B4+SCG/8TKA0b3FBYm5xZjpE6hSjLse7zb/fMwmx5OXnpUqJ84qCFAmAFGWU5sGNgIX8JUZZK WFeRqCjhHgKUotyM0tQ5V8xinMwKgnzKoFM4cnMK4Hb9AroCCagIyICvoAcUZKIkJJqYAzliu 6NXXpw3aJP+qUKMf71kROuH/vuJPREcMv0Z56FOtURIldfz2PRza1IfdUh0aWTX9Gxktn+QcW +OZUmrlUW6Sf4D82+tnK6ylHhXt1HOaGJNc93K8/+tHFeH+fZzKRDG1KMM0NlA97NvMYlIDDj VkNp/9wrBtM2Xr8Z+nX+fFml3S5nDZVYijMSDbWYi4oTAaGXtJt0AgAA X-Env-Sender: julien.grall@arm.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1492621999!58507987!2 X-Originating-IP: [217.140.101.70] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28221 invoked from network); 19 Apr 2017 17:13:21 -0000 Received: from foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-13.tower-21.messagelabs.com with SMTP; 19 Apr 2017 17:13:21 -0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id CA2CF169E; Wed, 19 Apr 2017 10:13:20 -0700 (PDT) Received: from e108454-lin.cambridge.arm.com (e108454-lin.cambridge.arm.com [10.1.206.53]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 34B7F3F4FF; Wed, 19 Apr 2017 10:13:20 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Date: Wed, 19 Apr 2017 18:13:11 +0100 Message-Id: <20170419171311.3243-5-julien.grall@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170419171311.3243-1-julien.grall@arm.com> References: <20170419171311.3243-1-julien.grall@arm.com> Cc: Julien Grall , sstabellini@kernel.org Subject: [Xen-devel] [PATCH for-4.9 4/4] xen/arm: Properly map the FDT in the boot page table 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" Currently, Xen is assuming the FDT will always fit in a 2MB section. Recently, I noticed an early crash on Xen when using GRUB with the following call trace: (XEN) Hypervisor Trap. HSR=0x96000006 EC=0x25 IL=1 Syndrome=0x6 (XEN) CPU0: Unexpected Trap: Hypervisor (XEN) ----[ Xen-4.9-unstable arm64 debug=y Not tainted ]---- (XEN) CPU: 0 (XEN) PC: 0000000000264140 strlen+0x10/0x84 (XEN) LR: 00000000002401c0 (XEN) SP: 00000000002cfc20 (XEN) CPSR: 400003c9 MODE:64-bit EL2h (Hypervisor, handler) (XEN) X0: 0000000000801230 X1: 0000000000801230 X2: 0000000000005230 (XEN) X3: 0000000000000030 X4: 0000000000000030 X5: 0000000000000038 (XEN) X6: 0000000000000034 X7: 0000000000000000 X8: 7f7f7f7f7f7f7f7f (XEN) X9: 64622c6479687222 X10: 7f7f7f7f7f7f7f7f X11: 0101010101010101 (XEN) X12: 0000000000000030 X13: ffffff00ff000000 X14: 0800000003000000 (XEN) X15: ffffffffffffffff X16: 00000000fefff610 X17: 00000000000000f0 (XEN) X18: 0000000000000004 X19: 0000000000000008 X20: 00000000007fc040 (XEN) X21: 00000000007fc000 X22: 000000000000000e X23: 0000000000000000 (XEN) X24: 00000000002a9f58 X25: 0000000000801230 X26: 00000000002a9f68 (XEN) X27: 00000000002a9f58 X28: 0000000000298910 FP: 00000000002cfc20 (XEN) (XEN) VTCR_EL2: 80010c40 (XEN) VTTBR_EL2: 0000082800203000 (XEN) (XEN) SCTLR_EL2: 30c5183d (XEN) HCR_EL2: 000000000038663f (XEN) TTBR0_EL2: 00000000f4912000 (XEN) (XEN) ESR_EL2: 96000006 (XEN) HPFAR_EL2: 00000000e8071000 (XEN) FAR_EL2: 0000000000801230 (XEN) (XEN) Xen stack trace from sp=00000000002cfc20: (XEN) 00000000002cfc70 0000000000240254 00000000002a9f58 00000000007fc000 (XEN) 0000000000000000 0000000000000000 0000000000000000 00000000007fc03c (XEN) 00000000002cfd78 0000000000000000 00000000002cfca0 00000000002986fc (XEN) 0000000000000000 00000000007fc000 0000000000000000 0000000000000000 (XEN) 00000000002cfcc0 0000000000298f1c 0000000000000000 00000000007fc000 (XEN) 00000000002cfdc0 000000000029904c 00000000f47fc000 00000000f4604000 (XEN) 00000000f47fc000 00000000007fc000 0000000000400000 0000000000000100 (XEN) 00000000f4604000 0000000000000001 0000000000000001 8000000000000002 (XEN) 0000000000000000 0000000000000000 0000000000000000 0000000000000000 (XEN) 0000000000000000 0000000000000000 0000000000000000 0000000000000000 (XEN) 0000000000000000 0000000000000000 0000000000000000 0000000000000000 (XEN) 0000000000000000 0000000000000000 00000000002cfdc0 0000000000299038 (XEN) 00000000f47fc000 00000000f4604000 00000000f47fc000 0000000000000000 (XEN) 00000000002cfe20 000000000029c420 00000000002d8000 00000000f4604000 (XEN) 00000000f47fc000 0000000000000000 0000000000400000 0000000000000100 (XEN) 00000000f4604000 0000000000000001 00000000f47fc000 000000000029c404 (XEN) 00000000fefff510 0000000000200624 00000000f4804000 00000000f4604000 (XEN) 00000000f47fc000 0000000000000000 0000000000400000 0000000000000100 (XEN) 0000000000000001 0000000000000001 0000000000000001 8000000000000002 (XEN) 00000000f47fc000 0000000000000000 0000000000000000 0000000000000000 (XEN) 0000000000000000 0000000000000000 0000000000000000 0000000000000000 (XEN) 0000000000000000 0000000000000000 0000000000000000 0000000000000000 (XEN) 0000000000000000 0000000000000000 0000000000000000 0000000000000000 (XEN) 0000000000000000 0000000000000000 0000000000000000 0000000000000000 (XEN) 0000000000000000 0000000000000000 0000000000000000 0000000000000000 (XEN) 0000000000000000 0000000000000000 0000000000000000 0000000000000000 (XEN) 0000000000000000 0000000000000000 0000000000000000 0000000000000000 (XEN) 0000000000000000 0000000000000000 0000000000000000 0000000000000000 (XEN) 0000000000000000 0000000000000000 0000000000000000 0000000000000000 (XEN) 0000000000000000 0000000000000000 0000000000000000 0000000000000000 (XEN) 0000000000000000 0000000000000000 0000000000000000 0000000000000000 (XEN) Xen call trace: (XEN) [<0000000000264140>] strlen+0x10/0x84 (PC) (XEN) [<00000000002401c0>] fdt_get_property_namelen+0x9c/0xf0 (LR) (XEN) [<0000000000240254>] fdt_get_property+0x40/0x50 (XEN) [<00000000002986fc>] bootfdt.c#device_tree_get_u32+0x18/0x5c (XEN) [<0000000000298f1c>] device_tree_for_each_node+0x84/0x144 (XEN) [<000000000029904c>] boot_fdt_info+0x70/0x23c (XEN) [<000000000029c420>] start_xen+0x9c/0xd30 (XEN) [<0000000000200624>] arm64/head.o#paging+0x84/0xbc (XEN) (XEN) (XEN) **************************************** (XEN) Panic on CPU 0: (XEN) CPU0: Unexpected Trap: Hypervisor (XEN) (XEN) **************************************** Indeed, the booting documentation for AArch32 and AArch64 only requires the FDT to be placed on a 8-byte boundary. This means the Device-Tree can cross a 2MB boundary. Given that Xen limits the size of the FDT to 2MB, it will always fit in a 4MB slot. So extend the fixmap slot for FDT from 2MB to 4MB. The second 2MB superpage will only be mapped if the FDT is cross the 2MB boundary. Signed-off-by: Julien Grall --- xen/arch/arm/mm.c | 16 ++++++++++++++-- xen/include/asm-arm/config.h | 14 +++++++------- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 53d36e2ce2..9cff1619c6 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -451,6 +451,7 @@ void * __init early_fdt_map(paddr_t fdt_paddr) paddr_t base_paddr = fdt_paddr & SECOND_MASK; paddr_t offset; void *fdt_virt; + uint32_t size; /* * Check whether the physical FDT address is set and meets the minimum @@ -475,9 +476,17 @@ void * __init early_fdt_map(paddr_t fdt_paddr) if ( fdt_magic(fdt_virt) != FDT_MAGIC ) return NULL; - if ( fdt_totalsize(fdt_virt) > MAX_FDT_SIZE ) + size = fdt_totalsize(fdt_virt); + if ( size > MAX_FDT_SIZE ) return NULL; + if ( (offset + size) > SZ_2M ) + { + create_mappings(boot_second, BOOT_FDT_VIRT_START + SZ_2M, + paddr_to_pfn(base_paddr + SZ_2M), + SZ_2M >> PAGE_SHIFT, SZ_2M); + } + return fdt_virt; } @@ -485,7 +494,8 @@ void __init remove_early_mappings(void) { lpae_t pte = {0}; write_pte(xen_second + second_table_offset(BOOT_FDT_VIRT_START), pte); - flush_xen_data_tlb_range_va(BOOT_FDT_VIRT_START, SECOND_SIZE); + write_pte(xen_second + second_table_offset(BOOT_FDT_VIRT_START), pte); + flush_xen_data_tlb_range_va(BOOT_FDT_VIRT_START, BOOT_FDT_SLOT_SIZE); } extern void relocate_xen(uint64_t ttbr, void *src, void *dst, size_t len); @@ -544,6 +554,8 @@ void __init setup_pagetables(unsigned long boot_phys_offset, paddr_t xen_paddr) /* ... DTB */ pte = boot_second[second_table_offset(BOOT_FDT_VIRT_START)]; xen_second[second_table_offset(BOOT_FDT_VIRT_START)] = pte; + pte = boot_second[second_table_offset(BOOT_FDT_VIRT_START + SZ_2M)]; + xen_second[second_table_offset(BOOT_FDT_VIRT_START + SZ_2M)] = pte; /* ... Boot Misc area for xen relocation */ dest_va = BOOT_RELOC_VIRT_START; diff --git a/xen/include/asm-arm/config.h b/xen/include/asm-arm/config.h index 9c14a385e7..5b6f3c985d 100644 --- a/xen/include/asm-arm/config.h +++ b/xen/include/asm-arm/config.h @@ -77,12 +77,12 @@ * 0 - 2M Unmapped * 2M - 4M Xen text, data, bss * 4M - 6M Fixmap: special-purpose 4K mapping slots - * 6M - 8M Early boot mapping of FDT - * 8M - 10M Early relocation address (used when relocating Xen) + * 6M - 10M Early boot mapping of FDT + * 10M - 12M Early relocation address (used when relocating Xen) * and later for livepatch vmap (if compiled in) * * ARM32 layout: - * 0 - 10M + * 0 - 12M * * 32M - 128M Frametable: 24 bytes per page for 16GB of RAM * 256M - 1G VMAP: ioremap and early_ioremap use this virtual address @@ -93,7 +93,7 @@ * * ARM64 layout: * 0x0000000000000000 - 0x0000007fffffffff (512GB, L0 slot [0]) - * 0 - 10M + * 0 - 12M * * 1G - 2G VMAP: ioremap and early_ioremap * @@ -113,12 +113,12 @@ #define FIXMAP_ADDR(n) (_AT(vaddr_t,0x00400000) + (n) * PAGE_SIZE) #define BOOT_FDT_VIRT_START _AT(vaddr_t,0x00600000) -#define BOOT_FDT_SLOT_SIZE MB(2) +#define BOOT_FDT_SLOT_SIZE MB(4) #define BOOT_FDT_VIRT_END (BOOT_FDT_VIRT_START + BOOT_FDT_SLOT_SIZE) -#define BOOT_RELOC_VIRT_START _AT(vaddr_t,0x00800000) +#define BOOT_RELOC_VIRT_START _AT(vaddr_t,0x00a00000) #ifdef CONFIG_LIVEPATCH -#define LIVEPATCH_VMAP_START _AT(vaddr_t,0x00800000) +#define LIVEPATCH_VMAP_START _AT(vaddr_t,0x00a00000) #define LIVEPATCH_VMAP_END (LIVEPATCH_VMAP_START + MB(2)) #endif