X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvppinfra%2Fpmalloc.c;h=cca8039433da8b031842f5bfe816f2df2589fe9d;hb=0938eba153ed20b8a32b7278ed6301b45ce257cc;hp=a881a65310a518e060274af2e911ffd072881cb3;hpb=878b65aa6c16b6013e75ea9039b9978c52982e97;p=vpp.git diff --git a/src/vppinfra/pmalloc.c b/src/vppinfra/pmalloc.c index a881a65310a..cca8039433d 100644 --- a/src/vppinfra/pmalloc.c +++ b/src/vppinfra/pmalloc.c @@ -18,8 +18,10 @@ #include #include #include +#include #include #include +#include #include #include @@ -52,17 +54,18 @@ pmalloc_validate_numa_node (u32 * numa_node) if (*numa_node == CLIB_PMALLOC_NUMA_LOCAL) { u32 cpu; - if (getcpu (&cpu, numa_node, 0) != 0) + if (getcpu (&cpu, numa_node) != 0) return 1; } return 0; } int -clib_pmalloc_init (clib_pmalloc_main_t * pm, uword size) +clib_pmalloc_init (clib_pmalloc_main_t * pm, uword base_addr, uword size) { uword off, pagesize; u64 *pt = 0; + int mmap_flags; ASSERT (pm->error == 0); @@ -82,8 +85,13 @@ clib_pmalloc_init (clib_pmalloc_main_t * pm, uword size) pm->max_pages = size >> pm->def_log2_page_sz; /* reserve VA space for future growth */ - pm->base = mmap (0, size + pagesize, PROT_NONE, - MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + mmap_flags = MAP_PRIVATE | MAP_ANONYMOUS; + + if (base_addr) + mmap_flags |= MAP_FIXED; + + pm->base = mmap (uword_to_pointer (base_addr, void *), size + pagesize, + PROT_NONE, mmap_flags, -1, 0); if (pm->base == MAP_FAILED) { @@ -138,6 +146,9 @@ alloc_chunk_from_page (clib_pmalloc_main_t * pm, clib_pmalloc_page_t * pp, pp->n_free_chunks = a->subpages_per_page; } + if (pp->n_free_blocks < n_blocks) + return 0; + alloc_chunk_index = pp->first_chunk_index; next_chunk: @@ -212,7 +223,7 @@ pmalloc_update_lookup_table (clib_pmalloc_main_t * pm, u32 first, u32 count) vec_validate_aligned (pm->lookup_table, vec_len (pm->pages) * elts_per_page - 1, CLIB_CACHE_LINE_BYTES); - p = first * elts_per_page; + p = (uword) first *elts_per_page; if (pm->flags & CLIB_PMALLOC_F_NO_PAGEMAP) { while (p < (uword) elts_per_page * count) @@ -250,7 +261,7 @@ pmalloc_map_pages (clib_pmalloc_main_t * pm, clib_pmalloc_arena_t * a, { clib_pmalloc_page_t *pp = 0; int status, rv, i, mmap_flags; - void *va; + void *va = MAP_FAILED; int old_mpol = -1; long unsigned int mask[16] = { 0 }; long unsigned int old_mask[16] = { 0 }; @@ -290,27 +301,26 @@ pmalloc_map_pages (clib_pmalloc_main_t * pm, clib_pmalloc_arena_t * a, return 0; } - mmap_flags = MAP_FIXED | MAP_ANONYMOUS; - - if ((pm->flags & CLIB_PMALLOC_F_NO_PAGEMAP) == 0) - mmap_flags |= MAP_LOCKED; - - if (a->log2_subpage_sz != pm->sys_log2_page_sz) - mmap_flags |= MAP_HUGETLB | MAP_LOCKED; + mmap_flags = MAP_FIXED; if (a->flags & CLIB_PMALLOC_ARENA_F_SHARED_MEM) { mmap_flags |= MAP_SHARED; - if (mmap_flags & MAP_HUGETLB) + if (a->log2_subpage_sz != pm->sys_log2_page_sz) pm->error = clib_mem_create_hugetlb_fd ((char *) a->name, &a->fd); else pm->error = clib_mem_create_fd ((char *) a->name, &a->fd); if (a->fd == -1) goto error; + if ((ftruncate (a->fd, size)) == -1) + goto error; } else { - mmap_flags |= MAP_PRIVATE; + if (a->log2_subpage_sz != pm->sys_log2_page_sz) + mmap_flags |= MAP_HUGETLB; + + mmap_flags |= MAP_PRIVATE | MAP_ANONYMOUS; a->fd = -1; } @@ -321,6 +331,13 @@ pmalloc_map_pages (clib_pmalloc_main_t * pm, clib_pmalloc_arena_t * a, pm->error = clib_error_return_unix (0, "failed to mmap %u pages at %p " "fd %d numa %d flags 0x%x", n_pages, va, a->fd, numa_node, mmap_flags); + va = MAP_FAILED; + goto error; + } + + if (a->log2_subpage_sz != pm->sys_log2_page_sz && mlock (va, size) != 0) + { + pm->error = clib_error_return_unix (0, "Unable to lock pages"); goto error; } @@ -344,10 +361,6 @@ pmalloc_map_pages (clib_pmalloc_main_t * pm, clib_pmalloc_arena_t * a, clib_error_return (0, "page allocated on wrong node, numa node " "%u status %d", numa_node, status); - /* unmap & reesrve */ - munmap (va, size); - mmap (va, size, PROT_NONE, MAP_FIXED | MAP_PRIVATE | MAP_ANONYMOUS, - -1, 0); goto error; } @@ -377,6 +390,13 @@ pmalloc_map_pages (clib_pmalloc_main_t * pm, clib_pmalloc_arena_t * a, return pp - (n_pages - 1); error: + if (va != MAP_FAILED) + { + /* unmap & reserve */ + munmap (va, size); + mmap (va, size, PROT_NONE, MAP_FIXED | MAP_PRIVATE | MAP_ANONYMOUS, + -1, 0); + } if (a->fd != -1) close (a->fd); return 0; @@ -426,7 +446,7 @@ clib_pmalloc_create_shared_arena (clib_pmalloc_main_t * pm, char *name, return 0; } - return pm->base + (pp->index << pm->def_log2_page_sz); + return pm->base + ((uword) pp->index << pm->def_log2_page_sz); } static inline void * @@ -605,8 +625,6 @@ format_pmalloc_page (u8 * s, va_list * va) int verbose = va_arg (*va, int); u32 indent = format_get_indent (s); - s = format (s, "page %u: phys-addr %p ", pp->index, pp->pa); - if (pp->chunks == 0) return s; @@ -685,6 +703,29 @@ format_pmalloc (u8 * s, va_list * va) return s; } +u8 * +format_pmalloc_map (u8 * s, va_list * va) +{ + clib_pmalloc_main_t *pm = va_arg (*va, clib_pmalloc_main_t *); + + u32 index; + s = format (s, "%16s %13s %8s", "virtual-addr", "physical-addr", "size"); + vec_foreach_index (index, pm->lookup_table) + { + uword *lookup_val, pa, va; + lookup_val = vec_elt_at_index (pm->lookup_table, index); + va = + pointer_to_uword (pm->base) + + ((uword) index << pm->lookup_log2_page_sz); + pa = va - *lookup_val; + s = + format (s, "\n %16p %13p %8U", uword_to_pointer (va, u64), + uword_to_pointer (pa, u64), format_log2_page_size, + pm->lookup_log2_page_sz); + } + return s; +} + /* * fd.io coding-style-patch-verification: ON *