Fix unwinding feature in sel4-microkit crate

Cargo.toml

@@ -51,6 +51,7 @@ members = [
     "crates/private/support/sel4-simple-task/threading",
     "crates/private/tests/capdl/threads/components/test",
     "crates/private/tests/capdl/utcover/components/test",
+    "crates/private/tests/microkit/minimal",
     "crates/private/tests/microkit/passive-server-with-deferred-action/pds/client",
     "crates/private/tests/microkit/passive-server-with-deferred-action/pds/server",
     "crates/private/tests/microkit/reset",

crates/private/tests/microkit/minimal/Cargo.nix

@@ -0,0 +1,16 @@
+#
+# Copyright 2024, Colias Group, LLC
+#
+# SPDX-License-Identifier: BSD-2-Clause
+#
+
+{ mk, localCrates }:
+
+mk {
+  package.name = "tests-microkit-minimal";
+  dependencies = {
+    inherit (localCrates)
+    ;
+    sel4-microkit = localCrates.sel4-microkit // { default-features = false; };
+  };
+}

crates/private/tests/microkit/minimal/Cargo.toml

@@ -0,0 +1,20 @@
+#
+# Copyright 2023, Colias Group, LLC
+#
+# SPDX-License-Identifier: BSD-2-Clause
+#
+#
+# This file is generated from './Cargo.nix'. You can edit this file directly
+# if you are not using this project's Cargo manifest management tools.
+# See 'hacking/cargo-manifest-management/README.md' for more information.
+#
+
+[package]
+name = "tests-microkit-minimal"
+version = "0.1.0"
+authors = ["Nick Spinale <[email protected]>"]
+edition = "2021"
+license = "BSD-2-Clause"
+
+[dependencies]
+sel4-microkit = { path = "../../../../sel4-microkit", default-features = false }

crates/private/tests/microkit/minimal/src/bin/test.rs

@@ -0,0 +1,16 @@
+//
+// Copyright 2024, Colias Group, LLC
+//
+// SPDX-License-Identifier: BSD-2-Clause
+//
+
+#![no_std]
+#![no_main]
+
+use sel4_microkit::{debug_println, protection_domain, NullHandler};
+
+#[protection_domain]
+fn init() -> NullHandler {
+    debug_println!("TEST_PASS");
+    NullHandler::new()
+}

crates/private/tests/microkit/minimal/x.system

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Copyright 2024, Colias Group, LLC
+
+     SPDX-License-Identifier: BSD-2-Clause
+-->
+<system>
+    <protection_domain name="test" priority="128">
+        <program_image path="test.elf" />
+    </protection_domain>
+</system>

crates/sel4-microkit/Cargo.nix

@@ -20,7 +20,7 @@ mk {
       sel4-microkit-base
       sel4-microkit-macros
     ;
-    sel4-runtime-common = localCrates.sel4-runtime-common // { features = [ "tls" "unwinding" "start" ]; };
+    sel4-runtime-common = localCrates.sel4-runtime-common // { features = [ "tls" "start" ]; };
     sel4 = localCrates.sel4 // { features = [ "single-threaded" ]; };
   };
   features = {
@@ -33,6 +33,7 @@ mk {
     ];
     unwinding = [
       "sel4-panicking/unwinding"
+      "sel4-runtime-common/unwinding"
     ];
     alloc = [
       "sel4-panicking/alloc"

crates/sel4-microkit/Cargo.toml

@@ -20,7 +20,7 @@ license = "BSD-2-Clause"
 alloc = ["sel4-panicking/alloc"]
 default = ["unwinding"]
 full = ["default", "alloc"]
-unwinding = ["sel4-panicking/unwinding"]
+unwinding = ["sel4-panicking/unwinding", "sel4-runtime-common/unwinding"]
 
 [dependencies]
 cfg-if = "1.0.0"
@@ -32,5 +32,5 @@ sel4-microkit-base = { path = "base" }
 sel4-microkit-macros = { path = "macros" }
 sel4-panicking = { path = "../sel4-panicking" }
 sel4-panicking-env = { path = "../sel4-panicking/env" }
-sel4-runtime-common = { path = "../sel4-runtime-common", features = ["tls", "unwinding", "start"] }
+sel4-runtime-common = { path = "../sel4-runtime-common", features = ["tls", "start"] }
 sel4-sync = { path = "../sel4-sync" }

crates/sel4-microkit/base/src/symbols.rs

@@ -183,5 +183,9 @@ pub fn ipc_buffer_ptr() -> *mut sel4::IpcBuffer {
         static mut __sel4_ipc_buffer_obj: sel4::IpcBuffer;
     }
 
-    ptr::addr_of_mut!(__sel4_ipc_buffer_obj)
+    // Only unsafe until 1.82
+    #[allow(unused_unsafe)]
+    unsafe {
+        ptr::addr_of_mut!(__sel4_ipc_buffer_obj)
+    }
 }

hacking/nix/scope/world/instances/default.nix

@@ -98,6 +98,7 @@ in rec {
     microkit.examples.hello
     microkit.examples.banscii
     microkit.examples.http-server
+    microkit.tests.minimal
     microkit.tests.passive-server-with-deferred-action
     microkit.tests.reset
     examples.root-task.hello

hacking/nix/scope/world/instances/microkit/default.nix

@@ -18,6 +18,7 @@
 , worldConfig
 , seL4Config
 , callPlatform
+, verus
 
 , maybe
 , canSimulate
@@ -77,6 +78,31 @@ in {
   };
 
   tests = {
+    minimal = maybe isMicrokit (
+      let
+        pd = mkPD rec {
+          inherit (verus) rustEnvironment;
+          rootCrate = crates.tests-microkit-minimal;
+          extraProfile = {
+            panic = "abort";
+          };
+        };
+      in
+        callPlatform {
+          system = microkit.mkSystem {
+            searchPath = [
+              "${pd}/bin"
+            ];
+            systemXML = sources.srcRoot + "/crates/private/tests/microkit/minimal/x.system";
+          };
+          extraPlatformArgs = lib.optionalAttrs canSimulate  {
+            canAutomateSimply = true;
+          };
+        } // {
+          inherit pd;
+        }
+    );
+
     passive-server-with-deferred-action = maybe isMicrokit (
       let
         mkCrateName = role: "tests-microkit-passive-server-with-deferred-action-pds-${role}";

hacking/nix/scope/worlds.nix

@@ -29,6 +29,8 @@ in rec {
     let
     in rec {
       default = qemu-arm-virt.default;
+      microkitDefault = qemu-arm-virt.microkit;
+
       qemu-arm-virt =
         let
           mk =
@@ -263,6 +265,7 @@ in rec {
     let
     in rec {
       default = qemu-riscv-virt.default;
+      microkitDefault = qemu-riscv-virt.microkit;
 
       qemu-riscv-virt =
         let

hacking/nix/top-level/default.nix

@@ -208,6 +208,11 @@ in {
 
   worlds = lib.fix (self: {
     default = self.aarch64.default;
+    microkit = rec {
+      default = aarch64;
+      aarch64 = self.aarch64.microkitDefault;
+      riscv64 = self.riscv64.microkitDefault;
+    };
   } // lib.mapAttrs (_: arch: arch.none.this.worlds) {
     inherit (pkgs.host) aarch64 aarch32 x86_64 i386;
     riscv64 = pkgs.host.riscv64.default;