From mboxrd@z Thu Jan  1 00:00:00 1970
From: "Tian, Kevin" <kevin.tian@intel.com>
Subject: Re: [PATCH 1/4] x86/EPT: consider page order when
 checking for APIC MFN
Date: Mon, 28 Apr 2014 07:38:32 +0000
Message-ID: <AADFC41AFE54684AB9EE6CBC0274A5D125E53AE3@SHSMSX101.ccr.corp.intel.com>
References: <53579447020000780000B2A9@nat28.tlf.novell.com>
	<53579876020000780000B2E2@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 <kevin.tian@intel.com>) id 1Weg98-0000X6-DD
	for xen-devel@lists.xenproject.org; Mon, 28 Apr 2014 07:38:38 +0000
In-Reply-To: <53579876020000780000B2E2@nat28.tlf.novell.com>
Content-Language: en-US
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>
Cc: Keir Fraser <keir@xen.org>, "Dong, Eddie" <eddie.dong@intel.com>, "Nakajima,
	Jun" <jun.nakajima@intel.com>, Tim Deegan <tim@xen.org>
List-Id: xen-devel@lists.xenproject.org

> From: Jan Beulich [mailto:JBeulich@suse.com]
> Sent: Wednesday, April 23, 2014 4:40 PM
> 
> This was overlooked in 3d90d6e6 ("x86/EPT: split super pages upon
> mismatching memory types").
> 
> Signed-off-by: Jan Beulich <jbeulich@suse.com>

Acked-by: Kevin Tian <kevin.tian@intel.com>

> 
> --- a/xen/arch/x86/hvm/mtrr.c
> +++ b/xen/arch/x86/hvm/mtrr.c
> @@ -816,15 +816,18 @@ int epte_get_entry_emt(struct domain *d,
>            !has_arch_pdevs(d)) )
>      {
>          ASSERT(!direct_mmio ||
> -               mfn_x(mfn) ==
> d->arch.hvm_domain.vmx.apic_access_mfn);
> +               !((mfn_x(mfn) ^
> d->arch.hvm_domain.vmx.apic_access_mfn) >>
> +                 order));
>          *ipat = 1;
>          return MTRR_TYPE_WRBACK;
>      }
> 
>      if ( direct_mmio )
>      {
> -        if ( mfn_x(mfn) != d->arch.hvm_domain.vmx.apic_access_mfn )
> +        if ( (mfn_x(mfn) ^ d->arch.hvm_domain.vmx.apic_access_mfn) >>
> order )
>              return MTRR_TYPE_UNCACHABLE;
> +        if ( order )
> +            return -1;
>          *ipat = 1;
>          return MTRR_TYPE_WRBACK;
>      }
> 
>