From nobody Tue Apr 28 07:43:47 2026 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 A8E9DC43334 for ; Fri, 3 Jun 2022 12:16:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244271AbiFCMQK (ORCPT ); Fri, 3 Jun 2022 08:16:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53706 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244222AbiFCMQA (ORCPT ); Fri, 3 Jun 2022 08:16:00 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9238E39B9C; Fri, 3 Jun 2022 05:15:59 -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 ams.source.kernel.org (Postfix) with ESMTPS id 3AEEBB8229C; Fri, 3 Jun 2022 12:15:58 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E3662C385A9; Fri, 3 Jun 2022 12:15:55 +0000 (UTC) Authentication-Results: smtp.kernel.org; dkim=pass (1024-bit key) header.d=zx2c4.com header.i=@zx2c4.com header.b="c3mcp+J+" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zx2c4.com; s=20210105; t=1654258553; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=oRsHxHQzO9b36Wu7d91EDPUtT5qXNW3912jYDw/ciis=; b=c3mcp+J+qUuufS2+xBe8Ii9kTqaeIMNB6W/woJj8yZqwjHzz9spVBuRHXD5MyzJIRw+Znw Sv2ZWHqUZu6dNBVJwJq15W+sAGxXcU3gVt5AYH8ICM6+yal0iL4Erteq+dy7pZqFGMp0dt qNk8lOYjQprBB4UmUtI0s4BmkDGCYns= Received: by mail.zx2c4.com (ZX2C4 Mail Server) with ESMTPSA id 2573374e (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO); Fri, 3 Jun 2022 12:15:52 +0000 (UTC) From: "Jason A. Donenfeld" To: linux@armlinux.org.uk, rmk+kernel@armlinux.org.uk, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, catalin.marinas@arm.com Cc: "Jason A. Donenfeld" , Stephen Boyd , Ard Biesheuvel , stable@vger.kernel.org Subject: [PATCH v2] ARM: initialize jump labels before setup_machine_fdt() Date: Fri, 3 Jun 2022 14:15:43 +0200 Message-Id: <20220603121543.360283-1-Jason@zx2c4.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Stephen reported that a static key warning splat appears during early boot on arm64 systems that credit randomness from device trees that contain an "rng-seed" property, because setup_machine_fdt() is called before jump_label_init() during setup_arch(), which was fixed by 73e2d827a501 ("arm64: Initialize jump labels before setup_machine_fdt()"). Upon cursory inspection, the same basic issue appears to apply to arm32 as well. So this commit adds a call to jump_label_init() just before setup_machine_fdt(). Reported-by: Stephen Boyd Suggested-by: Ard Biesheuvel Cc: Catalin Marinas Cc: stable@vger.kernel.org Fixes: f5bda35fba61 ("random: use static branch for crng_ready()") Signed-off-by: Jason A. Donenfeld --- arch/arm/kernel/setup.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index 1e8a50a97edf..3ff80b1ee0b5 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c @@ -1101,6 +1101,7 @@ void __init setup_arch(char **cmdline_p) atags_vaddr =3D FDT_VIRT_BASE(__atags_pointer); =20 setup_processor(); + jump_label_init(); if (atags_vaddr) { mdesc =3D setup_machine_fdt(atags_vaddr); if (mdesc) --=20 2.35.1