X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Ftest_malloc.c;h=67a48ba38a958489b1adfc12566cebe55620af36;hb=43e34a229d3e575eb5ed075091afef0e5bf60a77;hp=238929d025010d1d527fb20b97dee52274b76c36;hpb=a40a1f8231b43844312c9b2ff7b3f1726c9a2c25;p=dpdk.git diff --git a/app/test/test_malloc.c b/app/test/test_malloc.c index 238929d025..67a48ba38a 100644 --- a/app/test/test_malloc.c +++ b/app/test/test_malloc.c @@ -1,35 +1,5 @@ -/*- - * BSD LICENSE - * - * Copyright(c) 2010-2012 Intel Corporation. All rights reserved. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2010-2019 Intel Corporation */ #include @@ -40,16 +10,11 @@ #include #include -#include - #include #include -#include #include #include -#include #include -#include #include #include #include @@ -60,16 +25,19 @@ #define N 10000 -#define QUOTE_(x) #x -#define QUOTE(x) QUOTE_(x) -#define MALLOC_MEMZONE_SIZE QUOTE(RTE_MALLOC_MEMZONE_SIZE) + +static int +is_mem_on_socket(int32_t socket); + +static int32_t +addr_to_socket(void *addr); /* * Malloc * ====== * * Allocate some dynamic memory from heap (3 areas). Check that areas - * don't overlap an that alignment constraints match. This test is + * don't overlap and that alignment constraints match. This test is * done many times on different lcores simultaneously. */ @@ -117,8 +85,7 @@ test_align_overlap_per_lcore(__attribute__((unused)) void *arg) } for(j = 0; j < 1000 ; j++) { if( *(char *)p1 != 0) { - printf("rte_zmalloc didn't zero" - "the allocated memory\n"); + printf("rte_zmalloc didn't zero the allocated memory\n"); ret = -1; } } @@ -165,7 +132,7 @@ test_align_overlap_per_lcore(__attribute__((unused)) void *arg) rte_free(p2); rte_free(p3); } - rte_malloc_dump_stats("dummy"); + rte_malloc_dump_stats(stdout, "dummy"); return ret; } @@ -189,8 +156,7 @@ test_reordered_free_per_lcore(__attribute__((unused)) void *arg) } for(j = 0; j < 1000 ; j++) { if( *(char *)p1 != 0) { - printf("rte_zmalloc didn't zero" - "the allocated memory\n"); + printf("rte_zmalloc didn't zero the allocated memory\n"); ret = -1; } } @@ -261,7 +227,7 @@ test_reordered_free_per_lcore(__attribute__((unused)) void *arg) break; } } - rte_malloc_dump_stats("dummy"); + rte_malloc_dump_stats(stdout, "dummy"); return ret; } @@ -289,86 +255,46 @@ test_str_to_size(void) {"18446744073709551616", 0} /* ULLONG_MAX + 1 == out of range*/ }; unsigned i; - for (i = 0; i < sizeof(test_values)/sizeof(test_values[0]); i++) + for (i = 0; i < RTE_DIM(test_values); i++) if (rte_str_to_size(test_values[i].str) != test_values[i].value) return -1; return 0; } static int -test_big_alloc(void) +test_multi_alloc_statistics(void) { int socket = 0; - struct rte_malloc_socket_stats pre_stats, post_stats; - size_t size =rte_str_to_size(MALLOC_MEMZONE_SIZE)*2; - int align = 0; -#ifndef RTE_LIBRTE_MALLOC_DEBUG - int overhead = 64 + 64; -#else - int overhead = 64 + 64 + 64; -#endif + struct rte_malloc_socket_stats pre_stats, post_stats ,first_stats, second_stats; + size_t size = 2048; + int align = 1024; + int overhead = 0; + /* Dynamically calculate the overhead by allocating one cacheline and + * then comparing what was allocated from the heap. + */ rte_malloc_get_socket_stats(socket, &pre_stats); - void *p1 = rte_malloc_socket("BIG", size , align, socket); - if (!p1) + void *dummy = rte_malloc_socket(NULL, RTE_CACHE_LINE_SIZE, 0, socket); + if (dummy == NULL) return -1; - rte_malloc_get_socket_stats(socket,&post_stats); - /* Check statistics reported are correct */ - /* Allocation increase, cannot be the same as before big allocation */ - if (post_stats.heap_totalsz_bytes == pre_stats.heap_totalsz_bytes) { - printf("Malloc statistics are incorrect - heap_totalz_bytes\n"); - return -1; - } - /* Check that allocated size adds up correctly */ - if (post_stats.heap_allocsz_bytes != - pre_stats.heap_allocsz_bytes + size + align + overhead) { - printf("Malloc statistics are incorrect - alloc_size\n"); - return -1; - } - /* Check free size against tested allocated size */ - if (post_stats.heap_freesz_bytes != - post_stats.heap_totalsz_bytes - post_stats.heap_allocsz_bytes) { - printf("Malloc statistics are incorrect - heap_freesz_bytes\n"); - return -1; - } - /* Number of allocated blocks must increase after allocation */ - if (post_stats.alloc_count != pre_stats.alloc_count + 1) { - printf("Malloc statistics are incorrect - alloc_count\n"); - return -1; - } - /* New blocks now available - just allocated 1 but also 1 new free */ - if(post_stats.free_count != pre_stats.free_count ) { - printf("Malloc statistics are incorrect - free_count\n"); - return -1; - } + rte_malloc_get_socket_stats(socket, &post_stats); - rte_free(p1); - return 0; -} + /* after subtracting cache line, remainder is overhead */ + overhead = post_stats.heap_allocsz_bytes - pre_stats.heap_allocsz_bytes; + overhead -= RTE_CACHE_LINE_SIZE; -static int -test_multi_alloc_statistics(void) -{ - int socket = 0; - struct rte_malloc_socket_stats pre_stats, post_stats ,first_stats, second_stats; - size_t size = 2048; - int align = 1024; -#ifndef RTE_LIBRTE_MALLOC_DEBUG - int trailer_size = 0; -#else - int trailer_size = 64; -#endif - int overhead = 64 + trailer_size; + rte_free(dummy); + /* Now start the real tests */ rte_malloc_get_socket_stats(socket, &pre_stats); void *p1 = rte_malloc_socket("stats", size , align, socket); if (!p1) return -1; rte_free(p1); - rte_malloc_dump_stats("stats"); + rte_malloc_dump_stats(stdout, "stats"); rte_malloc_get_socket_stats(socket,&post_stats); /* Check statistics reported are correct */ @@ -393,12 +319,15 @@ test_multi_alloc_statistics(void) void *p3 = rte_malloc_socket("add2", size,align, socket); if (!p3) return -1; + rte_malloc_get_socket_stats(socket,&second_stats); - /* - * Check that no new blocks added after small allocations - * i.e. < RTE_MALLOC_MEMZONE_SIZE - */ + rte_free(p2); + rte_free(p3); + + /* After freeing both allocations check stats return to original */ + rte_malloc_get_socket_stats(socket, &post_stats); + if(second_stats.heap_totalsz_bytes != first_stats.heap_totalsz_bytes) { printf("Incorrect heap statistics: Total size \n"); return -1; @@ -420,10 +349,8 @@ test_multi_alloc_statistics(void) return -1; } - /* 2 Free blocks smaller 11M, larger 11M + (11M - 2048) */ - if (second_stats.greatest_free_size != - (rte_str_to_size(MALLOC_MEMZONE_SIZE) * 2) - - 2048 - trailer_size) { + /* Make sure that we didn't touch our greatest chunk: 2 * 11M) */ + if (post_stats.greatest_free_size != pre_stats.greatest_free_size) { printf("Incorrect heap statistics: Greatest free size \n"); return -1; } @@ -432,10 +359,7 @@ test_multi_alloc_statistics(void) printf("Incorrect heap statistics: Free size \n"); return -1; } - rte_free(p2); - rte_free(p3); - /* After freeing both allocations check stats return to original */ - rte_malloc_get_socket_stats(socket, &post_stats); + if ((post_stats.heap_totalsz_bytes != pre_stats.heap_totalsz_bytes) && (post_stats.heap_freesz_bytes!=pre_stats.heap_freesz_bytes) && (post_stats.heap_allocsz_bytes!=pre_stats.heap_allocsz_bytes)&& @@ -447,30 +371,6 @@ test_multi_alloc_statistics(void) return 0; } -static int -test_memzone_size_alloc(void) -{ - void *p1 = rte_malloc("BIG", rte_str_to_size(MALLOC_MEMZONE_SIZE) - 128, 64); - if (!p1) - return -1; - rte_free(p1); - /* one extra check - check no crashes if free(NULL) */ - rte_free(NULL); - return 0; -} - -static int -test_rte_malloc_type_limits(void) -{ - /* The type-limits functionality is not yet implemented, - * so always return 0 no matter what the retval. - */ - const char *typename = "limit_test"; - rte_malloc_set_limit(typename, 64 * 1024); - rte_malloc_dump_stats(typename); - return 0; -} - static int test_realloc(void) { @@ -481,13 +381,13 @@ test_realloc(void) const unsigned size4 = size3 + 1024; /* test data is the same even if element is moved*/ - char *ptr1 = rte_zmalloc(NULL, size1, CACHE_LINE_SIZE); + char *ptr1 = rte_zmalloc(NULL, size1, RTE_CACHE_LINE_SIZE); if (!ptr1){ printf("NULL pointer returned from rte_zmalloc\n"); return -1; } - rte_snprintf(ptr1, size1, "%s" ,hello_str); - char *ptr2 = rte_realloc(ptr1, size2, CACHE_LINE_SIZE); + strlcpy(ptr1, hello_str, size1); + char *ptr2 = rte_realloc(ptr1, size2, RTE_CACHE_LINE_SIZE); if (!ptr2){ rte_free(ptr1); printf("NULL pointer returned from rte_realloc\n"); @@ -511,7 +411,7 @@ test_realloc(void) /* now allocate third element, free the second * and resize third. It should not move. (ptr1 is now invalid) */ - char *ptr3 = rte_zmalloc(NULL, size3, CACHE_LINE_SIZE); + char *ptr3 = rte_zmalloc(NULL, size3, RTE_CACHE_LINE_SIZE); if (!ptr3){ printf("NULL pointer returned from rte_zmalloc\n"); rte_free(ptr2); @@ -526,7 +426,7 @@ test_realloc(void) } rte_free(ptr2); /* first resize to half the size of the freed block */ - char *ptr4 = rte_realloc(ptr3, size4, CACHE_LINE_SIZE); + char *ptr4 = rte_realloc(ptr3, size4, RTE_CACHE_LINE_SIZE); if (!ptr4){ printf("NULL pointer returned from rte_realloc\n"); rte_free(ptr3); @@ -538,7 +438,7 @@ test_realloc(void) return -1; } /* now resize again to the full size of the freed block */ - ptr4 = rte_realloc(ptr3, size3 + size2 + size1, CACHE_LINE_SIZE); + ptr4 = rte_realloc(ptr3, size3 + size2 + size1, RTE_CACHE_LINE_SIZE); if (ptr3 != ptr4){ printf("Unexpected - ptr4 != ptr3 on second resize\n"); rte_free(ptr4); @@ -549,12 +449,12 @@ test_realloc(void) /* now try a resize to a smaller size, see if it works */ const unsigned size5 = 1024; const unsigned size6 = size5 / 2; - char *ptr5 = rte_malloc(NULL, size5, CACHE_LINE_SIZE); + char *ptr5 = rte_malloc(NULL, size5, RTE_CACHE_LINE_SIZE); if (!ptr5){ printf("NULL pointer returned from rte_malloc\n"); return -1; } - char *ptr6 = rte_realloc(ptr5, size6, CACHE_LINE_SIZE); + char *ptr6 = rte_realloc(ptr5, size6, RTE_CACHE_LINE_SIZE); if (!ptr6){ printf("NULL pointer returned from rte_realloc\n"); rte_free(ptr5); @@ -569,8 +469,8 @@ test_realloc(void) /* check for behaviour changing alignment */ const unsigned size7 = 1024; - const unsigned orig_align = CACHE_LINE_SIZE; - unsigned new_align = CACHE_LINE_SIZE * 2; + const unsigned orig_align = RTE_CACHE_LINE_SIZE; + unsigned new_align = RTE_CACHE_LINE_SIZE * 2; char *ptr7 = rte_malloc(NULL, size7, orig_align); if (!ptr7){ printf("NULL pointer returned from rte_malloc\n"); @@ -597,18 +497,18 @@ test_realloc(void) */ unsigned size9 = 1024, size10 = 1024; unsigned size11 = size9 + size10 + 256; - char *ptr9 = rte_malloc(NULL, size9, CACHE_LINE_SIZE); + char *ptr9 = rte_malloc(NULL, size9, RTE_CACHE_LINE_SIZE); if (!ptr9){ printf("NULL pointer returned from rte_malloc\n"); return -1; } - char *ptr10 = rte_malloc(NULL, size10, CACHE_LINE_SIZE); + char *ptr10 = rte_malloc(NULL, size10, RTE_CACHE_LINE_SIZE); if (!ptr10){ printf("NULL pointer returned from rte_malloc\n"); return -1; } rte_free(ptr9); - char *ptr11 = rte_realloc(ptr10, size11, CACHE_LINE_SIZE); + char *ptr11 = rte_realloc(ptr10, size11, RTE_CACHE_LINE_SIZE); if (!ptr11){ printf("NULL pointer returned from rte_realloc\n"); rte_free(ptr10); @@ -625,7 +525,7 @@ test_realloc(void) * We should get a malloc of the size requested*/ const size_t size12 = 1024; size_t size12_check; - char *ptr12 = rte_realloc(NULL, size12, CACHE_LINE_SIZE); + char *ptr12 = rte_realloc(NULL, size12, RTE_CACHE_LINE_SIZE); if (!ptr12){ printf("NULL pointer returned from rte_realloc\n"); return -1; @@ -636,7 +536,49 @@ test_realloc(void) return -1; } rte_free(ptr12); - return 0; + + /* check realloc_socket part */ + int32_t socket_count = 0, socket_allocated, socket; + int ret = -1; + size_t size = 1024; + + ptr1 = NULL; + for (socket = 0; socket < RTE_MAX_NUMA_NODES; socket++) { + if (is_mem_on_socket(socket)) { + int j = 2; + + socket_count++; + while (j--) { + /* j == 1 -> resizing */ + ptr2 = rte_realloc_socket(ptr1, size, + RTE_CACHE_LINE_SIZE, + socket); + if (ptr2 == NULL) { + printf("NULL pointer returned from rte_realloc_socket\n"); + goto end; + } + + ptr1 = ptr2; + socket_allocated = addr_to_socket(ptr2); + if (socket_allocated != socket) { + printf("Requested socket (%d) doesn't mach allocated one (%d)\n", + socket, socket_allocated); + goto end; + } + size += RTE_CACHE_LINE_SIZE; + } + } + } + + /* Print warnign if only a single socket, but don't fail the test */ + if (socket_count < 2) + printf("WARNING: realloc_socket test needs memory on multiple sockets!\n"); + + ret = 0; +end: + rte_free(ptr1); + + return ret; } static int @@ -698,8 +640,8 @@ test_rte_malloc_validate(void) { const size_t request_size = 1024; size_t allocated_size; - char *data_ptr = rte_malloc(NULL, request_size, CACHE_LINE_SIZE); -#ifdef RTE_LIBRTE_MALLOC_DEBUG + char *data_ptr = rte_malloc(NULL, request_size, RTE_CACHE_LINE_SIZE); +#ifdef RTE_MALLOC_DEBUG int retval; char *over_write_vals = NULL; #endif @@ -721,7 +663,7 @@ test_rte_malloc_validate(void) if (allocated_size < request_size) err_return(); -#ifdef RTE_LIBRTE_MALLOC_DEBUG +#ifdef RTE_MALLOC_DEBUG /****** change the header to be bad */ char save_buf[64]; @@ -773,7 +715,7 @@ test_zero_aligned_alloc(void) char *p1 = rte_malloc(NULL,1024, 0); if (!p1) goto err_return; - if (!rte_is_aligned(p1, CACHE_LINE_SIZE)) + if (!rte_is_aligned(p1, RTE_CACHE_LINE_SIZE)) goto err_return; rte_free(p1); return 0; @@ -789,7 +731,7 @@ test_malloc_bad_params(void) { const char *type = NULL; size_t size = 0; - unsigned align = CACHE_LINE_SIZE; + unsigned align = RTE_CACHE_LINE_SIZE; /* rte_malloc expected to return null with inappropriate size */ char *bad_ptr = rte_malloc(type, size, align); @@ -813,20 +755,25 @@ err_return: return -1; } -/* Check if memory is avilable on a specific socket */ static int -is_mem_on_socket(int32_t socket) +check_socket_mem(const struct rte_memseg_list *msl, void *arg) { - const struct rte_memseg *ms = rte_eal_get_physmem_layout(); - unsigned i; + int32_t *socket = arg; - for (i = 0; i < RTE_MAX_MEMSEG; i++) { - if (socket == ms[i].socket_id) - return 1; - } - return 0; + if (msl->external) + return 0; + + return *socket == msl->socket_id; } +/* Check if memory is available on a specific socket */ +static int +is_mem_on_socket(int32_t socket) +{ + return rte_memseg_list_walk(check_socket_mem, &socket); +} + + /* * Find what socket a memory address is on. Only works for addresses within * memsegs, not heap or stack... @@ -834,16 +781,9 @@ is_mem_on_socket(int32_t socket) static int32_t addr_to_socket(void * addr) { - const struct rte_memseg *ms = rte_eal_get_physmem_layout(); - unsigned i; + const struct rte_memseg *ms = rte_mem_virt2memseg(addr, NULL); + return ms == NULL ? -1 : ms->socket_id; - for (i = 0; i < RTE_MAX_MEMSEG; i++) { - if ((ms[i].addr <= addr) && - ((uintptr_t)addr < - ((uintptr_t)ms[i].addr + (uintptr_t)ms[i].len))) - return ms[i].socket_id; - } - return -1; } /* Test using rte_[c|m|zm]alloc_socket() on a specific socket */ @@ -924,7 +864,7 @@ test_alloc_socket(void) return 0; } -int +static int test_malloc(void) { unsigned lcore_id; @@ -936,18 +876,6 @@ test_malloc(void) } else printf("test_str_to_size() passed\n"); - if (test_memzone_size_alloc() < 0){ - printf("test_memzone_size_alloc() failed\n"); - return -1; - } - else printf("test_memzone_size_alloc() passed\n"); - - if (test_big_alloc() < 0){ - printf("test_big_alloc() failed\n"); - return -1; - } - else printf("test_big_alloc() passed\n"); - if (test_zero_aligned_alloc() < 0){ printf("test_zero_aligned_alloc() failed\n"); return -1; @@ -1011,15 +939,6 @@ test_malloc(void) } else printf("test_random_alloc_free() passed\n"); - /*----------------------------*/ - ret = test_rte_malloc_type_limits(); - if (ret < 0){ - printf("test_rte_malloc_type_limits() failed\n"); - return ret; - } - /* TODO: uncomment following line once type limits are valid */ - /*else printf("test_rte_malloc_type_limits() passed\n");*/ - /*----------------------------*/ ret = test_rte_malloc_validate(); if (ret < 0){ @@ -1037,11 +956,13 @@ test_malloc(void) ret = test_multi_alloc_statistics(); if (ret < 0) { - printf("test_muti_alloc_statistics() failed\n"); + printf("test_multi_alloc_statistics() failed\n"); return ret; } else - printf("test_muti_alloc_statistics() passed\n"); + printf("test_multi_alloc_statistics() passed\n"); return 0; } + +REGISTER_TEST_COMMAND(malloc_autotest, test_malloc);