Memfault Firmware SDK 0.30.1 (Build 422861)

Author: Memfault Inc

.circleci/config.yml

@@ -16,7 +16,7 @@ executors:
   memfault-ci:
     docker:
       # TODO: create separate docker image + public Dockerfile
-      - image: memfault/ci:2.5.0
+      - image: memfault/ci:3.2.0
     working_directory: ~/repo
 
 commands:

CHANGES.md

@@ -1,3 +1,17 @@
+### Changes between Memfault SDK 0.30.1 and SDK 0.30.0 - April 6, 2022
+
+#### :chart_with_upwards_trend: Improvements
+
+- Fix stack selection when in ISR context in some Zephyr versions
+- Fix a build error when building Zephyr with `CONFIG_NORDIC_SECURITY_BACKEND`
+  enabled. New Kconfig flag `CONFIG_MEMFAULT_HTTP_USES_MBEDTLS` can be used to
+  manually control this configuration if necessary (default should be set
+  correctly in most cases)
+
+#### :house: Internal
+
+- Fix CI unit test build error from older version of gcc
+
 ### Changes between Memfault SDK 0.30.0 and SDK 0.29.1 - Mar 31, 2022
 
 #### :rocket: New Features

VERSION

@@ -1,2 +1,2 @@
-BUILD ID: 421632
-GIT COMMIT: 92115a2ee
+BUILD ID: 422861
+GIT COMMIT: a04fc3457

components/include/memfault/core/compact_log_compile_time_checks.h

@@ -27,13 +27,13 @@ extern "C" {
 #define MEMFAULT_LOGGING_MAX_SUPPORTED_ARGS 15
 
 
-static void _run_printf_like_func_check(const char* format, ...)
+static void run_printf_like_func_check_(const char* format, ...)
     MEMFAULT_PRINTF_LIKE_FUNC(1, 2);
 
 //! Mark the function as used to prevent warnings in situations where this header is included but
 //! no logging is actually used
 MEMFAULT_USED
-static void _run_printf_like_func_check(MEMFAULT_UNUSED const char* format, ...) { }
+static void run_printf_like_func_check_(MEMFAULT_UNUSED const char* format, ...) { }
 
 //! Compilation time checks on log formatter
 //!
@@ -48,7 +48,7 @@ static void _run_printf_like_func_check(MEMFAULT_UNUSED const char* format, ...)
       " args > MEMFAULT_LOGGING_MAX_SUPPORTED_ARGS ("                                   \
       MEMFAULT_EXPAND_AND_QUOTE(MEMFAULT_LOGGING_MAX_SUPPORTED_ARGS) ")!");             \
   if (false) {                                                                          \
-    _run_printf_like_func_check(format, ## __VA_ARGS__);                                \
+    run_printf_like_func_check_(format, ## __VA_ARGS__);                                \
   } \
 } while (0)
 

components/include/memfault/version.h

@@ -19,7 +19,7 @@ typedef struct {
   uint8_t patch;
 } sMfltSdkVersion;
 
-#define MEMFAULT_SDK_VERSION   { .major = 0, .minor = 30, .patch = 0 }
+#define MEMFAULT_SDK_VERSION   { .major = 0, .minor = 30, .patch = 1 }
 
 #ifdef __cplusplus
 }

examples/zephyr/apps/memfault_demo_app/prj.conf

@@ -52,6 +52,9 @@ CONFIG_MBEDTLS_HEAP_SIZE=34000
 CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=4096
 CONFIG_NET_SOCKETS_SOCKOPT_TLS=y
 
+# Use MBEDTLS for Memfault HTTP sockets
+CONFIG_MEMFAULT_HTTP_USES_MBEDTLS=y
+
 # Disable socket offload because attempts to use eswifi socket offload
 # hangs during setsockopt() calls
 CONFIG_NET_SOCKETS_OFFLOAD=n

ports/zephyr/Kconfig

@@ -182,6 +182,13 @@ config MEMFAULT_HTTP_PERIODIC_UPLOAD_INTERVAL_SECS
           The first check will run between [1, 1+MEMFAULT_HTTP_PERIODIC_UPLOAD_INTERVAL_SECS]
           Subsequent checks will run at MEMFAULT_HTTP_PERIODIC_UPLOAD_INTERVAL_SECS intervals.
 
+config MEMFAULT_HTTP_USES_MBEDTLS
+        bool "Use mbedTLS for HTTP transport"
+        default y if !NET_SOCKETS_OFFLOAD_TLS
+        help
+          Configure Memfault HTTP for using mbedTLS- perform some sanity checks
+          at compile time that it is configured correctly.
+
 endif # MEMFAULT_HTTP_ENABLE
 
 config MEMFAULT_EVENT_STORAGE_SIZE

ports/zephyr/common/memfault_platform_coredump_regions.c

@@ -42,7 +42,7 @@ MEMFAULT_WEAK
 const sMfltCoredumpRegion *memfault_platform_coredump_get_regions(
     const sCoredumpCrashInfo *crash_info, size_t *num_regions) {
 
-  const bool msp_was_active = (crash_info->exception_reg_state->exc_return & (1 << 3)) == 0;
+  const bool msp_was_active = (crash_info->exception_reg_state->exc_return & (1 << 2)) == 0;
   int region_idx = 0;
 
   size_t stack_size_to_collect = memfault_platform_sanitize_address_range(

ports/zephyr/common/memfault_platform_http.c

@@ -28,7 +28,7 @@
 #include "memfault/http/utils.h"
 #include "memfault/panics/assert.h"
 
-#if CONFIG_MBEDTLS
+#if defined(CONFIG_MEMFAULT_HTTP_USES_MBEDTLS)
 
 // Sanity check that SNI extension is enabled when using Mbed TLS since as of 2.4 Zephyr doesn't
 // enable it by default
@@ -43,7 +43,7 @@
 #error "MBEDTLS_SSL_SERVER_NAME_INDICATION must be enabled for Memfault HTTPS. This can be done with CONFIG_MBEDTLS_USER_CONFIG_ENABLE/FILE"
 #endif
 
-#endif /* CONFIG_MBEDTLS */
+#endif /* CONFIG_MEMFAULT_HTTP_USES_MBEDTLS */
 
 #if (CONFIG_MINIMAL_LIBC_MALLOC_ARENA_SIZE > 0)
 static void *prv_calloc(size_t count, size_t size) {

ports/zephyr/v2.4/memfault_fault_handler.c

@@ -46,8 +46,11 @@ void __wrap_z_fatal_error(unsigned int reason, const z_arch_esf_t *esf) {
   const struct __extra_esf_info *extra_info = &esf->extra_info;
   const _callee_saved_t *callee_regs = extra_info->callee;
 
+  // Read the "SPSEL" bit where
+  //  0 = Main Stack Pointer in use prior to exception
+  //  1 = Process Stack Pointer in use prior to exception
   const uint32_t exc_return = extra_info->exc_return;
-  const bool msp_was_active = (exc_return & (1 << 3)) == 0;
+  const bool msp_was_active = (exc_return & (1 << 2)) == 0;
 
   sMfltRegState reg = {
     .exception_frame = (void *)(msp_was_active ? extra_info->msp : callee_regs->psp),