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 2622B2F8E83; Thu, 28 May 2026 20:19:12 +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=1779999553; cv=none; b=CEWZnAlpx5tbUF+9/4wTd9eNFcInA20JDYi/M6+4QVKmcNDIovZqAfY1G5i+Ps5TjWDtI2gvDRTHfGNiE5GYUzE96uGmJfAVGY45Vw9jWqgiEqN0/Es/Mvthcke4thAB3AeaKAFWsmONBdeDMRQUN4mIQPHEtr6Y0uKVi8gwOXg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779999553; c=relaxed/simple; bh=/NknHXXIMsUk5p6XNBz/q2Y4RZhzVnGtwagdOiHw6CY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jHayc/bS25AqbueHoDG3TwWp9/mu0yfC576ATfd0pa9eu0/DZFOj2Z1i+2p2zqlgRuOtWYGpVo5a1cVrvp+31YHmkdfFM5T+46+TL6E3Yy9SV35RxAdhPAY1OVlkEGEN9q2XspkS8sE5dlUI87OcA84EClJYL1TQcHb36NuQLF8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=S55vp4Ba; 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="S55vp4Ba" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 844271F00A3A; Thu, 28 May 2026 20:19:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1779999552; bh=/tz5S4EouP4gHcgp+68w7l9Ex8bUekrD1nDXKDJ8hrE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=S55vp4Bam7lcl4QWODoGOyT8ROrdhv2R60hoZ+WadqNcP5cSAxxFIbIvkBsm6UroA ZO4F3RPVBp0CZQ+4W0aJv63XQl+sjLBP5regaG+SXZwx3TsTjeiaJ4/Tu8gzTePdzE 0N+le4aj8aT+V/VAKhX0LFNRonrt1ee6CbeNWoaA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Vladimir Murzin , Catalin Marinas Subject: [PATCH 6.18 106/377] arm64: probes: Handle probes on hinted conditional branch instructions Date: Thu, 28 May 2026 21:45:44 +0200 Message-ID: <20260528194641.411152381@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260528194638.371537336@linuxfoundation.org> References: <20260528194638.371537336@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-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 @@ -409,7 +409,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)