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 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 AEBFFD711B0 for ; Wed, 20 Nov 2024 15:14:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=yWc8/VM9RaL6t5aIfBHNZxsmQ2GPhB4JV5f5Rhn5e5I=; b=gfr//rGa6mmH6OngdgFO6MRrXe 22wk/ZhkaV8u+JnTU9EiM+5S0wpolHJy3f3uqJ25aHEkYcZ84L/q2eOb8RooiRGrZOQ2Cw1Z6KPCt jkZzt4YFDLRr43eL9Ozj3qtG10+ksbjFjzmFWizKnW+KfrC+gR7jVqqgyx2B0kbSt5iHG9OQzVkEJ 2JtdzM0P5scRwx7i+fp+34LutolLWFKfAp+rdqlJyinQUV6GSjk3pMdElPlqmwEozIKMwNU4C59NU 403EnXUZ8LqgRxZSf9E8dKtNpT06EZdf8O/yXI3cCviVOfg1PWSrprXvIYqnm1byk0/GjO9YHho3C HL/1z6gw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tDmPg-0000000Ff0Y-0k9Z; Wed, 20 Nov 2024 15:14:40 +0000 Received: from nyc.source.kernel.org ([2604:1380:45d1:ec00::3]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tDmOk-0000000Ferd-1NE5 for linux-arm-kernel@lists.infradead.org; Wed, 20 Nov 2024 15:13:43 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id A1D3DA431E9; Wed, 20 Nov 2024 15:11:47 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 245D4C4CECD; Wed, 20 Nov 2024 15:13:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1732115620; bh=yYsWTQBIMD66SABAUXfCYw2uFwXuceiArk0rR9d0OxQ=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=g3aS6CeOXkJpy+IgbAMv19UCKWR0mwxWb4lKwmER/FXkWvVOe3dWB/5N3XWRj81XD LTFeVjm2lq/Of7hrUKd9kxfvOk1JL1QS//3XUvmU/7OMCYsRs17cIxOm9qB8u0bs+X JOVkcJ6MJnlrZJJbOo4kMspZU0UvXqxE6cnSmUuYnTcPcyhz0ChVjXvPI57/pc9Wm0 CH19C2eqyPZMjZtXoWizJbDurUwIpBCO25n4Fen8Mrp+8nDRWzbQNys/ux+nuanRQw Q42AE1k8INrejX3OP2gNGAq0nWPUKA9yZSQyRrXJWgHRNsUta47UjwgaJRJZNUM6yG BOx8Nvl2eyaeQ== Date: Wed, 20 Nov 2024 08:13:38 -0700 From: Nathan Chancellor To: Sasha Levin Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org, Linus Walleij , kernel test robot , Russell King , linux@armlinux.org.uk, arnd@arndb.de, samitolvanen@google.com, linux-arm-kernel@lists.infradead.org, llvm@lists.linux.dev Subject: Re: [PATCH AUTOSEL 6.6 5/6] ARM: 9434/1: cfi: Fix compilation corner case Message-ID: <20241120151338.GA3158726@thelio-3990X> References: <20241120140647.1768984-1-sashal@kernel.org> <20241120140647.1768984-5-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20241120140647.1768984-5-sashal@kernel.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241120_071342_424986_4A5E0718 X-CRM114-Status: GOOD ( 22.08 ) 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 Hi Sasha, On Wed, Nov 20, 2024 at 09:06:35AM -0500, Sasha Levin wrote: > From: Linus Walleij > > [ Upstream commit 4aea16b7cfb76bd3361858ceee6893ef5c9b5570 ] > > When enabling expert mode CONFIG_EXPERT and using that power > user mode to disable the branch prediction hardening > !CONFIG_HARDEN_BRANCH_PREDICTOR, the assembly linker > in CLANG notices that some assembly in proc-v7.S does > not have corresponding C call sites, i.e. the prototypes > in proc-v7-bugs.c are enclosed in ifdef > CONFIG_HARDEN_BRANCH_PREDICTOR so this assembly: > > SYM_TYPED_FUNC_START(cpu_v7_smc_switch_mm) > SYM_TYPED_FUNC_START(cpu_v7_hvc_switch_mm) > > Results in: > > ld.lld: error: undefined symbol: __kcfi_typeid_cpu_v7_smc_switch_mm > >>> referenced by proc-v7.S:94 (.../arch/arm/mm/proc-v7.S:94) > >>> arch/arm/mm/proc-v7.o:(.text+0x108) in archive vmlinux.a > > ld.lld: error: undefined symbol: __kcfi_typeid_cpu_v7_hvc_switch_mm > >>> referenced by proc-v7.S:105 (.../arch/arm/mm/proc-v7.S:105) > >>> arch/arm/mm/proc-v7.o:(.text+0x124) in archive vmlinux.a > > Fix this by adding an additional requirement that > CONFIG_HARDEN_BRANCH_PREDICTOR has to be enabled to compile > these assembly calls. > > Closes: https://lore.kernel.org/oe-kbuild-all/202411041456.ZsoEiD7T-lkp@intel.com/ > > Reported-by: kernel test robot > Reviewed-by: Nathan Chancellor > Signed-off-by: Linus Walleij > Signed-off-by: Russell King (Oracle) > Signed-off-by: Sasha Levin > --- > arch/arm/mm/proc-v7.S | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S > index 193c7aeb67039..bea11f9bfe856 100644 > --- a/arch/arm/mm/proc-v7.S > +++ b/arch/arm/mm/proc-v7.S > @@ -93,7 +93,7 @@ ENTRY(cpu_v7_dcache_clean_area) > ret lr > ENDPROC(cpu_v7_dcache_clean_area) > > -#ifdef CONFIG_ARM_PSCI > +#if defined(CONFIG_ARM_PSCI) && defined(CONFIG_HARDEN_BRANCH_PREDICTOR) > .arch_extension sec > ENTRY(cpu_v7_smc_switch_mm) This patch is unnecessary in branches prior to 6.10 (when ARM started supporting kCFI) because SYM_TYPED_FUNC_START() is not used here. I would just drop it for 6.6 and earlier. > stmfd sp!, {r0 - r3} > -- > 2.43.0 >