lkml.org 
[lkml]   [2013]   [Dec]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.10 30/52] xen/gnttab: leave lazy MMU mode in the case of a m2p override failure
    Date
    3.10-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Matt Wilson <msw@amazon.com>

    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>

    ---
    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
    @@ -920,9 +920,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();

    @@ -953,9 +954,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();




    \
     
     \ /
      Last update: 2013-12-10 11:41    [W:2.933 / U:0.140 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site