X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Ftest_memzone.c;h=d87fcc01f2820ca24bd103d421bffb57d599fc5d;hb=21a7f4e2646e1cb6b0dbd6643e5d64f72355af58;hp=294c0dbccee1b747c8e593e3f4caa6f080ebfb7a;hpb=65043089720a39aedfef178fe2c2d9ac1b54b5ac;p=dpdk.git

diff --git a/app/test/test_memzone.c b/app/test/test_memzone.c
index 294c0dbcce..d87fcc01f2 100644
--- a/app/test/test_memzone.c
+++ b/app/test/test_memzone.c
@@ -1,7 +1,7 @@
 /*-
  *   BSD LICENSE
  * 
- *   Copyright(c) 2010-2013 Intel Corporation. All rights reserved.
+ *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   All rights reserved.
  * 
  *   Redistribution and use in source and binary forms, with or without
@@ -36,8 +36,6 @@
 #include <inttypes.h>
 #include <sys/queue.h>
 
-#include <cmdline_parse.h>
-
 #include <rte_random.h>
 #include <rte_cycles.h>
 #include <rte_memory.h>
@@ -46,6 +44,7 @@
 #include <rte_eal.h>
 #include <rte_eal_memconfig.h>
 #include <rte_common.h>
+#include <rte_string_fns.h>
 
 #include "test.h"
 
@@ -134,7 +133,7 @@ test_memzone_reserve_flags(void)
 	const struct rte_memseg *ms;
 	int hugepage_2MB_avail = 0;
 	int hugepage_1GB_avail = 0;
-	const int size = 100;
+	const size_t size = 100;
 	int i = 0;
 	ms = rte_eal_get_physmem_layout();
 	for (i = 0; i < RTE_MAX_MEMSEG; i++) {
@@ -451,33 +450,23 @@ 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_lookup("aligned_32");
-	if (memzone_aligned_32 == NULL)
-		memzone_aligned_32 = rte_memzone_reserve_aligned("aligned_32", 100,
+	memzone_aligned_32 = rte_memzone_reserve_aligned("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_lookup("aligned_128");
-	if (memzone_aligned_128 == NULL)
-		memzone_aligned_128 = rte_memzone_reserve_aligned("aligned_128", 100,
+	memzone_aligned_128 = rte_memzone_reserve_aligned("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_lookup("aligned_256");
-	if (memzone_aligned_256 == NULL)
-		memzone_aligned_256 = rte_memzone_reserve_aligned("aligned_256", 100,
+	memzone_aligned_256 = rte_memzone_reserve_aligned("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_lookup("aligned_512");
-	if (memzone_aligned_512 == NULL)
-		memzone_aligned_512 = rte_memzone_reserve_aligned("aligned_512", 100,
+	memzone_aligned_512 = rte_memzone_reserve_aligned("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_lookup("aligned_1024");
-	if (memzone_aligned_1024 == NULL)
-		memzone_aligned_1024 = rte_memzone_reserve_aligned("aligned_1024", 100,
+	memzone_aligned_1024 = rte_memzone_reserve_aligned("aligned_1024", 100,
 				SOCKET_ID_ANY, 0, 1024);
 
 	printf("check alignments and lengths\n");
@@ -491,6 +480,7 @@ test_memzone_aligned(void)
 		return -1;
 	if ((memzone_aligned_32->len & CACHE_LINE_MASK) != 0)
 		return -1;
+
 	if (memzone_aligned_128 == NULL) {
 		printf("Unable to reserve 128-byte aligned memzone!\n");
 		return -1;
@@ -501,6 +491,7 @@ test_memzone_aligned(void)
 		return -1;
 	if ((memzone_aligned_128->len & CACHE_LINE_MASK) != 0)
 		return -1;
+
 	if (memzone_aligned_256 == NULL) {
 		printf("Unable to reserve 256-byte aligned memzone!\n");
 		return -1;
@@ -511,6 +502,7 @@ test_memzone_aligned(void)
 		return -1;
 	if ((memzone_aligned_256->len & CACHE_LINE_MASK) != 0)
 		return -1;
+
 	if (memzone_aligned_512 == NULL) {
 		printf("Unable to reserve 512-byte aligned memzone!\n");
 		return -1;
@@ -521,6 +513,7 @@ test_memzone_aligned(void)
 		return -1;
 	if ((memzone_aligned_512->len & CACHE_LINE_MASK) != 0)
 		return -1;
+
 	if (memzone_aligned_1024 == NULL) {
 		printf("Unable to reserve 1024-byte aligned memzone!\n");
 		return -1;
@@ -567,31 +560,391 @@ test_memzone_aligned(void)
 	return 0;
 }
 
+static int
+check_memzone_bounded(const char *name, uint32_t len,  uint32_t align,
+	uint32_t bound)
+{
+	const struct rte_memzone *mz;
+	phys_addr_t bmask;
+
+	bmask = ~((phys_addr_t)bound - 1);
+
+	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);
+	}
+
+	if ((mz->phys_addr & ((phys_addr_t)align - 1)) != 0) {
+		printf("%s(%s): invalid phys addr alignment\n",
+			__func__, mz->name);
+		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);
+	}
+
+	if ((mz->len & CACHE_LINE_MASK) != 0 || mz->len < len ||
+			mz->len < CACHE_LINE_SIZE) {
+		printf("%s(%s): invalid length\n",
+			__func__, mz->name);
+		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 (0);
+}
+
+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) {
+		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) {
+		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)
+		return (rc);
+
+	if ((rc = check_memzone_bounded("bounded_256", 100, 256, 128)) != 0)
+		return (rc);
+
+	if ((rc = check_memzone_bounded("bounded_1K", 100, 64, 1024)) != 0)
+		return (rc);
+
+	if ((rc = check_memzone_bounded("bounded_1K_MAX", 0, 64, 1024)) != 0)
+		return (rc);
+
+	return (0);
+}
+
+static int
+test_memzone_reserve_memory_in_smallest_segment(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;
+	int i;
+
+	config = rte_eal_get_configuration();
+
+	min_ms = NULL;  /*< smallest segment */
+	prev_min_ms = NULL; /*< second smallest segment */
+
+	/* 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");
+		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");
+		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");
+		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 (min_ms == NULL || prev_min_ms == NULL) {
+		printf("Smallest segments not found!\n");
+		return -1;
+	}
+
+	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 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;
+		}
+	}
+	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");
+		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");
+		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");
+		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;
+
+			/* 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");
+		return -1;
+	}
+
+	/* 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");
+		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;
+	}
+
+	return 0;
+}
+
 int
 test_memzone(void)
 {
 	const struct rte_memzone *memzone1;
 	const struct rte_memzone *memzone2;
 	const struct rte_memzone *memzone3;
+	const struct rte_memzone *memzone4;
 	const struct rte_memzone *mz;
 
-	memzone1 = rte_memzone_lookup("testzone1");
-	if (memzone1 == NULL)
-		memzone1 = rte_memzone_reserve("testzone1", 100,
+	memzone1 = rte_memzone_reserve("testzone1", 100,
 				SOCKET_ID_ANY, 0);
 
-	memzone2 = rte_memzone_lookup("testzone2");
-	if (memzone2 == NULL)
-		memzone2 = rte_memzone_reserve("testzone2", 1000,
+	memzone2 = rte_memzone_reserve("testzone2", 1000,
 				0, 0);
 
-	memzone3 = rte_memzone_lookup("testzone3");
-	if (memzone3 == NULL)
-		memzone3 = rte_memzone_reserve("testzone3", 1000,
+	memzone3 = rte_memzone_reserve("testzone3", 1000,
 				1, 0);
 
+	memzone4 = rte_memzone_reserve("testzone4", 1024,
+				SOCKET_ID_ANY, 0);
+
 	/* memzone3 may be NULL if we don't have NUMA */
-	if (memzone1 == NULL || memzone2 == NULL)
+	if (memzone1 == NULL || memzone2 == NULL || memzone4 == NULL)
 		return -1;
 
 	rte_memzone_dump();
@@ -612,6 +965,8 @@ test_memzone(void)
 	if (memzone3 != NULL && ((memzone3->len & CACHE_LINE_MASK) != 0 ||
 			memzone3->len == 0))
 		return -1;
+	if (memzone4->len != 1024)
+		return -1;
 
 	/* check that zones don't overlap */
 	printf("check overlapping\n");
@@ -651,6 +1006,14 @@ test_memzone(void)
 	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)
+		return -1;
+
+	printf("test reserving memory in segments with smallest offsets\n");
+	if (test_memzone_reserve_memory_with_smallest_offset() < 0)
+		return -1;
+
 	printf("test memzone_reserve flags\n");
 	if (test_memzone_reserve_flags() < 0)
 		return -1;
@@ -659,10 +1022,18 @@ test_memzone(void)
 	if (test_memzone_aligned() < 0)
 		return -1;
 
+	printf("test boundary alignment for memzone_reserve\n");
+	if (test_memzone_bounded() < 0)
+		return -1;
+
 	printf("test invalid alignment for memzone_reserve\n");
 	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;