Merge branch 'arm' of https://github.com/gwsystems/composite into arm

Author: hungry-foolish

src/components/implementation/tests/micro_booter/mb_tests.c

@@ -853,7 +853,6 @@ test_captbl_expand(void)
 
 /* FIXME: values are hard-coded */
 #define TEST_SMALL
-#define TEST_SUPERPAGE_FRAME    0x4A400000
 #define TEST_SUPERPAGE_VADDR    0x42000000
 #define TEST_SMALLPAGE_VADDR    0x408FF000
 #define TEST_SUPERDELEG_VADDR   0x42400000
@@ -865,10 +864,9 @@ void test_superpages(void)
 	/* This will be used by the memory test */
 	unsigned long *ptr_small = (unsigned long*)TEST_SMALLPAGE_VADDR;
 	unsigned long *ptr_large = (unsigned long*)TEST_SUPERDELEG_VADDR;
+
 	/* Retype this to user */
-	if (call_cap_op(BOOT_CAPTBL_SELF_UNTYPED_PT, CAPTBL_OP_MEM_RETYPE2USER, TEST_SUPERPAGE_FRAME, 0, 0, 0) != 0) BUG();
-	/* Map a superpage to somewhere we want */
-	if (call_cap_op(BOOT_CAPTBL_SELF_UNTYPED_PT, CAPTBL_OP_MEMACTIVATE, TEST_SUPERPAGE_FRAME, BOOT_CAPTBL_SELF_PT, (unsigned long)ptr, SUPER_PAGE_ORDER) !=0) BUG();
+	cos_booter_allocn_super(&booter_info, (1 << SUPER_PAGE_ORDER), ptr);
 
 	/* Do some rw tests on this - write */
 	PRINTC("Doing R/W tests on superpage....\n");
@@ -890,7 +888,19 @@ void test_superpages(void)
 	for (i = 0; i < (1 << SUPER_PAGE_ORDER) / sizeof(unsigned long); i++) {
 		if (ptr_large[i] != i) BUG();
 	}
-	PRINTC("Superpage test SUCCESS.\n");
+	PRINTC("Initial superpage test SUCCESS.\n");
+
+	PRINTC("Doing expanded testing on ALL superpages...\n");
+	ptr += (1 << SUPER_PAGE_ORDER);
+	cos_booter_allocn_super(&booter_info, (EXTRA_SUPERPAGES - 1) * (1 << SUPER_PAGE_ORDER), ptr);
+
+	/* Do some rw tests on this - write */
+	PRINTC("Doing R/W tests on superpage....\n");
+	for (i = 0; i < 4 * (1 << SUPER_PAGE_ORDER) / sizeof(unsigned long); i++) ptr[i] = i;
+	for (i = 0; i < 4 * (1 << SUPER_PAGE_ORDER) / sizeof(unsigned long); i++) {
+		if (ptr[i] != i) BUG();
+	}
+	PRINTC("Expanded superpage test SUCCESS.\n");
 }
 
 /* Executed in micro_booter environment */

src/components/include/cos_kernel_api.h

@@ -56,8 +56,8 @@ typedef capid_t hwcap_t;
 
 /* Memory source information */
 struct cos_meminfo {
-	vaddr_t    untyped_ptr, umem_ptr, kmem_ptr;
-	vaddr_t    untyped_frontier, umem_frontier, kmem_frontier;
+	vaddr_t    untyped_ptr, umem_ptr, kmem_ptr, super_ptr;
+	vaddr_t    untyped_frontier, umem_frontier, kmem_frontier, super_frontier;
 	pgtblcap_t pgtbl_cap;
 };
 
@@ -120,6 +120,7 @@ asndcap_t cos_asnd_alloc(struct cos_compinfo *ci, arcvcap_t arcvcap, captblcap_t
 
 void *cos_page_bump_alloc(struct cos_compinfo *ci);
 void *cos_page_bump_allocn(struct cos_compinfo *ci, size_t sz);
+void *cos_booter_allocn_super(struct cos_compinfo *ci, size_t sz, void* vaddr);
 
 capid_t cos_cap_cpy(struct cos_compinfo *dstci, struct cos_compinfo *srcci, cap_t srcctype, capid_t srccap);
 int     cos_cap_cpy_at(struct cos_compinfo *dstci, capid_t dstcap, struct cos_compinfo *srcci, capid_t srccap);

src/components/lib/cos_kernel_api.c

@@ -17,11 +17,20 @@
 #define printd(...)
 #endif
 
+/* RSK -- move this to proper location, probably consts.h
+ * At this point I'm following runyu's lead but I don't think is
+ * a good long term solution
+ * */
+#define SUPER_PAGE_ORDER 22
+#define SUPER_PAGE_SIZE (1 << SUPER_PAGE_ORDER)
+
 void
 cos_meminfo_init(struct cos_meminfo *mi, vaddr_t untyped_ptr, unsigned long untyped_sz, pgtblcap_t pgtbl_cap)
 {
 	mi->untyped_ptr = mi->umem_ptr = mi->kmem_ptr = mi->umem_frontier = mi->kmem_frontier = untyped_ptr;
 	mi->untyped_frontier = untyped_ptr + untyped_sz;
+	mi->super_ptr = TEST_SUPERPAGE_FRAME;
+	mi->super_frontier = mi->super_ptr + (EXTRA_SUPERPAGES * SUPER_PAGE_SIZE);
 	mi->pgtbl_cap        = pgtbl_cap;
 }
 
@@ -743,6 +752,43 @@ cos_page_bump_allocn(struct cos_compinfo *ci, size_t sz)
 	return (void *)__page_bump_alloc(ci, sz);
 }
 
+static vaddr_t
+__superpage_bump_alloc(struct cos_compinfo *ci, vaddr_t addr)
+{
+	vaddr_t              ret = 0;
+	vaddr_t *            ptr, *frontier;
+
+	ptr      = &ci->mi.super_ptr;
+	frontier = &ci->mi.super_frontier;
+
+	ret = ps_faa(ptr, SUPER_PAGE_SIZE);
+
+	//TODO: RSK -- ensure checks make sense and are sufficient
+	if (ret >= *frontier) return 0;
+
+	if (call_cap_op(BOOT_CAPTBL_SELF_UNTYPED_PT, CAPTBL_OP_MEM_RETYPE2USER, ret, 0, 0, 0)) return 0;
+	if (call_cap_op(BOOT_CAPTBL_SELF_UNTYPED_PT, CAPTBL_OP_MEMACTIVATE, ret, BOOT_CAPTBL_SELF_PT, addr, 22)) return 0;
+
+	return ret;
+}
+
+void *
+cos_booter_allocn_super(struct cos_compinfo *ci, size_t sz, void* vaddr)
+{
+	int i;
+	vaddr_t ret = 0;
+	vaddr_t curr;
+
+	//TODO: check for valid booter component
+
+	assert (sz % SUPER_PAGE_SIZE == 0);
+	for (curr = (vaddr_t)vaddr; curr < (vaddr_t)vaddr + sz; curr += SUPER_PAGE_SIZE) {
+		ret = __superpage_bump_alloc(ci, curr);
+		if (!ret) assert(0);
+	}
+	return vaddr;
+}
+
 capid_t
 cos_cap_cpy(struct cos_compinfo *dstci, struct cos_compinfo *srcci, cap_t srcctype, capid_t srccap)
 {

src/kernel/include/shared/consts.h

@@ -140,4 +140,7 @@ struct pt_regs {
 #define THDID_OFFSET 2
 #define INVTOKEN_OFFSET 3
 
+/* Info on superpage mappings */
+#define TEST_SUPERPAGE_FRAME    0x4A400000
+
 #endif