X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Ftest_memzone.c;h=7ae31cf7461579ea8e6471f88e56b1ecbb05654d;hb=dd0eedb1cfcf0cb7423d859177c5bc6f931eaf8a;hp=cebe375d17746fc768412152a99a83a33fc57d9e;hpb=013615a784c18582d32e2a702049783c68801f6c;p=dpdk.git diff --git a/app/test/test_memzone.c b/app/test/test_memzone.c index cebe375d17..7ae31cf746 100644 --- a/app/test/test_memzone.c +++ b/app/test/test_memzone.c @@ -1,13 +1,13 @@ /*- * BSD LICENSE - * + * * Copyright(c) 2010-2014 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 @@ -17,7 +17,7 @@ * * 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 @@ -36,17 +36,17 @@ #include #include -#include - #include #include #include #include -#include #include #include #include #include +#include +#include +#include "../../lib/librte_eal/common/malloc_elem.h" #include "test.h" @@ -135,6 +135,8 @@ test_memzone_reserve_flags(void) const struct rte_memseg *ms; int hugepage_2MB_avail = 0; int hugepage_1GB_avail = 0; + int hugepage_16MB_avail = 0; + int hugepage_16GB_avail = 0; const size_t size = 100; int i = 0; ms = rte_eal_get_physmem_layout(); @@ -143,12 +145,20 @@ test_memzone_reserve_flags(void) hugepage_2MB_avail = 1; if (ms[i].hugepage_sz == RTE_PGSIZE_1G) hugepage_1GB_avail = 1; + if (ms[i].hugepage_sz == RTE_PGSIZE_16M) + hugepage_16MB_avail = 1; + if (ms[i].hugepage_sz == RTE_PGSIZE_16G) + hugepage_16GB_avail = 1; } - /* Display the availability of 2MB and 1GB pages */ + /* Display the availability of 2MB ,1GB, 16MB, 16GB pages */ if (hugepage_2MB_avail) printf("2MB Huge pages available\n"); if (hugepage_1GB_avail) printf("1GB Huge pages available\n"); + if (hugepage_16MB_avail) + printf("16MB Huge pages available\n"); + if (hugepage_16GB_avail) + printf("16GB Huge pages available\n"); /* * If 2MB pages available, check that a small memzone is correctly * reserved from 2MB huge pages when requested by the RTE_MEMZONE_2MB flag. @@ -257,68 +267,151 @@ test_memzone_reserve_flags(void) } } } + /* + * This option is for IBM Power. If 16MB pages available, check + * that a small memzone is correctly reserved from 16MB huge pages + * when requested by the RTE_MEMZONE_16MB flag. Also check that + * RTE_MEMZONE_SIZE_HINT_ONLY flag only defaults to an available + * page size (i.e 16GB ) when 16MB pages are unavailable. + */ + if (hugepage_16MB_avail) { + mz = rte_memzone_reserve("flag_zone_16M", size, SOCKET_ID_ANY, + RTE_MEMZONE_16MB); + if (mz == NULL) { + printf("MEMZONE FLAG 16MB\n"); + return -1; + } + if (mz->hugepage_sz != RTE_PGSIZE_16M) { + printf("hugepage_sz not equal 16M\n"); + return -1; + } + + mz = rte_memzone_reserve("flag_zone_16M_HINT", size, + SOCKET_ID_ANY, RTE_MEMZONE_16MB|RTE_MEMZONE_SIZE_HINT_ONLY); + if (mz == NULL) { + printf("MEMZONE FLAG 2MB\n"); + return -1; + } + if (mz->hugepage_sz != RTE_PGSIZE_16M) { + printf("hugepage_sz not equal 16M\n"); + return -1; + } + + /* Check if 1GB huge pages are unavailable, that function fails + * unless HINT flag is indicated + */ + if (!hugepage_16GB_avail) { + mz = rte_memzone_reserve("flag_zone_16G_HINT", size, + SOCKET_ID_ANY, + RTE_MEMZONE_16GB|RTE_MEMZONE_SIZE_HINT_ONLY); + if (mz == NULL) { + printf("MEMZONE FLAG 16GB & HINT\n"); + return -1; + } + if (mz->hugepage_sz != RTE_PGSIZE_16M) { + printf("hugepage_sz not equal 16M\n"); + return -1; + } + + mz = rte_memzone_reserve("flag_zone_16G", size, + SOCKET_ID_ANY, RTE_MEMZONE_16GB); + if (mz != NULL) { + printf("MEMZONE FLAG 16GB\n"); + return -1; + } + } + } + /*As with 16MB tests above for 16GB huge page requests*/ + if (hugepage_16GB_avail) { + mz = rte_memzone_reserve("flag_zone_16G", size, SOCKET_ID_ANY, + RTE_MEMZONE_16GB); + if (mz == NULL) { + printf("MEMZONE FLAG 16GB\n"); + return -1; + } + if (mz->hugepage_sz != RTE_PGSIZE_16G) { + printf("hugepage_sz not equal 16G\n"); + return -1; + } + + mz = rte_memzone_reserve("flag_zone_16G_HINT", size, + SOCKET_ID_ANY, RTE_MEMZONE_16GB|RTE_MEMZONE_SIZE_HINT_ONLY); + if (mz == NULL) { + printf("MEMZONE FLAG 16GB\n"); + return -1; + } + if (mz->hugepage_sz != RTE_PGSIZE_16G) { + printf("hugepage_sz not equal 16G\n"); + return -1; + } + + /* Check if 1GB huge pages are unavailable, that function fails + * unless HINT flag is indicated + */ + if (!hugepage_16MB_avail) { + mz = rte_memzone_reserve("flag_zone_16M_HINT", size, + SOCKET_ID_ANY, + RTE_MEMZONE_16MB|RTE_MEMZONE_SIZE_HINT_ONLY); + if (mz == NULL) { + printf("MEMZONE FLAG 16MB & HINT\n"); + return -1; + } + if (mz->hugepage_sz != RTE_PGSIZE_16G) { + printf("hugepage_sz not equal 16G\n"); + return -1; + } + mz = rte_memzone_reserve("flag_zone_16M", size, + SOCKET_ID_ANY, RTE_MEMZONE_16MB); + if (mz != NULL) { + printf("MEMZONE FLAG 16MB\n"); + return -1; + } + } + + if (hugepage_16MB_avail && hugepage_16GB_avail) { + mz = rte_memzone_reserve("flag_zone_16M_HINT", size, + SOCKET_ID_ANY, + RTE_MEMZONE_16MB|RTE_MEMZONE_16GB); + if (mz != NULL) { + printf("BOTH SIZES SET\n"); + return -1; + } + } + } return 0; } -static int -test_memzone_reserve_max(void) + +/* Find the heap with the greatest free block size */ +static size_t +find_max_block_free_size(const unsigned _align) { - const struct rte_memzone *mz; - const struct rte_config *config; - const struct rte_memseg *ms; - int memseg_idx = 0; - int memzone_idx = 0; + struct rte_malloc_socket_stats stats; + unsigned i, align = _align; size_t len = 0; - void* last_addr; - size_t maxlen = 0; - /* get pointer to global configuration */ - config = rte_eal_get_configuration(); + for (i = 0; i < RTE_MAX_NUMA_NODES; i++) { + rte_malloc_get_socket_stats(i, &stats); + if (stats.greatest_free_size > len) + len = stats.greatest_free_size; + } - ms = rte_eal_get_physmem_layout(); + if (align < RTE_CACHE_LINE_SIZE) + align = RTE_CACHE_LINE_ROUNDUP(align+1); - for (memseg_idx = 0; memseg_idx < RTE_MAX_MEMSEG; memseg_idx++){ - /* ignore smaller memsegs as they can only get smaller */ - if (ms[memseg_idx].len < maxlen) - continue; - - /* align everything */ - last_addr = RTE_PTR_ALIGN_CEIL(ms[memseg_idx].addr, CACHE_LINE_SIZE); - len = ms[memseg_idx].len - RTE_PTR_DIFF(last_addr, ms[memseg_idx].addr); - len &= ~((size_t) CACHE_LINE_MASK); - - /* cycle through all memzones */ - for (memzone_idx = 0; memzone_idx < RTE_MAX_MEMZONE; memzone_idx++) { - - /* stop when reaching last allocated memzone */ - if (config->mem_config->memzone[memzone_idx].addr == NULL) - break; - - /* check if the memzone is in our memseg and subtract length */ - if ((config->mem_config->memzone[memzone_idx].addr >= - ms[memseg_idx].addr) && - (config->mem_config->memzone[memzone_idx].addr < - (RTE_PTR_ADD(ms[memseg_idx].addr, ms[memseg_idx].len)))) { - /* since the zones can now be aligned and occasionally skip - * some space, we should calculate the length based on - * reported length and start addresses difference. Addresses - * are allocated sequentially so we don't need to worry about - * them being in the right order. - */ - len -= RTE_PTR_DIFF( - config->mem_config->memzone[memzone_idx].addr, - last_addr); - len -= config->mem_config->memzone[memzone_idx].len; - last_addr = RTE_PTR_ADD(config->mem_config->memzone[memzone_idx].addr, - (size_t) config->mem_config->memzone[memzone_idx].len); - } - } + if (len <= MALLOC_ELEM_OVERHEAD + align) + return 0; - /* we don't need to calculate offset here since length - * is always cache-aligned */ - if (len > maxlen) - maxlen = len; - } + return len - MALLOC_ELEM_OVERHEAD - align; +} + +static int +test_memzone_reserve_max(void) +{ + const struct rte_memzone *mz; + size_t maxlen; + + maxlen = find_max_block_free_size(0); if (maxlen == 0) { printf("There is no space left!\n"); @@ -327,19 +420,18 @@ test_memzone_reserve_max(void) mz = rte_memzone_reserve("max_zone", 0, SOCKET_ID_ANY, 0); if (mz == NULL){ - printf("Failed to reserve a big chunk of memory\n"); - rte_dump_physmem_layout(); - rte_memzone_dump(); + printf("Failed to reserve a big chunk of memory - %s\n", + rte_strerror(rte_errno)); + rte_dump_physmem_layout(stdout); + rte_memzone_dump(stdout); return -1; } if (mz->len != maxlen) { printf("Memzone reserve with 0 size did not return bigest block\n"); - printf("Expected size = %zu, actual size = %zu\n", - maxlen, mz->len); - rte_dump_physmem_layout(); - rte_memzone_dump(); - + printf("Expected size = %zu, actual size = %zu\n", maxlen, mz->len); + rte_dump_physmem_layout(stdout); + rte_memzone_dump(stdout); return -1; } return 0; @@ -349,83 +441,26 @@ static int test_memzone_reserve_max_aligned(void) { const struct rte_memzone *mz; - const struct rte_config *config; - const struct rte_memseg *ms; - int memseg_idx = 0; - int memzone_idx = 0; - uintptr_t addr_offset; - size_t len = 0; - void* last_addr; size_t maxlen = 0; /* random alignment */ rte_srand((unsigned)rte_rdtsc()); const unsigned align = 1 << ((rte_rand() % 8) + 5); /* from 128 up to 4k alignment */ - /* get pointer to global configuration */ - config = rte_eal_get_configuration(); - - ms = rte_eal_get_physmem_layout(); + maxlen = find_max_block_free_size(align); - addr_offset = 0; - - for (memseg_idx = 0; memseg_idx < RTE_MAX_MEMSEG; memseg_idx++){ - - /* ignore smaller memsegs as they can only get smaller */ - if (ms[memseg_idx].len < maxlen) - continue; - - /* align everything */ - last_addr = RTE_PTR_ALIGN_CEIL(ms[memseg_idx].addr, CACHE_LINE_SIZE); - len = ms[memseg_idx].len - RTE_PTR_DIFF(last_addr, ms[memseg_idx].addr); - len &= ~((size_t) CACHE_LINE_MASK); - - /* cycle through all memzones */ - for (memzone_idx = 0; memzone_idx < RTE_MAX_MEMZONE; memzone_idx++) { - - /* stop when reaching last allocated memzone */ - if (config->mem_config->memzone[memzone_idx].addr == NULL) - break; - - /* check if the memzone is in our memseg and subtract length */ - if ((config->mem_config->memzone[memzone_idx].addr >= - ms[memseg_idx].addr) && - (config->mem_config->memzone[memzone_idx].addr < - (RTE_PTR_ADD(ms[memseg_idx].addr, ms[memseg_idx].len)))) { - /* since the zones can now be aligned and occasionally skip - * some space, we should calculate the length based on - * reported length and start addresses difference. - */ - len -= (uintptr_t) RTE_PTR_SUB( - config->mem_config->memzone[memzone_idx].addr, - (uintptr_t) last_addr); - len -= config->mem_config->memzone[memzone_idx].len; - last_addr = - RTE_PTR_ADD(config->mem_config->memzone[memzone_idx].addr, - (size_t) config->mem_config->memzone[memzone_idx].len); - } - } - - /* make sure we get the alignment offset */ - if (len > maxlen) { - addr_offset = RTE_PTR_ALIGN_CEIL((uintptr_t) last_addr, align) - (uintptr_t) last_addr; - maxlen = len; - } - } - - if (maxlen == 0 || maxlen == addr_offset) { + if (maxlen == 0) { printf("There is no space left for biggest %u-aligned memzone!\n", align); return 0; } - maxlen -= addr_offset; - mz = rte_memzone_reserve_aligned("max_zone_aligned", 0, SOCKET_ID_ANY, 0, align); if (mz == NULL){ - printf("Failed to reserve a big chunk of memory\n"); - rte_dump_physmem_layout(); - rte_memzone_dump(); + printf("Failed to reserve a big chunk of memory - %s\n", + rte_strerror(rte_errno)); + rte_dump_physmem_layout(stdout); + rte_memzone_dump(stdout); return -1; } @@ -434,9 +469,8 @@ test_memzone_reserve_max_aligned(void) " bigest block\n", align); printf("Expected size = %zu, actual size = %zu\n", maxlen, mz->len); - rte_dump_physmem_layout(); - rte_memzone_dump(); - + rte_dump_physmem_layout(stdout); + rte_memzone_dump(stdout); return -1; } return 0; @@ -476,11 +510,11 @@ test_memzone_aligned(void) printf("Unable to reserve 64-byte aligned memzone!\n"); return -1; } - if ((memzone_aligned_32->phys_addr & CACHE_LINE_MASK) != 0) + if ((memzone_aligned_32->phys_addr & RTE_CACHE_LINE_MASK) != 0) return -1; - if (((uintptr_t) memzone_aligned_32->addr & CACHE_LINE_MASK) != 0) + if (((uintptr_t) memzone_aligned_32->addr & RTE_CACHE_LINE_MASK) != 0) return -1; - if ((memzone_aligned_32->len & CACHE_LINE_MASK) != 0) + if ((memzone_aligned_32->len & RTE_CACHE_LINE_MASK) != 0) return -1; if (memzone_aligned_128 == NULL) { @@ -491,7 +525,7 @@ test_memzone_aligned(void) return -1; if (((uintptr_t) memzone_aligned_128->addr & 127) != 0) return -1; - if ((memzone_aligned_128->len & CACHE_LINE_MASK) != 0) + if ((memzone_aligned_128->len & RTE_CACHE_LINE_MASK) != 0) return -1; if (memzone_aligned_256 == NULL) { @@ -502,7 +536,7 @@ test_memzone_aligned(void) return -1; if (((uintptr_t) memzone_aligned_256->addr & 255) != 0) return -1; - if ((memzone_aligned_256->len & CACHE_LINE_MASK) != 0) + if ((memzone_aligned_256->len & RTE_CACHE_LINE_MASK) != 0) return -1; if (memzone_aligned_512 == NULL) { @@ -513,7 +547,7 @@ test_memzone_aligned(void) return -1; if (((uintptr_t) memzone_aligned_512->addr & 511) != 0) return -1; - if ((memzone_aligned_512->len & CACHE_LINE_MASK) != 0) + if ((memzone_aligned_512->len & RTE_CACHE_LINE_MASK) != 0) return -1; if (memzone_aligned_1024 == NULL) { @@ -524,7 +558,7 @@ test_memzone_aligned(void) return -1; if (((uintptr_t) memzone_aligned_1024->addr & 1023) != 0) return -1; - if ((memzone_aligned_1024->len & CACHE_LINE_MASK) != 0) + if ((memzone_aligned_1024->len & RTE_CACHE_LINE_MASK) != 0) return -1; /* check that zones don't overlap */ @@ -571,40 +605,40 @@ check_memzone_bounded(const char *name, uint32_t len, uint32_t align, bmask = ~((phys_addr_t)bound - 1); - if ((mz = rte_memzone_reserve_bounded(name, len, SOCKET_ID_ANY, 0, + if ((mz = rte_memzone_reserve_bounded(name, len, SOCKET_ID_ANY, 0, align, bound)) == NULL) { printf("%s(%s): memzone creation failed\n", __func__, name); - return (-1); + return -1; } if ((mz->phys_addr & ((phys_addr_t)align - 1)) != 0) { printf("%s(%s): invalid phys addr alignment\n", __func__, mz->name); - return (-1); + return -1; } if (((uintptr_t) mz->addr & ((uintptr_t)align - 1)) != 0) { printf("%s(%s): invalid virtual addr alignment\n", __func__, mz->name); - return (-1); + return -1; } - if ((mz->len & CACHE_LINE_MASK) != 0 || mz->len < len || - mz->len < CACHE_LINE_SIZE) { + if ((mz->len & RTE_CACHE_LINE_MASK) != 0 || mz->len < len || + mz->len < RTE_CACHE_LINE_SIZE) { printf("%s(%s): invalid length\n", __func__, mz->name); - return (-1); + return -1; } if ((mz->phys_addr & bmask) != ((mz->phys_addr + mz->len - 1) & bmask)) { printf("%s(%s): invalid memzone boundary %u crossed\n", __func__, mz->name, bound); - return (-1); + return -1; } - return (0); + return 0; } static int @@ -620,311 +654,110 @@ test_memzone_bounded(void) 100, SOCKET_ID_ANY, 0, 32, UINT32_MAX)) != NULL) { printf("%s(%s)created a memzone with invalid boundary " "conditions\n", __func__, memzone_err->name); - return (-1); + return -1; } - + /* should fail as len is greater then boundary */ name = "bounded_error_32"; if ((memzone_err = rte_memzone_reserve_bounded(name, 100, SOCKET_ID_ANY, 0, 32, 32)) != NULL) { printf("%s(%s)created a memzone with invalid boundary " "conditions\n", __func__, memzone_err->name); - return (-1); + return -1; } if ((rc = check_memzone_bounded("bounded_128", 100, 128, 128)) != 0) - return (rc); + return rc; if ((rc = check_memzone_bounded("bounded_256", 100, 256, 128)) != 0) - return (rc); + return rc; if ((rc = check_memzone_bounded("bounded_1K", 100, 64, 1024)) != 0) - return (rc); + return rc; if ((rc = check_memzone_bounded("bounded_1K_MAX", 0, 64, 1024)) != 0) - return (rc); + return rc; - return (0); + return 0; } static int -test_memzone_reserve_memory_in_smallest_segment(void) +test_memzone_free(void) { - const struct rte_memzone *mz; - const struct rte_memseg *ms, *min_ms, *prev_min_ms; - size_t min_len, prev_min_len; - const struct rte_config *config; + const struct rte_memzone *mz[RTE_MAX_MEMZONE]; int i; + char name[20]; - config = rte_eal_get_configuration(); - - min_ms = NULL; /*< smallest segment */ - prev_min_ms = NULL; /*< second smallest segment */ + mz[0] = rte_memzone_reserve("tempzone0", 2000, SOCKET_ID_ANY, 0); + mz[1] = rte_memzone_reserve("tempzone1", 4000, SOCKET_ID_ANY, 0); - /* find two smallest segments */ - for (i = 0; i < RTE_MAX_MEMSEG; i++) { - ms = &config->mem_config->free_memseg[i]; - - if (ms->addr == NULL) - break; - if (ms->len == 0) - continue; - - if (min_ms == NULL) - min_ms = ms; - else if (min_ms->len > ms->len) { - /* set last smallest to second last */ - prev_min_ms = min_ms; - - /* set new smallest */ - min_ms = ms; - } - else if (prev_min_ms == NULL) { - prev_min_ms = ms; - } - } - - if (min_ms == NULL || prev_min_ms == NULL) { - printf("Smallest segments not found!\n"); + if (mz[0] > mz[1]) return -1; - } - - min_len = min_ms->len; - prev_min_len = prev_min_ms->len; - - /* try reserving a memzone in the smallest memseg */ - mz = rte_memzone_reserve("smallest_mz", CACHE_LINE_SIZE, - SOCKET_ID_ANY, 0); - if (mz == NULL) { - printf("Failed to reserve memory from smallest memseg!\n"); + if (!rte_memzone_lookup("tempzone0")) return -1; - } - if (prev_min_ms->len != prev_min_len && - min_ms->len != min_len - CACHE_LINE_SIZE) { - printf("Reserved memory from wrong memseg!\n"); + if (!rte_memzone_lookup("tempzone1")) return -1; - } - - return 0; -} - -/* this test is a bit tricky, and thus warrants explanation. - * - * first, we find two smallest memsegs to conduct our experiments on. - * - * then, we bring them within alignment from each other: if second segment is - * twice+ as big as the first, reserve memory from that segment; if second - * segment is comparable in length to the first, then cut the first segment - * down until it becomes less than half of second segment, and then cut down - * the second segment to be within alignment of the first. - * - * then, we have to pass the following test: if segments are within alignment - * of each other (that is, the difference is less than 256 bytes, which is what - * our alignment will be), segment with smallest offset should be picked. - * - * we know that min_ms will be our smallest segment, so we need to make sure - * that we adjust the alignments so that the bigger segment has smallest - * alignment (in our case, smallest segment will have 64-byte alignment, while - * bigger segment will have 128-byte alignment). - */ -static int -test_memzone_reserve_memory_with_smallest_offset(void) -{ - const struct rte_memseg *ms, *min_ms, *prev_min_ms; - size_t len, min_len, prev_min_len; - const struct rte_config *config; - int i, align; - - config = rte_eal_get_configuration(); - - min_ms = NULL; /*< smallest segment */ - prev_min_ms = NULL; /*< second smallest segment */ - align = CACHE_LINE_SIZE * 4; - - /* find two smallest segments */ - for (i = 0; i < RTE_MAX_MEMSEG; i++) { - ms = &config->mem_config->free_memseg[i]; - - if (ms->addr == NULL) - break; - if (ms->len == 0) - continue; - - if (min_ms == NULL) - min_ms = ms; - else if (min_ms->len > ms->len) { - /* set last smallest to second last */ - prev_min_ms = min_ms; - /* set new smallest */ - min_ms = ms; - } - else if (prev_min_ms == NULL) { - prev_min_ms = ms; - } + if (rte_memzone_free(mz[0])) { + printf("Fail memzone free - tempzone0\n"); + return -1; } - - if (min_ms == NULL || prev_min_ms == NULL) { - printf("Smallest segments not found!\n"); + if (rte_memzone_lookup("tempzone0")) { + printf("Found previously free memzone - tempzone0\n"); return -1; } + mz[2] = rte_memzone_reserve("tempzone2", 2000, SOCKET_ID_ANY, 0); - prev_min_len = prev_min_ms->len; - min_len = min_ms->len; - - /* if smallest segment is bigger than half of bigger segment */ - if (prev_min_ms->len - min_ms->len <= min_ms->len) { - - len = (min_ms->len * 2) - prev_min_ms->len; - - /* make sure final length is *not* aligned */ - while (((min_ms->addr_64 + len) & (align-1)) == 0) - len += CACHE_LINE_SIZE; - - if (rte_memzone_reserve("dummy_mz1", len, SOCKET_ID_ANY, 0) == NULL) { - printf("Cannot reserve memory!\n"); - return -1; - } - - /* check if we got memory from correct segment */ - if (min_ms->len != min_len - len) { - printf("Reserved memory from wrong segment!\n"); - return -1; - } + if (mz[2] > mz[1]) { + printf("tempzone2 should have gotten the free entry from tempzone0\n"); + return -1; } - /* if we don't need to touch smallest segment but it's aligned */ - else if ((min_ms->addr_64 & (align-1)) == 0) { - if (rte_memzone_reserve("align_mz1", CACHE_LINE_SIZE, - SOCKET_ID_ANY, 0) == NULL) { - printf("Cannot reserve memory!\n"); - return -1; - } - if (min_ms->len != min_len - CACHE_LINE_SIZE) { - printf("Reserved memory from wrong segment!\n"); - return -1; - } - } - - /* if smallest segment is less than half of bigger segment */ - if (prev_min_ms->len - min_ms->len > min_ms->len) { - len = prev_min_ms->len - min_ms->len - align; - - /* make sure final length is aligned */ - while (((prev_min_ms->addr_64 + len) & (align-1)) != 0) - len += CACHE_LINE_SIZE; - - if (rte_memzone_reserve("dummy_mz2", len, SOCKET_ID_ANY, 0) == NULL) { - printf("Cannot reserve memory!\n"); - return -1; - } - - /* check if we got memory from correct segment */ - if (prev_min_ms->len != prev_min_len - len) { - printf("Reserved memory from wrong segment!\n"); - return -1; - } + if (rte_memzone_free(mz[2])) { + printf("Fail memzone free - tempzone2\n"); + return -1; } - len = CACHE_LINE_SIZE; - - - - prev_min_len = prev_min_ms->len; - min_len = min_ms->len; - - if (min_len >= prev_min_len || prev_min_len - min_len > (unsigned) align) { - printf("Segments are of wrong lengths!\n"); + if (rte_memzone_lookup("tempzone2")) { + printf("Found previously free memzone - tempzone2\n"); return -1; } - - /* try reserving from a bigger segment */ - if (rte_memzone_reserve_aligned("smallest_offset", len, SOCKET_ID_ANY, 0, align) == - NULL) { - printf("Cannot reserve memory!\n"); + if (rte_memzone_free(mz[1])) { + printf("Fail memzone free - tempzone1\n"); return -1; } - - /* check if we got memory from correct segment */ - if (min_ms->len != min_len && prev_min_ms->len != (prev_min_len - len)) { - printf("Reserved memory from segment with smaller offset!\n"); + if (rte_memzone_lookup("tempzone1")) { + printf("Found previously free memzone - tempzone1\n"); return -1; } - return 0; -} - -static int -test_memzone_reserve_remainder(void) -{ - const struct rte_memzone *mz1, *mz2; - const struct rte_memseg *ms, *min_ms = NULL; - size_t min_len; - const struct rte_config *config; - int i, align; - - min_len = 0; - align = CACHE_LINE_SIZE; - - config = rte_eal_get_configuration(); - - /* find minimum free contiguous length */ - for (i = 0; i < RTE_MAX_MEMSEG; i++) { - ms = &config->mem_config->free_memseg[i]; - - if (ms->addr == NULL) - break; - if (ms->len == 0) - continue; - - if (min_len == 0 || ms->len < min_len) { - min_len = ms->len; - min_ms = ms; + i = 0; + do { + snprintf(name, sizeof(name), "tempzone%u", i); + mz[i] = rte_memzone_reserve(name, 1, SOCKET_ID_ANY, 0); + } while (mz[i++] != NULL); - /* find maximum alignment this segment is able to hold */ - align = CACHE_LINE_SIZE; - while ((ms->addr_64 & (align-1)) == 0) { - align <<= 1; - } - } - } - - if (min_ms == NULL) { - printf("Minimal sized segment not found!\n"); + if (rte_memzone_free(mz[0])) { + printf("Fail memzone free - tempzone0\n"); return -1; } + mz[0] = rte_memzone_reserve("tempzone0new", 0, SOCKET_ID_ANY, 0); - /* try reserving min_len bytes with alignment - this should not affect our - * memseg, the memory will be taken from a different one. - */ - mz1 = rte_memzone_reserve_aligned("reserve_remainder_1", min_len, - SOCKET_ID_ANY, 0, align); - if (mz1 == NULL) { - printf("Failed to reserve %zu bytes aligned on %i bytes\n", min_len, - align); - return -1; - } - if (min_ms->len != min_len) { - printf("Memseg memory should not have been reserved!\n"); + if (mz[0] == NULL) { + printf("Fail to create memzone - tempzone0new - when MAX memzones were " + "created and one was free\n"); return -1; } - /* try reserving min_len bytes with less alignment - this should fill up - * the segment. - */ - mz2 = rte_memzone_reserve("reserve_remainder_2", min_len, - SOCKET_ID_ANY, 0); - if (mz2 == NULL) { - printf("Failed to reserve %zu bytes\n", min_len); - return -1; - } - if (min_ms->len != 0) { - printf("Memseg memory should have been reserved!\n"); - return -1; + for (i = i - 2; i >= 0; i--) { + if (rte_memzone_free(mz[i])) { + printf("Fail memzone free - tempzone%d\n", i); + return -1; + } } return 0; } -int +static int test_memzone(void) { const struct rte_memzone *memzone1; @@ -949,22 +782,22 @@ test_memzone(void) if (memzone1 == NULL || memzone2 == NULL || memzone4 == NULL) return -1; - rte_memzone_dump(); + rte_memzone_dump(stdout); /* check cache-line alignments */ printf("check alignments and lengths\n"); - if ((memzone1->phys_addr & CACHE_LINE_MASK) != 0) + if ((memzone1->phys_addr & RTE_CACHE_LINE_MASK) != 0) return -1; - if ((memzone2->phys_addr & CACHE_LINE_MASK) != 0) + if ((memzone2->phys_addr & RTE_CACHE_LINE_MASK) != 0) return -1; - if (memzone3 != NULL && (memzone3->phys_addr & CACHE_LINE_MASK) != 0) + if (memzone3 != NULL && (memzone3->phys_addr & RTE_CACHE_LINE_MASK) != 0) return -1; - if ((memzone1->len & CACHE_LINE_MASK) != 0 || memzone1->len == 0) + if ((memzone1->len & RTE_CACHE_LINE_MASK) != 0 || memzone1->len == 0) return -1; - if ((memzone2->len & CACHE_LINE_MASK) != 0 || memzone2->len == 0) + if ((memzone2->len & RTE_CACHE_LINE_MASK) != 0 || memzone2->len == 0) return -1; - if (memzone3 != NULL && ((memzone3->len & CACHE_LINE_MASK) != 0 || + if (memzone3 != NULL && ((memzone3->len & RTE_CACHE_LINE_MASK) != 0 || memzone3->len == 0)) return -1; if (memzone4->len != 1024) @@ -1004,16 +837,12 @@ test_memzone(void) if (mz != NULL) return -1; - printf("test reserving memzone with bigger size than the maximum\n"); - if (test_memzone_reserving_zone_size_bigger_than_the_maximum() < 0) - return -1; - - printf("test reserving memory in smallest segments\n"); - if (test_memzone_reserve_memory_in_smallest_segment() < 0) + printf("test free memzone\n"); + if (test_memzone_free() < 0) return -1; - printf("test reserving memory in segments with smallest offsets\n"); - if (test_memzone_reserve_memory_with_smallest_offset() < 0) + printf("test reserving memzone with bigger size than the maximum\n"); + if (test_memzone_reserving_zone_size_bigger_than_the_maximum() < 0) return -1; printf("test memzone_reserve flags\n"); @@ -1032,10 +861,6 @@ test_memzone(void) if (test_memzone_invalid_alignment() < 0) return -1; - printf("test reserving amounts of memory equal to segment's length\n"); - if (test_memzone_reserve_remainder() < 0) - return -1; - printf("test reserving the largest size memzone possible\n"); if (test_memzone_reserve_max() < 0) return -1; @@ -1046,3 +871,5 @@ test_memzone(void) return 0; } + +REGISTER_TEST_COMMAND(memzone_autotest, test_memzone);