lkml.org 
[lkml]   [2007]   [Sep]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[03/17] is_vmalloc_addr(): Check if an address is within the vmalloc boundaries
    This test is used in a couple of places. Add a version to vmalloc.h
    and replace the other checks.

    Signed-off-by: Christoph Lameter <clameter@sgi.com>

    ---
    drivers/net/cxgb3/cxgb3_offload.c | 4 +---
    fs/ntfs/malloc.h | 3 +--
    fs/proc/kcore.c | 2 +-
    fs/xfs/linux-2.6/kmem.c | 3 +--
    fs/xfs/linux-2.6/xfs_buf.c | 3 +--
    include/linux/mm.h | 8 ++++++++
    mm/sparse.c | 10 +---------
    7 files changed, 14 insertions(+), 19 deletions(-)

    Index: linux-2.6/include/linux/mm.h
    ===================================================================
    --- linux-2.6.orig/include/linux/mm.h 2007-09-17 21:46:06.000000000 -0700
    +++ linux-2.6/include/linux/mm.h 2007-09-17 23:56:54.000000000 -0700
    @@ -1158,6 +1158,14 @@ static inline unsigned long vma_pages(st
    return (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
    }

    +/* Determine if an address is within the vmalloc range */
    +static inline int is_vmalloc_addr(const void *x)
    +{
    + unsigned long addr = (unsigned long)x;
    +
    + return addr >= VMALLOC_START && addr < VMALLOC_END;
    +}
    +
    pgprot_t vm_get_page_prot(unsigned long vm_flags);
    struct vm_area_struct *find_extend_vma(struct mm_struct *, unsigned long addr);
    int remap_pfn_range(struct vm_area_struct *, unsigned long addr,
    Index: linux-2.6/mm/sparse.c
    ===================================================================
    --- linux-2.6.orig/mm/sparse.c 2007-09-17 21:45:24.000000000 -0700
    +++ linux-2.6/mm/sparse.c 2007-09-17 23:56:26.000000000 -0700
    @@ -289,17 +289,9 @@ got_map_ptr:
    return ret;
    }

    -static int vaddr_in_vmalloc_area(void *addr)
    -{
    - if (addr >= (void *)VMALLOC_START &&
    - addr < (void *)VMALLOC_END)
    - return 1;
    - return 0;
    -}
    -
    static void __kfree_section_memmap(struct page *memmap, unsigned long nr_pages)
    {
    - if (vaddr_in_vmalloc_area(memmap))
    + if (is_vmalloc_addr(memmap))
    vfree(memmap);
    else
    free_pages((unsigned long)memmap,
    Index: linux-2.6/drivers/net/cxgb3/cxgb3_offload.c
    ===================================================================
    --- linux-2.6.orig/drivers/net/cxgb3/cxgb3_offload.c 2007-09-17 21:45:24.000000000 -0700
    +++ linux-2.6/drivers/net/cxgb3/cxgb3_offload.c 2007-09-17 21:46:06.000000000 -0700
    @@ -1035,9 +1035,7 @@ void *cxgb_alloc_mem(unsigned long size)
    */
    void cxgb_free_mem(void *addr)
    {
    - unsigned long p = (unsigned long)addr;
    -
    - if (p >= VMALLOC_START && p < VMALLOC_END)
    + if (is_vmalloc_addr(addr))
    vfree(addr);
    else
    kfree(addr);
    Index: linux-2.6/fs/ntfs/malloc.h
    ===================================================================
    --- linux-2.6.orig/fs/ntfs/malloc.h 2007-09-17 21:45:24.000000000 -0700
    +++ linux-2.6/fs/ntfs/malloc.h 2007-09-17 21:46:06.000000000 -0700
    @@ -85,8 +85,7 @@ static inline void *ntfs_malloc_nofs_nof

    static inline void ntfs_free(void *addr)
    {
    - if (likely(((unsigned long)addr < VMALLOC_START) ||
    - ((unsigned long)addr >= VMALLOC_END ))) {
    + if (!is_vmalloc_addr(addr)) {
    kfree(addr);
    /* free_page((unsigned long)addr); */
    return;
    Index: linux-2.6/fs/proc/kcore.c
    ===================================================================
    --- linux-2.6.orig/fs/proc/kcore.c 2007-09-17 21:45:24.000000000 -0700
    +++ linux-2.6/fs/proc/kcore.c 2007-09-17 21:46:06.000000000 -0700
    @@ -325,7 +325,7 @@ read_kcore(struct file *file, char __use
    if (m == NULL) {
    if (clear_user(buffer, tsz))
    return -EFAULT;
    - } else if ((start >= VMALLOC_START) && (start < VMALLOC_END)) {
    + } else if (is_vmalloc_addr((void *)start)) {
    char * elf_buf;
    struct vm_struct *m;
    unsigned long curstart = start;
    Index: linux-2.6/fs/xfs/linux-2.6/kmem.c
    ===================================================================
    --- linux-2.6.orig/fs/xfs/linux-2.6/kmem.c 2007-09-17 21:45:24.000000000 -0700
    +++ linux-2.6/fs/xfs/linux-2.6/kmem.c 2007-09-17 21:46:06.000000000 -0700
    @@ -92,8 +92,7 @@ kmem_zalloc_greedy(size_t *size, size_t
    void
    kmem_free(void *ptr, size_t size)
    {
    - if (((unsigned long)ptr < VMALLOC_START) ||
    - ((unsigned long)ptr >= VMALLOC_END)) {
    + if (!is_vmalloc_addr(ptr)) {
    kfree(ptr);
    } else {
    vfree(ptr);
    Index: linux-2.6/fs/xfs/linux-2.6/xfs_buf.c
    ===================================================================
    --- linux-2.6.orig/fs/xfs/linux-2.6/xfs_buf.c 2007-09-17 21:45:24.000000000 -0700
    +++ linux-2.6/fs/xfs/linux-2.6/xfs_buf.c 2007-09-17 21:46:06.000000000 -0700
    @@ -696,8 +696,7 @@ static inline struct page *
    mem_to_page(
    void *addr)
    {
    - if (((unsigned long)addr < VMALLOC_START) ||
    - ((unsigned long)addr >= VMALLOC_END)) {
    + if ((!is_vmalloc_addr(addr))) {
    return virt_to_page(addr);
    } else {
    return vmalloc_to_page(addr);
    --
    -
    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: 2007-09-19 05:41    [W:0.054 / U:1.784 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site