Date: Wed, 27 May 2020 18:17:40 +0000 (UTC) From: Konstantin Belousov <kib@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r361556 - stable/12/sys/x86/x86 Message-ID: <202005271817.04RIHe80053681@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kib Date: Wed May 27 18:17:40 2020 New Revision: 361556 URL: https://svnweb.freebsd.org/changeset/base/361556 Log: MFC r361299: Do not consider CAP_RDCL_NO as an indicator for all MDS vulnerabilities handled by hardware. Modified: stable/12/sys/x86/x86/cpu_machdep.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/x86/x86/cpu_machdep.c ============================================================================== --- stable/12/sys/x86/x86/cpu_machdep.c Wed May 27 17:49:32 2020 (r361555) +++ stable/12/sys/x86/x86/cpu_machdep.c Wed May 27 18:17:40 2020 (r361556) @@ -1019,11 +1019,11 @@ hw_mds_recalculate(void) * reported. For instance, hypervisor might unknowingly * filter the cap out. * For the similar reasons, and for testing, allow to enable - * mitigation even for RDCL_NO or MDS_NO caps. + * mitigation even when MDS_NO cap is set. */ if (cpu_vendor_id != CPU_VENDOR_INTEL || hw_mds_disable == 0 || - ((cpu_ia32_arch_caps & (IA32_ARCH_CAP_RDCL_NO | - IA32_ARCH_CAP_MDS_NO)) != 0 && hw_mds_disable == 3)) { + ((cpu_ia32_arch_caps & IA32_ARCH_CAP_MDS_NO) != 0 && + hw_mds_disable == 3)) { mds_handler = mds_handler_void; } else if (((cpu_stdext_feature3 & CPUID_STDEXT3_MD_CLEAR) != 0 && hw_mds_disable == 3) || hw_mds_disable == 1) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202005271817.04RIHe80053681>