lkml.org 
[lkml]   [2018]   [Feb]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.15 122/163] xen: Fix {set,clear}_foreign_p2m_mapping on autotranslating guests
    Date
    4.15-stable review patch.  If anyone has any objections, please let me know.

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

    From: Simon Gaiser <simon@invisiblethingslab.com>

    commit 781198f1f373c3e350dbeb3af04a7d4c81c1b8d7 upstream.

    Commit 82616f9599a7 ("xen: remove tests for pvh mode in pure pv paths")
    removed the check for autotranslation from {set,clear}_foreign_p2m_mapping
    but those are called by grant-table.c also on PVH/HVM guests.

    Cc: <stable@vger.kernel.org> # 4.14
    Fixes: 82616f9599a7 ("xen: remove tests for pvh mode in pure pv paths")
    Signed-off-by: Simon Gaiser <simon@invisiblethingslab.com>
    Reviewed-by: Juergen Gross <jgross@suse.com>
    Signed-off-by: Juergen Gross <jgross@suse.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    arch/x86/xen/p2m.c | 6 ++++++
    1 file changed, 6 insertions(+)

    --- a/arch/x86/xen/p2m.c
    +++ b/arch/x86/xen/p2m.c
    @@ -694,6 +694,9 @@ int set_foreign_p2m_mapping(struct gntta
    int i, ret = 0;
    pte_t *pte;

    + if (xen_feature(XENFEAT_auto_translated_physmap))
    + return 0;
    +
    if (kmap_ops) {
    ret = HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref,
    kmap_ops, count);
    @@ -736,6 +739,9 @@ int clear_foreign_p2m_mapping(struct gnt
    {
    int i, ret = 0;

    + if (xen_feature(XENFEAT_auto_translated_physmap))
    + return 0;
    +
    for (i = 0; i < count; i++) {
    unsigned long mfn = __pfn_to_mfn(page_to_pfn(pages[i]));
    unsigned long pfn = page_to_pfn(pages[i]);

    \
     
     \ /
      Last update: 2018-02-21 14:28    [W:2.739 / U:0.096 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site