Received-SPF: pass (google.com: domain of linux-kernel+bounces-110004-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
From: Borislav Petkov <bp@alien8.de>
To: X86 ML <x86@kernel.org>
Cc: LKML <linux-kernel@vger.kernel.org>,
	Boris Ostrovsky <boris.ostrovsky@oracle.com>,
	"Maciej S. Szmigiero" <maciej.szmigiero@oracle.com>
Subject: [PATCH 2/2] x86/CPU/AMD: Improve the erratum 1386 workaround
Date: Thu, 21 Mar 2024 13:05:48 +0100
Message-ID: <20240321120548.22687-2-bp@alien8.de>
In-Reply-To: <20240321120548.22687-1-bp@alien8.de>
References: <20240321120548.22687-1-bp@alien8.de>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

From: "Borislav Petkov (AMD)" <bp@alien8.de>

Disable XSAVES only on machines which haven't loaded the microcode
revision containing the erratum fix.

This will come in handy when running archaic OSes as guests. OSes whose
brilliant programmers thought that CPUID is overrated and one should not
query it but use features directly, ala shoot first, ask questions
later... but only if you're alive after the shooting.

Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: "Maciej S. Szmigiero" <maciej.szmigiero@oracle.com>
---
 arch/x86/kernel/cpu/amd.c | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
index 6d8677e80ddb..c02b07feff6e 100644
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@ -15,6 +15,7 @@
 #include <asm/cpu.h>
 #include <asm/spec-ctrl.h>
 #include <asm/smp.h>
+#include <asm/microcode.h>
 #include <asm/numa.h>
 #include <asm/pci-direct.h>
 #include <asm/delay.h>
@@ -804,6 +805,16 @@ static void init_amd_bd(struct cpuinfo_x86 *c)
=20
 static void fix_erratum_1386(struct cpuinfo_x86 *c)
 {
+	u8 fam, model, stpng, rev;
+	union zen_patch_rev p;
+
+	p.ucode_rev =3D c->microcode;
+
+	fam   =3D p.ext_fam + 0xf;
+	model =3D p.ext_model << 4 | p.model;
+	stpng =3D p.stepping;
+	rev   =3D p.rev;
+
 	/*
 	 * Work around Erratum 1386.  The XSAVES instruction malfunctions in
 	 * certain circumstances on Zen1/2 uarch, and not all parts have had
@@ -811,7 +822,24 @@ static void fix_erratum_1386(struct cpuinfo_x86 *c)
 	 *
 	 * Affected parts all have no supervisor XSAVE states, meaning that
 	 * the XSAVEC instruction (which works fine) is equivalent.
+	 *
+	 * Clear the feature flag only on microcode revisions which
+	 * don't have the fix.
 	 */
+	if (fam   =3D=3D c->x86 &&
+	    model =3D=3D c->x86_model &&
+	    stpng =3D=3D c->x86_stepping) {
+		if (fam =3D=3D 0x17) {
+			if (model =3D=3D 0x1 && stpng =3D=3D 0x2) {
+				if (rev >=3D 0x6e)
+					return;
+			} else if (model =3D=3D 0x31 && stpng =3D=3D 0x0) {
+				if (rev >=3D 0x52)
+					return;
+			}
+		}
+	}
+
 	clear_cpu_cap(c, X86_FEATURE_XSAVES);
 }
=20
--=20
2.43.0