remove UEFI app (project-oak#2956)

.github/workflows/ci.yaml

@@ -87,7 +87,7 @@ jobs:
         uses: actions/cache@v2
         env:
           # Increment this value to invalidate previous cache entries.
-          CACHE_VERSION: 11
+          CACHE_VERSION: 12
         with:
           path: |
             ./cargo-cache/bin

Cargo.toml

@@ -15,11 +15,11 @@ members = [
   "experimental/trusted_shuffler/common",
   "experimental/trusted_shuffler/server",
   "experimental/trusted_shuffler/trusted_shuffler",
-  "experimental/uefi/channel",
-  "experimental/uefi/client",
-  "experimental/uefi/kernel",
-  "experimental/uefi/loader",
-  "experimental/uefi/runtime",
+  "experimental/oak_baremetal_channel",
+  "experimental/oak_baremetal_client",
+  "experimental/oak_baremetal_kernel",
+  "experimental/oak_baremetal_loader",
+  "experimental/oak_baremetal_runtime",
   "experimental/virtio",
   "experimental/vsock/echo",
   "experimental/web_client",
@@ -65,8 +65,8 @@ members = [
   "xtask",
 ]
 exclude = [
-  "experimental/uefi/baremetal",
-  "experimental/uefi/baremetal-crosvm",
+  "experimental/oak_baremetal_app_qemu",
+  "experimental/oak_baremetal_app_crosvm",
   "oak_functions/loader/fuzz",
   "third_party/ring",
   "third_party/curve25519-dalek",

experimental/uefi/baremetal-crosvm/Cargo.toml → experimental/oak_baremetal_app_crosvm/Cargo.toml

@@ -1,12 +1,14 @@
 [package]
-name = "baremetal-crosvm"
+name = "oak_baremetal_app_crosvm"
 version = "0.1.0"
 authors = ["Andri Saar <[email protected]>"]
 edition = "2021"
 license = "Apache-2.0"
 
 [dependencies]
-kernel = { path = "../kernel", features = ["vsock_channel"] }
+oak_baremetal_kernel = { path = "../../experimental/oak_baremetal_kernel", features = [
+  "vsock_channel"
+] }
 
 [patch.crates-io]
 # Ensure no_std compatibility. TODO(#2920): remove once https://github.com/google/flatbuffers/pull/7338 is merged.

experimental/uefi/baremetal-crosvm/src/bootparam.rs → experimental/oak_baremetal_app_crosvm/src/bootparam.rs

@@ -19,7 +19,7 @@
  *   --ctypes-prefix c_types arch/x86/include/uapi/asm/bootparam.h
  */
 
-use kernel::boot::{BootInfo, E820Entry, E820EntryType};
+use oak_baremetal_kernel::boot::{BootInfo, E820Entry, E820EntryType};
 
 #[allow(non_camel_case_types)]
 mod c_types {

experimental/uefi/baremetal-crosvm/src/main.rs → experimental/oak_baremetal_app_crosvm/src/main.rs

@@ -33,13 +33,13 @@ mod bootparam;
 #[cfg(test)]
 pub extern "C" fn rust64_start(_rdi: u64, _rsi: &bootparam::boot_params) -> ! {
     test_main();
-    kernel::i8042::shutdown();
+    oak_baremetal_kernel::i8042::shutdown();
 }
 
 #[no_mangle]
 #[cfg(not(test))]
 pub extern "C" fn rust64_start(_rdi: u64, rsi: &bootparam::boot_params) -> ! {
-    kernel::start_kernel(rsi);
+    oak_baremetal_kernel::start_kernel(rsi);
 }
 
 #[alloc_error_handler]
@@ -49,7 +49,7 @@ fn out_of_memory(layout: ::core::alloc::Layout) -> ! {
 
 #[panic_handler]
 fn panic(info: &PanicInfo) -> ! {
-    kernel::panic(info);
+    oak_baremetal_kernel::panic(info);
 }
 
 #[lang = "eh_personality"]

experimental/uefi/baremetal/src/hvm_start_info.rs → experimental/oak_baremetal_app_qemu/src/hvm_start_info.rs

@@ -14,7 +14,7 @@
 // limitations under the License.
 //
 
-use kernel::boot::{BootInfo, E820Entry, E820EntryType};
+use oak_baremetal_kernel::boot::{BootInfo, E820Entry, E820EntryType};
 
 include!(concat!(env!("OUT_DIR"), "/start_info.rs"));
 

experimental/uefi/baremetal/src/main.rs → experimental/oak_baremetal_app_qemu/src/main.rs

@@ -35,7 +35,7 @@ mod multiboot;
 #[cfg(test)]
 pub extern "C" fn rust64_start(_rdi: &hvm_start_info::hvm_start_info) -> ! {
     test_main();
-    kernel::i8042::shutdown();
+    oak_baremetal_kernel::i8042::shutdown();
 }
 
 #[no_mangle]
@@ -47,15 +47,15 @@ pub extern "C" fn rust64_start(start_info: &multiboot::multiboot_info, magic: u6
     // As at this stage we don't even have logging set up, so if the magic does not match,
     // let's just shut down the machine.
     if magic != 0x2BADB002 {
-        kernel::i8042::shutdown();
+        oak_baremetal_kernel::i8042::shutdown();
     }
-    kernel::start_kernel(start_info);
+    oak_baremetal_kernel::start_kernel(start_info);
 }
 
 #[no_mangle]
 #[cfg(all(not(test), not(feature = "multiboot")))]
 pub extern "C" fn rust64_start(start_info: &hvm_start_info::hvm_start_info) -> ! {
-    kernel::start_kernel(start_info);
+    oak_baremetal_kernel::start_kernel(start_info);
 }
 
 #[alloc_error_handler]
@@ -65,7 +65,7 @@ fn out_of_memory(layout: ::core::alloc::Layout) -> ! {
 
 #[panic_handler]
 fn panic(info: &PanicInfo) -> ! {
-    kernel::panic(info);
+    oak_baremetal_kernel::panic(info);
 }
 
 #[lang = "eh_personality"]

experimental/uefi/baremetal/src/multiboot.rs → experimental/oak_baremetal_app_qemu/src/multiboot.rs

@@ -18,7 +18,7 @@
 #![allow(non_camel_case_types)]
 
 use bitflags::bitflags;
-use kernel::boot::{BootInfo, E820Entry, E820EntryType};
+use oak_baremetal_kernel::boot::{BootInfo, E820Entry, E820EntryType};
 
 include!(concat!(env!("OUT_DIR"), "/multiboot.rs"));
 

experimental/uefi/channel/Cargo.toml → experimental/oak_baremetal_channel/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "channel"
+name = "oak_baremetal_communication_channel"
 version = "0.1.0"
 authors = ["Juliette Pretot <[email protected]>"]
 edition = "2021"
@@ -8,10 +8,10 @@ license = "Apache-2.0"
 [dependencies]
 anyhow = { version = "*", default-features = false }
 ciborium-io = { version = "*", default-features = false }
-oak_idl = { path = "../../../oak_idl" }
+oak_idl = { path = "../../oak_idl" }
 flatbuffers = { version = "*", features = ["no_std"], default-features = false }
 static_assertions = "*"
 
 [build-dependencies]
-oak_idl_gen_services = { path = "../../../oak_idl_gen_services" }
-oak_idl_gen_structs = { path = "../../../oak_idl_gen_structs" }
+oak_idl_gen_services = { path = "../../oak_idl_gen_services" }
+oak_idl_gen_structs = { path = "../../oak_idl_gen_structs" }

experimental/uefi/client/Cargo.toml → experimental/oak_baremetal_client/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "uefi-client"
+name = "oak_baremetal_client"
 version = "0.1.0"
 authors = ["Andri Saar <[email protected]>"]
 edition = "2021"
@@ -10,9 +10,9 @@ clap = { version = "*", features = ["derive"] }
 prost = "*"
 tokio = { version = "*", features = ["macros", "rt-multi-thread"] }
 tonic = "*"
-grpc_unary_attestation = { path = "../../../grpc_unary_attestation/" }
-oak_remote_attestation = { path = "../../../remote_attestation/rust/" }
+grpc_unary_attestation = { path = "../../grpc_unary_attestation/" }
+oak_remote_attestation = { path = "../../remote_attestation/rust/" }
 anyhow = "*"
 
 [build-dependencies]
-oak_utils = { path = "../../../oak_utils" }
+oak_utils = { path = "../../oak_utils" }