From nobody Mon Jun 22 23:39:01 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0AF45C433F5 for ; Tue, 15 Mar 2022 10:46:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347545AbiCOKrb (ORCPT ); Tue, 15 Mar 2022 06:47:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33944 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347366AbiCOKpk (ORCPT ); Tue, 15 Mar 2022 06:45:40 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B1FAB3980F; Tue, 15 Mar 2022 03:44:07 -0700 (PDT) Date: Tue, 15 Mar 2022 10:44:04 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1647341045; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kmuRiVt4S7lk81Sx0EKYCUvfVOF778wXcXwbJSt/SVU=; b=I1CuD1db6qLke+ZX9oS8nV9/4iTMR1c8w7STXznJvrSGDIBS7a/ow3cHpnZIDlvqi5x0mo 22gffIH8oty53Uu0npPxWCwNqDGEBXcrvw9Jau7GX4huDOHsLgRyWo9it9Vq783Xr1GgGY /TGjaf+UFxTtjgnHq0xaGGR5WM0J2y3x+Y3eV8J48G6FaQgOjZlqnxt/L2iHqv1EEl6QiJ KXebNzSjTyK3CwmakeWVZR/EC4daaKO7oELZTutGefcA/dniQarECpfDipL1BPrWwhWQfp 5zfcG4jX2kXgYdWl8PykgBGxYJA92v7sXL5xHR2iu66WgUz53jRdAXHyWUB8fw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1647341045; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kmuRiVt4S7lk81Sx0EKYCUvfVOF778wXcXwbJSt/SVU=; b=YhLln9qZvDC9UIwXf2LynKO5A9el/DOveyqm4PJMArSQDZdPflqhTqn9oudDVn860Y8pvE lDRRYbKXr5SUcPBQ== From: "tip-bot2 for Peter Zijlstra" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/core] x86/ibt,crypto: Add ENDBR for the jump-table entries Cc: "Peter Zijlstra (Intel)" , Josh Poimboeuf , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20220308154318.110500806@infradead.org> References: <20220308154318.110500806@infradead.org> MIME-Version: 1.0 Message-ID: <164734104492.16921.1303395725859323707.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the x86/core branch of tip: Commit-ID: 214b9a83b617367d53680812ad09687542370b8e Gitweb: https://git.kernel.org/tip/214b9a83b617367d53680812ad0968754= 2370b8e Author: Peter Zijlstra AuthorDate: Tue, 08 Mar 2022 16:30:27 +01:00 Committer: Peter Zijlstra CommitterDate: Tue, 15 Mar 2022 10:32:36 +01:00 x86/ibt,crypto: Add ENDBR for the jump-table entries The code does: ## branch into array mov jump_table(,%rax,8), %bufp JMP_NOSPEC bufp resulting in needing to mark the jump-table entries with ENDBR. Signed-off-by: Peter Zijlstra (Intel) Acked-by: Josh Poimboeuf Link: https://lore.kernel.org/r/20220308154318.110500806@infradead.org --- arch/x86/crypto/crc32c-pcl-intel-asm_64.S | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/x86/crypto/crc32c-pcl-intel-asm_64.S b/arch/x86/crypto/cr= c32c-pcl-intel-asm_64.S index 80c0d22..ec35915 100644 --- a/arch/x86/crypto/crc32c-pcl-intel-asm_64.S +++ b/arch/x86/crypto/crc32c-pcl-intel-asm_64.S @@ -195,6 +195,7 @@ crc_array: .altmacro LABEL crc_ %i .noaltmacro + ENDBR crc32q -i*8(block_0), crc_init crc32q -i*8(block_1), crc1 crc32q -i*8(block_2), crc2 @@ -204,6 +205,7 @@ LABEL crc_ %i .altmacro LABEL crc_ %i .noaltmacro + ENDBR crc32q -i*8(block_0), crc_init crc32q -i*8(block_1), crc1 # SKIP crc32 -i*8(block_2), crc2 ; Don't do this one yet @@ -237,6 +239,7 @@ LABEL crc_ %i ################################################################ =20 LABEL crc_ 0 + ENDBR mov tmp, len cmp $128*24, tmp jae full_block