Merge changes Ic0ca4ab4,If1c494aa,I56701b4a,Ia7ff0097,I13812a9f, ...

* changes:
  Replace SeL4Debug with direct syscalls.
  sel4-sys: fix conditional syscall numbering
  sel4-sys: use target_arch &co to select target architecture
  kata-os-common: add sel4-sys support for riscv32
  kata-os-common: cleanup sel4-sys before bringing in local changes
  kata-os-common: pristine import of sel4-sys-0.0.28 (-seL4 submodule)

GitOrigin-RevId: 36ee1d4f9e521b60fdc6b91f2581413b55882fca
This commit is contained in:
Sam Leffler
2021-09-30 21:22:49 +00:00
parent 4faa2e4c82
commit e23e5907d0
35 changed files with 13574 additions and 52 deletions

View File

@@ -3,7 +3,6 @@ import <ProcessControlInterface.camkes>;
import <PackageManagementInterface.camkes>;
import <MlCoordinatorInterface.camkes>;
import <SecurityCoordinatorInterface.camkes>;
import <SeL4DebugInterface.camkes>;
import <StorageInterface.camkes>;
component DebugConsole {
@@ -22,6 +21,5 @@ component DebugConsole {
uses SecurityCoordinatorInterface security;
// TODO(b/200707300): for debugging
uses StorageInterface storage;
uses SeL4DebugInterface sel4debug;
uses MlCoordinatorInterface mlcoord;
}

View File

@@ -10,6 +10,7 @@ hex = { version = "0.4.3", default-features = false, features = ["alloc"] }
kata-io = { path = "../kata-io" }
kata-line-reader = { path = "../kata-line-reader" }
kata-proc-interface = { path = "../../ProcessManager/kata-proc-interface" }
kata-os-common = { path = "../../kata-os-common" }
kata-security-interface = { path = "../../SecurityCoordinator/kata-security-interface" }
kata-storage-interface = { path = "../../StorageManager/kata-storage-interface" }
log = "0.4"

View File

@@ -15,6 +15,7 @@ use kata_proc_interface::kata_pkg_mgmt_uninstall;
use kata_proc_interface::kata_proc_ctrl_get_running_bundles;
use kata_proc_interface::kata_proc_ctrl_start;
use kata_proc_interface::kata_proc_ctrl_stop;
use kata_os_common::sel4_sys::seL4_DebugDumpScheduler;
use kata_storage_interface::kata_storage_delete;
use kata_storage_interface::kata_storage_read;
use kata_storage_interface::kata_storage_write;
@@ -207,12 +208,7 @@ fn rz_command(
/// Implements a "ps" command that dumps seL4 scheduler state to the console.
fn ps_command() -> Result<(), CommandError> {
extern "C" {
fn sel4debug_dump_scheduler();
}
unsafe {
sel4debug_dump_scheduler();
}
unsafe { seL4_DebugDumpScheduler(); }
Ok(())
}