[src/netbsd-7]: src/sys/arch/x86/x86 Pull up following revision(s) (requested...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a815f0640abe
branches:  netbsd-7
changeset: 798482:a815f0640abe
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Oct 30 18:58:45 2014 +0000

description:
Pull up following revision(s) (requested by riz in ticket #171):
        sys/arch/x86/x86/identcpu.c: revision 1.46
        sys/arch/x86/x86/identcpu.c: revision 1.47
Force x86_xsave_features to 0 when running under XEN.
This prevents the use of xsave and xrstor thus fixing
the problem in PR/49150.  The basic problem is that the way AMD
implements those instructions means that information can leak
between domains so XEN treats them as privileged.

diffstat:

 sys/arch/x86/x86/identcpu.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (28 lines):

diff -r d89f6bd5ac59 -r a815f0640abe sys/arch/x86/x86/identcpu.c
--- a/sys/arch/x86/x86/identcpu.c       Thu Oct 30 12:40:36 2014 +0000
+++ b/sys/arch/x86/x86/identcpu.c       Thu Oct 30 18:58:45 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: identcpu.c,v 1.45 2014/07/08 19:35:36 msaitoh Exp $    */
+/*     $NetBSD: identcpu.c,v 1.45.2.1 2014/10/30 18:58:45 martin Exp $ */
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: identcpu.c,v 1.45 2014/07/08 19:35:36 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: identcpu.c,v 1.45.2.1 2014/10/30 18:58:45 martin Exp $");
 
 #include "opt_xen.h"
 
@@ -757,7 +757,9 @@
        /* XXX these probably ought to be per-cpu */
        if (descs[2] > 512)
            x86_fpu_save_size = descs[2];
+#ifndef XEN
        x86_xsave_features = (uint64_t)descs[3] << 32 | descs[0];
+#endif
 }
 
 void