New upstream version 16.11.5
[deb_dpdk.git] / app / test / test_memzone.c
index 72cda00..53be29f 100644 (file)
@@ -33,6 +33,7 @@
 
 #include <stdio.h>
 #include <stdint.h>
+#include <string.h>
 #include <inttypes.h>
 #include <sys/queue.h>
 
@@ -76,6 +77,8 @@
  * - Check flags for specific huge page size reservation
  */
 
+#define TEST_MEMZONE_NAME(suffix) "MZ_TEST_" suffix
+
 /* Test if memory overlaps: return 1 if true, or 0 if false. */
 static int
 is_memory_overlap(phys_addr_t ptr1, size_t len1, phys_addr_t ptr2, size_t len2)
@@ -92,14 +95,14 @@ test_memzone_invalid_alignment(void)
 {
        const struct rte_memzone * mz;
 
-       mz = rte_memzone_lookup("invalid_alignment");
+       mz = rte_memzone_lookup(TEST_MEMZONE_NAME("invalid_alignment"));
        if (mz != NULL) {
                printf("Zone with invalid alignment has been reserved\n");
                return -1;
        }
 
-       mz = rte_memzone_reserve_aligned("invalid_alignment", 100,
-                       SOCKET_ID_ANY, 0, 100);
+       mz = rte_memzone_reserve_aligned(TEST_MEMZONE_NAME("invalid_alignment"),
+                                        100, SOCKET_ID_ANY, 0, 100);
        if (mz != NULL) {
                printf("Zone with invalid alignment has been reserved\n");
                return -1;
@@ -112,14 +115,16 @@ test_memzone_reserving_zone_size_bigger_than_the_maximum(void)
 {
        const struct rte_memzone * mz;
 
-       mz = rte_memzone_lookup("zone_size_bigger_than_the_maximum");
+       mz = rte_memzone_lookup(
+                       TEST_MEMZONE_NAME("zone_size_bigger_than_the_maximum"));
        if (mz != NULL) {
                printf("zone_size_bigger_than_the_maximum has been reserved\n");
                return -1;
        }
 
-       mz = rte_memzone_reserve("zone_size_bigger_than_the_maximum", (size_t)-1,
-                       SOCKET_ID_ANY, 0);
+       mz = rte_memzone_reserve(
+                       TEST_MEMZONE_NAME("zone_size_bigger_than_the_maximum"),
+                       (size_t)-1, SOCKET_ID_ANY, 0);
        if (mz != NULL) {
                printf("It is impossible to reserve such big a memzone\n");
                return -1;
@@ -166,8 +171,8 @@ test_memzone_reserve_flags(void)
         * available page size (i.e 1GB ) when 2MB pages are unavailable.
         */
        if (hugepage_2MB_avail) {
-               mz = rte_memzone_reserve("flag_zone_2M", size, SOCKET_ID_ANY,
-                               RTE_MEMZONE_2MB);
+               mz = rte_memzone_reserve(TEST_MEMZONE_NAME("flag_zone_2M"),
+                               size, SOCKET_ID_ANY, RTE_MEMZONE_2MB);
                if (mz == NULL) {
                        printf("MEMZONE FLAG 2MB\n");
                        return -1;
@@ -181,7 +186,8 @@ test_memzone_reserve_flags(void)
                        return -1;
                }
 
-               mz = rte_memzone_reserve("flag_zone_2M_HINT", size, SOCKET_ID_ANY,
+               mz = rte_memzone_reserve(TEST_MEMZONE_NAME("flag_zone_2M_HINT"),
+                               size, SOCKET_ID_ANY,
                                RTE_MEMZONE_2MB|RTE_MEMZONE_SIZE_HINT_ONLY);
                if (mz == NULL) {
                        printf("MEMZONE FLAG 2MB\n");
@@ -200,7 +206,9 @@ test_memzone_reserve_flags(void)
                 * HINT flag is indicated
                 */
                if (!hugepage_1GB_avail) {
-                       mz = rte_memzone_reserve("flag_zone_1G_HINT", size, SOCKET_ID_ANY,
+                       mz = rte_memzone_reserve(
+                                       TEST_MEMZONE_NAME("flag_zone_1G_HINT"),
+                                       size, SOCKET_ID_ANY,
                                        RTE_MEMZONE_1GB|RTE_MEMZONE_SIZE_HINT_ONLY);
                        if (mz == NULL) {
                                printf("MEMZONE FLAG 1GB & HINT\n");
@@ -215,8 +223,9 @@ test_memzone_reserve_flags(void)
                                return -1;
                        }
 
-                       mz = rte_memzone_reserve("flag_zone_1G", size, SOCKET_ID_ANY,
-                                       RTE_MEMZONE_1GB);
+                       mz = rte_memzone_reserve(
+                                       TEST_MEMZONE_NAME("flag_zone_1G"), size,
+                                       SOCKET_ID_ANY, RTE_MEMZONE_1GB);
                        if (mz != NULL) {
                                printf("MEMZONE FLAG 1GB\n");
                                return -1;
@@ -226,8 +235,8 @@ test_memzone_reserve_flags(void)
 
        /*As with 2MB tests above for 1GB huge page requests*/
        if (hugepage_1GB_avail) {
-               mz = rte_memzone_reserve("flag_zone_1G", size, SOCKET_ID_ANY,
-                               RTE_MEMZONE_1GB);
+               mz = rte_memzone_reserve(TEST_MEMZONE_NAME("flag_zone_1G"),
+                               size, SOCKET_ID_ANY, RTE_MEMZONE_1GB);
                if (mz == NULL) {
                        printf("MEMZONE FLAG 1GB\n");
                        return -1;
@@ -241,7 +250,8 @@ test_memzone_reserve_flags(void)
                        return -1;
                }
 
-               mz = rte_memzone_reserve("flag_zone_1G_HINT", size, SOCKET_ID_ANY,
+               mz = rte_memzone_reserve(TEST_MEMZONE_NAME("flag_zone_1G_HINT"),
+                               size, SOCKET_ID_ANY,
                                RTE_MEMZONE_1GB|RTE_MEMZONE_SIZE_HINT_ONLY);
                if (mz == NULL) {
                        printf("MEMZONE FLAG 1GB\n");
@@ -260,7 +270,9 @@ test_memzone_reserve_flags(void)
                 * HINT flag is indicated
                 */
                if (!hugepage_2MB_avail) {
-                       mz = rte_memzone_reserve("flag_zone_2M_HINT", size, SOCKET_ID_ANY,
+                       mz = rte_memzone_reserve(
+                                       TEST_MEMZONE_NAME("flag_zone_2M_HINT"),
+                                       size, SOCKET_ID_ANY,
                                        RTE_MEMZONE_2MB|RTE_MEMZONE_SIZE_HINT_ONLY);
                        if (mz == NULL){
                                printf("MEMZONE FLAG 2MB & HINT\n");
@@ -274,25 +286,33 @@ test_memzone_reserve_flags(void)
                                printf("Fail memzone free\n");
                                return -1;
                        }
-                       mz = rte_memzone_reserve("flag_zone_2M", size, SOCKET_ID_ANY,
-                                       RTE_MEMZONE_2MB);
+                       mz = rte_memzone_reserve(
+                                       TEST_MEMZONE_NAME("flag_zone_2M"), size,
+                                       SOCKET_ID_ANY, RTE_MEMZONE_2MB);
                        if (mz != NULL) {
                                printf("MEMZONE FLAG 2MB\n");
                                return -1;
                        }
-                       if (rte_memzone_free(mz)) {
-                               printf("Fail memzone free\n");
-                               return -1;
-                       }
                }
 
                if (hugepage_2MB_avail && hugepage_1GB_avail) {
-                       mz = rte_memzone_reserve("flag_zone_2M_HINT", size, SOCKET_ID_ANY,
-                                                               RTE_MEMZONE_2MB|RTE_MEMZONE_1GB);
-                       if (mz != NULL) {
+                       mz = rte_memzone_reserve(
+                                       TEST_MEMZONE_NAME("flag_zone_2M_HINT"),
+                                       size, SOCKET_ID_ANY,
+                                       RTE_MEMZONE_2MB|RTE_MEMZONE_1GB);
+                       if (mz == NULL) {
                                printf("BOTH SIZES SET\n");
                                return -1;
                        }
+                       if (mz->hugepage_sz != RTE_PGSIZE_1G &&
+                                       mz->hugepage_sz != RTE_PGSIZE_2M) {
+                               printf("Wrong size when both sizes set\n");
+                               return -1;
+                       }
+                       if (rte_memzone_free(mz)) {
+                               printf("Fail memzone free\n");
+                               return -1;
+                       }
                }
        }
        /*
@@ -303,8 +323,8 @@ test_memzone_reserve_flags(void)
         * 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);
+               mz = rte_memzone_reserve(TEST_MEMZONE_NAME("flag_zone_16M"),
+                               size, SOCKET_ID_ANY, RTE_MEMZONE_16MB);
                if (mz == NULL) {
                        printf("MEMZONE FLAG 16MB\n");
                        return -1;
@@ -318,8 +338,10 @@ test_memzone_reserve_flags(void)
                        return -1;
                }
 
-               mz = rte_memzone_reserve("flag_zone_16M_HINT", size,
-               SOCKET_ID_ANY, RTE_MEMZONE_16MB|RTE_MEMZONE_SIZE_HINT_ONLY);
+               mz = rte_memzone_reserve(
+                               TEST_MEMZONE_NAME("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;
@@ -337,9 +359,11 @@ test_memzone_reserve_flags(void)
                 * 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);
+                       mz = rte_memzone_reserve(
+                                       TEST_MEMZONE_NAME("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;
@@ -353,8 +377,10 @@ test_memzone_reserve_flags(void)
                                return -1;
                        }
 
-                       mz = rte_memzone_reserve("flag_zone_16G", size,
-                               SOCKET_ID_ANY, RTE_MEMZONE_16GB);
+                       mz = rte_memzone_reserve(
+                                       TEST_MEMZONE_NAME("flag_zone_16G"),
+                                       size,
+                                       SOCKET_ID_ANY, RTE_MEMZONE_16GB);
                        if (mz != NULL) {
                                printf("MEMZONE FLAG 16GB\n");
                                return -1;
@@ -363,8 +389,8 @@ test_memzone_reserve_flags(void)
        }
        /*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);
+               mz = rte_memzone_reserve(TEST_MEMZONE_NAME("flag_zone_16G"),
+                               size, SOCKET_ID_ANY, RTE_MEMZONE_16GB);
                if (mz == NULL) {
                        printf("MEMZONE FLAG 16GB\n");
                        return -1;
@@ -378,8 +404,10 @@ test_memzone_reserve_flags(void)
                        return -1;
                }
 
-               mz = rte_memzone_reserve("flag_zone_16G_HINT", size,
-               SOCKET_ID_ANY, RTE_MEMZONE_16GB|RTE_MEMZONE_SIZE_HINT_ONLY);
+               mz = rte_memzone_reserve(
+                               TEST_MEMZONE_NAME("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;
@@ -397,9 +425,11 @@ test_memzone_reserve_flags(void)
                 * 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);
+                       mz = rte_memzone_reserve(
+                                       TEST_MEMZONE_NAME("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;
@@ -412,8 +442,9 @@ test_memzone_reserve_flags(void)
                                printf("Fail memzone free\n");
                                return -1;
                        }
-                       mz = rte_memzone_reserve("flag_zone_16M", size,
-                               SOCKET_ID_ANY, RTE_MEMZONE_16MB);
+                       mz = rte_memzone_reserve(
+                                       TEST_MEMZONE_NAME("flag_zone_16M"),
+                                       size, SOCKET_ID_ANY, RTE_MEMZONE_16MB);
                        if (mz != NULL) {
                                printf("MEMZONE FLAG 16MB\n");
                                return -1;
@@ -421,13 +452,23 @@ test_memzone_reserve_flags(void)
                }
 
                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) {
+                       mz = rte_memzone_reserve(
+                                       TEST_MEMZONE_NAME("flag_zone_16M_HINT"),
+                                       size, SOCKET_ID_ANY,
+                                       RTE_MEMZONE_16MB|RTE_MEMZONE_16GB);
+                       if (mz == NULL) {
                                printf("BOTH SIZES SET\n");
                                return -1;
                        }
+                       if (mz->hugepage_sz != RTE_PGSIZE_16G &&
+                                       mz->hugepage_sz != RTE_PGSIZE_16M) {
+                               printf("Wrong size when both sizes set\n");
+                               return -1;
+                       }
+                       if (rte_memzone_free(mz)) {
+                               printf("Fail memzone free\n");
+                               return -1;
+                       }
                }
        }
        return 0;
@@ -470,7 +511,8 @@ test_memzone_reserve_max(void)
                return 0;
        }
 
-       mz = rte_memzone_reserve("max_zone", 0, SOCKET_ID_ANY, 0);
+       mz = rte_memzone_reserve(TEST_MEMZONE_NAME("max_zone"), 0,
+                       SOCKET_ID_ANY, 0);
        if (mz == NULL){
                printf("Failed to reserve a big chunk of memory - %s\n",
                                rte_strerror(rte_errno));
@@ -512,8 +554,8 @@ test_memzone_reserve_max_aligned(void)
                return 0;
        }
 
-       mz = rte_memzone_reserve_aligned("max_zone_aligned", 0,
-                       SOCKET_ID_ANY, 0, align);
+       mz = rte_memzone_reserve_aligned(TEST_MEMZONE_NAME("max_zone_aligned"),
+                       0, SOCKET_ID_ANY, 0, align);
        if (mz == NULL){
                printf("Failed to reserve a big chunk of memory - %s\n",
                                rte_strerror(rte_errno));
@@ -550,24 +592,29 @@ test_memzone_aligned(void)
        const struct rte_memzone *memzone_aligned_1024;
 
        /* memzone that should automatically be adjusted to align on 64 bytes */
-       memzone_aligned_32 = rte_memzone_reserve_aligned("aligned_32", 100,
-                               SOCKET_ID_ANY, 0, 32);
+       memzone_aligned_32 = rte_memzone_reserve_aligned(
+                       TEST_MEMZONE_NAME("aligned_32"), 100, SOCKET_ID_ANY, 0,
+                       32);
 
        /* memzone that is supposed to be aligned on a 128 byte boundary */
-       memzone_aligned_128 = rte_memzone_reserve_aligned("aligned_128", 100,
-                               SOCKET_ID_ANY, 0, 128);
+       memzone_aligned_128 = rte_memzone_reserve_aligned(
+                       TEST_MEMZONE_NAME("aligned_128"), 100, SOCKET_ID_ANY, 0,
+                       128);
 
        /* memzone that is supposed to be aligned on a 256 byte boundary */
-       memzone_aligned_256 = rte_memzone_reserve_aligned("aligned_256", 100,
-                               SOCKET_ID_ANY, 0, 256);
+       memzone_aligned_256 = rte_memzone_reserve_aligned(
+                       TEST_MEMZONE_NAME("aligned_256"), 100, SOCKET_ID_ANY, 0,
+                       256);
 
        /* memzone that is supposed to be aligned on a 512 byte boundary */
-       memzone_aligned_512 = rte_memzone_reserve_aligned("aligned_512", 100,
-                               SOCKET_ID_ANY, 0, 512);
+       memzone_aligned_512 = rte_memzone_reserve_aligned(
+                       TEST_MEMZONE_NAME("aligned_512"), 100, SOCKET_ID_ANY, 0,
+                       512);
 
        /* memzone that is supposed to be aligned on a 1024 byte boundary */
-       memzone_aligned_1024 = rte_memzone_reserve_aligned("aligned_1024", 100,
-                               SOCKET_ID_ANY, 0, 1024);
+       memzone_aligned_1024 = rte_memzone_reserve_aligned(
+                       TEST_MEMZONE_NAME("aligned_1024"), 100, SOCKET_ID_ANY,
+                       0, 1024);
 
        printf("check alignments and lengths\n");
        if (memzone_aligned_32 == NULL) {
@@ -736,37 +783,46 @@ static int
 test_memzone_bounded(void)
 {
        const struct rte_memzone *memzone_err;
-       const char *name;
        int rc;
 
        /* should fail as boundary is not power of two */
-       name = "bounded_error_31";
-       if ((memzone_err = rte_memzone_reserve_bounded(name,
-                       100, SOCKET_ID_ANY, 0, 32, UINT32_MAX)) != NULL) {
+       memzone_err = rte_memzone_reserve_bounded(
+                       TEST_MEMZONE_NAME("bounded_error_31"), 100,
+                       SOCKET_ID_ANY, 0, 32, UINT32_MAX);
+       if (memzone_err != NULL) {
                printf("%s(%s)created a memzone with invalid boundary "
                        "conditions\n", __func__, memzone_err->name);
                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) {
+       memzone_err = rte_memzone_reserve_bounded(
+                       TEST_MEMZONE_NAME("bounded_error_32"), 100,
+                       SOCKET_ID_ANY, 0, 32, 32);
+       if (memzone_err != NULL) {
                printf("%s(%s)created a memzone with invalid boundary "
                        "conditions\n", __func__, memzone_err->name);
                return -1;
        }
 
-       if ((rc = check_memzone_bounded("bounded_128", 100, 128, 128)) != 0)
+       rc = check_memzone_bounded(TEST_MEMZONE_NAME("bounded_128"), 100, 128,
+                       128);
+       if (rc != 0)
                return rc;
 
-       if ((rc = check_memzone_bounded("bounded_256", 100, 256, 128)) != 0)
+       rc = check_memzone_bounded(TEST_MEMZONE_NAME("bounded_256"), 100, 256,
+                       128);
+       if (rc != 0)
                return rc;
 
-       if ((rc = check_memzone_bounded("bounded_1K", 100, 64, 1024)) != 0)
+       rc = check_memzone_bounded(TEST_MEMZONE_NAME("bounded_1K"), 100, 64,
+                       1024);
+       if (rc != 0)
                return rc;
 
-       if ((rc = check_memzone_bounded("bounded_1K_MAX", 0, 64, 1024)) != 0)
+       rc = check_memzone_bounded(TEST_MEMZONE_NAME("bounded_1K_MAX"), 0, 64,
+                       1024);
+       if (rc != 0)
                return rc;
 
        return 0;
@@ -775,29 +831,32 @@ test_memzone_bounded(void)
 static int
 test_memzone_free(void)
 {
-       const struct rte_memzone *mz[RTE_MAX_MEMZONE];
+       const struct rte_memzone *mz[RTE_MAX_MEMZONE + 1];
        int i;
        char name[20];
 
-       mz[0] = rte_memzone_reserve("tempzone0", 2000, SOCKET_ID_ANY, 0);
-       mz[1] = rte_memzone_reserve("tempzone1", 4000, SOCKET_ID_ANY, 0);
+       mz[0] = rte_memzone_reserve(TEST_MEMZONE_NAME("tempzone0"), 2000,
+                       SOCKET_ID_ANY, 0);
+       mz[1] = rte_memzone_reserve(TEST_MEMZONE_NAME("tempzone1"), 4000,
+                       SOCKET_ID_ANY, 0);
 
        if (mz[0] > mz[1])
                return -1;
-       if (!rte_memzone_lookup("tempzone0"))
+       if (!rte_memzone_lookup(TEST_MEMZONE_NAME("tempzone0")))
                return -1;
-       if (!rte_memzone_lookup("tempzone1"))
+       if (!rte_memzone_lookup(TEST_MEMZONE_NAME("tempzone1")))
                return -1;
 
        if (rte_memzone_free(mz[0])) {
                printf("Fail memzone free - tempzone0\n");
                return -1;
        }
-       if (rte_memzone_lookup("tempzone0")) {
+       if (rte_memzone_lookup(TEST_MEMZONE_NAME("tempzone0"))) {
                printf("Found previously free memzone - tempzone0\n");
                return -1;
        }
-       mz[2] = rte_memzone_reserve("tempzone2", 2000, SOCKET_ID_ANY, 0);
+       mz[2] = rte_memzone_reserve(TEST_MEMZONE_NAME("tempzone2"), 2000,
+                       SOCKET_ID_ANY, 0);
 
        if (mz[2] > mz[1]) {
                printf("tempzone2 should have gotten the free entry from tempzone0\n");
@@ -807,7 +866,7 @@ test_memzone_free(void)
                printf("Fail memzone free - tempzone2\n");
                return -1;
        }
-       if (rte_memzone_lookup("tempzone2")) {
+       if (rte_memzone_lookup(TEST_MEMZONE_NAME("tempzone2"))) {
                printf("Found previously free memzone - tempzone2\n");
                return -1;
        }
@@ -815,14 +874,15 @@ test_memzone_free(void)
                printf("Fail memzone free - tempzone1\n");
                return -1;
        }
-       if (rte_memzone_lookup("tempzone1")) {
+       if (rte_memzone_lookup(TEST_MEMZONE_NAME("tempzone1"))) {
                printf("Found previously free memzone - tempzone1\n");
                return -1;
        }
 
        i = 0;
        do {
-               snprintf(name, sizeof(name), "tempzone%u", i);
+               snprintf(name, sizeof(name), TEST_MEMZONE_NAME("tempzone%u"),
+                               i);
                mz[i] = rte_memzone_reserve(name, 1, SOCKET_ID_ANY, 0);
        } while (mz[i++] != NULL);
 
@@ -830,7 +890,8 @@ test_memzone_free(void)
                printf("Fail memzone free - tempzone0\n");
                return -1;
        }
-       mz[0] = rte_memzone_reserve("tempzone0new", 0, SOCKET_ID_ANY, 0);
+       mz[0] = rte_memzone_reserve(TEST_MEMZONE_NAME("tempzone0new"), 0,
+                       SOCKET_ID_ANY, 0);
 
        if (mz[0] == NULL) {
                printf("Fail to create memzone - tempzone0new - when MAX memzones were "
@@ -857,16 +918,16 @@ test_memzone_basic(void)
        const struct rte_memzone *memzone4;
        const struct rte_memzone *mz;
 
-       memzone1 = rte_memzone_reserve("testzone1", 100,
+       memzone1 = rte_memzone_reserve(TEST_MEMZONE_NAME("testzone1"), 100,
                                SOCKET_ID_ANY, 0);
 
-       memzone2 = rte_memzone_reserve("testzone2", 1000,
+       memzone2 = rte_memzone_reserve(TEST_MEMZONE_NAME("testzone2"), 1000,
                                0, 0);
 
-       memzone3 = rte_memzone_reserve("testzone3", 1000,
+       memzone3 = rte_memzone_reserve(TEST_MEMZONE_NAME("testzone3"), 1000,
                                1, 0);
 
-       memzone4 = rte_memzone_reserve("testzone4", 1024,
+       memzone4 = rte_memzone_reserve(TEST_MEMZONE_NAME("testzone4"), 1024,
                                SOCKET_ID_ANY, 0);
 
        /* memzone3 may be NULL if we don't have NUMA */
@@ -918,12 +979,12 @@ test_memzone_basic(void)
                return -1;
 
        printf("test zone lookup\n");
-       mz = rte_memzone_lookup("testzone1");
+       mz = rte_memzone_lookup(TEST_MEMZONE_NAME("testzone1"));
        if (mz != memzone1)
                return -1;
 
        printf("test duplcate zone name\n");
-       mz = rte_memzone_reserve("testzone1", 100,
+       mz = rte_memzone_reserve(TEST_MEMZONE_NAME("testzone1"), 100,
                        SOCKET_ID_ANY, 0);
        if (mz != NULL)
                return -1;
@@ -948,16 +1009,22 @@ test_memzone_basic(void)
        return 0;
 }
 
-static int memzone_calk_called;
-static void memzone_walk_clb(const struct rte_memzone *mz __rte_unused,
+static int test_memzones_left;
+static int memzone_walk_cnt;
+static void memzone_walk_clb(const struct rte_memzone *mz,
                             void *arg __rte_unused)
 {
-       memzone_calk_called = 1;
+       memzone_walk_cnt++;
+       if (!strncmp(TEST_MEMZONE_NAME(""), mz->name, RTE_MEMZONE_NAMESIZE))
+               test_memzones_left++;
 }
 
 static int
 test_memzone(void)
 {
+       /* take note of how many memzones were allocated before running */
+       int memzone_cnt = rte_eal_get_configuration()->mem_config->memzone_cnt;
+
        printf("test basic memzone API\n");
        if (test_memzone_basic() < 0)
                return -1;
@@ -995,8 +1062,10 @@ test_memzone(void)
                return -1;
 
        printf("check memzone cleanup\n");
+       memzone_walk_cnt = 0;
+       test_memzones_left = 0;
        rte_memzone_walk(memzone_walk_clb, NULL);
-       if (memzone_calk_called) {
+       if (memzone_walk_cnt != memzone_cnt || test_memzones_left > 0) {
                printf("there are some memzones left after test\n");
                rte_memzone_dump(stdout);
                return -1;