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 864C120C488; Tue, 29 Apr 2025 18:07:07 +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=1745950027; cv=none; b=gaQgvnlQDCmGXmiWkVUbfQhfbMddcU1Q0qz4aTWmh8t111RPSNbFU80q8qJRfUT2W+9j74b+0YdPa61lbrigq9ekcdt100wsTUgR3uPYlOmPY35qPCH/bo6ko+9GjC+AQrVVaA7sFafy7a9UBIYzL4w+FBvNhYclhYqUrbPXFmc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745950027; c=relaxed/simple; bh=KLvI1Thg1G+9RuGmvNq6EpGJjeDSeF8vEOHd0dDg7JU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AYKxFdUJjtL+3VWkjTGIt9RNKSDXdq9myEPrJzofPoNI1OcMZM707alylpXBXlO/iJEo815GDr2IOM3T4wvrkKaEXlTdnkA6gplvLYwxl+IpJiXp0Hy46nqrbV8XYUuazEJOX0T+TpTnRdjZ7/HYmc6/WFDFaYC7XGfGbLXhkAA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=UHCvcRLj; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="UHCvcRLj" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EC5B9C4CEE3; Tue, 29 Apr 2025 18:07:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1745950027; bh=KLvI1Thg1G+9RuGmvNq6EpGJjeDSeF8vEOHd0dDg7JU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UHCvcRLjYOHmIXHr11t8z7DyGgsCs7+jeJIAe8mHaRfLnjPOrVItBSlFhRTM0gKR7 Y1PiVLJiDV5rPgqL7vLNWajt4muqnjChCG1YQD2Q39XX4Drcj3egn7mfKdKZBtvk71 QWDXMXJJwZF83FQ4uu5/b/UTd+aFImPYW40mJenc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Josh Poimboeuf , Ingo Molnar , Sasha Levin Subject: [PATCH 6.1 134/167] x86/bugs: Use SBPB in write_ibpb() if applicable Date: Tue, 29 Apr 2025 18:44:02 +0200 Message-ID: <20250429161057.153200738@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250429161051.743239894@linuxfoundation.org> References: <20250429161051.743239894@linuxfoundation.org> User-Agent: quilt/0.68 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.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Josh Poimboeuf [ Upstream commit fc9fd3f98423367c79e0bd85a9515df26dc1b3cc ] write_ibpb() does IBPB, which (among other things) flushes branch type predictions on AMD. If the CPU has SRSO_NO, or if the SRSO mitigation has been disabled, branch type flushing isn't needed, in which case the lighter-weight SBPB can be used. The 'x86_pred_cmd' variable already keeps track of whether IBPB or SBPB should be used. Use that instead of hardcoding IBPB. Signed-off-by: Josh Poimboeuf Signed-off-by: Ingo Molnar Link: https://lore.kernel.org/r/17c5dcd14b29199b75199d67ff7758de9d9a4928.1744148254.git.jpoimboe@kernel.org Signed-off-by: Sasha Levin --- arch/x86/entry/entry.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/entry/entry.S b/arch/x86/entry/entry.S index f4419afc7147d..bda217961172b 100644 --- a/arch/x86/entry/entry.S +++ b/arch/x86/entry/entry.S @@ -16,7 +16,7 @@ SYM_FUNC_START(entry_ibpb) movl $MSR_IA32_PRED_CMD, %ecx - movl $PRED_CMD_IBPB, %eax + movl _ASM_RIP(x86_pred_cmd), %eax xorl %edx, %edx wrmsr -- 2.39.5