From patchwork Tue Jun 7 19:30:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jason A. Donenfeld" X-Patchwork-Id: 12872290 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 3BA2BC43334 for ; Tue, 7 Jun 2022 19:32:27 +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:References:In-Reply-To: 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: List-Owner; bh=oKIMntXs25HQU2cryIoVK1u1tSDxYtwhv2IzT9qdAaM=; b=nmvZLasYnf5/+g arUBjVRh/lzaphozNLa020TAaF3/dMgMJwTIF/fA0sMa+azABOxs0Z+H/NbRHs5qVwg2cEiZkBfiW eggR6P24HLGremg1uyaY5QXw9A/oDBfd9fvLeUjxNPevUhw0N8kzaMqQqQRl4MSfh2Rk9Ikmu07gX ZQ2t5cwjGzOPBRMv7FSiiX4khXQxsU9e1GeqAd89d8KQHGv4dENoOzcduW14mxKAR6e7KMvgObKBn lMF1r+lCHwIApC8Zgm86OxnAf3xQgYnoSM8cteyza4NYYmNmN+If4vVlVSZYvaWWe52d/2eWtwVRy hyD2lMVKOLjLgvCkkvjg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nyevB-0091uz-8n; Tue, 07 Jun 2022 19:31:21 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nyev7-0091u7-SP for linux-arm-kernel@lists.infradead.org; Tue, 07 Jun 2022 19:31:19 +0000 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 1FE14611CA; Tue, 7 Jun 2022 19:31:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A0832C385A2; Tue, 7 Jun 2022 19:31:15 +0000 (UTC) Authentication-Results: smtp.kernel.org; dkim=pass (1024-bit key) header.d=zx2c4.com header.i=@zx2c4.com header.b="ezRz14S7" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zx2c4.com; s=20210105; t=1654630272; 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: in-reply-to:in-reply-to:references:references; bh=aIk3Rt4nDto2wWZJ+glqe0AEG6VQh1/nNLxNJJ+VXZQ=; b=ezRz14S7LF6mMOq6Y8L0jlHdpkHv5/MCl5Z6EXV61XdLF/2w+XGyhz5zXj8ZQqSGJlGW3q TKZJw2/TwkTK8xN8pMLyqzHxYkaMGeqWDEaBSHyQuowIiZYvWOrs0+akt9LBRFPvs69ClY BzBioCKFw9TzQO1WYsOtHnzigc1S7js= Received: by mail.zx2c4.com (ZX2C4 Mail Server) with ESMTPSA id e15e7cd2 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO); Tue, 7 Jun 2022 19:31:12 +0000 (UTC) From: "Jason A. Donenfeld" To: linux-arm-kernel , LKML Cc: "Jason A. Donenfeld" , Stephen Boyd , Phil Elwell , Ard Biesheuvel , Russel King , Catalin Marinas Subject: [PATCH v3] ARM: initialize jump labels before setup_machine_fdt() Date: Tue, 7 Jun 2022 21:30:44 +0200 Message-Id: <20220607193044.1063287-1-Jason@zx2c4.com> In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220607_123118_251145_2E021E2A X-CRM114-Status: GOOD ( 17.75 ) 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 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()"). The same basic issue applies to arm32 as well. So this commit adds a call to jump_label_init() just before setup_machine_fdt(). Since the page maps haven't been set yet, this also requires us to use the early patching code in the jump label code. Reported-by: Stephen Boyd Reported-by: Phil Elwell Cc: Ard Biesheuvel Cc: Russel King Cc: Catalin Marinas Fixes: f5bda35fba61 ("random: use static branch for crng_ready()") Signed-off-by: Jason A. Donenfeld --- arch/arm/kernel/jump_label.c | 3 ++- arch/arm/kernel/setup.c | 1 + arch/arm/mm/mmu.c | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/arch/arm/kernel/jump_label.c b/arch/arm/kernel/jump_label.c index 303b3ab87f7e..8f8c5312f917 100644 --- a/arch/arm/kernel/jump_label.c +++ b/arch/arm/kernel/jump_label.c @@ -8,6 +8,7 @@ static void __arch_jump_label_transform(struct jump_entry *entry, enum jump_label_type type, bool is_static) { + extern bool early_mm_initialized; void *addr = (void *)entry->code; unsigned int insn; @@ -16,7 +17,7 @@ static void __arch_jump_label_transform(struct jump_entry *entry, else insn = arm_gen_nop(); - if (is_static) + if (is_static || !early_mm_initialized) __patch_text_early(addr, insn); else patch_text(addr, insn); 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 = FDT_VIRT_BASE(__atags_pointer); setup_processor(); + jump_label_init(); if (atags_vaddr) { mdesc = setup_machine_fdt(atags_vaddr); if (mdesc) diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c index 5e2be37a198e..3f63a5581966 100644 --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c @@ -1754,10 +1754,13 @@ void __init paging_init(const struct machine_desc *mdesc) __flush_dcache_page(NULL, empty_zero_page); } +bool early_mm_initialized; + void __init early_mm_init(const struct machine_desc *mdesc) { build_mem_type_table(); early_paging_init(mdesc); + early_mm_initialized = true; } void set_pte_at(struct mm_struct *mm, unsigned long addr,