From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7BA0F262FEC for ; Sun, 1 Mar 2026 01:59:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772330382; cv=none; b=Achomre6846A+1WF81Uq21ckxkCClzA+8CAFmDb7EDWYdq1Nf+Oo8egNaqtN5H2n2FWr703nfhP3o3fu3QoJTb3Nu8iPq/579h4nuzHAg9+8FR+afMUZ9pVCyUpWAvQAQJ/yjiONgpDrTfthHxlUxfCCorkDxPjQEuwUyH7ZYIA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772330382; c=relaxed/simple; bh=W/DX8cr5K+Id0xUvca8y8W493BwMPzfRlKkjr1izSOs=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=KzKsPuVMLpqb31beNfAo58UsKofm9Vfvx0jSuEIhgYG+oA9llM2rrsYUrlnIIBM6Hez/OgpP8TazBIWL6+UX6E9qU0CKGSTztLDP+PgmD1UmFpb5xjGuuF42AgbBmSVNAak/mv+VljRAqFgnQh4RPDe4sSxmmi7GuHvIIdjHuME= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=psfDbIr5; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="psfDbIr5" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CB8FAC19421; Sun, 1 Mar 2026 01:59:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772330382; bh=W/DX8cr5K+Id0xUvca8y8W493BwMPzfRlKkjr1izSOs=; h=From:To:Cc:Subject:Date:From; b=psfDbIr5JfR2sTip6QgnXREJgf9gwSCRbjjoD5ZnOOC6bUvLbH1KzdFJgO1XyZ1hF /MRAYuxeXGeD4JE9Us4AaABL/D6jUgtqT5vxkYBbLIRwXWpCFZs1TlAsWurRiGlq6Y uu2KzosEkNIACzwaNtenfH0QdkJH8GLY/HxOwQr7Y5UBaeziKWSWHWjlq8/QWe9OuL Tw21nML0kPoTT144P7creOvn1xMA3ufIbUcyZ+nrgiODjV5Dn7QYGilQdluZG25jn/ Hq6ZMKcTOzaVg2EgQx3K4Dc5dO9zNPaR0phZaJryMKTXkuANDh9C85vKdQ3v7p3n4H L3LQ/t1xiCDSA== 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 5.10-stable tree Date: Sat, 28 Feb 2026 20:59:40 -0500 Message-ID: <20260301015940.1725516-1-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Hint: ignore X-stable: review Content-Transfer-Encoding: 8bit The patch below does not apply to the 5.10-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