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 56F1DFD0048 for ; Sun, 1 Mar 2026 01:19: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:Content-Transfer-Encoding: MIME-Version:Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=lDGE4CMoAvEZhLbMs7isfXbJFpJExf2lQjQvJwZvxw4=; b=IE7qQdnbVcgxs/5+Xd3BTVtsyL ux23xv4yZfYbObH5q7rFNu+qsQx+2T7xVPYIKZF6mb2DXNJYxpQA5c/hd91QDIU6oeIlRlA18qRJ8 Brcep5fvNyGUSKCXfLf9t9fMbZ04oBAq5luYcH3ScBd8/gO2+aQzBt9cz/PW02t/zhqxPsk6LvL4J bwGlb0d/gdDK12ClDcQjMjNJ0neklc3PJeTzM2nK+FB1xbu3lklMRczJJh5+cqtlWATJg7KSbqH+k AOkyXU4fw65rNJCim82raDKP7XSa27ukyASwMQMA17/n+kS3F0kw5Ve/HnRAjxvRfHdGQo1eOPtMM Yz+Wj6JA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1vwVTG-0000000ATqU-1dYX; Sun, 01 Mar 2026 01:19:46 +0000 Received: from sea.source.kernel.org ([172.234.252.31]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1vwVT2-0000000ATZX-0xZQ for linux-arm-kernel@lists.infradead.org; Sun, 01 Mar 2026 01:19:43 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id B61A040164; Sun, 1 Mar 2026 01:19:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 080C4C19421; Sun, 1 Mar 2026 01:19:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772327971; bh=2M9vkXXL3bQw/LBh+BIy1+CbLyIf6zojcnCf0sXqJQU=; h=From:To:Cc:Subject:Date:From; b=vCgmXqeN81XhcUvFAPAZq700xMMWriIE8QqCyq4o03vNo4Wg7XE+Kb1msMIUrOt4p wGzU9cK8M2pCIIsVkiTEAFFIsH9EiFz/BCz0b0XYP0+j06HXQdBL3K1lobEGmpA2as tVkY124pYgeLUxIRNOHvMusxbhEvXBvmKcL5YQSXDkcrOgzSkCwOHInXk2FeAI34gg wlVs4cxEp8yFGjMqNYcrsO9kQWos8b/x5KFacUQW4seFdAC6kJtvQ2ioHH6sbBaQzP FiA8Jfay6jvUFna447R9GxPIYaE9Zi2RoBwZhBRGZ83XobuYaiVH+7huK9/sYdx6Fd /kyEkA603U95g== From: Sasha Levin To: stable@vger.kernel.org, leitao@debian.org Cc: Mark Rutland , Will Deacon , linux-arm-kernel@lists.infradead.org Subject: FAILED: Patch "arm64: Disable branch profiling for all arm64 code" failed to apply to 6.12-stable tree Date: Sat, 28 Feb 2026 20:19:29 -0500 Message-ID: <20260301011929.1674573-1-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 MIME-Version: 1.0 X-Patchwork-Hint: ignore X-stable: review Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260228_171932_347458_62916FCA X-CRM114-Status: GOOD ( 14.26 ) 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 The patch below does not apply to the 6.12-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . Thanks, Sasha ------------------ original commit in Linus's tree ------------------ >From f22c81bebf8bda6e54dc132df0ed54f6bf8756f9 Mon Sep 17 00:00:00 2001 From: Breno Leitao Date: Tue, 6 Jan 2026 02:16:35 -0800 Subject: [PATCH] arm64: Disable branch profiling for all arm64 code The arm64 kernel doesn't boot with annotated branches (PROFILE_ANNOTATED_BRANCHES) enabled and CONFIG_DEBUG_VIRTUAL together. Bisecting it, I found that disabling branch profiling in arch/arm64/mm solved the problem. Narrowing down a bit further, I found that physaddr.c is the file that needs to have branch profiling disabled to get the machine to boot. I suspect that it might invoke some ftrace helper very early in the boot process and ftrace is still not enabled(!?). Rather than playing whack-a-mole with individual files, disable branch profiling for the entire arch/arm64 tree, similar to what x86 already does in arch/x86/Kbuild. Cc: stable@vger.kernel.org Signed-off-by: Breno Leitao Acked-by: Mark Rutland Signed-off-by: Will Deacon --- arch/arm64/Kbuild | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm64/Kbuild b/arch/arm64/Kbuild index 5bfbf7d79c99b..d876bc0e54211 100644 --- a/arch/arm64/Kbuild +++ b/arch/arm64/Kbuild @@ -1,4 +1,8 @@ # SPDX-License-Identifier: GPL-2.0-only + +# Branch profiling isn't noinstr-safe +subdir-ccflags-$(CONFIG_TRACE_BRANCH_PROFILING) += -DDISABLE_BRANCH_PROFILING + obj-y += kernel/ mm/ net/ obj-$(CONFIG_KVM) += kvm/ obj-$(CONFIG_XEN) += xen/ -- 2.51.0