X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvppinfra%2Fpmalloc.c;h=e903511ab81c814946f4b1ad97088e74048ab892;hb=dbc34b89061feae88e0641eab4c82e48903b8396;hp=e11d27ef77b78478c25a773b8d61be656c62b67c;hpb=5efaeee40c9e7790e57bcf90642f66a15c111334;p=vpp.git diff --git a/src/vppinfra/pmalloc.c b/src/vppinfra/pmalloc.c index e11d27ef77b..e903511ab81 100644 --- a/src/vppinfra/pmalloc.c +++ b/src/vppinfra/pmalloc.c @@ -212,7 +212,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) @@ -359,7 +359,6 @@ pmalloc_map_pages (clib_pmalloc_main_t * pm, clib_pmalloc_arena_t * a, pp->n_free_blocks = 1 << (pm->def_log2_page_sz - PMALLOC_LOG2_BLOCK_SZ); pp->index = pp - pm->pages; pp->arena_index = a->index; - pp->pa = (uword) va + (1 << pm->def_log2_page_sz) * i; vec_add1 (a->page_indices, pp->index); a->n_pages++; } @@ -608,8 +607,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; @@ -699,7 +696,9 @@ format_pmalloc_map (u8 * s, va_list * va) { uword *lookup_val, pa, va; lookup_val = vec_elt_at_index (pm->lookup_table, index); - va = pointer_to_uword (pm->base) + (index << pm->lookup_log2_page_sz); + 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),