From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 0584C35DA65; Thu, 28 May 2026 20:36:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780000592; cv=none; b=tuJurmnD7CJEHksMLeQO0Zxl+NtEaSRCulH0TLruUn+922gzdIqovFG4OBjd+56KH4dlB3hv8CDP7ENBz19DtpPwYcTk6zu6gIcLrA0oPuY+fzKjWSGgNR2qsF/yDj0RBF4gP8och62KvBhCoj24C1YjzEawrdsjIO4srws2O7Q= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780000592; c=relaxed/simple; bh=e1ylb7LGsB8mAanEubvfzi8U1F6XcHO/3tQrPlLfaM4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Cp57qrJldQyIyhQGOw6NCREMlZrnEbox7JF1aLgA3NHAMkTIpVG5a7sqwuogNCJl/bEaWQRPKO27O3PLqaEwSieBINHcyA0XROCKUXncDOmOb8x1yEv5eLUI8Wad+L5EQxyddnF6qz1b7CDnXAxgrDb5W6AOb/YvC5JQ3Gh8w9o= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=gx4+l3ey; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="gx4+l3ey" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 638921F000E9; Thu, 28 May 2026 20:36:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1780000590; bh=xMYCQib99tmPsFfrBMXr73aYiNb3TyA5MZgt2phTriI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=gx4+l3eyR9WA4id7frKASLbZLqL8PxgNzEzUewlhxt5fXJMOjFj7+qWrHmSTfSvWC FPOR2VovxBdCcw3GfUxbrxkNRf/cbp+dsffcqnTY5XebSrK2iGIQFMIo/E4UaVNrHX nLXPz95cPiHCJlt8mK2jbqBAw9CtIlSy/oIPYaR4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Vladimir Murzin , Catalin Marinas Subject: [PATCH 6.12 100/272] arm64: probes: Handle probes on hinted conditional branch instructions Date: Thu, 28 May 2026 21:47:54 +0200 Message-ID: <20260528194632.181882237@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260528194629.379955525@linuxfoundation.org> References: <20260528194629.379955525@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Vladimir Murzin commit 2ccd8ff980b50e842481bae71102fa3883fc4377 upstream. BC.cond instructions introduced by FEAT_HBC cannot be executed out-of-line, like other branch instructions. However, they can be simulated in the same way as B.cond instructions. Extend the B.cond decoder mask to match BC.cond instructions as well, and handle them using the existing B.cond simulation path. Fixes: 7f86d128e437 ("arm64: add HWCAP for FEAT_HBC (hinted conditional branches)") Cc: Signed-off-by: Vladimir Murzin Signed-off-by: Catalin Marinas Signed-off-by: Greg Kroah-Hartman --- arch/arm64/include/asm/insn.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/arm64/include/asm/insn.h +++ b/arch/arm64/include/asm/insn.h @@ -405,7 +405,7 @@ __AARCH64_INSN_FUNCS(cbz, 0x7F000000, 0x __AARCH64_INSN_FUNCS(cbnz, 0x7F000000, 0x35000000) __AARCH64_INSN_FUNCS(tbz, 0x7F000000, 0x36000000) __AARCH64_INSN_FUNCS(tbnz, 0x7F000000, 0x37000000) -__AARCH64_INSN_FUNCS(bcond, 0xFF000010, 0x54000000) +__AARCH64_INSN_FUNCS(bcond, 0xFF000000, 0x54000000) __AARCH64_INSN_FUNCS(svc, 0xFFE0001F, 0xD4000001) __AARCH64_INSN_FUNCS(hvc, 0xFFE0001F, 0xD4000002) __AARCH64_INSN_FUNCS(smc, 0xFFE0001F, 0xD4000003)