samples, tests: Add z_libc_partition to all test domains

When a memory domain is initialized, the z_libc_partition must be
included so that critical libc-related data can be accessed.

On ARM processors without TPIDRURO when THREAD_LOCAL_STORAGE is enabled,
this includes the TLS base pointer, which is used for several
thread-local variables in the kernel.

Signed-off-by: Keith Packard <[email protected]>

Author: keith-packard

samples/userspace/shared_mem/src/main.c

@@ -15,6 +15,7 @@
  */
 
 #include <sys/__assert.h>
+#include <sys/libc-hooks.h> /* for z_libc_partition */
 
 #include "main.h"
 #include "enc.h"
@@ -101,8 +102,18 @@ _app_ct_d char ctMSG[] = "CT!\n";
 
 void main(void)
 {
-	struct k_mem_partition *enc_parts[] = {&enc_part, &red_part, &blk_part};
-	struct k_mem_partition *pt_parts[] = {&user_part, &red_part};
+	struct k_mem_partition *enc_parts[] = {
+#if Z_LIBC_PARTITION_EXISTS
+		&z_libc_partition,
+#endif
+		&enc_part, &red_part, &blk_part
+	};
+	struct k_mem_partition *pt_parts[] = {
+#if Z_LIBC_PARTITION_EXISTS
+		&z_libc_partition,
+#endif
+		&user_part, &red_part
+	};
 	k_tid_t tPT, tENC, tCT;
 	int ret;
 
@@ -129,7 +140,7 @@ void main(void)
 	/* use K_FOREVER followed by k_thread_start*/
 	printk("ENC Thread Created %p\n", tENC);
 
-	ret = k_mem_domain_init(&enc_domain, 3, enc_parts);
+	ret = k_mem_domain_init(&enc_domain, ARRAY_SIZE(enc_parts), enc_parts);
 	__ASSERT(ret == 0, "k_mem_domain_init() on enc_domain failed %d", ret);
 	ARG_UNUSED(ret);
 
@@ -145,7 +156,7 @@ void main(void)
 	k_thread_access_grant(tPT, &allforone);
 	printk("PT Thread Created %p\n", tPT);
 
-	ret = k_mem_domain_init(&pt_domain, 2, pt_parts);
+	ret = k_mem_domain_init(&pt_domain, ARRAY_SIZE(pt_parts), pt_parts);
 	__ASSERT(ret == 0, "k_mem_domain_init() on pt_domain failed %d", ret);
 
 	k_mem_domain_add_thread(&pt_domain, tPT);

tests/benchmarks/footprints/src/main.c

@@ -13,7 +13,7 @@
 #include <kernel.h>
 #include <zephyr.h>
 #include <ksched.h>
-
+#include <sys/libc-hooks.h>
 #include "footprint.h"
 
 #ifdef CONFIG_USERSPACE
@@ -44,7 +44,10 @@ void main(void)
 #ifdef CONFIG_USERSPACE
 	int ret;
 	struct k_mem_partition *mem_parts[] = {
-	&footprint_mem_partition
+#if Z_LIBC_PARTITION_EXISTS
+		&z_libc_partition,
+#endif
+		&footprint_mem_partition
 	};
 
 	ret = k_mem_domain_init(&footprint_mem_domain,

tests/kernel/mem_protect/mem_protect/src/inherit.c

@@ -6,6 +6,7 @@
 
 #include "mem_protect.h"
 #include <syscall_handler.h>
+#include <sys/libc-hooks.h> /* for z_libc_partition */
 
 /* function prototypes */
 static inline void dummy_start(struct k_timer *timer)
@@ -38,6 +39,9 @@ K_MEM_PARTITION_DEFINE(inherit_memory_partition,
 		       K_MEM_PARTITION_P_RW_U_RW);
 
 struct k_mem_partition *inherit_memory_partition_array[] = {
+#if Z_LIBC_PARTITION_EXISTS
+	&z_libc_partition,
+#endif
 	&inherit_memory_partition,
 	&ztest_mem_partition
 };

tests/kernel/mem_protect/mem_protect/src/mem_domain.c

@@ -6,14 +6,19 @@
 
 #include "mem_protect.h"
 #include <kernel_internal.h> /* For z_main_thread */
+#include <sys/libc-hooks.h> /* for z_libc_partition */
 
 static struct k_thread child_thread;
 static K_THREAD_STACK_DEFINE(child_stack, 512 + CONFIG_TEST_EXTRA_STACK_SIZE);
 
 /* Special memory domain for test case purposes */
 static struct k_mem_domain test_domain;
 
+#if Z_LIBC_PARTITION_EXISTS
+#define PARTS_USED	3
+#else
 #define PARTS_USED	2
+#endif
 /* Maximum number of allowable memory partitions defined by the build */
 #define NUM_RW_PARTS	(CONFIG_MAX_DOMAIN_PARTITIONS - PARTS_USED)
 
@@ -45,7 +50,12 @@ static K_THREAD_DEFINE(zzz_thread, 256 + CONFIG_TEST_EXTRA_STACK_SIZE,
 void test_mem_domain_setup(void)
 {
 	int max_parts = arch_mem_domain_max_partitions_get();
-	struct k_mem_partition *parts[] = { &ro_part, &ztest_mem_partition };
+	struct k_mem_partition *parts[] = {
+#if Z_LIBC_PARTITION_EXISTS
+		&z_libc_partition,
+#endif
+		&ro_part, &ztest_mem_partition
+	};
 
 	num_rw_parts = max_parts - PARTS_USED;
 	zassert_true(num_rw_parts <= NUM_RW_PARTS,

tests/kernel/mem_protect/userspace/src/main.c

@@ -17,6 +17,7 @@
 #include <debug/stack.h>
 #include <syscall_handler.h>
 #include "test_syscall.h"
+#include <sys/libc-hooks.h> /* for z_libc_partition */
 
 #if defined(CONFIG_ARC)
 #include <arch/arc/v2/mpu/arc_core_mpu.h>
@@ -680,7 +681,12 @@ static void drop_user(volatile bool *to_modify)
  */
 static void test_init_and_access_other_memdomain(void)
 {
-	struct k_mem_partition *parts[] = { &ztest_mem_partition, &alt_part };
+	struct k_mem_partition *parts[] = {
+#if Z_LIBC_PARTITION_EXISTS
+		&z_libc_partition,
+#endif
+		&ztest_mem_partition, &alt_part
+	};
 
 	zassert_equal(
 		k_mem_domain_init(&alternate_domain, ARRAY_SIZE(parts), parts),