lkml.org 
[lkml]   [2019]   [Aug]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.14 09/30] x86/mm: Check for pfn instead of page in vmalloc_sync_one()
    Date
    From: Joerg Roedel <jroedel@suse.de>

    [ Upstream commit 51b75b5b563a2637f9d8dc5bd02a31b2ff9e5ea0 ]

    Do not require a struct page for the mapped memory location because it
    might not exist. This can happen when an ioremapped region is mapped with
    2MB pages.

    Fixes: 5d72b4fba40ef ('x86, mm: support huge I/O mapping capability I/F')
    Signed-off-by: Joerg Roedel <jroedel@suse.de>
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Reviewed-by: Dave Hansen <dave.hansen@linux.intel.com>
    Link: https://lkml.kernel.org/r/20190719184652.11391-2-joro@8bytes.org
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/x86/mm/fault.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
    index b162f92fd55cf..407522db3d9ea 100644
    --- a/arch/x86/mm/fault.c
    +++ b/arch/x86/mm/fault.c
    @@ -266,7 +266,7 @@ static inline pmd_t *vmalloc_sync_one(pgd_t *pgd, unsigned long address)
    if (!pmd_present(*pmd))
    set_pmd(pmd, *pmd_k);
    else
    - BUG_ON(pmd_page(*pmd) != pmd_page(*pmd_k));
    + BUG_ON(pmd_pfn(*pmd) != pmd_pfn(*pmd_k));

    return pmd_k;
    }
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-08-02 15:25    [W:2.154 / U:0.260 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site