From owner-svn-src-releng@freebsd.org Mon Nov 19 13:59:13 2018 Return-Path: Delivered-To: svn-src-releng@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8317811046BD; Mon, 19 Nov 2018 13:59:13 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 262ED76542; Mon, 19 Nov 2018 13:59:13 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DE55022EE1; Mon, 19 Nov 2018 13:59:12 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wAJDxCKR052072; Mon, 19 Nov 2018 13:59:12 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAJDxCc9052068; Mon, 19 Nov 2018 13:59:12 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201811191359.wAJDxCc9052068@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Mon, 19 Nov 2018 13:59:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r340627 - in releng/12.0/sys: amd64/vmm/intel x86/include x86/x86 X-SVN-Group: releng X-SVN-Commit-Author: kib X-SVN-Commit-Paths: in releng/12.0/sys: amd64/vmm/intel x86/include x86/x86 X-SVN-Commit-Revision: 340627 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 262ED76542 X-Spamd-Result: default: False [0.73 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_SPAM_SHORT(0.58)[0.584,0]; NEURAL_SPAM_MEDIUM(0.15)[0.147,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Nov 2018 13:59:13 -0000 Author: kib Date: Mon Nov 19 13:59:11 2018 New Revision: 340627 URL: https://svnweb.freebsd.org/changeset/base/340627 Log: MFS r340605: Align IA32_ARCH_CAP MSR definitions and use with SDM rev. 068. Approved by: re (gjb) Modified: releng/12.0/sys/amd64/vmm/intel/vmx.c releng/12.0/sys/x86/include/specialreg.h releng/12.0/sys/x86/x86/cpu_machdep.c releng/12.0/sys/x86/x86/identcpu.c Directory Properties: releng/12.0/ (props changed) Modified: releng/12.0/sys/amd64/vmm/intel/vmx.c ============================================================================== --- releng/12.0/sys/amd64/vmm/intel/vmx.c Mon Nov 19 10:01:03 2018 (r340626) +++ releng/12.0/sys/amd64/vmm/intel/vmx.c Mon Nov 19 13:59:11 2018 (r340627) @@ -814,7 +814,8 @@ vmx_init(int ipinum) return (error); } - guest_l1d_flush = (cpu_ia32_arch_caps & IA32_ARCH_CAP_RDCL_NO) == 0; + guest_l1d_flush = (cpu_ia32_arch_caps & + IA32_ARCH_CAP_SKIP_L1DFL_VMENTRY) == 0; TUNABLE_INT_FETCH("hw.vmm.l1d_flush", &guest_l1d_flush); /* Modified: releng/12.0/sys/x86/include/specialreg.h ============================================================================== --- releng/12.0/sys/x86/include/specialreg.h Mon Nov 19 10:01:03 2018 (r340626) +++ releng/12.0/sys/x86/include/specialreg.h Mon Nov 19 13:59:11 2018 (r340627) @@ -434,7 +434,9 @@ /* MSR IA32_ARCH_CAP(ABILITIES) bits */ #define IA32_ARCH_CAP_RDCL_NO 0x00000001 #define IA32_ARCH_CAP_IBRS_ALL 0x00000002 -#define IA32_ARCH_CAP_SSBD_NO 0x00000004 +#define IA32_ARCH_CAP_RSBA 0x00000004 +#define IA32_ARCH_CAP_SKIP_L1DFL_VMENTRY 0x00000008 +#define IA32_ARCH_CAP_SSB_NO 0x00000010 /* * CPUID manufacturers identifiers Modified: releng/12.0/sys/x86/x86/cpu_machdep.c ============================================================================== --- releng/12.0/sys/x86/x86/cpu_machdep.c Mon Nov 19 10:01:03 2018 (r340626) +++ releng/12.0/sys/x86/x86/cpu_machdep.c Mon Nov 19 13:59:11 2018 (r340627) @@ -891,7 +891,7 @@ hw_ssb_recalculate(bool all_cpus) hw_ssb_set(true, all_cpus); break; case 2: /* auto */ - hw_ssb_set((cpu_ia32_arch_caps & IA32_ARCH_CAP_SSBD_NO) != 0 ? + hw_ssb_set((cpu_ia32_arch_caps & IA32_ARCH_CAP_SSB_NO) != 0 ? false : true, all_cpus); break; } Modified: releng/12.0/sys/x86/x86/identcpu.c ============================================================================== --- releng/12.0/sys/x86/x86/identcpu.c Mon Nov 19 10:01:03 2018 (r340626) +++ releng/12.0/sys/x86/x86/identcpu.c Mon Nov 19 13:59:11 2018 (r340627) @@ -1014,6 +1014,9 @@ printcpuinfo(void) "\020" "\001RDCL_NO" "\002IBRS_ALL" + "\003RSBA" + "\004SKIP_L1DFL_VME" + "\005SSB_NO" ); }