lkml.org 
[lkml]   [2005]   [Oct]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH 3/3] hugetlb: Simple overcommit check
    From
    Date
    Initial Post (Thu, 18 Aug 2005)

    Basic overcommit checking for hugetlb_file_map() based on an implementation
    used with demand faulting in SLES9.

    Since we're not prefaulting the pages at mmap time, some extra accounting is
    needed. This patch implements a basic sanity check to ensure that the number
    of huge pages required to satisfy the mmap are currently available. Of course
    this method doesn't guarantee that the pages will be available at fault time,
    but I think it is a good start on doing proper accounting and solves 90% of the
    overcommit problems I see in practice.

    Huge page shared memory segments are simpler and still maintain their commit on
    shmget semantics.

    Signed-off-by: Adam Litke <agl@us.ibm.com>
    ---
    inode.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----------
    1 files changed, 55 insertions(+), 10 deletions(-)
    diff -upN reference/fs/hugetlbfs/inode.c current/fs/hugetlbfs/inode.c
    --- reference/fs/hugetlbfs/inode.c
    +++ current/fs/hugetlbfs/inode.c
    @@ -45,9 +45,59 @@ static struct backing_dev_info hugetlbfs

    int sysctl_hugetlb_shm_group;

    +static void huge_pagevec_release(struct pagevec *pvec)
    +{
    + int i;
    +
    + for (i = 0; i < pagevec_count(pvec); ++i)
    + put_page(pvec->pages[i]);
    +
    + pagevec_reinit(pvec);
    +}
    +
    +unsigned long
    +huge_pages_needed(struct address_space *mapping, struct vm_area_struct *vma)
    +{
    + int i;
    + struct pagevec pvec;
    + unsigned long start = vma->vm_start;
    + unsigned long end = vma->vm_end;
    + unsigned long hugepages = (end - start) >> HPAGE_SHIFT;
    + pgoff_t next = vma->vm_pgoff;
    + pgoff_t endpg = next + ((end - start) >> PAGE_SHIFT);
    + struct inode *inode = vma->vm_file->f_dentry->d_inode;
    +
    + /*
    + * Shared memory segments are accounted for at shget time,
    + * not at shmat (when the mapping is actually created) so
    + * check here if the memory has already been accounted for.
    + */
    + if (inode->i_blocks != 0)
    + return 0;
    +
    + pagevec_init(&pvec, 0);
    + while (next < endpg) {
    + if (!pagevec_lookup(&pvec, mapping, next, PAGEVEC_SIZE))
    + break;
    + for (i = 0; i < pagevec_count(&pvec); i++) {
    + struct page *page = pvec.pages[i];
    + if (page->index > next)
    + next = page->index;
    + if (page->index >= endpg)
    + break;
    + next++;
    + hugepages--;
    + }
    + huge_pagevec_release(&pvec);
    + }
    + return hugepages << HPAGE_SHIFT;
    +}
    +
    static int hugetlbfs_file_mmap(struct file *file, struct vm_area_struct *vma)
    {
    struct inode *inode = file->f_dentry->d_inode;
    + struct address_space *mapping = inode->i_mapping;
    + unsigned long bytes;
    loff_t len, vma_len;
    int ret;

    @@ -66,6 +116,10 @@ static int hugetlbfs_file_mmap(struct fi
    if (vma->vm_end - vma->vm_start < HPAGE_SIZE)
    return -EINVAL;

    + bytes = huge_pages_needed(mapping, vma);
    + if (!is_hugepage_mem_enough(bytes))
    + return -ENOMEM;
    +
    vma_len = (loff_t)(vma->vm_end - vma->vm_start);

    down(&inode->i_sem);
    @@ -167,16 +221,6 @@ static int hugetlbfs_commit_write(struct
    return -EINVAL;
    }

    -static void huge_pagevec_release(struct pagevec *pvec)
    -{
    - int i;
    -
    - for (i = 0; i < pagevec_count(pvec); ++i)
    - put_page(pvec->pages[i]);
    -
    - pagevec_reinit(pvec);
    -}
    -
    static void truncate_huge_page(struct page *page)
    {
    clear_page_dirty(page);
    @@ -792,6 +836,7 @@ struct file *hugetlb_zero_setup(size_t s
    d_instantiate(dentry, inode);
    inode->i_size = size;
    inode->i_nlink = 0;
    + inode->i_blocks = 1;
    file->f_vfsmnt = mntget(hugetlbfs_vfsmount);
    file->f_dentry = dentry;
    file->f_mapping = inode->i_mapping;
    --
    Adam Litke - (agl at us.ibm.com)
    IBM Linux Technology Center

    -
    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-10-11 20:36    [W:2.258 / U:0.612 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site