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.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,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 55B7EC43381 for ; Thu, 14 Mar 2019 03:21:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 15EAD20854 for ; Thu, 14 Mar 2019 03:21:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="qJ5Vhr7N" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727179AbfCNDVC (ORCPT ); Wed, 13 Mar 2019 23:21:02 -0400 Received: from mail-pf1-f193.google.com ([209.85.210.193]:43456 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726339AbfCNDVC (ORCPT ); Wed, 13 Mar 2019 23:21:02 -0400 Received: by mail-pf1-f193.google.com with SMTP id q17so2833125pfh.10 for ; Wed, 13 Mar 2019 20:21:01 -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=ccAeTLQBdIVAFjTPGt6RXumwLGC6PlH3sQ70vUsR9Gc=; b=qJ5Vhr7NaYOZCTOrqsEMP0xuKedlfAVu/AcWGo1mtWZpE8DdW0UR8LBe6g6f3Jkm7F b3TnGn3R9eqZOwQDXe/ft16SQvDbsLiNG6Jchww8aBHb/3bQbAKbUI7Z0O/8weRsKYak OBC2P/FoLWQRe7hUoxY6Vgr+ZMhBvL37uql7WQIysftP4V392D97frV0nHUlzsWzCZfy xrjOEuauYOnTQIouaed0NUd17ube6yCwj2SYLsfSARcgOSalONCwCOqFNN9ozmmeXkHZ A8cs27/ZZpcxBv6MonidoCRbfS9F7qzrpctxnAqPN7uUhfbMrVI45CbJXLRsHKPyFTLl 2SVQ== 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=ccAeTLQBdIVAFjTPGt6RXumwLGC6PlH3sQ70vUsR9Gc=; b=lqmh0BztS9oVxdTfVS+Cc8GabyhYwS9FmF2RaMoAfduBmhbX3KrqA4ueJNHV2aSrZb LrY//5paEw/iu81Ua3J93lCujvKv5s90AHmbxKu1pjPDAfObggUIVznoPHCZpdInx+iZ Fl/NbX79KruMVUKC4nHwmbCFuO4oNOez9dvF1B45zYdsIW77XRN6Dc87RTvAMINrcZxr XdbZSiMgV+Z7yTg4emkiLJ3q5j7iTRJQq/JCBIDK4M4Jx3DZ7Nz67b4B4zIodTnLhdBQ srF6Qn4RV7erWNnvjlkjNXsNdppfpw9/GW8BHuoS+PiH0EaSGXn6EzvJDTksIJUeTzF9 nvhQ== X-Gm-Message-State: APjAAAUljcnRUPFS1qNFmajcjLghRUiUSrUEQpgzGoFLOhSy9BcB7lK4 +CDFO04mj+VixSU1JuQJgFoc8UXd4eM= X-Google-Smtp-Source: APXvYqwNBOCf+zxKuePzfJX1TgnaqQiLZ3rNd/PuIziuO2iDt+lL44cbIy+QuyfsM4znNoYaE3aUxw== X-Received: by 2002:a65:40c5:: with SMTP id u5mr42681148pgp.275.1552533661385; Wed, 13 Mar 2019 20:21:01 -0700 (PDT) Received: from ubuntu14_04.bitmain.com (61-220-100-83.HINET-IP.hinet.net. [61.220.100.83]) by smtp.gmail.com with ESMTPSA id p5sm19215693pfn.154.2019.03.13.20.20.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Mar 2019 20:21:00 -0700 (PDT) From: pierre Kuo To: steven.price@arm.com, catalin.marinas@arm.com, will.deacon@arm.com Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, vichy.kuo@gmail.com Subject: [PATCH v2 1/1] initrd: move initrd_start calculate within linear mapping range check Date: Thu, 14 Mar 2019 11:20:47 +0800 Message-Id: <20190314032047.15790-1-vichy.kuo@gmail.com> X-Mailer: git-send-email 2.17.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.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 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; - } early_init_fdt_scan_reserved_mem(); -- 2.17.1 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,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 25751C43381 for ; Thu, 14 Mar 2019 03:21:20 +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 E712120854 for ; Thu, 14 Mar 2019 03:21:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="iAD8XXAt"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="qJ5Vhr7N" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E712120854 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=2R8RSMp5XxbHmRlChR8k2SZFI72nSx0Tm/EuhbHZYE0=; b=iAD 8XXAtyZ/QKuBeFBWVs04a97Kgi8eReudwz5SJ59E5N8FJXULovpdNjFra7O/Tl+vVMTx1FdA7kQgd 6cMSASc/EGbwZKETt9DnF8zxPcUU1vm4GMPw0qT9O1VBxStVym10Ku1MwsRazVjKa9JSxK3wmhylN rkdRZEDxENChfmRdm+HHrbobe0ps/9SezYXFyHdne3g5Q04lav1P/yfhPy3Iz5TUTGBeOFE3FRljM rlcQD7YkX+mRAOqpi0HqsaePO6bY5xbDDYgYD32Gzg/FJQ4s/0ttlySjnTNi9hEZWazoTUNvNeNFJ BnFM5qNUs2w4SP0nxIEQogoNTR6YLVw==; 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 1h4Gva-000532-JU; Thu, 14 Mar 2019 03:21:06 +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 1h4GvW-00052L-PE for linux-arm-kernel@lists.infradead.org; Thu, 14 Mar 2019 03:21:04 +0000 Received: by mail-pf1-x441.google.com with SMTP id y124so2838731pfy.7 for ; Wed, 13 Mar 2019 20:21:01 -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=ccAeTLQBdIVAFjTPGt6RXumwLGC6PlH3sQ70vUsR9Gc=; b=qJ5Vhr7NaYOZCTOrqsEMP0xuKedlfAVu/AcWGo1mtWZpE8DdW0UR8LBe6g6f3Jkm7F b3TnGn3R9eqZOwQDXe/ft16SQvDbsLiNG6Jchww8aBHb/3bQbAKbUI7Z0O/8weRsKYak OBC2P/FoLWQRe7hUoxY6Vgr+ZMhBvL37uql7WQIysftP4V392D97frV0nHUlzsWzCZfy xrjOEuauYOnTQIouaed0NUd17ube6yCwj2SYLsfSARcgOSalONCwCOqFNN9ozmmeXkHZ A8cs27/ZZpcxBv6MonidoCRbfS9F7qzrpctxnAqPN7uUhfbMrVI45CbJXLRsHKPyFTLl 2SVQ== 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=ccAeTLQBdIVAFjTPGt6RXumwLGC6PlH3sQ70vUsR9Gc=; b=UTMkc+AAJdTkpC+Cv1iqcULAjJ/yeTEdrKcfgJB3JGdRe8TIZ+r4kYmEYqoXXO+O6r df6R6iTWv5W6ax05f10WMLkGRc/VZCEv8ZP0vOrBEc7NLlCgWDIL/e9+wqUwU23OLu/9 qHrpK5QIL2KPgul4yvPp2P2uV/CTrN3vmIM6vBXNW28HWTD2JsUQMWlJfRsODS39hTTf X/wCeGvpr283YWjX5eJSaSoGZcisRBAq7/61nL4tg0KBUv/MYuJoIigrsm+3AYQoKxr+ JRYyr80lz0F/70EcRTJzLvew02anqcVvFnCVatALxZy5Dgl7b2DsnkeQfmLeJ1tyAHmS Pzow== X-Gm-Message-State: APjAAAXpYFXHWeGpU3Bu/pMn7quBwpQZ/f9/1BIaCC4uf0migNwKUGbZ PmssiTm7KnoWfSRrw5Sdp18= X-Google-Smtp-Source: APXvYqwNBOCf+zxKuePzfJX1TgnaqQiLZ3rNd/PuIziuO2iDt+lL44cbIy+QuyfsM4znNoYaE3aUxw== X-Received: by 2002:a65:40c5:: with SMTP id u5mr42681148pgp.275.1552533661385; Wed, 13 Mar 2019 20:21:01 -0700 (PDT) Received: from ubuntu14_04.bitmain.com (61-220-100-83.HINET-IP.hinet.net. [61.220.100.83]) by smtp.gmail.com with ESMTPSA id p5sm19215693pfn.154.2019.03.13.20.20.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Mar 2019 20:21:00 -0700 (PDT) From: pierre Kuo To: steven.price@arm.com, catalin.marinas@arm.com, will.deacon@arm.com Subject: [PATCH v2 1/1] initrd: move initrd_start calculate within linear mapping range check Date: Thu, 14 Mar 2019 11:20:47 +0800 Message-Id: <20190314032047.15790-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-20190313_202102_844872_A90A2AE1 X-CRM114-Status: GOOD ( 12.30 ) 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: vichy.kuo@gmail.com, linux-kernel@vger.kernel.org, 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 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; - } 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