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=-3.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,SPF_PASS 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 00B8EC43381 for ; Sun, 31 Mar 2019 15:14:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BAA352086C for ; Sun, 31 Mar 2019 15:14:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="g8Ut0kmJ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731289AbfCaPO5 (ORCPT ); Sun, 31 Mar 2019 11:14:57 -0400 Received: from mail-vs1-f66.google.com ([209.85.217.66]:36549 "EHLO mail-vs1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731211AbfCaPO5 (ORCPT ); Sun, 31 Mar 2019 11:14:57 -0400 Received: by mail-vs1-f66.google.com with SMTP id n4so4032301vsm.3 for ; Sun, 31 Mar 2019 08:14:56 -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=DBsJQsFvMrPo98lUzLMYhevM4wuKttyWGnDZLyEeI5I=; b=g8Ut0kmJICKhqDxP9atG/H7Yv4fVseGuy/EJ91DIaFNaNUChAwd8eHHAES77CHLOQw FBpBn0MJZN4mET3h8XVOVH9IEyznbDrugOr1ja+ByNxA9weKhZxlju++8WK34SMj28mN YGD3QWiDi/VGpavY/U2rSijys5shVfs9SswggySLdG+d/J4K6125qVEiBd598N23NipS ngaIdVaO7WQdcXXJWP629G3WBf1zj0bsKBGwOeJeA5Y3Ho3yyhZoJeQ1iL0u469qQUrG F2SjoN3wW9nUpYUs35Griy9rZ1XxvFF8DZJk9o7GKebS7K9fdqysYigelvrYMB9gdWsD xw/Q== 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=DBsJQsFvMrPo98lUzLMYhevM4wuKttyWGnDZLyEeI5I=; b=OrU6d2GqP48JOCewYpO6gnLl4yg8YIk0MmVUE2FAuRsY+YwO0dVMAWJsGz9nPLD0DS IuGkcfApMjGbBYGTlZ9KfeTP10s2wp77QAl1nbuo/ynGcQRx9A5OfkG9vH6wnHcnyMXn HPans76zDjFnQMx+yz24pCykUNNI4R8cadBC6hZLz3J/IPYFRkljIsTKtaHm36EmOaeQ 4DzlEwV+l6LHbCJYKnP/X0gIrlA7cy65TCmzJ7nDO0Bp+UJQY+WD/3EgAwtFkA1SpYZb WUBpaLDsfW1P6xhYBmJ+CT/OYepy/ebYue/blqWRlrsB+xP2BjPI1q0tMwszEnU642PX 0e4g== X-Gm-Message-State: APjAAAXE7j9BYyn2bljcyJq+uPo0rek2iGwVdOgWk9XWKZlsA44RAeeB SE10RheV40do8AVVBF1QErj0pMo3wEbDWfcncF0= X-Google-Smtp-Source: APXvYqzK83/i8i+qsrzflAplGdVyteBV7BJTIGue66UCsb4hczK2yA3KU2IVzZJMpVg9VE0gQiZ444gz58oe1gcx8jY= X-Received: by 2002:a67:f694:: with SMTP id n20mr35245354vso.9.1554045296313; Sun, 31 Mar 2019 08:14:56 -0700 (PDT) MIME-Version: 1.0 References: <20190314032047.15790-1-vichy.kuo@gmail.com> <20190319153114.GI59586@arrakis.emea.arm.com> In-Reply-To: <20190319153114.GI59586@arrakis.emea.arm.com> From: pierre kuo Date: Sun, 31 Mar 2019 23:14:44 +0800 Message-ID: Subject: Re: [PATCH v2 1/1] initrd: move initrd_start calculate within linear mapping range check To: Catalin Marinas Cc: Steven Price , Will Deacon , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Florian Fainelli 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 Catalin: > On Thu, Mar 14, 2019 at 11:20:47AM +0800, pierre Kuo wrote: > > 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") > > For future versions, please also cc the author of the original commit > you are fixing. Got it and thanks for ur warm reminder ^^ > > > > 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 7205a9085b4d..1adf418de685 100644 > > --- a/arch/arm64/mm/init.c > > +++ b/arch/arm64/mm/init.c > > @@ -425,6 +425,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; > > } > > } > > > > @@ -450,11 +453,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; > > - } > > With CONFIG_RANDOMIZE_BASE we can get a further change to memstart_addr > after the place where you moved the initrd_{start,end} setting, which > would result in a different value for __phys_to_virt(phys_initrd_start). I found what you mean, since __phys_to_virt will use PHYS_OFFSET (memstart_addr) for calculating. How about moving CONFIG_RANDOMIZE_BASE part of code ahead of CONFIG_BLK_DEV_INITRD checking? That means below (d) moving ahead of (c) prvious: 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) now: if (memstart_addr + linear_region_size < memblock_end_of_DRAM()) { ---(a) if (memory_limit != PHYS_ADDR_MAX) {} ----------------(b) if (IS_ENABLED(CONFIG_RANDOMIZE_BASE)) {} --------------(d) if (IS_ENABLED(CONFIG_BLK_DEV_INITRD) && phys_initrd_size) {} ---(c) Appreciate your kind advice. 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=-3.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,SPF_PASS 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 277CFC43381 for ; Sun, 31 Mar 2019 15:15:25 +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 E64C42086C for ; Sun, 31 Mar 2019 15:15:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="htu2SyGw"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="g8Ut0kmJ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E64C42086C 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=bckU4IOzaClevF8pj/a3cko2KGyFX4f83Lx3fGBDlkQ=; b=htu2SyGw5rSE/2 MAGoohwtaoyDyvmBejTkqY9/phzdX2yV7W1ubw3TIz6uHcij9C8ktVmp2z/jozBF/AZgOxgzn+qVk ZTfzeV8cgkWTQeJolfgivtmehTYuXw5Hi+nuIiXruYuEw18ovGcPpMMTJI6u7wfvb4KSSoZ1tZ36W c6Koj/k8aYOQ8uUcFWWSVRYfoiN2YZrkMxmpwzDEjvBiEhehSSKAiWcddNkg1HdvXBfM5ou7Jxx9p VxvnYQAgjhVx74JwmgwVeg9CPD9chAZdf6MqdTKBZBSdcUtNWO1T+m2i79KV9vkWSsnF7Ys+jYzBg Z2LPkXgW+556v7iXD6tg==; 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 1hAcAs-0004jr-DL; Sun, 31 Mar 2019 15:15:06 +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 1hAcAl-0004Yl-Su for linux-arm-kernel@lists.infradead.org; Sun, 31 Mar 2019 15:15:01 +0000 Received: by mail-vs1-xe42.google.com with SMTP id n14so3984538vsp.12 for ; Sun, 31 Mar 2019 08:14:57 -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=DBsJQsFvMrPo98lUzLMYhevM4wuKttyWGnDZLyEeI5I=; b=g8Ut0kmJICKhqDxP9atG/H7Yv4fVseGuy/EJ91DIaFNaNUChAwd8eHHAES77CHLOQw FBpBn0MJZN4mET3h8XVOVH9IEyznbDrugOr1ja+ByNxA9weKhZxlju++8WK34SMj28mN YGD3QWiDi/VGpavY/U2rSijys5shVfs9SswggySLdG+d/J4K6125qVEiBd598N23NipS ngaIdVaO7WQdcXXJWP629G3WBf1zj0bsKBGwOeJeA5Y3Ho3yyhZoJeQ1iL0u469qQUrG F2SjoN3wW9nUpYUs35Griy9rZ1XxvFF8DZJk9o7GKebS7K9fdqysYigelvrYMB9gdWsD xw/Q== 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=DBsJQsFvMrPo98lUzLMYhevM4wuKttyWGnDZLyEeI5I=; b=ajplS2c0Opa+VFFtFMLdZ08AvmHQDTUZgNQKkYOOhbJUsjHB03ueMk5Patz0ihs43t 2U+1qjxG5lNIqv+kGGCoRrMzwvOWmakW6zDi8+xu07CwIcMaU3QEVo6sWV1CgoFa48HD AR0M65ojzCwslJiaxy80+M3liXlZ/rn/LZ30qKfUvgO00Mw7rITZ6x7sGbUmup/c8HS8 MDTBBPo0MFgtJh08IVFTuxYbEu5x6qLktnXjEW+sdYizaDw5eiyJHzJVK9VoT2Is6Yl3 EUgiVXcFoxsWDn8VBGr6yhOhyDnhiXD85mkzRLlcjQVfIGdGd5Pq2vxCvHyoeMHRxYoO FsZQ== X-Gm-Message-State: APjAAAWT/ksNimTxp4bTRPO1Az/au8OCBUmhUON/U8Ytg2mmQK8CmrOi L9YGRhFnpmlf6E/E/pgusJgOQaXseW8HquVyaAA= X-Google-Smtp-Source: APXvYqzK83/i8i+qsrzflAplGdVyteBV7BJTIGue66UCsb4hczK2yA3KU2IVzZJMpVg9VE0gQiZ444gz58oe1gcx8jY= X-Received: by 2002:a67:f694:: with SMTP id n20mr35245354vso.9.1554045296313; Sun, 31 Mar 2019 08:14:56 -0700 (PDT) MIME-Version: 1.0 References: <20190314032047.15790-1-vichy.kuo@gmail.com> <20190319153114.GI59586@arrakis.emea.arm.com> In-Reply-To: <20190319153114.GI59586@arrakis.emea.arm.com> From: pierre kuo Date: Sun, 31 Mar 2019 23:14:44 +0800 Message-ID: Subject: Re: [PATCH v2 1/1] initrd: move initrd_start calculate within linear mapping range check To: Catalin Marinas X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190331_081459_960774_1B167391 X-CRM114-Status: GOOD ( 18.16 ) 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 , Will Deacon , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Steven Price 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 Catalin: > On Thu, Mar 14, 2019 at 11:20:47AM +0800, pierre Kuo wrote: > > 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") > > For future versions, please also cc the author of the original commit > you are fixing. Got it and thanks for ur warm reminder ^^ > > > > 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 7205a9085b4d..1adf418de685 100644 > > --- a/arch/arm64/mm/init.c > > +++ b/arch/arm64/mm/init.c > > @@ -425,6 +425,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; > > } > > } > > > > @@ -450,11 +453,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; > > - } > > With CONFIG_RANDOMIZE_BASE we can get a further change to memstart_addr > after the place where you moved the initrd_{start,end} setting, which > would result in a different value for __phys_to_virt(phys_initrd_start). I found what you mean, since __phys_to_virt will use PHYS_OFFSET (memstart_addr) for calculating. How about moving CONFIG_RANDOMIZE_BASE part of code ahead of CONFIG_BLK_DEV_INITRD checking? That means below (d) moving ahead of (c) prvious: 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) now: if (memstart_addr + linear_region_size < memblock_end_of_DRAM()) { ---(a) if (memory_limit != PHYS_ADDR_MAX) {} ----------------(b) if (IS_ENABLED(CONFIG_RANDOMIZE_BASE)) {} --------------(d) if (IS_ENABLED(CONFIG_BLK_DEV_INITRD) && phys_initrd_size) {} ---(c) Appreciate your kind advice. _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel