lkml.org 
[lkml]   [2016]   [May]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 28/67] xen: Fix page <-> pfn conversion on 32 bit systems
    Date
    4.4-stable review patch.  If anyone has any objections, please let me know.

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

    From: Ross Lagerwall <ross.lagerwall@citrix.com>

    commit 60901df3aed230d4565dca003f11b6a95fbf30d9 upstream.

    Commit 1084b1988d22dc165c9dbbc2b0e057f9248ac4db (xen: Add Xen specific
    page definition) caused a regression in 4.4.

    The xen functions to convert between pages and pfns fail due to an
    overflow on systems where a physical address may not fit in an
    unsigned long (e.g. x86 32 bit PAE systems). Rework the conversion to
    avoid overflow. This should also result in simpler object code.

    This bug manifested itself as disk corruption with Linux 4.4 when
    using blkfront in a Xen HVM x86 32 bit guest with more than 4 GiB of
    memory.

    Signed-off-by: Ross Lagerwall <ross.lagerwall@citrix.com>
    Signed-off-by: David Vrabel <david.vrabel@citrix.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    include/xen/page.h | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/include/xen/page.h
    +++ b/include/xen/page.h
    @@ -15,9 +15,9 @@
    */

    #define xen_pfn_to_page(xen_pfn) \
    - ((pfn_to_page(((unsigned long)(xen_pfn) << XEN_PAGE_SHIFT) >> PAGE_SHIFT)))
    + (pfn_to_page((unsigned long)(xen_pfn) >> (PAGE_SHIFT - XEN_PAGE_SHIFT)))
    #define page_to_xen_pfn(page) \
    - (((page_to_pfn(page)) << PAGE_SHIFT) >> XEN_PAGE_SHIFT)
    + ((page_to_pfn(page)) << (PAGE_SHIFT - XEN_PAGE_SHIFT))

    #define XEN_PFN_PER_PAGE (PAGE_SIZE / XEN_PAGE_SIZE)


    \
     
     \ /
      Last update: 2016-05-09 10:01    [W:4.814 / U:0.100 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site