From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.7 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B7B47C10F13 for ; Mon, 8 Apr 2019 16:33:54 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 88C2C2087F for ; Mon, 8 Apr 2019 16:33:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="lotw53A7"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Je+jL6gP" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 88C2C2087F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=8r7H7QImfZ/Rta+kDFL7HwwyGmmk9IgA9pnZtcdTEOE=; b=lotw53A7mKSK+0XjuxUYXOrIyk zTF5Cg8An9+RFetAJlkY8GGIM/bXGGiVXzL4YNFlINKrKukQkn53x0zts5t3Bb+0i7PFsGBOfM/D8 45zJQJZYBXEJrAAye1h0Rz56DAaTLecDDuqbEm07txbJpgAAJfSVVA4QPViFOb3XFa2fgflxd+Z4T m4ANuPbIk4mZkod7Ux0XSvrdALjz1/BFiykX8lw8uEdwJWgOV/dq4FkkklyS3CqnbK+MmT30W6fK3 KNJAAh+bhuMGzVmGLNfANifqlPAfz53ZMbJHc3Rq6jRXxZO/gn9SlpVzVtCP+coyRkni6bmEpO2Qd fGTvavbA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hDXDS-0002OY-Fr; Mon, 08 Apr 2019 16:33:50 +0000 Received: from mail-pg1-x542.google.com ([2607:f8b0:4864:20::542]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hDXDK-0002F3-Ly for linux-arm-kernel@lists.infradead.org; Mon, 08 Apr 2019 16:33:45 +0000 Received: by mail-pg1-x542.google.com with SMTP id z9so4694734pgu.10 for ; Mon, 08 Apr 2019 09:33:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=C300X2ejQ0xFADjlLWpFw9mFDk88hw+DVLLPDxl1UTY=; b=Je+jL6gPURZDjEEQ3d0+o0FZ6LjEoRC2hFwg0ImYPEdFJtIWK9cVTl2kvkf5G6FEhY ZFoDWeyDOwIJ4qAmRq7A/UK59G/Hd2UMv4nFoR2+sw8mhS1G8ODTa/gS4QQJ6q1H5ePk 2cEQEypAdbxH7WRmppypIeFdFn/0aSqYTPNmGniexC67+opupNaKWwMFH2DwJlzsaH8r DgzlWADC8aGGxqbNcrlWNEcTY1ofR4iQtRjU1RUc5UZ/hW0NX9hsmG6zfpXGBomZKdU7 f8tXiDG1Ap7Eccsb4tfnmbzU1xlaGhrdVxhlIuY54O2sU00Rw1C9npVdUnde8ORJ5TN8 t3kA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=C300X2ejQ0xFADjlLWpFw9mFDk88hw+DVLLPDxl1UTY=; b=N+x7DGF1ZJnoU7HvXNfiJkUaFwYZXnBQfjBg2Tx8wnomSZ0Hn0QmpKpwEtZaijJXBD bAO3KzZjA8kf6MYlbatznGj7WMQDLey0WvtnCImPT+BiiJ3zWgnFT5YeeJRp2XTymk6I Pz7Q8mJmLWXKIn2huffgQxYPEs2HuwcpYhC7vNoF8mLqEE+u7o8F8CLesO9Pdu502YUz kqr5CfKHaEkR1jY6NpbIDWr/ewnsxwfIqkCj/yEuI4/3/C8FxPCF5sTFpHRr8lebNj7k gyy4dwmwj4+nrMypYyBux1CyLOvnfM5aptQtL1ZllMk4s0U2f7kdybIuyaLe0sO1HdhR b57g== X-Gm-Message-State: APjAAAVWCrkbGQREzFRrIzACRdR0bJC5PexyPr8Wh6uO5ld5h2AryM0v +3vJRpI0y0XVAZssoRtYG+c= X-Google-Smtp-Source: APXvYqy0kUXps/GeV9TXWv3PEQyG1DnlMKuVeb/qB7cTSHPZbIECRmNWBNJmI9gWz+4BTeqKqLtabg== X-Received: by 2002:a63:465b:: with SMTP id v27mr29906732pgk.165.1554741221982; Mon, 08 Apr 2019 09:33:41 -0700 (PDT) Received: from localhost.localdomain (2001-b400-e3a7-6c70-b197-cec7-ec88-495a.emome-ip6.hinet.net. [2001:b400:e3a7:6c70:b197:cec7:ec88:495a]) by smtp.gmail.com with ESMTPSA id 143sm62117103pge.50.2019.04.08.09.33.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Apr 2019 09:33:41 -0700 (PDT) From: pierre Kuo To: will.deacon@arm.com Subject: [PATCH v3 2/2] initrd: move initrd_start calculate within linear mapping range check Date: Tue, 9 Apr 2019 00:33:19 +0800 Message-Id: <20190408163319.10382-2-vichy.kuo@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190408163319.10382-1-vichy.kuo@gmail.com> References: <20190408163319.10382-1-vichy.kuo@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190408_093343_072703_AB9FC04B X-CRM114-Status: GOOD ( 13.73 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: f.fainelli@gmail.com, ard.biesheuvel@linaro.org, catalin.marinas@arm.com, vichy.kuo@gmail.com, linux-kernel@vger.kernel.org, steven.price@arm.com, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org in the previous case, initrd_start and initrd_end can be successfully returned either (base < memblock_start_of_DRAM()) or (base + size > memblock_start_of_DRAM() + linear_region_size). That means even linear mapping range check fail for initrd_start and initrd_end, it still can get virtual address. Here we put initrd_start/initrd_end to be calculated only when linear mapping check pass. Fixes: c756c592e442 ("arm64: Utilize phys_initrd_start/phys_initrd_size") Reviewed-by: Steven Price Signed-off-by: pierre Kuo --- Changes in v2: - add Fixes tag Changes in v3: - adding patch of shifting linear region randomization ahead of memory_limit arch/arm64/mm/init.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index 5142020fc146..566761da5719 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -442,6 +442,9 @@ void __init arm64_memblock_init(void) memblock_remove(base, size); /* clear MEMBLOCK_ flags */ memblock_add(base, size); memblock_reserve(base, size); + /* the generic initrd code expects virtual addresses */ + initrd_start = __phys_to_virt(phys_initrd_start); + initrd_end = initrd_start + phys_initrd_size; } } @@ -451,11 +454,6 @@ void __init arm64_memblock_init(void) * pagetables with memblock. */ memblock_reserve(__pa_symbol(_text), _end - _text); - if (IS_ENABLED(CONFIG_BLK_DEV_INITRD) && phys_initrd_size) { - /* the generic initrd code expects virtual addresses */ - initrd_start = __phys_to_virt(phys_initrd_start); - initrd_end = initrd_start + phys_initrd_size; - } early_init_fdt_scan_reserved_mem(); -- 2.17.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel