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 6270FEEC8; Tue, 8 Oct 2024 12:18:18 +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=1728389898; cv=none; b=UR43rbrJv3l43W+kllT7d/WUwD8Ja0bRbjUWX0r9qLh/+ER2e/pfwa88T8+YW/EKSf1IEHPgDqTdISZyuympO6qK7q0OmbYkntv90P4PCi7+KLhpqFD70z/h3fbHwVOejLcllZjxmrq33hHtwRsqgOVWw15UCMb/rvHqXGTrxFg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728389898; c=relaxed/simple; bh=Fks232i+ltgkFT1/YcARPxoSwoeDB+4sBIaA/NfrkY4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RGmCSaF4SkbPQR9mGTja5MYXRKM3WIyH84QtDzOqIwGWRX2S8EwfPHinfg+BjnvbtSzeTl2J0pi6rNEgGVHnizByIchED8/YU7Z81uGoTlVRzoizVaFUdvvZaP0XBXaSurs6GSWlqXk4gu6fuF8y9IaFUKP7vZEBB7XNmkOeO5w= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=gVF+TH8F; 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="gVF+TH8F" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9A08DC4CEC7; Tue, 8 Oct 2024 12:18:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1728389898; bh=Fks232i+ltgkFT1/YcARPxoSwoeDB+4sBIaA/NfrkY4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gVF+TH8FVcfw4DVkQQtRSDTQJHD84Ah1QsDssiMN4R5r6FR5GEmv7Jr01cH5KbgDj DMr8pSi9IfnUb01nBu5Wg6FkMucVr8dme4v+FCz6SYktt0rfVPXVSlIPD2tmTfkrYq QTyaIqdGANCmi/QB7oAGh6TEI/uZQfNi4lryUpBw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, David Kaplan , "Borislav Petkov (AMD)" , Josh Poimboeuf , Sasha Levin Subject: [PATCH 6.10 130/482] x86/bugs: Fix handling when SRSO mitigation is disabled Date: Tue, 8 Oct 2024 14:03:13 +0200 Message-ID: <20241008115653.420590972@linuxfoundation.org> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241008115648.280954295@linuxfoundation.org> References: <20241008115648.280954295@linuxfoundation.org> User-Agent: quilt/0.67 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.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: David Kaplan [ Upstream commit 1dbb6b1495d472806fef1f4c94f5b3e4c89a3c1d ] When the SRSO mitigation is disabled, either via mitigations=off or spec_rstack_overflow=off, the warning about the lack of IBPB-enhancing microcode is printed anyway. This is unnecessary since the user has turned off the mitigation. [ bp: Massage, drop SBPB rationale as it doesn't matter because when mitigations are disabled x86_pred_cmd is not being used anyway. ] Signed-off-by: David Kaplan Signed-off-by: Borislav Petkov (AMD) Acked-by: Josh Poimboeuf Link: https://lore.kernel.org/r/20240904150711.193022-1-david.kaplan@amd.com Signed-off-by: Sasha Levin --- arch/x86/kernel/cpu/bugs.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c index b6f927f6c567e..47c84503ad9be 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c @@ -2545,10 +2545,9 @@ static void __init srso_select_mitigation(void) { bool has_microcode = boot_cpu_has(X86_FEATURE_IBPB_BRTYPE); - if (cpu_mitigations_off()) - return; - - if (!boot_cpu_has_bug(X86_BUG_SRSO)) { + if (!boot_cpu_has_bug(X86_BUG_SRSO) || + cpu_mitigations_off() || + srso_cmd == SRSO_CMD_OFF) { if (boot_cpu_has(X86_FEATURE_SBPB)) x86_pred_cmd = PRED_CMD_SBPB; return; @@ -2579,11 +2578,6 @@ static void __init srso_select_mitigation(void) } switch (srso_cmd) { - case SRSO_CMD_OFF: - if (boot_cpu_has(X86_FEATURE_SBPB)) - x86_pred_cmd = PRED_CMD_SBPB; - return; - case SRSO_CMD_MICROCODE: if (has_microcode) { srso_mitigation = SRSO_MITIGATION_MICROCODE; @@ -2637,6 +2631,8 @@ static void __init srso_select_mitigation(void) pr_err("WARNING: kernel not compiled with MITIGATION_SRSO.\n"); } break; + default: + break; } out: -- 2.43.0