Merge pull request #1400 from fwsGonzo/dev

Custom sanity checks for solo5

Author: fwsGonzo

cmake/post.service.cmake

@@ -9,7 +9,6 @@ endif()
 
 set(INSTALL_LOC $ENV{INCLUDEOS_PREFIX}/includeos)
 
-
 message(STATUS "Target CPU architecture ${ARCH}")
 set(TRIPLE "${ARCH}-pc-linux-elf")
 set(CMAKE_CXX_COMPILER_TARGET ${TRIPLE})
@@ -37,17 +36,6 @@ include(${CMAKE_CURRENT_LIST_DIR}/settings.cmake)
 set(CAPABS "${CAPABS} -mno-red-zone -fstack-protector-strong -DOS_TERMINATE_ON_CONTRACT_VIOLATION -D_GNU_SOURCE -DSERVICE=\"\\\"${BINARY}\\\"\" -DSERVICE_NAME=\"\\\"${SERVICE_NAME}\\\"\"")
 set(WARNS  "-Wall -Wextra") #-pedantic
 
-# configure options
-option(debug "Build with debugging symbols (OBS: increases binary size)" OFF)
-option(minimal "Build for minimal size" OFF)
-option(stripped "Strip symbols to further reduce size" OFF)
-
-add_definitions(-DARCH_${ARCH})
-add_definitions(-DARCH="${ARCH}")
-if (single_threaded)
-add_definitions(-DINCLUDEOS_SINGLE_THREADED)
-endif()
-
 # Compiler optimization
 set(OPTIMIZE "-O2")
 if (minimal)

cmake/pre.service.cmake

@@ -15,14 +15,26 @@ if (NOT DEFINED PLATFORM)
   endif()
 endif()
 
+# configure options
+option(debug "Build with debugging symbols (OBS: increases binary size)" OFF)
+option(minimal "Build for minimal size" OFF)
+option(stripped "Strip symbols to further reduce size" OFF)
+option(single_threaded "Compile without SMP support" ON)
 
+# arch and platform defines
 message(STATUS "Building for arch ${ARCH}, platform ${PLATFORM}")
-
 set(TRIPLE ${ARCH}) #-pc-linux-elf
 set(DCMAKE_CXX_COMPILER_TARGET ${TRIPLE})
 set(DCMAKE_C_COMPILER_TARGET ${TRIPLE})
 
-option(single_threaded "Compile without SMP support" ON)
+add_definitions(-DARCH_${ARCH})
+add_definitions(-DARCH="${ARCH}")
+add_definitions(-DPLATFORM="${PLATFORM}")
+add_definitions(-DPLATFORM_${PLATFORM})
+
+if (single_threaded)
+add_definitions(-DINCLUDEOS_SINGLE_THREADED)
+endif()
 
 # include toolchain for arch
 include($ENV{INCLUDEOS_PREFIX}/includeos/${ARCH}-elf-toolchain.cmake)

src/CMakeLists.txt

@@ -32,7 +32,7 @@ include_directories(${BOTAN_DIR})
 
 # TODO: i wanted to use a glob, but then found out that not everything is included
 set(OS_OBJECTS
-  kernel/kernel_start.cpp kernel/sanity_checks.cpp kernel/syscalls.cpp
+  kernel/kernel_start.cpp kernel/syscalls.cpp
   kernel/irq_manager.cpp kernel/multiboot.cpp
   kernel/os.cpp kernel/cpuid.cpp kernel/memmap.cpp kernel/pci_manager.cpp
   kernel/heap.cpp kernel/service_stub.cpp kernel/main_call.cpp

src/platform/x86_nano/CMakeLists.txt

@@ -11,6 +11,7 @@ set(PLATFORM_OBJECTS
   ../x86_pc/os.cpp
   ../x86_pc/block.cpp
   ../x86_pc/softreset.cpp
+  ../x86_pc/sanity_checks.cpp
   platform.cpp
   kernel_start.cpp
   )

src/platform/x86_pc/CMakeLists.txt

@@ -16,6 +16,7 @@ set(X86_PC_OBJECTS
   serial1.cpp
   pic.cpp
   softreset.cpp
+  sanity_checks.cpp
   )
 
 add_custom_command(

src/kernel/sanity_checks.cpp src/platform/x86_pc/sanity_checks.cppsrc/kernel/sanity_checks.cpp renamed to src/platform/x86_pc/sanity_checks.cpp

@@ -25,10 +25,6 @@
 
 // NOTE: crc_to MUST NOT be initialized to zero
 static uint32_t crc_ro = CRC32_BEGIN();
-extern char _TEXT_START_;
-extern char _TEXT_END_;
-extern char _RODATA_START_;
-extern char _RODATA_END_;
 const auto* LOW_CHECK_SIZE = (volatile int*) 0x200;
 
 // Global constructors
@@ -40,6 +36,10 @@ static void self_test_gconstr() {
 
 static uint32_t generate_ro_crc() noexcept
 {
+  extern char _TEXT_START_;
+  extern char _TEXT_END_;
+  extern char _RODATA_START_;
+  extern char _RODATA_END_;
   return crc32_fast(&_TEXT_START_, &_RODATA_END_ - &_TEXT_START_);
 }
 
@@ -68,6 +68,7 @@ void kernel_sanity_checks()
     kprintf("Memory at %p was not zeroed: %#x\n", lowmem, *lowmem);
     panic("Sanity checks: Low-memory zero test");
   }
+
   // verify that Elf symbols were not overwritten
   bool symbols_verified = Elf::verify_symbols();
   if (!symbols_verified)

src/platform/x86_solo5/CMakeLists.txt

@@ -5,6 +5,7 @@ set(PLATFORM_OBJECTS
   start.asm
   platform.cpp
   kernel_start.cpp
+  sanity_checks.cpp
   )
 
 add_library(x86_solo5 STATIC ${PLATFORM_OBJECTS})

src/platform/x86_solo5/sanity_checks.cpp

@@ -0,0 +1,50 @@
+// This file is a part of the IncludeOS unikernel - www.includeos.org
+//
+// Copyright 2015 Oslo and Akershus University College of Applied Sciences
+// and Alfred Bratterud
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include <common>
+#include <util/crc32.hpp>
+#include <kernel/elf.hpp>
+#include <kernel/syscalls.hpp>
+#include <cstdint>
+#include <kprint>
+
+// Global constructors
+static int gconstr_value = 0;
+__attribute__((constructor))
+static void self_test_gconstr() {
+  gconstr_value = 1;
+}
+
+extern "C"
+void __init_sanity_checks() noexcept
+{
+}
+
+extern "C"
+void kernel_sanity_checks()
+{
+  // verify that Elf symbols were not overwritten
+  bool symbols_verified = Elf::verify_symbols();
+  if (!symbols_verified)
+    panic("Sanity checks: Consistency of Elf symbols and string areas");
+
+  // global constructor self-test
+  if (gconstr_value != 1) {
+    kprintf("Sanity checks: Global constructors not working (or modified during run-time)!\n");
+    panic("Sanity checks: Global constructors verification failed");
+  }
+}