* Re: [Xen-devel] [PATCH] xen/gnttab: leave lazy MMU mode in the case of a m2p override failure
2013-11-20 20:11 [PATCH] xen/gnttab: leave lazy MMU mode in the case of a m2p override failure Matt Wilson
@ 2013-11-20 21:04 ` Anthony Liguori
2013-11-21 11:19 ` David Vrabel
` (2 subsequent siblings)
3 siblings, 0 replies; 7+ messages in thread
From: Anthony Liguori @ 2013-11-20 21:04 UTC (permalink / raw)
To: Matt Wilson
Cc: xen-devel, Matt Wilson, Stefano Stabellini, linux-kernel,
David Vrabel, Anthony Liguori, Boris Ostrovsky
On Wed, Nov 20, 2013 at 12:11 PM, Matt Wilson <msw@linux.com> wrote:
> From: Matt Wilson <msw@amazon.com>
>
> Commit f62805f1 introduced a bug where lazy MMU mode isn't exited if a
> m2p_add/remove_override call fails.
>
> Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
> Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
> Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
> Cc: David Vrabel <david.vrabel@citrix.com>
> Cc: Anthony Liguori <aliguori@amazon.com>
> Cc: xen-devel@lists.xenproject.org
> Cc: linux-kernel@vger.kernel.org
> Signed-off-by: Matt Wilson <msw@amazon.com>
Reviewed-by: Anthony Liguori <aliguori@amazon.com>
Regards,
Anthony Liguori
> ---
> drivers/xen/grant-table.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c
> index 62ccf54..0283871 100644
> --- a/drivers/xen/grant-table.c
> +++ b/drivers/xen/grant-table.c
> @@ -930,9 +930,10 @@ int gnttab_map_refs(struct gnttab_map_grant_ref *map_ops,
> ret = m2p_add_override(mfn, pages[i], kmap_ops ?
> &kmap_ops[i] : NULL);
> if (ret)
> - return ret;
> + goto out;
> }
>
> + out:
> if (lazy)
> arch_leave_lazy_mmu_mode();
>
> @@ -969,9 +970,10 @@ int gnttab_unmap_refs(struct gnttab_unmap_grant_ref *unmap_ops,
> ret = m2p_remove_override(pages[i], kmap_ops ?
> &kmap_ops[i] : NULL);
> if (ret)
> - return ret;
> + goto out;
> }
>
> + out:
> if (lazy)
> arch_leave_lazy_mmu_mode();
>
> --
> 1.7.9.5
>
>
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] xen/gnttab: leave lazy MMU mode in the case of a m2p override failure
2013-11-20 20:11 [PATCH] xen/gnttab: leave lazy MMU mode in the case of a m2p override failure Matt Wilson
2013-11-20 21:04 ` [Xen-devel] " Anthony Liguori
@ 2013-11-21 11:19 ` David Vrabel
2013-11-21 18:39 ` Stefano Stabellini
2013-11-22 15:21 ` Konrad Rzeszutek Wilk
3 siblings, 0 replies; 7+ messages in thread
From: David Vrabel @ 2013-11-21 11:19 UTC (permalink / raw)
To: Matt Wilson
Cc: xen-devel, Matt Wilson, Stefano Stabellini,
Konrad Rzeszutek Wilk, Boris Ostrovsky, Anthony Liguori,
linux-kernel
On 20/11/13 20:11, Matt Wilson wrote:
> From: Matt Wilson <msw@amazon.com>
>
> Commit f62805f1 introduced a bug where lazy MMU mode isn't exited if a
> m2p_add/remove_override call fails.
Reviewed-by: David Vrabel <david.vrabel@citrix.com>
Should be tagged for stable.
David
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] xen/gnttab: leave lazy MMU mode in the case of a m2p override failure
2013-11-20 20:11 [PATCH] xen/gnttab: leave lazy MMU mode in the case of a m2p override failure Matt Wilson
2013-11-20 21:04 ` [Xen-devel] " Anthony Liguori
2013-11-21 11:19 ` David Vrabel
@ 2013-11-21 18:39 ` Stefano Stabellini
2013-11-22 15:21 ` Konrad Rzeszutek Wilk
3 siblings, 0 replies; 7+ messages in thread
From: Stefano Stabellini @ 2013-11-21 18:39 UTC (permalink / raw)
To: Matt Wilson
Cc: xen-devel, Matt Wilson, Stefano Stabellini,
Konrad Rzeszutek Wilk, Boris Ostrovsky, David Vrabel,
Anthony Liguori, linux-kernel
On Wed, 20 Nov 2013, Matt Wilson wrote:
> From: Matt Wilson <msw@amazon.com>
>
> Commit f62805f1 introduced a bug where lazy MMU mode isn't exited if a
> m2p_add/remove_override call fails.
>
> Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
> Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
> Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
> Cc: David Vrabel <david.vrabel@citrix.com>
> Cc: Anthony Liguori <aliguori@amazon.com>
> Cc: xen-devel@lists.xenproject.org
> Cc: linux-kernel@vger.kernel.org
> Signed-off-by: Matt Wilson <msw@amazon.com>
Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
> drivers/xen/grant-table.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c
> index 62ccf54..0283871 100644
> --- a/drivers/xen/grant-table.c
> +++ b/drivers/xen/grant-table.c
> @@ -930,9 +930,10 @@ int gnttab_map_refs(struct gnttab_map_grant_ref *map_ops,
> ret = m2p_add_override(mfn, pages[i], kmap_ops ?
> &kmap_ops[i] : NULL);
> if (ret)
> - return ret;
> + goto out;
> }
>
> + out:
> if (lazy)
> arch_leave_lazy_mmu_mode();
>
> @@ -969,9 +970,10 @@ int gnttab_unmap_refs(struct gnttab_unmap_grant_ref *unmap_ops,
> ret = m2p_remove_override(pages[i], kmap_ops ?
> &kmap_ops[i] : NULL);
> if (ret)
> - return ret;
> + goto out;
> }
>
> + out:
> if (lazy)
> arch_leave_lazy_mmu_mode();
>
> --
> 1.7.9.5
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] xen/gnttab: leave lazy MMU mode in the case of a m2p override failure
2013-11-20 20:11 [PATCH] xen/gnttab: leave lazy MMU mode in the case of a m2p override failure Matt Wilson
` (2 preceding siblings ...)
2013-11-21 18:39 ` Stefano Stabellini
@ 2013-11-22 15:21 ` Konrad Rzeszutek Wilk
2013-11-29 12:22 ` Stefano Stabellini
3 siblings, 1 reply; 7+ messages in thread
From: Konrad Rzeszutek Wilk @ 2013-11-22 15:21 UTC (permalink / raw)
To: Matt Wilson, Stefano Stabellini
Cc: xen-devel, Matt Wilson, Stefano Stabellini, Boris Ostrovsky,
David Vrabel, Anthony Liguori, linux-kernel
On Wed, Nov 20, 2013 at 12:11:35PM -0800, Matt Wilson wrote:
> From: Matt Wilson <msw@amazon.com>
>
> Commit f62805f1 introduced a bug where lazy MMU mode isn't exited if a
> m2p_add/remove_override call fails.
Stefano?
>
> Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
> Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
> Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
> Cc: David Vrabel <david.vrabel@citrix.com>
> Cc: Anthony Liguori <aliguori@amazon.com>
> Cc: xen-devel@lists.xenproject.org
> Cc: linux-kernel@vger.kernel.org
> Signed-off-by: Matt Wilson <msw@amazon.com>
> ---
> drivers/xen/grant-table.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c
> index 62ccf54..0283871 100644
> --- a/drivers/xen/grant-table.c
> +++ b/drivers/xen/grant-table.c
> @@ -930,9 +930,10 @@ int gnttab_map_refs(struct gnttab_map_grant_ref *map_ops,
> ret = m2p_add_override(mfn, pages[i], kmap_ops ?
> &kmap_ops[i] : NULL);
> if (ret)
> - return ret;
> + goto out;
> }
>
> + out:
> if (lazy)
> arch_leave_lazy_mmu_mode();
>
> @@ -969,9 +970,10 @@ int gnttab_unmap_refs(struct gnttab_unmap_grant_ref *unmap_ops,
> ret = m2p_remove_override(pages[i], kmap_ops ?
> &kmap_ops[i] : NULL);
> if (ret)
> - return ret;
> + goto out;
> }
>
> + out:
> if (lazy)
> arch_leave_lazy_mmu_mode();
>
> --
> 1.7.9.5
>
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] xen/gnttab: leave lazy MMU mode in the case of a m2p override failure
2013-11-22 15:21 ` Konrad Rzeszutek Wilk
@ 2013-11-29 12:22 ` Stefano Stabellini
2013-12-02 21:43 ` Konrad Rzeszutek Wilk
0 siblings, 1 reply; 7+ messages in thread
From: Stefano Stabellini @ 2013-11-29 12:22 UTC (permalink / raw)
To: Konrad Rzeszutek Wilk
Cc: Matt Wilson, Stefano Stabellini, xen-devel, Matt Wilson,
Boris Ostrovsky, David Vrabel, Anthony Liguori, linux-kernel
On Fri, 22 Nov 2013, Konrad Rzeszutek Wilk wrote:
> On Wed, Nov 20, 2013 at 12:11:35PM -0800, Matt Wilson wrote:
> > From: Matt Wilson <msw@amazon.com>
> >
> > Commit f62805f1 introduced a bug where lazy MMU mode isn't exited if a
> > m2p_add/remove_override call fails.
>
> Stefano?
>
Already acked here:
http://marc.info/?l=linux-kernel&m=138505917602905&w=2
> > Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
> > Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
> > Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
> > Cc: David Vrabel <david.vrabel@citrix.com>
> > Cc: Anthony Liguori <aliguori@amazon.com>
> > Cc: xen-devel@lists.xenproject.org
> > Cc: linux-kernel@vger.kernel.org
> > Signed-off-by: Matt Wilson <msw@amazon.com>
> > ---
> > drivers/xen/grant-table.c | 6 ++++--
> > 1 file changed, 4 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c
> > index 62ccf54..0283871 100644
> > --- a/drivers/xen/grant-table.c
> > +++ b/drivers/xen/grant-table.c
> > @@ -930,9 +930,10 @@ int gnttab_map_refs(struct gnttab_map_grant_ref *map_ops,
> > ret = m2p_add_override(mfn, pages[i], kmap_ops ?
> > &kmap_ops[i] : NULL);
> > if (ret)
> > - return ret;
> > + goto out;
> > }
> >
> > + out:
> > if (lazy)
> > arch_leave_lazy_mmu_mode();
> >
> > @@ -969,9 +970,10 @@ int gnttab_unmap_refs(struct gnttab_unmap_grant_ref *unmap_ops,
> > ret = m2p_remove_override(pages[i], kmap_ops ?
> > &kmap_ops[i] : NULL);
> > if (ret)
> > - return ret;
> > + goto out;
> > }
> >
> > + out:
> > if (lazy)
> > arch_leave_lazy_mmu_mode();
> >
> > --
> > 1.7.9.5
> >
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] xen/gnttab: leave lazy MMU mode in the case of a m2p override failure
2013-11-29 12:22 ` Stefano Stabellini
@ 2013-12-02 21:43 ` Konrad Rzeszutek Wilk
0 siblings, 0 replies; 7+ messages in thread
From: Konrad Rzeszutek Wilk @ 2013-12-02 21:43 UTC (permalink / raw)
To: Stefano Stabellini
Cc: Matt Wilson, xen-devel, Matt Wilson, Boris Ostrovsky,
David Vrabel, Anthony Liguori, linux-kernel
On Fri, Nov 29, 2013 at 12:22:40PM +0000, Stefano Stabellini wrote:
> On Fri, 22 Nov 2013, Konrad Rzeszutek Wilk wrote:
> > On Wed, Nov 20, 2013 at 12:11:35PM -0800, Matt Wilson wrote:
> > > From: Matt Wilson <msw@amazon.com>
> > >
> > > Commit f62805f1 introduced a bug where lazy MMU mode isn't exited if a
> > > m2p_add/remove_override call fails.
> >
> > Stefano?
> >
>
> Already acked here:
>
> http://marc.info/?l=linux-kernel&m=138505917602905&w=2
Sent to Linus today.
Thank you!
>
>
>
> > > Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
> > > Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
> > > Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
> > > Cc: David Vrabel <david.vrabel@citrix.com>
> > > Cc: Anthony Liguori <aliguori@amazon.com>
> > > Cc: xen-devel@lists.xenproject.org
> > > Cc: linux-kernel@vger.kernel.org
> > > Signed-off-by: Matt Wilson <msw@amazon.com>
> > > ---
> > > drivers/xen/grant-table.c | 6 ++++--
> > > 1 file changed, 4 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c
> > > index 62ccf54..0283871 100644
> > > --- a/drivers/xen/grant-table.c
> > > +++ b/drivers/xen/grant-table.c
> > > @@ -930,9 +930,10 @@ int gnttab_map_refs(struct gnttab_map_grant_ref *map_ops,
> > > ret = m2p_add_override(mfn, pages[i], kmap_ops ?
> > > &kmap_ops[i] : NULL);
> > > if (ret)
> > > - return ret;
> > > + goto out;
> > > }
> > >
> > > + out:
> > > if (lazy)
> > > arch_leave_lazy_mmu_mode();
> > >
> > > @@ -969,9 +970,10 @@ int gnttab_unmap_refs(struct gnttab_unmap_grant_ref *unmap_ops,
> > > ret = m2p_remove_override(pages[i], kmap_ops ?
> > > &kmap_ops[i] : NULL);
> > > if (ret)
> > > - return ret;
> > > + goto out;
> > > }
> > >
> > > + out:
> > > if (lazy)
> > > arch_leave_lazy_mmu_mode();
> > >
> > > --
> > > 1.7.9.5
> > >
> >
^ permalink raw reply [flat|nested] 7+ messages in thread