lkml.org 
[lkml]   [2012]   [Aug]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 4/7] mm: pass fault address to clear_huge_page()
    Date
    From: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>

    Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
    ---
    include/linux/mm.h | 2 +-
    mm/huge_memory.c | 2 +-
    mm/hugetlb.c | 3 ++-
    mm/memory.c | 7 ++++---
    4 files changed, 8 insertions(+), 6 deletions(-)

    diff --git a/include/linux/mm.h b/include/linux/mm.h
    index 311be90..2858723 100644
    --- a/include/linux/mm.h
    +++ b/include/linux/mm.h
    @@ -1638,7 +1638,7 @@ extern void dump_page(struct page *page);

    #if defined(CONFIG_TRANSPARENT_HUGEPAGE) || defined(CONFIG_HUGETLBFS)
    extern void clear_huge_page(struct page *page,
    - unsigned long addr,
    + unsigned long haddr, unsigned long fault_address,
    unsigned int pages_per_huge_page);
    extern void copy_user_huge_page(struct page *dst, struct page *src,
    unsigned long addr, struct vm_area_struct *vma,
    diff --git a/mm/huge_memory.c b/mm/huge_memory.c
    index 6f0825b611..070bf89 100644
    --- a/mm/huge_memory.c
    +++ b/mm/huge_memory.c
    @@ -644,7 +644,7 @@ static int __do_huge_pmd_anonymous_page(struct mm_struct *mm,
    if (unlikely(!pgtable))
    return VM_FAULT_OOM;

    - clear_huge_page(page, haddr, HPAGE_PMD_NR);
    + clear_huge_page(page, haddr, address, HPAGE_PMD_NR);
    __SetPageUptodate(page);

    spin_lock(&mm->page_table_lock);
    diff --git a/mm/hugetlb.c b/mm/hugetlb.c
    index 3c86d3d..5182192 100644
    --- a/mm/hugetlb.c
    +++ b/mm/hugetlb.c
    @@ -2718,7 +2718,8 @@ retry:
    ret = VM_FAULT_SIGBUS;
    goto out;
    }
    - clear_huge_page(page, haddr, pages_per_huge_page(h));
    + clear_huge_page(page, haddr, fault_address,
    + pages_per_huge_page(h));
    __SetPageUptodate(page);

    if (vma->vm_flags & VM_MAYSHARE) {
    diff --git a/mm/memory.c b/mm/memory.c
    index 5736170..dfc179b 100644
    --- a/mm/memory.c
    +++ b/mm/memory.c
    @@ -3984,19 +3984,20 @@ static void clear_gigantic_page(struct page *page,
    }
    }
    void clear_huge_page(struct page *page,
    - unsigned long addr, unsigned int pages_per_huge_page)
    + unsigned long haddr, unsigned long fault_address,
    + unsigned int pages_per_huge_page)
    {
    int i;

    if (unlikely(pages_per_huge_page > MAX_ORDER_NR_PAGES)) {
    - clear_gigantic_page(page, addr, pages_per_huge_page);
    + clear_gigantic_page(page, haddr, pages_per_huge_page);
    return;
    }

    might_sleep();
    for (i = 0; i < pages_per_huge_page; i++) {
    cond_resched();
    - clear_user_highpage(page + i, addr + i * PAGE_SIZE);
    + clear_user_highpage(page + i, haddr + i * PAGE_SIZE);
    }
    }

    --
    1.7.7.6


    \
     
     \ /
      Last update: 2012-08-16 18:22    [W:3.615 / U:0.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site