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=-6.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED 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 76B0CC10F13 for ; Tue, 16 Apr 2019 05:26:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 37D332073F for ; Tue, 16 Apr 2019 05:26:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="iq6ex/zt" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726818AbfDPF0M (ORCPT ); Tue, 16 Apr 2019 01:26:12 -0400 Received: from mail-vs1-f66.google.com ([209.85.217.66]:44874 "EHLO mail-vs1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725830AbfDPF0M (ORCPT ); Tue, 16 Apr 2019 01:26:12 -0400 Received: by mail-vs1-f66.google.com with SMTP id j184so10818565vsd.11 for ; Mon, 15 Apr 2019 22:26:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=wSYFPZsuygOoy6qVoHRdTD0eecXLgTWkf1fF93D5ArI=; b=iq6ex/ztcBBjmyWJkRDzDRheabCvVhqZ4aBUg+MF6YDPB+VwE9+zAPyILCfdoS9kTX +05Na0Z8mK54KOnjsfSKTpw0KjVa8L6MYaujwLV5Us6Tc1/uMnsIZmGNw/55Hd0gSFLX e7l3tHsNhrWhuvj6ClET2UkmnanmBwpBsOyrZtqvR8boMCfgivNeonvz1J08NTfTereM rZ+okabsEfa2WlT6Z3hltCOnVZTzUuz6d5Gqw90GVTkHsbAIz3pyb7Advc7XlaivueAY GJa+sLWqUueKbOkJwV00UHzbx3OdFodRk/DQ8K8HrzFAUCncGtsPxu93UNAs2lxVbeC4 e/wg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=wSYFPZsuygOoy6qVoHRdTD0eecXLgTWkf1fF93D5ArI=; b=W7HagnKNJ/1bgxVBww7YHcf0LXVftSToJKsJxZOsYeDQL3EwOHxyoXh3JWoCm4Xst8 b8ba0ttKBFsHHkDA4AOdCjRNii4p2hTY5x3mHvH0Lgmkd84+aaDWTE0adqT2/jXRhD6r 2aBsf4IY0Lcf6P3IqRxqO1fziBAhLHTZQbMIyfr//IF95wIzJvBmo/VmgCJCSnvHef03 PbwrGKbPVwDwerY87SE6j99LK3zSlPRKrz2ZO8ZedKHH/cVX4Y+N4bBzr5FRzO/TOl0g rdanN5p+V79dOipigb0jnwUZSwBfuasNxEqNJTjB7eCGllwDM6RuDh31eYBf6L3m9+K3 bvfg== X-Gm-Message-State: APjAAAXmxYObcmuEJctZaFe5/3X+5Z02FhaX9VQs+CzTdj/ST5EAepb/ zXPcfu5eO4EaTmyCZR/QtL8WqxolVHlfWaA+dF4= X-Google-Smtp-Source: APXvYqz2o6DoARyz+eb1XG/GdmnWaCaMHDcVM9ts3E53/f5WeFThGPgp0frF/5EfmAUH+rOUCAo1/QH3Z29BsctEqmw= X-Received: by 2002:a67:870a:: with SMTP id j10mr41704482vsd.161.1555392371376; Mon, 15 Apr 2019 22:26:11 -0700 (PDT) MIME-Version: 1.0 References: <20190408163319.10382-1-vichy.kuo@gmail.com> In-Reply-To: <20190408163319.10382-1-vichy.kuo@gmail.com> From: pierre kuo Date: Tue, 16 Apr 2019 13:26:00 +0800 Message-ID: Subject: Re: [PATCH v3 1/2] kaslr: shift linear region randomization ahead of memory_limit To: Will Deacon Cc: Catalin Marinas , Steven Price , Florian Fainelli , Ard Biesheuvel , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org hi will and all: > > 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 Would you mind to give some comment and suggestion for these v3 patches? https://lkml.org/lkml/2019/4/8/682 https://lkml.org/lkml/2019/4/8/683 Sincerely appreciate your kind help, 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=-6.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 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 59BCEC10F13 for ; Tue, 16 Apr 2019 05:26:26 +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 2A09020868 for ; Tue, 16 Apr 2019 05:26:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="CWriLvGP"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="iq6ex/zt" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2A09020868 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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:To:Subject:Message-ID:Date:From: In-Reply-To:References:MIME-Version:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=nOUiWSFT75xiNTuhSkTPIhcOfzhaFtz7UZq+Rs5V2Q4=; b=CWriLvGPRXtgLF QagwDL8RdKPhyMsd0yqLiHWtaWnCAQH36NUoQXTLj4iSGzL0CoPPAIyxlj0cvxngX8JbsvgYVxtNB mYcz645IUDTJIzjRV8qN8xfLAJxJjkeKVzdy0C7uut32fRYaf8BQjcauH33CXXf0LhQQ9i3+lQTMx ZEoFPEgmFrBb0QnlmQ8ZtoKzkJ3vv5NkVZ6jzYwc5g1+7EVaQVbwxbmgq1i+zE3NkfJqkoWBU+XU+ AGhcs6fOQVWYvEPOu1OCySPL2CSyaZKUAJzg+RnlB3FcI8Qylo3XDU0+3YpPz/iRCWugnkmZ9O8Hy 8xqME0QbAL/26pzCsHww==; 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 1hGGbp-0005w5-8F; Tue, 16 Apr 2019 05:26:17 +0000 Received: from mail-vs1-xe42.google.com ([2607:f8b0:4864:20::e42]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hGGbm-0005vG-5k for linux-arm-kernel@lists.infradead.org; Tue, 16 Apr 2019 05:26:15 +0000 Received: by mail-vs1-xe42.google.com with SMTP id g187so10822708vsc.8 for ; Mon, 15 Apr 2019 22:26:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=wSYFPZsuygOoy6qVoHRdTD0eecXLgTWkf1fF93D5ArI=; b=iq6ex/ztcBBjmyWJkRDzDRheabCvVhqZ4aBUg+MF6YDPB+VwE9+zAPyILCfdoS9kTX +05Na0Z8mK54KOnjsfSKTpw0KjVa8L6MYaujwLV5Us6Tc1/uMnsIZmGNw/55Hd0gSFLX e7l3tHsNhrWhuvj6ClET2UkmnanmBwpBsOyrZtqvR8boMCfgivNeonvz1J08NTfTereM rZ+okabsEfa2WlT6Z3hltCOnVZTzUuz6d5Gqw90GVTkHsbAIz3pyb7Advc7XlaivueAY GJa+sLWqUueKbOkJwV00UHzbx3OdFodRk/DQ8K8HrzFAUCncGtsPxu93UNAs2lxVbeC4 e/wg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=wSYFPZsuygOoy6qVoHRdTD0eecXLgTWkf1fF93D5ArI=; b=B/urv5UuW7hjzMXgc2w7WvBuICMhMRyNsG1/0AjE9mVmxNKsW1Cgiigpbn5gKGV7Iu Q9e/87de0CugbhNpK6TxXydHlc7I3ihD0IWmrDLLftMgTYK0gDc2Bfvl1vqWgsWd0thx Qpor7mvLztKjP91Dkf22XfwiixT24/orprnNO/ecvQyVK1MRI2Xw0cH6nT31SWCGV+LY r/5KjOvtpQXopyRb8o99ODCzKWJikQgUEtsH6dqmkgEHjG6NAuptrHET9S7yrXf66KpN yXFssP0OILi1Tlv9LJig9m/fTdAJ6IbDmxcYKKUgcXxGmYKx4pHOQHwsjS12yLglnMkO H+eA== X-Gm-Message-State: APjAAAVlBn4G6N4btmnA8E0HaGvHR9JwtJKJyXZdAfQFGEkOkx3sxibW ADzipUGw264extckcexVBH1QKickwjwS6BxelH23riVi X-Google-Smtp-Source: APXvYqz2o6DoARyz+eb1XG/GdmnWaCaMHDcVM9ts3E53/f5WeFThGPgp0frF/5EfmAUH+rOUCAo1/QH3Z29BsctEqmw= X-Received: by 2002:a67:870a:: with SMTP id j10mr41704482vsd.161.1555392371376; Mon, 15 Apr 2019 22:26:11 -0700 (PDT) MIME-Version: 1.0 References: <20190408163319.10382-1-vichy.kuo@gmail.com> In-Reply-To: <20190408163319.10382-1-vichy.kuo@gmail.com> From: pierre kuo Date: Tue, 16 Apr 2019 13:26:00 +0800 Message-ID: Subject: Re: [PATCH v3 1/2] kaslr: shift linear region randomization ahead of memory_limit To: Will Deacon X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190415_222614_216387_CE3C146D X-CRM114-Status: GOOD ( 20.07 ) 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: Florian Fainelli , Ard Biesheuvel , Catalin Marinas , linux-kernel@vger.kernel.org, Steven Price , linux-arm-kernel@lists.infradead.org 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 hi will and all: > > 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 Would you mind to give some comment and suggestion for these v3 patches? https://lkml.org/lkml/2019/4/8/682 https://lkml.org/lkml/2019/4/8/683 Sincerely appreciate your kind help, _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel