From: Dave Hansen <dave.han...@linux.intel.com>
We will use this in non-KVM code in the next patch.
Note that we are also renaming the macro. It is not really
an 'XSTATE' like would go in XSTATE_BV, or be used as part
of the "instruction mask". It goes in XCOMP_BV, so make
that explicit in the name.
Signed-off-by: Dave Hansen <dave.han...@linux.intel.com>
Cc: x...@kernel.org
Cc: Fenghua Yu <fenghua...@intel.com>
Cc: Borislav Petkov <b...@alien8.de>
Cc: Oleg Nesterov <o...@redhat.com>
Cc: Andy Lutomirski <l...@amacapital.net>
---
b/arch/x86/include/asm/xsave.h | 2 ++
b/arch/x86/kvm/x86.c | 7 +++----
2 files changed, 5 insertions(+), 4 deletions(-)
diff -puN arch/x86/include/asm/xsave.h~x86-fpu-take-kvm-def-and-make-generic
arch/x86/include/asm/xsave.h
--- a/arch/x86/include/asm/xsave.h~x86-fpu-take-kvm-def-and-make-generic
2015-04-28 09:15:28.503683137 -0700
+++ b/arch/x86/include/asm/xsave.h 2015-04-28 09:15:28.522683994 -0700
@@ -38,6 +38,8 @@
/* All currently supported features */
#define XCNTXT_MASK (XSTATE_LAZY | XSTATE_EAGER)
+#define XCOMP_BV_COMPACTION_ENABLED (1ULL << 63)
+
#ifdef CONFIG_X86_64
#define REX_PREFIX "0x48, "
#else
diff -puN arch/x86/kvm/x86.c~x86-fpu-take-kvm-def-and-make-generic
arch/x86/kvm/x86.c
--- a/arch/x86/kvm/x86.c~x86-fpu-take-kvm-def-and-make-generic 2015-04-28
09:15:28.508683362 -0700
+++ b/arch/x86/kvm/x86.c 2015-04-28 09:15:28.534684535 -0700
@@ -3169,8 +3169,6 @@ static int kvm_vcpu_ioctl_x86_set_debugr
return 0;
}
-#define XSTATE_COMPACTION_ENABLED (1ULL << 63)
-
static void fill_xsave(u8 *dest, struct kvm_vcpu *vcpu)
{
struct xsave_struct *xsave = &vcpu->arch.guest_fpu.state->xsave;
@@ -3222,7 +3220,8 @@ static void load_xsave(struct kvm_vcpu *
/* Set XSTATE_BV and possibly XCOMP_BV. */
xsave->xsave_hdr.xstate_bv = xstate_bv;
if (cpu_has_xsaves)
- xsave->xsave_hdr.xcomp_bv = host_xcr0 |
XSTATE_COMPACTION_ENABLED;
+ xsave->xsave_hdr.xcomp_bv =
+ host_xcr0 | XCOMP_BV_COMPACTION_ENABLED;
/*
* Copy each region from the non-compacted offset to the
@@ -6992,7 +6991,7 @@ int fx_init(struct kvm_vcpu *vcpu)
fpu_finit(&vcpu->arch.guest_fpu);
if (cpu_has_xsaves)
vcpu->arch.guest_fpu.state->xsave.xsave_hdr.xcomp_bv =
- host_xcr0 | XSTATE_COMPACTION_ENABLED;
+ host_xcr0 | XCOMP_BV_COMPACTION_ENABLED;
/*
* Ensure guest xcr0 is valid for loading
_
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
