core: arm: enable dynamic config with pager

Add support for CFG_DYN_CONFIG=y and CFG_WITH_PAGER=y.  The special
.pager_boot_mem section is extended to cover the memory needed by
CFG_DYN_CONFIG=y, this includes translation tables, stacks, and heap.

Later patches can make CFG_DYN_CONFIG=y mandatory for ARCH=arm and
remove redundant code.

Signed-off-by: Jens Wiklander <[email protected]>

Author: jenswi-linaro

core/arch/arm/kernel/boot.c

@@ -911,11 +911,11 @@ static void init_primary(unsigned long pageable_part)
 	 * every virtual partition separately. Core code uses nex_malloc
 	 * instead.
 	 */
+#ifndef CFG_DYN_CONFIG
 #ifdef CFG_WITH_PAGER
 	/* Add heap2 first as heap1 may be too small as initial bget pool */
 	malloc_add_pool(__heap2_start, __heap2_end - __heap2_start);
 #endif
-#ifndef CFG_DYN_CONFIG
 #ifdef CFG_NS_VIRTUALIZATION
 	nex_malloc_add_pool(__nex_heap_start, __nex_heap_end -
 					      __nex_heap_start);
@@ -981,6 +981,12 @@ static void init_primary(unsigned long pageable_part)
 		 * init_runtime()).
 		 */
 		thread_get_core_local()->curr_thread = 0;
+		if (IS_ENABLED(CFG_DYN_CONFIG)) {
+			threads = calloc(1, sizeof(*threads));
+			if (!threads)
+				panic();
+			thread_count = 1;
+		}
 		init_pager_runtime(pageable_part);
 	}
 

core/arch/arm/kernel/entry_a32.S

@@ -451,8 +451,12 @@ shadow_stack_access_ok:
 #endif
 
 #if defined(CFG_DYN_CONFIG)
+#ifdef CFG_WITH_PAGER
+	ldr	r0, =__vcore_free_end
+#else
 	ldr	r0, =boot_embdata_ptr
 	ldr	r0, [r0]
+#endif
 	sub	r1, r0, #THREAD_BOOT_INIT_TMP_ALLOC
 
 	/* Clear the allocated struct thread_core_local */
@@ -537,7 +541,11 @@ shadow_stack_access_ok:
 	ldr	r0, =__vcore_free_start
 	ldr	r2, =__vcore_free_end
 #ifdef CFG_WITH_PAGER
+#ifdef CFG_DYN_CONFIG
+	sub	r1, r2, #THREAD_BOOT_INIT_TMP_ALLOC
+#else
 	mov	r1, r2
+#endif
 #else
 	ldr	r1, =boot_embdata_ptr
 	ldr	r1, [r1]

core/arch/arm/kernel/entry_a64.S

@@ -316,8 +316,12 @@ clear_nex_bss:
 	 * Point SP_EL1 a temporary struct thread_core_local before the
 	 * temporary stack.
 	 */
+#ifdef CFG_WITH_PAGER
+	adr_l	x0, __vcore_free_end
+#else
 	adr_l	x0, boot_embdata_ptr
 	ldr	x0, [x0]
+#endif
 	sub	x1, x0, #THREAD_BOOT_INIT_TMP_ALLOC
 
 	/* Clear the allocated struct thread_core_local */
@@ -391,7 +395,11 @@ clear_nex_bss:
 	adr_l	x0, __vcore_free_start
 	adr_l	x2, __vcore_free_end
 #ifdef CFG_WITH_PAGER
+#ifdef CFG_DYN_CONFIG
+	sub	x1, x2, #THREAD_BOOT_INIT_TMP_ALLOC
+#else
 	mov	x1, x2
+#endif
 #else
 	adr_l	x1, boot_embdata_ptr
 	ldr	x1, [x1]

core/arch/arm/kernel/kern.ld.S

@@ -49,6 +49,8 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#include <generated/asm-defines.h>
+#include <kernel/thread_private_arch.h>
 #include <mm/core_mmu.h>
 #include <platform_config.h>
 #include <util.h>
@@ -316,7 +318,33 @@ SECTIONS
 	 * the physical memory.
 	 */
 	.pager_boot_mem (NOLOAD): {
+#ifdef CFG_DYN_CONFIG
+#ifdef CFG_WITH_LPAE
+		XLAT_TABLE_SIZE = SMALL_PAGE_SIZE;
+#ifndef MAX_XLAT_TABLES
+		MAX_XLAT_TABLES = 3 /* ASLR_EXTRA */ + 5 /* TEE_EXTRA */;
+#endif
+		/* Base tables */
+		. += 4 * 2 * CFG_TEE_CORE_NB_CORE * XLAT_TABLE_SIZE;
+		/* Per thread EL0 tables */
+		. += CFG_NUM_THREADS * XLAT_TABLE_SIZE;
+#else
+		XLAT_TABLE_SIZE = 1024;
+#ifndef MAX_XLAT_TABLES
+		MAX_XLAT_TABLES = 6 + 2 /* ASLR_EXTRA */;
+#endif
+		. += 16 * 1024; /* Main L1 table */
+		. += 64 * 4 * CFG_NUM_THREADS; /* L1 table for TAs */
+#endif
+		. += MAX_XLAT_TABLES * XLAT_TABLE_SIZE;
+		. += CFG_CORE_HEAP_SIZE;
+		. += CFG_NUM_THREADS * THREAD_CTX_SIZE;
+		. += CFG_TEE_CORE_NB_CORE * THREAD_CORE_LOCAL_SIZE;
+		. += THREAD_BOOT_INIT_TMP_ALLOC;
+#else
 		. += SMALL_PAGE_SIZE;
+#endif
+		. = ALIGN(SMALL_PAGE_SIZE);
 	}
 	__flatmap_free_start = ADDR(.pager_boot_mem);
 	__flatmap_free_size = SIZEOF(.pager_boot_mem);

mk/config.mk

@@ -1296,12 +1296,8 @@ CFG_CORE_UNSAFE_MODEXP ?= n
 CFG_TA_MBEDTLS_UNSAFE_MODEXP ?= n
 
 # CFG_DYN_CONFIG, when enabled, use dynamic memory allocation for translation
-# tables and stacks. Not supported with pager.
-ifeq ($(CFG_WITH_PAGER),y)
-$(call force,CFG_DYN_CONFIG,n,conflicts with CFG_WITH_PAGER)
-else
+# tables and stacks.
 CFG_DYN_CONFIG ?= y
-endif
 
 # CFG_EXTERNAL_ABORT_PLAT_HANDLER is used to implement platform-specific
 # handling of external abort implementing the plat_external_abort_handler()