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=unavailable 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 116C5C10F14 for ; Mon, 8 Apr 2019 16:33:47 +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 D4CC02087F for ; Mon, 8 Apr 2019 16:33:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="JehhK8CE"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Ei5RSYQF" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D4CC02087F 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: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:In-Reply-To: References:List-Owner; bh=OMgazSZomUFI/dEG7BFWNWQ4GnyqDQV7/Ed/BAS8VTc=; b=Jeh hK8CEvHWDFPPq07VGDnRmhiF9WCGG/t2jlGiTaAk7cxLQ5K5cE3E0VfgejTKd71Od1b+ZG7ovcj2v +c8vMDzv5L+YVOtNkWBSmd3YUAhycuKT3HNhq/VQxuvqPcZnITBRMTdfz1M0QSeC7v7AUx4YzBSR2 5xUI6gojUSPiBORxb3cbE8/YfiD9YV5uDg5vshN4/1hshmNX8W1rCUkg7zq9J4Z8JMaVKwpNS/XTC 9GJv3nG+/BPqC9+fOuX16VsDewzRdjTbys1rKeRWSr8beEmVuhZTVpfueWakEnY0EoIRqDRD3D4U1 7ktiV73iP1NVIZug8kZVM1rWq6HJdKQ==; 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 1hDXDJ-0002Dl-Do; Mon, 08 Apr 2019 16:33:41 +0000 Received: from mail-pf1-x441.google.com ([2607:f8b0:4864:20::441]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hDXDF-0002DK-OY for linux-arm-kernel@lists.infradead.org; Mon, 08 Apr 2019 16:33:39 +0000 Received: by mail-pf1-x441.google.com with SMTP id w25so6479464pfi.9 for ; Mon, 08 Apr 2019 09:33:37 -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; bh=adM7GO+50iuUmAcUxnBbVrKSbGKte77qypSkx5gSfhY=; b=Ei5RSYQFkvcE01miYVzVojPZwxiN2U9LXOt1q9JVINBVwt5R8GaU1JFRkrhb4RBnSP nqUEBJyAVk+Z6bVI1gmnTVL3qXSJedH44vnn4Qt+nMNfaRWpXCzaazPt9xdYO44fmzCq PtP2llahNxeiZPDqI48SUV7FCmTIqs809723EWpkg0tGvRz8RcXsRBTGbCuf0zDktVPD j18PFWJWxH6mCipz5CLiR6kcPQv620qrDK1hJcMkR40ZrryDCjCLB3rCU81/Aq38xzZN /zEZ00Wu7Mm6GHv8vEyXSVGUnsgxKA4hXYxCXPwtsHzssk1+7+vdjuF2ehZKiAckSwTR nsDQ== 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; bh=adM7GO+50iuUmAcUxnBbVrKSbGKte77qypSkx5gSfhY=; b=PtiqPoCk95heFEyIwLgSvuOXqUP4Q94O2VKMeZ0yG19f+2H9u8YOd4idyHAf5J4Qhu RXp4fKg1SB9Nrr8xKgMyg3VjTB+CdkbnXPsdTE7BJqMiSosPcD+o1ppBF2N8TvVTJt/3 nq2FDPFh75bTnS3Z4/7CNyePueoFkc6qR/Kr/Ai9qJlfWzl4JcRmytPxRFy4+fSQagUy goxEvRiEoY0xEeiT1L94zVfUitMxY8aEYCCNKQB2BdZynpay+P6oPQ0CmEiepaMacuWW EksEuZ99OXhpdPcxH4fDE+1gN92GDG9YejChE0t+5bNE/QLTBtVctN8XQom8biSh1AL5 viBQ== X-Gm-Message-State: APjAAAWrUBc/yBWyPu14JHWqTOKYnPMcN5TBCQnwEKpX/lKAC6u1ok4g iQEhGSiUlCZDbaFdGKZ+qs4= X-Google-Smtp-Source: APXvYqxho0IpZwRA9Y5E/1foJWx2ZKY2a26+T3ucHduOhyin2w+5vx2twZyiFxTBcpUZXzuwLTbD+Q== X-Received: by 2002:aa7:8c84:: with SMTP id p4mr31269768pfd.164.1554741217261; Mon, 08 Apr 2019 09:33:37 -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.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Apr 2019 09:33:36 -0700 (PDT) From: pierre Kuo To: will.deacon@arm.com Subject: [PATCH v3 1/2] kaslr: shift linear region randomization ahead of memory_limit Date: Tue, 9 Apr 2019 00:33:18 +0800 Message-Id: <20190408163319.10382-1-vichy.kuo@gmail.com> X-Mailer: git-send-email 2.17.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190408_093337_819134_21A3213D X-CRM114-Status: GOOD ( 14.75 ) 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 The following is schematic diagram of the program before and after the modification. Before: if (memstart_addr + linear_region_size < memblock_end_of_DRAM()) {} --(a) if (memory_limit != PHYS_ADDR_MAX) {} --(b) if (IS_ENABLED(CONFIG_BLK_DEV_INITRD) && phys_initrd_size) {} --(c) if (IS_ENABLED(CONFIG_RANDOMIZE_BASE)) {} --(d)* After: if (memstart_addr + linear_region_size < memblock_end_of_DRAM()) {} --(a) if (IS_ENABLED(CONFIG_RANDOMIZE_BASE)) {} --(d)* if (memory_limit != PHYS_ADDR_MAX) {} --(b) if (IS_ENABLED(CONFIG_BLK_DEV_INITRD) && phys_initrd_size) {} --(c) After grouping modification of memstart_address by moving linear region randomization ahead of memory_init, driver can safely using macro, __phys_to_virt, in (b) or (c), if necessary. 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 | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index 7205a9085b4d..5142020fc146 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -389,6 +389,23 @@ void __init arm64_memblock_init(void) memblock_remove(0, memstart_addr); } + if (IS_ENABLED(CONFIG_RANDOMIZE_BASE)) { + extern u16 memstart_offset_seed; + u64 range = linear_region_size - + (memblock_end_of_DRAM() - memblock_start_of_DRAM()); + + /* + * If the size of the linear region exceeds, by a sufficient + * margin, the size of the region that the available physical + * memory spans, randomize the linear region as well. + */ + if (memstart_offset_seed > 0 && range >= ARM64_MEMSTART_ALIGN) { + range /= ARM64_MEMSTART_ALIGN; + memstart_addr -= ARM64_MEMSTART_ALIGN * + ((range * memstart_offset_seed) >> 16); + } + } + /* * Apply the memory limit if it was set. Since the kernel may be loaded * high up in memory, add back the kernel region that must be accessible @@ -428,22 +445,6 @@ void __init arm64_memblock_init(void) } } - if (IS_ENABLED(CONFIG_RANDOMIZE_BASE)) { - extern u16 memstart_offset_seed; - u64 range = linear_region_size - - (memblock_end_of_DRAM() - memblock_start_of_DRAM()); - - /* - * If the size of the linear region exceeds, by a sufficient - * margin, the size of the region that the available physical - * memory spans, randomize the linear region as well. - */ - if (memstart_offset_seed > 0 && range >= ARM64_MEMSTART_ALIGN) { - range /= ARM64_MEMSTART_ALIGN; - memstart_addr -= ARM64_MEMSTART_ALIGN * - ((range * memstart_offset_seed) >> 16); - } - } /* * Register the kernel text, kernel data, initrd, and initial -- 2.17.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel