From mboxrd@z Thu Jan  1 00:00:00 1970
From: Keir Fraser <keir.xen@gmail.com>
Subject: Re: [PATCH] x86/xsave: also save/restore XCR0 across
 suspend (ACPI S3)
Date: Mon, 21 Oct 2013 15:07:51 +0100
Message-ID: <CE8AF3C7.61112%keir.xen@gmail.com>
References: <5264FDDC02000078000FC4BD@nat28.tlf.novell.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xen.org>
Received: from mail6.bemta4.messagelabs.com ([85.158.143.247])
	by lists.xen.org with esmtp (Exim 4.72)
	(envelope-from <keir.xen@gmail.com>) id 1VYG9F-0002ug-Bk
	for xen-devel@lists.xenproject.org; Mon, 21 Oct 2013 14:07:57 +0000
Received: by mail-wi0-f177.google.com with SMTP id h11so4055753wiv.10
	for <xen-devel@lists.xenproject.org>;
	Mon, 21 Oct 2013 07:07:56 -0700 (PDT)
In-Reply-To: <5264FDDC02000078000FC4BD@nat28.tlf.novell.com>
List-Unsubscribe: <http://lists.xen.org/cgi-bin/mailman/options/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xen.org>
List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help>
List-Subscribe: <http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=subscribe>
Sender: xen-devel-bounces@lists.xen.org
Errors-To: xen-devel-bounces@lists.xen.org
To: Jan Beulich <JBeulich@suse.com>, xen-devel <xen-devel@lists.xenproject.org>
List-Id: xen-devel@lists.xenproject.org

On 21/10/2013 09:11, "Jan Beulich" <JBeulich@suse.com> wrote:

> Signed-off-by: Jan Beulich <jbeulich@suse.com>

Acked-by: Keir Fraser <keir@xen.org>

> --- a/xen/arch/x86/acpi/suspend.c
> +++ b/xen/arch/x86/acpi/suspend.c
> @@ -13,12 +13,14 @@
>  #include <asm/hvm/hvm.h>
>  #include <asm/hvm/support.h>
>  #include <asm/i387.h>
> +#include <asm/xstate.h>
>  #include <xen/hypercall.h>
>  
>  static unsigned long saved_lstar, saved_cstar;
>  static unsigned long saved_sysenter_esp, saved_sysenter_eip;
>  static unsigned long saved_fs_base, saved_gs_base, saved_kernel_gs_base;
>  static uint16_t saved_segs[4];
> +static uint64_t saved_xcr0;
>  
>  void save_rest_processor_state(void)
>  {
> @@ -38,6 +40,8 @@ void save_rest_processor_state(void)
>          rdmsrl(MSR_IA32_SYSENTER_ESP, saved_sysenter_esp);
>          rdmsrl(MSR_IA32_SYSENTER_EIP, saved_sysenter_eip);
>      }
> +    if ( cpu_has_xsave )
> +        saved_xcr0 = get_xcr0();
>  }
>  
>  
> @@ -77,6 +81,9 @@ void restore_rest_processor_state(void)
>          do_set_segment_base(SEGBASE_GS_USER_SEL, saved_segs[3]);
>      }
>  
> +    if ( cpu_has_xsave && !set_xcr0(saved_xcr0) )
> +        BUG();
> +
>      /* Maybe load the debug registers. */
>      BUG_ON(is_hvm_vcpu(curr));
>      if ( !is_idle_vcpu(curr) && curr->arch.debugreg[7] )
> 
> 
>