zephyrproject-rtos · keith-packard · Sep 29, 2023 · Nov 17, 2023 · Sep 28, 2023 · Sep 29, 2023
diff --git a/lib/cpp/Kconfig b/lib/cpp/Kconfig
@@ -7,6 +7,7 @@ menu "C++ Language Support"
 
 config CPP
 	bool "C++ support for the application"
+	imply REQUIRES_MALLOC
 	help
 	  This option enables the use of applications built with C++.
 

diff --git a/lib/libc/Kconfig b/lib/libc/Kconfig
@@ -19,6 +19,23 @@ config REQUIRES_FLOAT_PRINTF
 	  Select a printf implementation that provides a complete
 	  implementation including floating point support.
 
+config REQUIRES_MALLOC
+	bool "Requires malloc APIs"
+	help
+	  Indicates that the malloc family of functions are required by the
+	  application.
+
+config REQUIRED_MALLOC_ARENA_SIZE
+	int "Required malloc arena size"
+	default -1
+	help
+	  Indicates the minimum desired size of the malloc arena. This is
+	  only a hint; some malloc implementations may not be able to
+	  guarantee that this amount will be available at runtime.
+
+	  If set to -1, then the underlying C library default value will
+	  be used.
+
 config FULL_LIBC_SUPPORTED
 	bool
 	help
@@ -75,6 +92,7 @@ config MINIMAL_LIBC
 	imply COMPILER_FREESTANDING
 	select COMMON_LIBC_ABORT
 	select COMMON_LIBC_STRNLEN
+	select COMMON_LIBC_MALLOC if REQUIRES_MALLOC
 	help
 	  Build with minimal C library.
 
@@ -84,7 +102,7 @@ config PICOLIBC
 	imply THREAD_LOCAL_STORAGE if ARCH_HAS_THREAD_LOCAL_STORAGE && TOOLCHAIN_SUPPORTS_THREAD_LOCAL_STORAGE
 	select LIBC_ERRNO if THREAD_LOCAL_STORAGE
 	select NEED_LIBC_MEM_PARTITION
-	imply COMMON_LIBC_MALLOC
+	select COMMON_LIBC_MALLOC if REQUIRES_MALLOC
 	depends on !NATIVE_APPLICATION
 	depends on PICOLIBC_SUPPORTED
 	help

diff --git a/lib/libc/common/Kconfig b/lib/libc/common/Kconfig
@@ -21,6 +21,7 @@ config COMMON_LIBC_MALLOC
 config COMMON_LIBC_MALLOC_ARENA_SIZE
 	int "Size of the common C library malloc arena"
 	depends on COMMON_LIBC_MALLOC
+	default REQUIRED_MALLOC_ARENA_SIZE if REQUIRED_MALLOC_ARENA_SIZE >= 0
 	default 0 if MINIMAL_LIBC
 	default 16384 if MMU
 	default 2048 if USERSPACE && MPU_REQUIRES_POWER_OF_TWO_ALIGNMENT

diff --git a/lib/libc/newlib/Kconfig b/lib/libc/newlib/Kconfig
@@ -23,6 +23,7 @@ config NEWLIB_LIBC_MAX_MAPPED_REGION_SIZE
 
 config NEWLIB_LIBC_MIN_REQUIRED_HEAP_SIZE
 	int "Newlib minimum required heap size"
+	default REQUIRED_MALLOC_ARENA_SIZE if REQUIRED_MALLOC_ARENA_SIZE >= 0
 	default 2048 if NEWLIB_LIBC_NANO
 	default 8192 if !NEWLIB_LIBC_NANO
 	help

diff --git a/modules/Kconfig.mcux b/modules/Kconfig.mcux
@@ -5,6 +5,7 @@
 
 config HAS_MCUX
 	bool
+	select REQUIRES_MALLOC
 	depends on SOC_FAMILY_KINETIS || SOC_FAMILY_IMX || SOC_FAMILY_LPC || \
 		SOC_FAMILY_NXP_ADSP || SOC_FAMILY_NXP_S32
 

diff --git a/modules/lz4/Kconfig b/modules/lz4/Kconfig
@@ -6,6 +6,7 @@ config ZEPHYR_LZ4_MODULE
 
 config LZ4
 	bool "Lz4 data compression and decompression"
+	select REQUIRES_MALLOC
 	help
 	  This option enables lz4 compression & decompression library
 	  support.
diff --git a/modules/mbedtls/Kconfig b/modules/mbedtls/Kconfig
@@ -27,6 +27,7 @@ choice MBEDTLS_IMPLEMENTATION
 
 config MBEDTLS_BUILTIN
 	bool "Use Zephyr in-tree mbedTLS version"
+	select REQUIRES_MALLOC
 	help
 	  Link with mbedTLS sources included with Zephyr distribution.
 	  Included mbedTLS version is well integrated with and supported

diff --git a/modules/tflite-micro/Kconfig b/modules/tflite-micro/Kconfig
@@ -8,6 +8,7 @@ config ZEPHYR_TFLITE-MICRO_MODULE
 config TENSORFLOW_LITE_MICRO
 	bool "TensorFlow Lite Micro Support"
 	select REQUIRES_FULL_LIBCPP
+	select REQUIRES_MALLOC
 	help
 	  This option enables the TensorFlow Lite Micro library.
 

diff --git a/modules/thrift/Kconfig b/modules/thrift/Kconfig
@@ -7,6 +7,7 @@ config ZEPHYR_THRIFT_MODULE
 menuconfig THRIFT
 	bool "Support for Thrift [EXPERIMENTAL]"
 	select EXPERIMENTAL
+	select REQUIRES_MALLOC
 	depends on CPP
 	depends on STD_CPP17
 	depends on CPP_EXCEPTIONS

diff --git a/samples/basic/hash_map/prj.conf b/samples/basic/hash_map/prj.conf
@@ -11,3 +11,5 @@ CONFIG_SYS_HASH_FUNC32=y
 CONFIG_SYS_HASH_MAP=y
 
 CONFIG_TEST_LIB_HASH_MAP_MAX_ENTRIES=40
+
+CONFIG_REQUIRES_MALLOC=y
diff --git a/samples/drivers/counter/maxim_ds3231/prj.conf b/samples/drivers/counter/maxim_ds3231/prj.conf
@@ -8,6 +8,9 @@ CONFIG_COUNTER_INIT_PRIORITY=65
 # Minimal libc doesn't have strftime()
 CONFIG_REQUIRES_FULL_LIBC=y
 
+# picolibc strftime require malloc (currently)
+CONFIG_REQUIRES_MALLOC=y
+
 # Optional step that syncs RTC and local clock.  Don't enable this if
 # your RTC has already been synchronized and you want to keep its
 # setting.

diff --git a/samples/drivers/virtualization/ivshmem/doorbell/prj.conf b/samples/drivers/virtualization/ivshmem/doorbell/prj.conf
@@ -12,3 +12,5 @@ CONFIG_POLL=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_IVSHMEM=y
 CONFIG_IVSHMEM_DOORBELL=y
+
+CONFIG_REQUIRES_MALLOC=y
diff --git a/soc/arm/renesas_smartbond/da1469x/Kconfig.series b/soc/arm/renesas_smartbond/da1469x/Kconfig.series
@@ -12,5 +12,6 @@ config SOC_SERIES_DA1469X
 	select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE
 	select CLOCK_CONTROL
 	select CLOCK_CONTROL_SMARTBOND
+	select REQUIRES_MALLOC
 	help
 	  Enable support for Renesas SmartBond(tm) DA1469x MCU series
diff --git a/subsys/fs/Kconfig.littlefs b/subsys/fs/Kconfig.littlefs
@@ -7,6 +7,7 @@ config FILE_SYSTEM_LITTLEFS
 	bool "LittleFS support"
 	depends on FILE_SYSTEM
 	depends on ZEPHYR_LITTLEFS_MODULE
+	select REQUIRES_MALLOC
 	help
 	  Enables LittleFS file system support.
 

diff --git a/subsys/net/lib/sockets/Kconfig b/subsys/net/lib/sockets/Kconfig
@@ -6,6 +6,7 @@
 menuconfig NET_SOCKETS
 	bool "BSD Sockets compatible API"
 	select FDTABLE
+	select REQUIRES_MALLOC if DNS_RESOLVER || NET_IP
 	help
 	  Provide BSD Sockets like API on top of native Zephyr networking API.
 

diff --git a/tests/lib/cmsis_dsp/statistics/prj.conf b/tests/lib/cmsis_dsp/statistics/prj.conf
@@ -1,3 +1,4 @@
 CONFIG_ZTEST=y
 CONFIG_REQUIRES_FULL_LIBC=y
 CONFIG_CMSIS_DSP=y
+CONFIG_REQUIRES_MALLOC=y
diff --git a/tests/lib/cmsis_dsp/transform/prj.conf b/tests/lib/cmsis_dsp/transform/prj.conf
@@ -1,6 +1,7 @@
 CONFIG_ZTEST=y
 CONFIG_REQUIRES_FULL_LIBC=y
 CONFIG_CMSIS_DSP=y
+CONFIG_REQUIRES_MALLOC=y
 
 # Test Options
 CONFIG_CMSIS_DSP_TEST_TRANSFORM_CQ15=y

diff --git a/tests/lib/cmsis_dsp/transform/prj_base.conf b/tests/lib/cmsis_dsp/transform/prj_base.conf
@@ -1,3 +1,4 @@
 CONFIG_ZTEST=y
 CONFIG_REQUIRES_FULL_LIBC=y
 CONFIG_CMSIS_DSP=y
+CONFIG_REQUIRES_MALLOC=y
diff --git a/tests/lib/cmsis_nn/prj.conf b/tests/lib/cmsis_nn/prj.conf
@@ -1,5 +1,6 @@
 CONFIG_ZTEST=y
 CONFIG_REQUIRES_FULL_LIBC=y
+CONFIG_REQUIRES_MALLOC=y
 CONFIG_CMSIS_DSP=y
 CONFIG_CMSIS_NN=y
 CONFIG_CMSIS_NN_ACTIVATION=y

diff --git a/tests/lib/hash_map/prj.conf b/tests/lib/hash_map/prj.conf
@@ -4,6 +4,9 @@
 
 CONFIG_ZTEST=y
 
+CONFIG_REQUIRES_MALLOC=y
+CONFIG_REQUIRED_MALLOC_ARENA_SIZE=8192
+
 CONFIG_SYS_HASH_FUNC32=y
 CONFIG_SYS_HASH_MAP=y
 

diff --git a/tests/lib/mem_alloc/prj.conf b/tests/lib/mem_alloc/prj.conf
@@ -1,3 +1,4 @@
 CONFIG_ZTEST=y
 CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=2048
 CONFIG_TEST_USERSPACE=y
+CONFIG_MINIMAL_LIBC=y
diff --git a/tests/lib/mem_alloc/prj_negative_testing.conf b/tests/lib/mem_alloc/prj_negative_testing.conf
@@ -1,3 +1,4 @@
 CONFIG_ZTEST=y
 CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=0
 CONFIG_TEST_USERSPACE=y
+CONFIG_MINIMAL_LIBC=y
diff --git a/tests/lib/mem_alloc/prj_picolibc.conf b/tests/lib/mem_alloc/prj_picolibc.conf
@@ -1,3 +1,4 @@
 CONFIG_ZTEST=y
 CONFIG_PICOLIBC=y
 CONFIG_TEST_USERSPACE=y
+CONFIG_REQUIRES_MALLOC=y
diff --git a/tests/lib/mem_alloc/testcase.yaml b/tests/lib/mem_alloc/testcase.yaml
@@ -9,11 +9,13 @@ tests:
   libraries.libc.minimal.mem_alloc:
     extra_args: CONF_FILE=prj.conf
     platform_exclude: twr_ke18f
+    filter: not CONFIG_REQUIRES_FULL_LIBC
     tags:
       - minimal_libc
   libraries.libc.minimal.mem_alloc_negative_testing:
     extra_args: CONF_FILE=prj_negative_testing.conf
     platform_exclude: twr_ke18f
+    filter: not CONFIG_REQUIRES_FULL_LIBC
     tags:
       - minimal_libc
   libraries.libc.newlib.mem_alloc:

diff --git a/tests/subsys/dsp/basicmath/prj.conf b/tests/subsys/dsp/basicmath/prj.conf
@@ -3,3 +3,4 @@ CONFIG_REQUIRES_FULL_LIBC=y
 CONFIG_DSP=y
 CONFIG_CMSIS_DSP=y
 CONFIG_DSP_BACKEND_CMSIS=y
+CONFIG_REQUIRES_MALLOC=y