lkml.org 
[lkml]   [2002]   [Oct]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subjectabstract out prefaulting from alloc_shared_hugetlb_pages()
    In order for hugetlbfs to operate, prefaulting the vma at mmap()-time
    while simultaneously instantiating and performing lookups on its
    ratcache entries is needed as an isolated operation. This is implemented
    as part of a different function within hugetlbpage.c that ties it to
    inode and key lookup and allocation. The following patch simply moves
    the code already present into its own function, calls it, and makes it
    available for hugetlbfs to use.

    The BUG() checks for alignment etc. are consistent with current usage
    within sys_alloc_hugepages() and its associated get_addr():

    in get_addr():

    if (addr) {
    addr = HPAGE_ALIGN(addr);
    ...
    }
    addr = HPAGE_ALIGN(TASK_UNMAPPED_BASE);

    in sys_alloc_hugepages():

    if (len & (HPAGE_SIZE - 1))
    return -EINVAL;


    Bill


    diff -Nur --exclude=SCCS --exclude=BitKeeper --exclude=ChangeSet linux-2.5/arch/i386/mm/hugetlbpage.c hugetlbfs/arch/i386/mm/hugetlbpage.c
    --- linux-2.5/arch/i386/mm/hugetlbpage.c Wed Oct 2 20:14:31 2002
    +++ hugetlbfs/arch/i386/mm/hugetlbpage.c Thu Oct 3 17:45:14 2002
    @@ -406,25 +404,10 @@
    goto freeinode;
    }

    - spin_lock(&mm->page_table_lock);
    - do {
    - pte_t *pte = huge_pte_alloc(mm, addr);
    - if ((pte) && (pte_none(*pte))) {
    - idx = (addr - vma->vm_start) >> HPAGE_SHIFT;
    - page = find_get_page(mapping, idx);
    - if (page == NULL) {
    - page = alloc_hugetlb_page();
    - if (page == NULL)
    - goto out;
    - add_to_page_cache(page, mapping, idx);
    - }
    - set_huge_pte(mm, vma, page, pte,
    - (vma->vm_flags & VM_WRITE));
    - } else
    - goto out;
    - addr += HPAGE_SIZE;
    - } while (addr < vma->vm_end);
    - retval = 0;
    + retval = hugetlb_prefault(mapping, vma);
    + if (retval)
    + goto out;
    +
    vma->vm_flags |= (VM_HUGETLB | VM_RESERVED);
    vma->vm_ops = &hugetlb_vm_ops;
    spin_unlock(&mm->page_table_lock);
    @@ -459,6 +442,46 @@
    return retval;
    }

    +int hugetlb_prefault(struct address_space *mapping, struct vm_area_struct *vma)
    +{
    + struct mm_struct *mm = current->mm;
    + unsigned long addr;
    + int ret = 0;
    +
    + BUG_ON(vma->vm_start & ~HPAGE_MASK);
    + BUG_ON(vma->vm_end & ~HPAGE_MASK);
    +
    + spin_lock(&mm->page_table_lock);
    + for (addr = vma->vm_start; addr < vma->vm_end; addr += HPAGE_SIZE) {
    + unsigned long idx;
    + pte_t *pte = huge_pte_alloc(mm, addr);
    + struct page *page;
    +
    + if (!pte) {
    + ret = -ENOMEM;
    + goto out;
    + }
    + if (!pte_none(*pte))
    + continue;
    +
    + idx = ((addr - vma->vm_start) >> HPAGE_SHIFT)
    + + (vma->vm_pgoff >> (HPAGE_SHIFT - PAGE_SHIFT));
    + page = find_get_page(mapping, idx);
    + if (!page) {
    + page = alloc_hugetlb_page();
    + if (!page) {
    + ret = -ENOMEM;
    + goto out;
    + }
    + add_to_page_cache(page, mapping, idx);
    + }
    + set_huge_pte(mm, vma, page, pte, vma->vm_flags & VM_WRITE);
    + }
    +out:
    + spin_unlock(&mm->page_table_lock);
    + return ret;
    +}
    +
    static int
    alloc_private_hugetlb_pages(int key, unsigned long addr, unsigned long len,
    int prot, int flag)
    diff -Nur --exclude=SCCS --exclude=BitKeeper --exclude=ChangeSet linux-2.5/include/linux/mm.h hugetlbfs/include/linux/mm.h
    --- linux-2.5/include/linux/mm.h Wed Oct 2 20:14:55 2002
    +++ hugetlbfs/include/linux/mm.h Thu Oct 3 15:28:10 2002
    @@ -386,7 +386,7 @@
    extern int copy_hugetlb_page_range(struct mm_struct *, struct mm_struct *, struct vm_area_struct *);
    extern int follow_hugetlb_page(struct mm_struct *, struct vm_area_struct *, struct page **, struct vm_area_struct **, unsigned long *, int *, int);
    extern int free_hugepages(struct vm_area_struct *);
    -
    +extern int hugetlb_prefault(struct address_space *, struct vm_area_struct *);
    #else
    #define is_vm_hugetlb_page(vma) (0)
    #define follow_hugetlb_page(mm, vma, pages, vmas, start, len, i) (0)
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2005-03-22 13:29    [W:0.027 / U:60.084 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site