From patchwork Mon Jun 3 13:57:41 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 17484 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ye0-f198.google.com (mail-ye0-f198.google.com [209.85.213.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id F336823916 for ; Mon, 3 Jun 2013 13:57:50 +0000 (UTC) Received: by mail-ye0-f198.google.com with SMTP id m13sf3357489yen.1 for ; Mon, 03 Jun 2013 06:57:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-beenthere:x-forwarded-to:x-forwarded-for :delivered-to:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe; bh=M8tX7LIMmLLf7hT7TIiJYXKYdZHRA9uHVG1MKZz/MoY=; b=CChjJPfeS5A+Jev9d2sAFrAdFDfM9TzthVDwFioIIPsWMRladtYF1ZXXxaG9oQFYi/ l69Q6vo2dxO8SsgsTT7k5/oYjQQ6L/FuJYaZ7SWKBUtbrSoVWKAD+cHvOq5vHX7DRbnT PSHeJKOJbl+w5YDpPdRAIkPRDLFyKD8haVNaWBQngwnyWUTbRCRiOj3jyEgZ0oJqQfEo i87BzWexuCjMi5fUqkQ1TsM9dbRzSzTmNPCBhVQFhV2uzrmjKdqgjuz32pJInrbVRNKK ucA03SlCv+OYbIJ3Cp7BqJltCqREZsomFTRIzw4Qruwk9mESPcR+pbnETrSuCvQMqDb3 CMxw== X-Received: by 10.224.215.68 with SMTP id hd4mr45588qab.5.1370267870661; Mon, 03 Jun 2013 06:57:50 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.74.169 with SMTP id u9ls234068qev.32.gmail; Mon, 03 Jun 2013 06:57:50 -0700 (PDT) X-Received: by 10.58.85.134 with SMTP id h6mr17195722vez.18.1370267870526; Mon, 03 Jun 2013 06:57:50 -0700 (PDT) Received: from mail-vb0-x22e.google.com (mail-vb0-x22e.google.com [2607:f8b0:400c:c02::22e]) by mx.google.com with ESMTPS id wl5si35373852vec.25.2013.06.03.06.57.50 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 03 Jun 2013 06:57:50 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c02::22e is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=2607:f8b0:400c:c02::22e; Received: by mail-vb0-f46.google.com with SMTP id 10so795685vbe.33 for ; Mon, 03 Jun 2013 06:57:50 -0700 (PDT) X-Received: by 10.52.53.36 with SMTP id y4mr13996186vdo.51.1370267870384; Mon, 03 Jun 2013 06:57:50 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.221.10.206 with SMTP id pb14csp79689vcb; Mon, 3 Jun 2013 06:57:49 -0700 (PDT) X-Received: by 10.194.9.70 with SMTP id x6mr19149302wja.19.1370267868904; Mon, 03 Jun 2013 06:57:48 -0700 (PDT) Received: from mail-wi0-x230.google.com (mail-wi0-x230.google.com [2a00:1450:400c:c05::230]) by mx.google.com with ESMTPS id bn6si19115879wjc.171.2013.06.03.06.57.48 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 03 Jun 2013 06:57:48 -0700 (PDT) Received-SPF: neutral (google.com: 2a00:1450:400c:c05::230 is neither permitted nor denied by best guess record for domain of julien.grall@linaro.org) client-ip=2a00:1450:400c:c05::230; Received: by mail-wi0-f176.google.com with SMTP id hr14so2716782wib.3 for ; Mon, 03 Jun 2013 06:57:48 -0700 (PDT) X-Received: by 10.194.122.225 with SMTP id lv1mr19337396wjb.21.1370267868175; Mon, 03 Jun 2013 06:57:48 -0700 (PDT) Received: from belegaer.uk.xensource.com. (firewall.ctxuk.citrix.com. [46.33.159.2]) by mx.google.com with ESMTPSA id en3sm23680052wid.1.2013.06.03.06.57.45 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 03 Jun 2013 06:57:46 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Cc: patches@linaro.org, Stefano.Stabellini@eu.citrix.com, ian.campbell@citrix.com, Julien Grall Subject: [PATCH v4] xen/arm: Rework the way to compute dom0 DTB base address Date: Mon, 3 Jun 2013 14:57:41 +0100 Message-Id: <1370267861-23051-1-git-send-email-julien.grall@linaro.org> X-Mailer: git-send-email 1.7.10.4 X-Gm-Message-State: ALoCoQkL9SkbAFfv5/IZyUgqagy8kBNrtUeSihe1h5OKmaPmGzEAxRVYOss0CQirJSzVnLzlYsA/ X-Original-Sender: julien.grall@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c02::22e is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , If the DTB is loading right after the kernel, on some setup, Linux will overwrite the DTB during the decompression step. To be sure the DTB won't be overwritten by the decompression stage, load the DTB near the end of the first memory bank and below 4Gib (if memory range is greater). Signed-off-by: Julien Grall Changes in v4: - Rename type to ktype to avoid clash name on arm64 Changes in v3: - Rework comments - Missing blank line - Transform dtb_check_overlap to a void function - Directly panic in dtb_check_overlap - Use the right formula to check the overlap Changes in v2: - Align the DTB base address to 2Mib - Add dtb_check_overlap to check if the kernel will overlap the DTB - Fix typo --- xen/arch/arm/domain_build.c | 49 +++++++++++++++++++++++++++++++++++++------ xen/arch/arm/kernel.c | 2 ++ xen/arch/arm/kernel.h | 7 +++++++ 3 files changed, 52 insertions(+), 6 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index b92c64b..7abe537 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -477,6 +477,7 @@ static int prepare_dtb(struct domain *d, struct kernel_info *kinfo) void *fdt; int new_size; int ret; + paddr_t end; kinfo->unassigned_mem = dom0_mem; @@ -502,17 +503,26 @@ static int prepare_dtb(struct domain *d, struct kernel_info *kinfo) goto err; /* - * Put the device tree at the beginning of the first bank. It - * must be below 4 GiB. + * DTB must be load below 4GiB and far enough to linux (Linux use + * the space after it to decompress) + * Load the DTB at the end of the first bank, while ensure it is + * also below 4G */ - kinfo->dtb_paddr = kinfo->mem.bank[0].start + 0x100; - if ( kinfo->dtb_paddr + fdt_totalsize(kinfo->fdt) > (1ull << 32) ) + end = kinfo->mem.bank[0].start + kinfo->mem.bank[0].size; + end = MIN(1ull << 32, end); + kinfo->dtb_paddr = end - fdt_totalsize(kinfo->fdt); + /* Aligned the address to 2Mb. Linux only requires to be aligned to 4 bytes */ + kinfo->dtb_paddr &= ~((2 << 20) - 1); + + if ( fdt_totalsize(kinfo->fdt) > end ) { - printk("Not enough memory below 4 GiB for the device tree."); + printk(XENLOG_ERR "Not enough memory in the first bank for " + "the device tree."); ret = -FDT_ERR_XEN(EINVAL); goto err; } + return 0; err: @@ -521,10 +531,36 @@ static int prepare_dtb(struct domain *d, struct kernel_info *kinfo) return -EINVAL; } +static void dtb_check_overlap(struct kernel_info *kinfo) +{ + paddr_t zimage_start = kinfo->zimage.load_addr; + paddr_t zimage_end = kinfo->zimage.load_addr + kinfo->zimage.len; + paddr_t dtb_start = kinfo->dtb_paddr; + paddr_t dtb_end = kinfo->dtb_paddr + fdt_totalsize(kinfo->fdt); + + /* + * Check the kernel won't overlap the kernel + * Only when it's a ZIMAGE + */ + if ( kinfo->ktype != KERNEL_ZIMAGE ) + return; + + if ( (dtb_start > zimage_end) || (dtb_end < zimage_start) ) + return; + + panic(XENLOG_ERR "The kernel(0x%"PRIpaddr"-0x%"PRIpaddr + ") is overlapping the DTB(0x%"PRIpaddr"-0x%"PRIpaddr")\n", + zimage_start, zimage_end, dtb_start, dtb_end); + +} + static void dtb_load(struct kernel_info *kinfo) { void * __user dtb_virt = (void * __user)(register_t)kinfo->dtb_paddr; + printk("Loading dom0 DTB to 0x%"PRIpaddr"-0x%"PRIpaddr"\n", + kinfo->dtb_paddr, kinfo->dtb_paddr + fdt_totalsize(kinfo->fdt)); + raw_copy_to_guest(dtb_virt, kinfo->fdt, fdt_totalsize(kinfo->fdt)); xfree(kinfo->fdt); } @@ -559,10 +595,11 @@ int construct_dom0(struct domain *d) if ( rc < 0 ) return rc; + dtb_check_overlap(&kinfo); + /* The following loads use the domain's p2m */ p2m_load_VTTBR(d); - kinfo.dtb_paddr = kinfo.zimage.load_addr + kinfo.zimage.len; kernel_load(&kinfo); dtb_load(&kinfo); diff --git a/xen/arch/arm/kernel.c b/xen/arch/arm/kernel.c index 8f4a60d..cdaca9c 100644 --- a/xen/arch/arm/kernel.c +++ b/xen/arch/arm/kernel.c @@ -152,6 +152,7 @@ static int kernel_try_zimage_prepare(struct kernel_info *info, info->entry = info->zimage.load_addr; info->load = kernel_zimage_load; + info->ktype = KERNEL_ZIMAGE; return 0; } @@ -193,6 +194,7 @@ static int kernel_try_elf_prepare(struct kernel_info *info, */ info->entry = info->elf.parms.virt_entry; info->load = kernel_elf_load; + info->ktype = KERNEL_ELF; return 0; err: diff --git a/xen/arch/arm/kernel.h b/xen/arch/arm/kernel.h index 1776a4d..69a572c 100644 --- a/xen/arch/arm/kernel.h +++ b/xen/arch/arm/kernel.h @@ -9,6 +9,12 @@ #include #include +enum kernel_type +{ + KERNEL_ELF, + KERNEL_ZIMAGE, +}; + struct kernel_info { #ifdef CONFIG_ARM_64 enum domain_type type; @@ -23,6 +29,7 @@ struct kernel_info { void *kernel_img; unsigned kernel_order; + enum kernel_type ktype; union { struct {