From mboxrd@z Thu Jan  1 00:00:00 1970
From: Wei Liu <wei.liu2@citrix.com>
Subject: Re: [PATCH] x86/p2m: fix mismatched unlock
Date: Mon, 14 Sep 2015 09:45:02 +0100
Message-ID: <20150914084502.GA2728@zion.uk.xensource.com>
References: <55F68FBB02000078000A268C@prv-mh.provo.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.bemta5.messagelabs.com ([195.245.231.135])
	by lists.xen.org with esmtp (Exim 4.72)
	(envelope-from <prvs=692b41408=wei.liu2@citrix.com>)
	id 1ZbPNq-0003T4-ND
	for xen-devel@lists.xenproject.org; Mon, 14 Sep 2015 08:45:06 +0000
Content-Disposition: inline
In-Reply-To: <55F68FBB02000078000A268C@prv-mh.provo.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>
Cc: George Dunlap <George.Dunlap@eu.citrix.com>, xen-devel <xen-devel@lists.xenproject.org>, Keir Fraser <keir@xen.org>, Wei Liu <wei.liu2@citrix.com>, Andrew Cooper <andrew.cooper3@citrix.com>
List-Id: xen-devel@lists.xenproject.org

On Mon, Sep 14, 2015 at 01:13:31AM -0600, Jan Beulich wrote:
> Luckily, due to gfn_unlock() currently mapping to p2m_unlock(), this is
> only a cosmetic issue right now.
> 
> Signed-off-by: Jan Beulich <jbeulich@suse.com>

Reviewed-by: Wei Liu <wei.liu2@citrix.com>

> ---
> Despite its cosmetic nature I think it would be better to also fix this
> in 4.6.

Release-acked-by: Wei Liu <wei.liu2@citrix.com>

> 
> --- a/xen/arch/x86/mm/p2m.c
> +++ b/xen/arch/x86/mm/p2m.c
> @@ -912,7 +912,7 @@ static int set_typed_p2m_entry(struct do
>      omfn = p2m->get_entry(p2m, gfn, &ot, &a, 0, NULL, NULL);
>      if ( p2m_is_grant(ot) || p2m_is_foreign(ot) )
>      {
> -        p2m_unlock(p2m);
> +        gfn_unlock(p2m, gfn, 0);
>          domain_crash(d);
>          return -ENOENT;
>      }
> 
> 
> 

> x86/p2m: fix mismatched unlock
> 
> Luckily, due to gfn_unlock() currently mapping to p2m_unlock(), this is
> only a cosmetic issue right now.
> 
> Signed-off-by: Jan Beulich <jbeulich@suse.com>
> ---
> Despite its cosmetic nature I think it would be better to also fix this
> in 4.6.
> 
> --- a/xen/arch/x86/mm/p2m.c
> +++ b/xen/arch/x86/mm/p2m.c
> @@ -912,7 +912,7 @@ static int set_typed_p2m_entry(struct do
>      omfn = p2m->get_entry(p2m, gfn, &ot, &a, 0, NULL, NULL);
>      if ( p2m_is_grant(ot) || p2m_is_foreign(ot) )
>      {
> -        p2m_unlock(p2m);
> +        gfn_unlock(p2m, gfn, 0);
>          domain_crash(d);
>          return -ENOENT;
>      }