From patchwork Thu Jun 2 02:21:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 12867447 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 749C7C43334 for ; Thu, 2 Jun 2022 02:22:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :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=WUxdO70u6qm4EqAObwP4dV3IxLBHzsLDzK1RDtiGlCg=; b=JcVbHqiMNl5vvu XURqpDUrKJfEovSZ5RPRajcCerazXsEfnRPxbQElMqy96gZGw/0bRthTtOCNmmy26FBnAQYfaVQuo iyXfh4YQ54Y2DiwQZ9aNMINF7KB3J5auCEdosnMJ58AatROar33pqgx1txnM/ZDQS2LcnXZ17vy6s 42xYUD+h7IsZVCDs8qP3OBWLOwu3CCGM7WGOIb9nMiEwTD4YPo2ut6W9k5cV94ZQz7sGYU2iGvQLq LfB/hgDsWvxzKX3L6Yb6jOKnV+04BfhNV5XGIWoU1lWTbJBTedryuKCeDOq0g12GE8D4AO1YvTGRo 4stH+g+l5BHHd5Afakbg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nwaSb-0017RB-LZ; Thu, 02 Jun 2022 02:21:17 +0000 Received: from mail-pf1-x42a.google.com ([2607:f8b0:4864:20::42a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nwaSY-0017QC-8G for linux-arm-kernel@lists.infradead.org; Thu, 02 Jun 2022 02:21:15 +0000 Received: by mail-pf1-x42a.google.com with SMTP id w21so3588598pfc.0 for ; Wed, 01 Jun 2022 19:21:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=GG12pRWYpCMhzTmvdu+AwDhBRPq3Mk8LSZ48yQuCcmg=; b=LbojSCdMywwboJsHvQBCV5gloK38NF3e45HPu/lbWImG7XctvRZbulCzhPCX0vDVfF 7D5qg+qbh4OopNyx2h474m7+zYbil/P93rcOf4x5/U4K8/IQdtEV+U3vicJCJuY0hV8v SIzsmtEKrEtbUgmwdzaTytHMHhVSZHfj/n9uM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=GG12pRWYpCMhzTmvdu+AwDhBRPq3Mk8LSZ48yQuCcmg=; b=TQzqzbtzCYwOa3CW0D27eDh7Q9SwecywuGETw5OXESVmvSYjVuqAVy6B9XmdoHc1VP Il9IEntmmKPXEvZ22JFYiY9sWqT0XH+z0s+4vWCkhNYQ6cxGF9Ebytg/t4STDw9VHPos Dd2SYbvzPiYKco2t8BYOIwoyEE8gb8z7BtuQwK78NgP7Xapy094C0825X/eyH7W3mbiy kE33V91LwL01yUyL+j2tob//Xrbuam13UaBXYSp/KHTGAzKUKnIOy9uUnDgFbbXYa5qt RS4MlwQc1XUEqWHMLXLtUhdsD/sunWT/LuPjZohQgCs/ct96OGYmo5NBiUqdvQzFTzmc UGDQ== X-Gm-Message-State: AOAM530LCvvVcOaPTrPGcraaVdrMtx4Tk6ARwnHVVwL/VkSdl6z+/PAF dV4EW3VL9QSlJwzEw6smPoQliw== X-Google-Smtp-Source: ABdhPJzQAc7yvw8IedDY62s8gx/hzC1m4lhhsL8fO37xa12t5NllgzfENMY9KSnYKyYm/DhztZJw6Q== X-Received: by 2002:a05:6a00:10cc:b0:505:ada6:e03e with SMTP id d12-20020a056a0010cc00b00505ada6e03emr2569824pfu.45.1654136471309; Wed, 01 Jun 2022 19:21:11 -0700 (PDT) Received: from smtp.gmail.com ([2620:15c:202:201:6885:8b62:3875:9d55]) by smtp.gmail.com with ESMTPSA id d9-20020a170902cec900b0016378bfeb90sm2181299plg.227.2022.06.01.19.21.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jun 2022 19:21:10 -0700 (PDT) From: Stephen Boyd To: Catalin Marinas , Will Deacon Cc: linux-kernel@vger.kernel.org, patches@lists.linux.dev, linux-arm-kernel@lists.infradead.org, Hsin-Yi Wang , Douglas Anderson , Ard Biesheuvel , Steven Rostedt , "Jason A . Donenfeld" , Dominik Brodowski Subject: [PATCH] arm64: Initialize jump labels before setup_machine_fdt() Date: Wed, 1 Jun 2022 19:21:09 -0700 Message-Id: <20220602022109.780348-1-swboyd@chromium.org> X-Mailer: git-send-email 2.36.1.255.ge46751e96f-goog MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220601_192114_366550_4DE4190B X-CRM114-Status: GOOD ( 14.46 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 --- arch/arm64/kernel/setup.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index fea3223704b6..cf3a759f10d4 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -303,13 +303,14 @@ void __init __no_sanitize_address setup_arch(char **cmdline_p) 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(); /*