From 85f0d4dfc0aca7b8513d64f675644a37950e4e41 Mon Sep 17 00:00:00 2001 From: Taylor R Campbell Date: Mon, 24 Jul 2023 21:21:59 +0000 Subject: [PATCH] x86: Apply AMD's workaround for Zenbleed. XXX pullup-8 XXX pullup-9 XXX pullup-10 --- sys/arch/x86/include/specialreg.h | 1 + sys/arch/x86/x86/errata.c | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/sys/arch/x86/include/specialreg.h b/sys/arch/x86/include/specialreg.h index d6d7c0a4f069..3f828cf74001 100644 --- a/sys/arch/x86/include/specialreg.h +++ b/sys/arch/x86/include/specialreg.h @@ -1394,6 +1394,7 @@ #define MSR_DE_CFG 0xc0011029 #define DE_CFG_ERRATA_721 0x00000001 #define DE_CFG_LFENCE_SERIALIZE __BIT(1) +#define DE_CFG_ERRATA_ZENBLEED __BIT(9) #define DE_CFG_ERRATA_1021 __BIT(13) #define MSR_BU_CFG2 0xc001102a diff --git a/sys/arch/x86/x86/errata.c b/sys/arch/x86/x86/errata.c index d127116912eb..a911e62124f6 100644 --- a/sys/arch/x86/x86/errata.c +++ b/sys/arch/x86/x86/errata.c @@ -162,6 +162,10 @@ static const uint8_t x86_errata_set15[] = { KB_A1, ML_A1, OINK }; +static const uint8_t x86_errata_set16[] = { + ZP_B2, PiR_B2, OINK +}; + static bool x86_errata_setmsr(struct cpu_info *, errata_t *); static bool x86_errata_testmsr(struct cpu_info *, errata_t *); @@ -361,6 +365,16 @@ static errata_t errata[] = { 1095, FALSE, MSR_LS_CFG, x86_errata_set13, x86_errata_setmsr, LS_CFG_ERRATA_1095 }, + /* + * Zenbleed: + * https://www.amd.com/en/resources/product-security/bulletin/amd-sb-7008.html + * https://github.com/google/security-research/security/advisories/GHSA-v6wh-rxpg-cmm8 + * https://lock.cmpxchg8b.com/zenbleed.html + */ + { + -1, FALSE, MSR_DE_CFG, x86_errata_set16, + x86_errata_setmsr, DE_CFG_ERRATA_ZENBLEED, + }, }; static bool