Scatter/gather ELF files according to segments paddr

.github/workflows/test-configs.yml

@@ -220,6 +220,18 @@ jobs:
       config-file: ./config/examples/sim.config
       make-args: CFLAGS_EXTRA=-DWOLFBOOT_FLASH_MULTI_SECTOR_ERASE
 
+  sim_elf_scattered:
+    uses: ./.github/workflows/test-build.yml
+    with:
+      arch: host
+      config-file: ./config/examples/sim-elf-scattered.config
+
+  sim_elf_scattered_nobackup:
+    uses: ./.github/workflows/test-build.yml
+    with:
+      arch: host
+      config-file: ./config/examples/sim-elf-scattered.config
+      make-args: DISABLE_BACKUP=1
 
   # TODO: SP math with small stack has issues
 

.github/workflows/test-elf-scattered.yml

@@ -0,0 +1,36 @@
+name: Test for scattered elf validation
+
+on:
+  push:
+    branches: [ 'master', 'main', 'release/**' ]
+  pull_request:
+    branches: [ '*' ]
+
+jobs:
+  elf_scattered_test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
+
+      - name: make clean
+        run: |
+          make keysclean
+
+      - name: Select config
+        run: |
+          cp config/examples/sim.config .config
+
+      - name: Build tools
+        run: |
+          make -C tools/keytools && make -C tools/bin-assemble
+
+      - name: Build wolfboot.elf
+        run: |
+          make clean && make test-sim-internal-flash-with-update ELF=1 ELF_SCATTERED=1
+
+      - name: Run bootloader with no arguments
+        run: |
+          ./wolfboot.elf

.github/workflows/test-renode-fastmath-smallstack.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   renode_automated_fastmath_smallstack:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
       - uses: actions/checkout@v4

.github/workflows/test-renode-fastmath.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   renode_automated_fastmath:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
       - uses: actions/checkout@v2

.github/workflows/test-renode-noasm-smallstack.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   renode_automated_noasm_smallstack:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
       - uses: actions/checkout@v4

.github/workflows/test-renode-noasm.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   renode_automated_noasm:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
       - uses: actions/checkout@v4

.github/workflows/test-renode-nrf52.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   renode_automated_base:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
       - uses: actions/checkout@v4

.github/workflows/test-renode-sha3.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   renode_automated_multi_sha:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
       - uses: actions/checkout@v4

.github/workflows/test-renode-sha384.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   renode_automated_multi_sha:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
       - uses: actions/checkout@v4

.github/workflows/test-renode-smallstack.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   renode_automated_smallstack:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
       - uses: actions/checkout@v4

CMakeLists.txt

@@ -45,6 +45,9 @@ project(wolfBoot)
 include(cmake/utils.cmake)
 include(cmake/functions.cmake)
 
+include_directories(include)
+include_directories(lib/wolfssl)
+
 if(NOT DEFINED WOLFBOOT_TARGET)
     message(FATAL_ERROR "WOLFBOOT_TARGET must be defined")
 else()
@@ -620,6 +623,8 @@ if(NOT SPMATH AND NOT SPMATHALL)
     list(APPEND USER_SETTINGS USE_FAST_MATH)
 endif()
 
+list(APPEND WOLFBOOT_DEFS WOLFSSL_USER_SETTINGS)
+
 add_library(user_settings INTERFACE)
 target_compile_definitions(user_settings INTERFACE ${USER_SETTINGS} ${SIGN_OPTIONS})
 
@@ -699,7 +704,7 @@ configure_file(include/target.h.in ${CMAKE_CURRENT_BINARY_DIR}/target.h @ONLY)
 
 add_library(target INTERFACE)
 target_compile_definitions(target INTERFACE ${WOLFBOOT_DEFS})
-target_include_directories(target BEFORE INTERFACE ${CMAKE_CURRENT_BINARY_DIR})
+target_include_directories(target BEFORE INTERFACE ${CMAKE_CURRENT_BINARY_DIR} lib/wolfssl)
 
 set(KEYSTORE ${CMAKE_CURRENT_BINARY_DIR}/keystore.c)
 

arch.mk

@@ -253,7 +253,7 @@ ifeq ($(ARCH),ARM)
      CORTEX_A5=1
      UPDATE_OBJS:=src/update_ram.o
      CFLAGS+=-DWOLFBOOT_DUALBOOT -DEXT_FLASH -DNAND_FLASH -fno-builtin -ffreestanding
-     #CFLAGS+=-DWOLFBOOT_USE_STDLIBC
+     CFLAGS+=-DWOLFBOOT_USE_STDLIBC
   endif
 
 ## Cortex CPU
@@ -1125,7 +1125,9 @@ ifeq ($(TARGET),sim)
   LD_END_GROUP=
   BOOT_IMG=test-app/image.elf
   CFLAGS+=-DARCH_SIM
-  CFLAGS+=-DWOLFBOOT_USE_STDLIBC
+  ifneq ($(ELF_SCATTERED),1)
+    CFLAGS+=-DWOLFBOOT_USE_STDLIBC
+  endif
   ifeq ($(FORCE_32BIT),1)
     CFLAGS+=-m32
     LDFLAGS+=-m32

config/examples/sim-elf-scattered.config

@@ -0,0 +1,28 @@
+ARCH=sim
+TARGET=sim
+SIGN?=ED25519
+HASH?=SHA256
+WOLFBOOT_SMALL_STACK?=0
+SPI_FLASH=0
+DEBUG=1
+ELF_SCATTERED=1
+ELF=1
+
+
+# sizes should be multiple of system page size
+WOLFBOOT_PARTITION_SIZE=0x40000
+WOLFBOOT_SECTOR_SIZE=0x1000
+WOLFBOOT_PARTITION_BOOT_ADDRESS=0x80000
+# if on external flash, it should be multiple of system page size
+
+# Address from 0x100000 to 0x1FFFFF is reserved for ELF_SCATTERED
+
+WOLFBOOT_PARTITION_UPDATE_ADDRESS=0x200000
+WOLFBOOT_PARTITION_SWAP_ADDRESS=0x280000
+
+
+# required for keytools
+WOLFBOOT_FIXED_PARTITIONS=1
+
+# For debugging XMALLOC/XFREE
+#CFLAGS_EXTRA+=-DWOLFBOOT_DEBUG_MALLOC

config/examples/sim32-elf-scattered.config

@@ -0,0 +1,24 @@
+ARCH=sim
+TARGET=sim
+SIGN?=ECC256
+HASH?=SHA256
+WOLFBOOT_SMALL_STACK?=0
+SPI_FLASH=0
+DEBUG=1
+FORCE_32BIT=1
+ELF=1
+ELF_SCATTERED=1
+
+# sizes should be multiple of system page size
+WOLFBOOT_PARTITION_SIZE=0x40000
+WOLFBOOT_SECTOR_SIZE=0x1000
+WOLFBOOT_PARTITION_BOOT_ADDRESS=0x80000
+# if on external flash, it should be multiple of system page size
+WOLFBOOT_PARTITION_UPDATE_ADDRESS=0x100000
+WOLFBOOT_PARTITION_SWAP_ADDRESS=0x180000
+
+# required for keytools
+WOLFBOOT_FIXED_PARTITIONS=1
+
+# For debugging XMALLOC/XFREE
+#CFLAGS_EXTRA+=-DWOLFBOOT_DEBUG_MALLOC

hal/sama5d3.c

@@ -78,7 +78,7 @@ static int division(uint32_t dividend,
     return 0;
 }
 
-static uint32_t div(uint32_t dividend, uint32_t divisor)
+static uint32_t div_u(uint32_t dividend, uint32_t divisor)
 {
     uint32_t quotient = 0;
     uint32_t remainder = 0;
@@ -504,7 +504,7 @@ static void nand_read_info(void)
     nand_flash.bad_block_pos = (*(uint16_t *)(onfi_data + PARAMS_POS_FEATURES)) & 1;
     nand_flash.ext_page_len = *(uint16_t *)(onfi_data + PARAMS_POS_EXT_PARAM_PAGE_LEN);
     nand_flash.parameter_page = *(uint16_t *)(onfi_data + PARAMS_POS_PARAMETER_PAGE);
-    nand_flash.pages_per_block = div(nand_flash.block_size, nand_flash.page_size);
+    nand_flash.pages_per_block = div_u(nand_flash.block_size, nand_flash.page_size);
     nand_flash.pages_per_device = nand_flash.pages_per_block * nand_flash.block_count;
     nand_flash.oob_size = *(uint16_t *)(onfi_data + PARAMS_POS_OOBSIZE);
     nand_flash.revision = *(uint16_t *)(onfi_data + PARAMS_POS_REVISION);
@@ -605,8 +605,8 @@ static int nand_check_bad_block(uint32_t block)
 int ext_flash_read(uintptr_t address, uint8_t *data, int len)
 {
     uint8_t buffer_page[NAND_FLASH_PAGE_SIZE];
-    uint32_t block = div(address, nand_flash.block_size); /* The block where the address falls in */
-    uint32_t page = div(address, nand_flash.page_size); /* The page where the address falls in */
+    uint32_t block = div_u(address, nand_flash.block_size); /* The block where the address falls in */
+    uint32_t page = div_u(address, nand_flash.page_size); /* The page where the address falls in */
     uint32_t start_page_in_block = mod(page, nand_flash.pages_per_block); /* The start page within this block */
     uint32_t in_block_offset = mod(address, nand_flash.block_size); /* The offset of the address within the block */
     uint32_t remaining = nand_flash.block_size - in_block_offset; /* How many bytes remaining to read in the first block */
@@ -637,7 +637,7 @@ int ext_flash_read(uintptr_t address, uint8_t *data, int len)
         } while (ret < 0);
 
         /* Amount of pages to be read from this block */
-        pages_to_read = div((sz + nand_flash.page_size - 1), nand_flash.page_size);
+        pages_to_read = div_u((sz + nand_flash.page_size - 1), nand_flash.page_size);
 
         if (pages_to_read * nand_flash.page_size > remaining)
             pages_to_read--;

hal/sim.c

@@ -31,6 +31,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
+#include <errno.h>
 
 #ifdef __APPLE__
 #include <mach-o/loader.h>
@@ -42,6 +43,10 @@
 #include "target.h"
 #include "printf.h"
 
+#ifdef WOLFBOOT_ELF_SCATTERED
+#include "elf.h"
+#endif
+
 #ifdef WOLFBOOT_ENABLE_WOLFHSM_CLIENT
 #include "wolfhsm/wh_error.h"
 #include "wolfhsm/wh_client.h"
@@ -304,6 +309,7 @@ void do_boot(const uint32_t *app_offset)
 {
     int ret;
     size_t app_size = WOLFBOOT_PARTITION_SIZE - IMAGE_HEADER_SIZE;
+    wolfBoot_printf("Simulator do_boot app_offset = %p\n", app_offset);
 
     if (flashLocked == 0) {
         wolfBoot_printf("WARNING FLASH IS UNLOCKED AT BOOT");
@@ -348,18 +354,34 @@ void do_boot(const uint32_t *app_offset)
 
     main = (main_entry)((uint8_t*)pSymbolAddress + epc->entryoff);
     main(main_argc, main_argv, NULL, NULL);
+
+#elif defined (WOLFBOOT_ELF_SCATTERED)
+    uint8_t *entry_point = (sim_ram_base + (unsigned long)app_offset);
+    printf("entry point: %p\n", entry_point);
+    printf("app offset: %p\n", app_offset);
+    typedef int (*main_entry)(int, char**);
+    main_entry main;
+    main = (main_entry)(entry_point);
+
+    /* TODO: call main ! */
+    /* main(main_argc, main_argv); */
+    wolfBoot_printf("Simulator for ELF_SCATTERED image not implemented yet. Exiting...\n");
+    exit(0);
 #else
     char *envp[1] = {NULL};
     int fd = memfd_create("test_app", 0);
+    size_t wret;
     if (fd == -1) {
         wolfBoot_printf( "memfd error\n");
         exit(-1);
     }
 
-    if ((size_t)write(fd, app_offset, app_size) != app_size) {
-        wolfBoot_printf( "can't write test-app to memfd\n");
+    wret = write(fd, app_offset, app_size);
+    if (wret != app_size) {
+        wolfBoot_printf( "can't write test-app to memfd, address %p\n", app_offset);
         exit(-1);
     }
+    wolfBoot_printf("Stored test-app to memfd, address %p (%zu bytes)\n", app_offset, wret);
 
     ret = fexecve(fd, main_argv, envp);
     wolfBoot_printf( "fexecve error\n");

include/elf.h

@@ -32,6 +32,7 @@ extern "C" {
 #define ELF_IDENT_STR     "\x7F""ELF"
 
 /* header ident[4] */
+#define ELF_CLASS_OFF     (4)
 #define ELF_CLASS_32      (1)
 #define ELF_CLASS_64      (2)
 
@@ -111,6 +112,11 @@ typedef struct elf64_header {
     uint16_t sh_str_index;
 } elf64_header;
 
+union elf_header {
+    elf32_header *h32;
+    elf64_header *h64;
+};
+
 typedef struct elf64_section_header {
     uint32_t name;
     uint32_t type;
@@ -136,9 +142,36 @@ typedef struct elf64_program_header {
 } elf64_program_header;
 
 
+/* support byte swapping if testing/reading an elf with different endianess */
+#if defined(ELF_PARSER) || defined(ELF_ENDIAN_SUPPORT)
+  #ifdef BIG_ENDIAN_ORDER
+    #define GET16(x) (( is_le) ? __builtin_bswap16(x) : (x))
+    #define GET32(x) (( is_le) ? __builtin_bswap32(x) : (x))
+    #define GET64(x) (( is_le) ? __builtin_bswap64(x) : (x))
+  #else
+    #define GET16(x) ((!is_le) ? __builtin_bswap16(x) : (x))
+    #define GET32(x) ((!is_le) ? __builtin_bswap32(x) : (x))
+    #define GET64(x) ((!is_le) ? __builtin_bswap64(x) : (x))
+  #endif
+#else
+    #define GET16(x) (x)
+    #define GET32(x) (x)
+    #define GET64(x) (x)
+#endif
+
+#define GET_H64(name) (is_elf32 ? GET32(h32->name) : GET64(h64->name))
+#define GET_H32(name) (is_elf32 ? GET32(h32->name) : GET32(h64->name))
+#define GET_H16(name) (is_elf32 ? GET16(h32->name) : GET16(h64->name))
+#define GET_E64(name) (is_elf32 ? GET32(e32->name) : GET64(e64->name))
+#define GET_E32(name) (is_elf32 ? GET32(e32->name) : GET32(e64->name))
+
 typedef int (*elf_mmu_map_cb)(uint64_t, uint64_t, uint32_t);
 int elf_load_image_mmu(uint8_t *image, uintptr_t *entry, elf_mmu_map_cb mmu_cb);
-int elf_load_image(uint8_t *image, uintptr_t *entry);
+int elf_load_image(uint8_t *image, uintptr_t *entry, int is_ext);
+int elf_store_image_scattered(const unsigned char *image, unsigned long *entry_out, int ext_flash);
+int elf_check_image_scattered(uint8_t part, unsigned long *entry_out);
+int elf_hdr_size(const unsigned char *ehdr);
+int elf_open(const unsigned char *ehdr, int *is_elf32);
 
 
 #ifdef __cplusplus