lkml.org 
[lkml]   [2015]   [May]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.0 024/220] mm/hugetlb: use pmd_page() in follow_huge_pmd()
    Date
    4.0-stable review patch.  If anyone has any objections, please let me know.

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

    From: Gerald Schaefer <gerald.schaefer@de.ibm.com>

    commit 97534127012f0e396eddea4691f4c9b170aed74b upstream.

    Commit 61f77eda9bbf ("mm/hugetlb: reduce arch dependent code around
    follow_huge_*") broke follow_huge_pmd() on s390, where pmd and pte
    layout differ and using pte_page() on a huge pmd will return wrong
    results. Using pmd_page() instead fixes this.

    All architectures that were touched by that commit have pmd_page()
    defined, so this should not break anything on other architectures.

    Fixes: 61f77eda "mm/hugetlb: reduce arch dependent code around follow_huge_*"
    Signed-off-by: Gerald Schaefer <gerald.schaefer@de.ibm.com>
    Acked-by: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
    Cc: Hugh Dickins <hughd@google.com>
    Cc: Michal Hocko <mhocko@suse.cz>
    Cc: Andrea Arcangeli <aarcange@redhat.com>
    Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
    Acked-by: David Rientjes <rientjes@google.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    mm/hugetlb.c | 3 +--
    1 file changed, 1 insertion(+), 2 deletions(-)

    --- a/mm/hugetlb.c
    +++ b/mm/hugetlb.c
    @@ -3735,8 +3735,7 @@ retry:
    if (!pmd_huge(*pmd))
    goto out;
    if (pmd_present(*pmd)) {
    - page = pte_page(*(pte_t *)pmd) +
    - ((address & ~PMD_MASK) >> PAGE_SHIFT);
    + page = pmd_page(*pmd) + ((address & ~PMD_MASK) >> PAGE_SHIFT);
    if (flags & FOLL_GET)
    get_page(page);
    } else {



    \
     
     \ /
      Last update: 2015-05-02 21:21    [W:6.314 / U:0.148 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site