[Crypto] PSA: Heap is now needed for RCP builds

Author: LuDuda

src/core/BUILD.gn

@@ -761,6 +761,8 @@ openthread_radio_sources = [
   "common/error.hpp",
   "common/frame_builder.cpp",
   "common/frame_builder.hpp",
+  "common/heap.cpp",
+  "common/heap.hpp",
   "common/log.cpp",
   "common/random.cpp",
   "common/string.cpp",
@@ -786,6 +788,8 @@ openthread_radio_sources = [
   "radio/radio_callbacks.cpp",
   "radio/radio_platform.cpp",
   "thread/link_quality.cpp",
+  "utils/heap.cpp",
+  "utils/heap.hpp",
   "utils/parse_cmdline.cpp",
   "utils/power_calibration.cpp",
 ]

src/core/CMakeLists.txt

@@ -279,6 +279,7 @@ set(RADIO_COMMON_SOURCES
     common/binary_search.cpp
     common/error.cpp
     common/frame_builder.cpp
+    common/heap.cpp
     common/log.cpp
     common/random.cpp
     common/string.cpp
@@ -289,6 +290,7 @@ set(RADIO_COMMON_SOURCES
     crypto/aes_ecb.cpp
     crypto/crypto_platform_mbedtls.cpp
     crypto/crypto_platform_psa.cpp
+    crypto/mbedtls.cpp
     crypto/storage.cpp
     diags/factory_diags.cpp
     instance/instance.cpp
@@ -304,6 +306,7 @@ set(RADIO_COMMON_SOURCES
     radio/radio_callbacks.cpp
     radio/radio_platform.cpp
     thread/link_quality.cpp
+    utils/heap.cpp
     utils/parse_cmdline.cpp
     utils/power_calibration.cpp
 )

src/core/common/heap.cpp

@@ -44,7 +44,7 @@ void *CAlloc(size_t aCount, size_t aSize) { return otPlatCAlloc(aCount, aSize);
 
 void Free(void *aPointer) { otPlatFree(aPointer); }
 
-#else
+#elif OPENTHREAD_CONFIG_HEAP_INTERNAL_ENABLE
 
 void *CAlloc(size_t aCount, size_t aSize) { return Instance::GetHeap().CAlloc(aCount, aSize); }
 

src/core/common/message.cpp

@@ -156,7 +156,7 @@ uint16_t MessagePool::GetFreeBufferCount(void) const
     uint16_t rval;
 
 #if OPENTHREAD_CONFIG_MESSAGE_USE_HEAP_ENABLE
-#if !OPENTHREAD_CONFIG_HEAP_EXTERNAL_ENABLE
+#if OPENTHREAD_CONFIG_HEAP_INTERNAL_ENABLE
     rval = static_cast<uint16_t>(Instance::GetHeap().GetFreeSize() / sizeof(Buffer));
 #else
     rval = NumericLimits<uint16_t>::kMax;
@@ -175,7 +175,7 @@ uint16_t MessagePool::GetTotalBufferCount(void) const
     uint16_t rval;
 
 #if OPENTHREAD_CONFIG_MESSAGE_USE_HEAP_ENABLE
-#if !OPENTHREAD_CONFIG_HEAP_EXTERNAL_ENABLE
+#if OPENTHREAD_CONFIG_HEAP_INTERNAL_ENABLE
     rval = static_cast<uint16_t>(Instance::GetHeap().GetCapacity() / sizeof(Buffer));
 #else
     rval = NumericLimits<uint16_t>::kMax;

src/core/config/misc.h

@@ -44,6 +44,7 @@
  */
 
 #include "config/coap.h"
+#include "config/crypto.h"
 #include "config/srp_server.h"
 
 /**
@@ -316,6 +317,22 @@
 #define OPENTHREAD_CONFIG_HEAP_EXTERNAL_ENABLE 0
 #endif
 
+/**
+ * @def OPENTHREAD_CONFIG_HEAP_INTERNAL_ENABLE
+ *
+ * Enable the internal heap.
+ *
+ * This configuration is automatically enabled by default when an external heap is disabled.
+ * It is applicable for FTD and MTD builds. Additionally, if PSA library is used, it requires
+ * heap memory also for Radio build.
+ *
+ */
+#ifndef OPENTHREAD_CONFIG_HEAP_INTERNAL_ENABLE
+#define OPENTHREAD_CONFIG_HEAP_INTERNAL_ENABLE  \
+    (!OPENTHREAD_CONFIG_HEAP_EXTERNAL_ENABLE && \
+     (OPENTHREAD_MTD || OPENTHREAD_FTD || (OPENTHREAD_CONFIG_CRYPTO_LIB == OPENTHREAD_CONFIG_CRYPTO_LIB_PSA)))
+#endif
+
 /**
  * @def OPENTHREAD_CONFIG_DTLS_APPLICATION_DATA_MAX_LENGTH
  *

src/core/instance/instance.cpp

@@ -57,11 +57,12 @@ static uint64_t gMultiInstanceRaw[MULTI_INSTANCE_SIZE];
 
 #endif
 
-#if OPENTHREAD_MTD || OPENTHREAD_FTD
-#if !OPENTHREAD_CONFIG_HEAP_EXTERNAL_ENABLE
+#if OPENTHREAD_CONFIG_HEAP_INTERNAL_ENABLE
 OT_DEFINE_ALIGNED_VAR(sHeapRaw, sizeof(Utils::Heap), uint64_t);
 Utils::Heap *Instance::sHeap{nullptr};
 #endif
+
+#if OPENTHREAD_MTD || OPENTHREAD_FTD
 #if OPENTHREAD_CONFIG_REFERENCE_DEVICE_ENABLE
 bool Instance::sDnsNameCompressionEnabled = true;
 #endif
@@ -291,7 +292,7 @@ Instance::Instance(void)
 #endif
 }
 
-#if (OPENTHREAD_MTD || OPENTHREAD_FTD) && !OPENTHREAD_CONFIG_HEAP_EXTERNAL_ENABLE
+#if OPENTHREAD_CONFIG_HEAP_INTERNAL_ENABLE
 Utils::Heap &Instance::GetHeap(void)
 {
     if (nullptr == sHeap)

src/core/instance/instance.hpp

@@ -60,10 +60,12 @@
 #include "common/timer.hpp"
 #include "common/type_traits.hpp"
 #include "common/uptime.hpp"
+#include "crypto/mbedtls.hpp"
 #include "diags/factory_diags.hpp"
 #include "instance/extension.hpp"
 #include "mac/link_raw.hpp"
 #include "radio/radio.hpp"
+#include "utils/heap.hpp"
 #include "utils/otns.hpp"
 #include "utils/power_calibration.hpp"
 #include "utils/static_counter.hpp"
@@ -78,7 +80,6 @@
 #include "common/code_utils.hpp"
 #include "common/notifier.hpp"
 #include "common/settings.hpp"
-#include "crypto/mbedtls.hpp"
 #include "crypto/storage.hpp"
 #include "mac/mac.hpp"
 #include "mac/wakeup_tx_scheduler.hpp"
@@ -136,7 +137,6 @@
 #include "thread/tmf.hpp"
 #include "utils/channel_manager.hpp"
 #include "utils/channel_monitor.hpp"
-#include "utils/heap.hpp"
 #include "utils/history_tracker.hpp"
 #include "utils/jam_detector.hpp"
 #include "utils/link_metrics_manager.hpp"
@@ -329,6 +329,15 @@ class Instance : public otInstance, private NonCopyable
      */
     void Finalize(void);
 
+#if OPENTHREAD_CONFIG_HEAP_INTERNAL_ENABLE
+    /**
+     * Returns a reference to the Heap object.
+     *
+     * @returns A reference to the Heap object.
+     */
+    static Utils::Heap &GetHeap(void);
+#endif
+
 #if OPENTHREAD_MTD || OPENTHREAD_FTD
     /**
      * Deletes all the settings stored in non-volatile memory, and then triggers a platform reset.
@@ -345,15 +354,6 @@ class Instance : public otInstance, private NonCopyable
      */
     Error ErasePersistentInfo(void);
 
-#if !OPENTHREAD_CONFIG_HEAP_EXTERNAL_ENABLE
-    /**
-     * Returns a reference to the Heap object.
-     *
-     * @returns A reference to the Heap object.
-     */
-    static Utils::Heap &GetHeap(void);
-#endif
-
 #if OPENTHREAD_CONFIG_COAP_API_ENABLE
     /**
      * Returns a reference to application COAP object.
@@ -449,7 +449,7 @@ class Instance : public otInstance, private NonCopyable
     static LogLevel sLogLevel;
 #endif
 
-#if (OPENTHREAD_MTD || OPENTHREAD_FTD) && !OPENTHREAD_CONFIG_HEAP_EXTERNAL_ENABLE
+#if OPENTHREAD_CONFIG_HEAP_INTERNAL_ENABLE
     static Utils::Heap *sHeap;
 #endif
 
@@ -471,7 +471,7 @@ class Instance : public otInstance, private NonCopyable
     TimerMicro::Scheduler mTimerMicroScheduler;
 #endif
 
-#if OPENTHREAD_MTD || OPENTHREAD_FTD
+#if OPENTHREAD_MTD || OPENTHREAD_FTD || (OPENTHREAD_CONFIG_CRYPTO_LIB == OPENTHREAD_CONFIG_CRYPTO_LIB_PSA)
     // Random::Manager is initialized before other objects. Note that it
     // requires MbedTls which itself may use Heap.
     Crypto::MbedTls mMbedTls;

src/core/utils/heap.cpp

@@ -33,7 +33,7 @@
 
 #include "heap.hpp"
 
-#if !OPENTHREAD_CONFIG_HEAP_EXTERNAL_ENABLE
+#if OPENTHREAD_CONFIG_HEAP_INTERNAL_ENABLE
 
 #include <string.h>
 
@@ -219,4 +219,4 @@ void Heap::Free(void *aPointer)
 } // namespace Utils
 } // namespace ot
 
-#endif // !OPENTHREAD_CONFIG_HEAP_EXTERNAL_ENABLE
+#endif // OPENTHREAD_CONFIG_HEAP_INTERNAL_ENABLE

src/core/utils/heap.hpp

@@ -36,7 +36,7 @@
 
 #include "openthread-core-config.h"
 
-#if !OPENTHREAD_CONFIG_HEAP_EXTERNAL_ENABLE
+#if OPENTHREAD_CONFIG_HEAP_INTERNAL_ENABLE
 
 #include <stddef.h>
 #include <stdint.h>
@@ -323,6 +323,6 @@ class Heap : private NonCopyable
 } // namespace Utils
 } // namespace ot
 
-#endif // !OPENTHREAD_CONFIG_HEAP_EXTERNAL_ENABLE
+#endif // OPENTHREAD_CONFIG_HEAP_INTERNAL_ENABLE
 
 #endif // OT_UTILS_HEAP_HPP_

tests/unit/test_heap.cpp

@@ -40,7 +40,7 @@
 
 namespace ot {
 
-#if !OPENTHREAD_CONFIG_HEAP_EXTERNAL_ENABLE
+#if OPENTHREAD_CONFIG_HEAP_INTERNAL_ENABLE
 
 /**
  * Verifies single variable allocating and freeing.
@@ -173,15 +173,15 @@ void RunTimerTests(void)
     TestAllocateMultiple();
 }
 
-#endif // !OPENTHREAD_CONFIG_HEAP_EXTERNAL_ENABLE
+#endif // OPENTHREAD_CONFIG_HEAP_INTERNAL_ENABLE
 
 } // namespace ot
 
 int main(void)
 {
-#if !OPENTHREAD_CONFIG_HEAP_EXTERNAL_ENABLE
+#if OPENTHREAD_CONFIG_HEAP_INTERNAL_ENABLE
     ot::RunTimerTests();
     printf("All tests passed\n");
-#endif // !OPENTHREAD_CONFIG_HEAP_EXTERNAL_ENABLE
+#endif // OPENTHREAD_CONFIG_HEAP_INTERNAL_ENABLE
     return 0;
 }