diff options
| author | Matt Wilson <msw@amazon.com> | 2013-11-20 12:11:35 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-11 22:36:27 -0800 |
| commit | c52348079702c2fa0fcc74e2ac5ba81c70a47fbc (patch) | |
| tree | 71c2cd25c52ab195e948ced5cd77ae830ade5b5d /drivers/xen | |
| parent | ca62ebe3b1b6f3c9835cf84d1ba6e1f091c39726 (diff) | |
| download | linux-3.10-c52348079702c2fa0fcc74e2ac5ba81c70a47fbc.tar.gz linux-3.10-c52348079702c2fa0fcc74e2ac5ba81c70a47fbc.tar.bz2 linux-3.10-c52348079702c2fa0fcc74e2ac5ba81c70a47fbc.zip | |
xen/gnttab: leave lazy MMU mode in the case of a m2p override failure
commit 14883a75ec76b44759385fb12629f4a0f1aef4e3 upstream.
Commit f62805f1 introduced a bug where lazy MMU mode isn't exited if a
m2p_add/remove_override call fails.
Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Reviewed-by: David Vrabel <david.vrabel@citrix.com>
Reviewed-by: Anthony Liguori <aliguori@amazon.com>
Signed-off-by: Matt Wilson <msw@amazon.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/xen')
| -rw-r--r-- | drivers/xen/grant-table.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c index d5418c1be9a..840604ed023 100644 --- a/drivers/xen/grant-table.c +++ b/drivers/xen/grant-table.c @@ -920,9 +920,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(); @@ -953,9 +954,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(); |