From mboxrd@z Thu Jan  1 00:00:00 1970
From: Julien Grall <julien.grall@linaro.org>
Subject: Re: [PATCH v5 2/8] arch,
 arm: add consistency check to REMOVE p2m changes
Date: Mon, 07 Apr 2014 12:05:57 +0100
Message-ID: <53428695.6060204@linaro.org>
References: <1396827120-30617-1-git-send-email-avanzini.arianna@gmail.com>
	<1396827120-30617-3-git-send-email-avanzini.arianna@gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xen.org>
In-Reply-To: <1396827120-30617-3-git-send-email-avanzini.arianna@gmail.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: Arianna Avanzini <avanzini.arianna@gmail.com>
Cc: julien.grall@citrix.com, paolo.valente@unimore.it, keir@xen.org, stefano.stabellini@eu.citrix.com, tim@xen.org, dario.faggioli@citrix.com, Ian.Jackson@eu.citrix.com, xen-devel@lists.xen.org, Ian.Campbell@eu.citrix.com, etrudeau@broadcom.com, JBeulich@suse.com, viktor.kleinik@globallogic.com
List-Id: xen-devel@lists.xenproject.org

Hi Arianna,

Thank you for the patch.

On 04/07/2014 12:31 AM, Arianna Avanzini wrote:
> ---
>  xen/arch/arm/p2m.c | 27 +++++++++++++++++++++++++--
>  1 file changed, 25 insertions(+), 2 deletions(-)
> 
> diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c
> index 403fd89..395a0b2 100644
> --- a/xen/arch/arm/p2m.c
> +++ b/xen/arch/arm/p2m.c
> @@ -319,6 +319,7 @@ static int apply_p2m_changes(struct domain *d,
>              if ( !populate )
>              {
>                  addr = (addr + FIRST_SIZE) & FIRST_MASK;
> +                maddr = (maddr + FIRST_SIZE) & FIRST_MASK;
>                  continue;
>              }
>  
> @@ -345,6 +346,7 @@ static int apply_p2m_changes(struct domain *d,
>              if ( !populate )
>              {
>                  addr = (addr + SECOND_SIZE) & SECOND_MASK;
> +                maddr = (maddr + SECOND_SIZE) & SECOND_MASK;
>                  continue;
>              }
>  
> @@ -406,12 +408,32 @@ static int apply_p2m_changes(struct domain *d,
>                  {
>                      pte = mfn_to_p2m_entry(maddr >> PAGE_SHIFT, mattr, t);
>                      write_pte(&third[third_table_offset(addr)], pte);
> -                    maddr += PAGE_SIZE;
>                  }
>                  break;
> -            case RELINQUISH:
>              case REMOVE:
>                  {
> +                    unsigned long mfn;
> +
> +                    if ( !pte.p2m.valid )
> +                    {
> +                        count++;

count is only used for RELINQUISH mapping, you don't need to update here.

> +                        break;

I think we should fail if we can't remove rather than continuing.

Regards,

-- 
Julien Grall