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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 29D7DC77B7C for ; Thu, 11 May 2023 19:40:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239285AbjEKTkC (ORCPT ); Thu, 11 May 2023 15:40:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57300 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239329AbjEKTju (ORCPT ); Thu, 11 May 2023 15:39:50 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DFDABA5F1; Thu, 11 May 2023 12:39:23 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 5CD8665123; Thu, 11 May 2023 19:39:22 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A5947C433EF; Thu, 11 May 2023 19:39:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1683833961; bh=eusArGtpQsQ/mI/dj7NQjj77kk6DhjwgGYGdfDlh95U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dovm443LT+fICEbOAcS0pe1kumXbYJHrHlVKVtU569uAgpgHspUqEVCQdK0Rr3q9w bAQoBmZCapTV7qYjICeoVmMylGUd9tepJbaa9B/0g3x8Mm/usrMiF8rXSsNx59kAfm SMWwAs3qfKooB5s/+d/qTZBGkqZkd7EuKslhyXOPkg/y96/XbMVOuCihMZxdSyYgmx kmr9Ioaa334MnrUKQRxb6b7EJzEM7Hr0PZAqhRog1SBtksi6HAm459ww6Wz5o//Rwt c+/MGSfmez8bEpp8TRk8mpl7RCvv50tTorHFyX+OMN5TzGiYqOCkIg2JgoETgkWYtN 8AndyGFUm80Aw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Lucas Tanure , Rob Herring , Sasha Levin , robh+dt@kernel.org, frowand.list@gmail.com, devicetree@vger.kernel.org Subject: [PATCH AUTOSEL 6.2 05/10] of: fdt: Scan /memreserve/ last Date: Thu, 11 May 2023 15:38:43 -0400 Message-Id: <20230511193850.623289-5-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230511193850.623289-1-sashal@kernel.org> References: <20230511193850.623289-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org From: Lucas Tanure [ Upstream commit b413281876292de44ae84e9a9ce9d62e47f266e9 ] Change the scanning /memreserve/ and /reserved-memory node order to fix Kernel panic on Khadas Vim3 Board. If /memreserve/ goes first, the memory is reserved, but nomap can't be applied to the region. So the memory won't be used by Linux, but it is still present in the linear map as normal memory, which allows speculation. Legitimate access to adjacent pages will cause the CPU to end up prefetching into them leading to Kernel panic. So /reserved-memory node should go first, as it has a more updated description of the memory regions and can apply flags, like nomap. Link: https://lore.kernel.org/all/CAJX_Q+1Tjc+-TjZ6JW9X0NxEdFe=82a9626yL63j7uVD4LpxEA@mail.gmail.com/ Signed-off-by: Lucas Tanure Link: https://lore.kernel.org/r/20230424113846.46382-1-tanure@linux.com Signed-off-by: Rob Herring Signed-off-by: Sasha Levin --- drivers/of/fdt.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index d1a68b6d03b3f..c28aedd7ae1f7 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -635,6 +635,9 @@ void __init early_init_fdt_scan_reserved_mem(void) if (!initial_boot_params) return; + fdt_scan_reserved_mem(); + fdt_reserve_elfcorehdr(); + /* Process header /memreserve/ fields */ for (n = 0; ; n++) { fdt_get_mem_rsv(initial_boot_params, n, &base, &size); @@ -643,8 +646,6 @@ void __init early_init_fdt_scan_reserved_mem(void) memblock_reserve(base, size); } - fdt_scan_reserved_mem(); - fdt_reserve_elfcorehdr(); fdt_init_reserved_mem(); } -- 2.39.2