Received: by 2002:a5d:9c59:0:0:0:0:0 with SMTP id 25csp2180537iof; Tue, 7 Jun 2022 22:22:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzgYxIae+snQcQO/q3CGvO+SjyghguDNEborYKtBdwDQxuJBaeDXLKTYgG6gaR1znCgZeIf X-Received: by 2002:a05:6a00:4211:b0:51c:45e:532b with SMTP id cd17-20020a056a00421100b0051c045e532bmr17608556pfb.10.1654665757515; Tue, 07 Jun 2022 22:22:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654665757; cv=none; d=google.com; s=arc-20160816; b=PPefPi7f8TPxqFBSMi/rSWHt9H8kR4jLbXFrnl819L8aV+ZcFhn9FaptZH6UYH7/Lw mZLwTDHNfp9hmLdf07bVP/oCXXqpjaSCwogMJxksraBi+zzt1SzN9TEms0iZWZXXKZlN mJv/Ow84w738xMlDqeYpHlq8EWu1XATCCDYzI+QBNU0MdgHzYuVHCJZ64xvEPd51WZFN xr3Dk+Mj20yLIIXceVv9DZu0J85KqQZZ8vq2WapYrXo1twKU0gcPbF7++E00c1jq8JW5 P71fpGKH1+EwEbDxZrtvL41ztOLwrbV/djOvBgaLGg+GzdHBePq8hQ6pRsVNLCoEqWE1 vIuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=IkrF0BsckZBF6RU0Czu3C86GqKlT1YUifixQRDYz34c=; b=VhxEdcrV+lgv4XLVNYnAxUId7erYRDneJtjDk6pnhieBi1eHAD9HMoKp7sexVScltF BgS70IQp7jJFccIWz1MxEdOfGXMCpRBC0DBPj278VsWURyAZfdJ3PfyxSvVutxs8mMp8 hHFzh/7cIJq0cVt8tjXUn+ztrXHTM7+lk+gKh6mmWCoeJUyX9DO6eOfcFn94MTKtsWcJ 64N59K5jmu30OpWY5kL/x586YGBRp0zK3kRIjqnp11VlNDZwLK/Y6pO1GfNltF3IzNMc SHyPgs3AaLvNMnfbK+4KO8eiCPNoSB/DpANmZgC5azJCnyc6FOzhYcBBFWyzODnNDW8v 3m2Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=0MTfthgC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id ch3-20020a056a00288300b0051bd4457edesi7595318pfb.161.2022.06.07.22.22.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jun 2022 22:22:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=0MTfthgC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 77EFE24E07F; Tue, 7 Jun 2022 21:49:52 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345514AbiFGRST (ORCPT + 99 others); Tue, 7 Jun 2022 13:18:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36378 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345500AbiFGRSQ (ORCPT ); Tue, 7 Jun 2022 13:18:16 -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 8D8D69C2EA; Tue, 7 Jun 2022 10:18:15 -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 32ECD618CF; Tue, 7 Jun 2022 17:18:15 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 049EAC34115; Tue, 7 Jun 2022 17:18:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1654622294; bh=M9GpBb+hxWPuk1gmmRV5QjLpJiCOwIHmPwzQSqs4uPo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0MTfthgCj2Nhs2ZcVl5Mvj37Gi7fl3bnVq+8kMGZHg/IujognKLarYILGYfo3ShIo NuQ05c9R3SFutiMT30K0TnYTJz/7vpQeBCxM8bfAXdTciNq09fHm3MNHeUYnFfgkPo Sr33CCIPPMSVpuKb77N7ecbVCVekC7kgtPuhMIos= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hsin-Yi Wang , Douglas Anderson , Ard Biesheuvel , Steven Rostedt , "Jason A. Donenfeld" , Dominik Brodowski , Stephen Boyd , Catalin Marinas Subject: [PATCH 5.10 001/452] arm64: Initialize jump labels before setup_machine_fdt() Date: Tue, 7 Jun 2022 18:57:38 +0200 Message-Id: <20220607164908.572141803@linuxfoundation.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220607164908.521895282@linuxfoundation.org> References: <20220607164908.521895282@linuxfoundation.org> User-Agent: quilt/0.66 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-3.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Stephen Boyd commit 73e2d827a501d48dceeb5b9b267a4cd283d6b1ae upstream. A static key warning splat appears during early boot on arm64 systems that credit randomness from devicetrees that contain an "rng-seed" property. This is because setup_machine_fdt() is called before jump_label_init() during setup_arch(). Let's swap the order of these two calls so that jump labels are initialized before the devicetree is unflattened and the rng seed is credited. static_key_enable_cpuslocked(): static key '0xffffffe51c6fcfc0' used before call to jump_label_init() WARNING: CPU: 0 PID: 0 at kernel/jump_label.c:166 static_key_enable_cpuslocked+0xb0/0xb8 Modules linked in: CPU: 0 PID: 0 Comm: swapper Not tainted 5.18.0+ #224 44b43e377bfc84bc99bb5ab885ff694984ee09ff pstate: 600001c9 (nZCv dAIF -PAN -UAO -TCO -DIT -SSBS BTYPE=--) pc : static_key_enable_cpuslocked+0xb0/0xb8 lr : static_key_enable_cpuslocked+0xb0/0xb8 sp : ffffffe51c393cf0 x29: ffffffe51c393cf0 x28: 000000008185054c x27: 00000000f1042f10 x26: 0000000000000000 x25: 00000000f10302b2 x24: 0000002513200000 x23: 0000002513200000 x22: ffffffe51c1c9000 x21: fffffffdfdc00000 x20: ffffffe51c2f0831 x19: ffffffe51c6fcfc0 x18: 00000000ffff1020 x17: 00000000e1e2ac90 x16: 00000000000000e0 x15: ffffffe51b710708 x14: 0000000000000066 x13: 0000000000000018 x12: 0000000000000000 x11: 0000000000000000 x10: 00000000ffffffff x9 : 0000000000000000 x8 : 0000000000000000 x7 : 61632065726f6665 x6 : 6220646573752027 x5 : ffffffe51c641d25 x4 : ffffffe51c13142c x3 : ffff0a00ffffff05 x2 : 40000000ffffe003 x1 : 00000000000001c0 x0 : 0000000000000065 Call trace: static_key_enable_cpuslocked+0xb0/0xb8 static_key_enable+0x2c/0x40 crng_set_ready+0x24/0x30 execute_in_process_context+0x80/0x90 _credit_init_bits+0x100/0x154 add_bootloader_randomness+0x64/0x78 early_init_dt_scan_chosen+0x140/0x184 early_init_dt_scan_nodes+0x28/0x4c early_init_dt_scan+0x40/0x44 setup_machine_fdt+0x7c/0x120 setup_arch+0x74/0x1d8 start_kernel+0x84/0x44c __primary_switched+0xc0/0xc8 ---[ end trace 0000000000000000 ]--- random: crng init done Machine model: Google Lazor (rev1 - 2) with LTE Cc: Hsin-Yi Wang Cc: Douglas Anderson Cc: Ard Biesheuvel Cc: Steven Rostedt Cc: Jason A. Donenfeld Cc: Dominik Brodowski Fixes: f5bda35fba61 ("random: use static branch for crng_ready()") Signed-off-by: Stephen Boyd Reviewed-by: Jason A. Donenfeld Link: https://lore.kernel.org/r/20220602022109.780348-1-swboyd@chromium.org Signed-off-by: Catalin Marinas Signed-off-by: Jason A. Donenfeld Signed-off-by: Greg Kroah-Hartman --- arch/arm64/kernel/setup.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -300,13 +300,14 @@ void __init __no_sanitize_address setup_ early_fixmap_init(); early_ioremap_init(); - setup_machine_fdt(__fdt_pointer); - /* * Initialise the static keys early as they may be enabled by the - * cpufeature code and early parameters. + * cpufeature code, early parameters, and DT setup. */ jump_label_init(); + + setup_machine_fdt(__fdt_pointer); + parse_early_param(); /*