From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Stefano Stabellini , Boris Ostrovsky , David Vrabel , Anthony Liguori , Matt Wilson , Konrad Rzeszutek Wilk Subject: [PATCH 3.12 42/62] xen/gnttab: leave lazy MMU mode in the case of a m2p override failure Date: Tue, 10 Dec 2013 00:01:13 -0800 Message-Id: <20131210080100.385364332@linuxfoundation.org> In-Reply-To: <20131210080057.415644748@linuxfoundation.org> References: <20131210080057.415644748@linuxfoundation.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: 3.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Matt Wilson 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 Cc: Boris Ostrovsky Reviewed-by: David Vrabel Reviewed-by: Anthony Liguori Signed-off-by: Matt Wilson Signed-off-by: Konrad Rzeszutek Wilk Signed-off-by: Greg Kroah-Hartman --- drivers/xen/grant-table.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) --- a/drivers/xen/grant-table.c +++ b/drivers/xen/grant-table.c @@ -921,9 +921,10 @@ int gnttab_map_refs(struct gnttab_map_gr 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(); @@ -954,9 +955,10 @@ int gnttab_unmap_refs(struct gnttab_unma 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();