Update rust toolchain version to nightly-2022-04-07

Changes:
    - global_asm and asm macro are already stable features and can be used
      by import core::arch::global_asm and core::arch::asm
    - Update crate x86, x86_64, bootloader and uart to latest version.
    - Add #![feature(asm_sym)] to resolve compilation error.
    - Update rust toolchain version used by CI.

Signed-off-by: Jiaqi Gao <[email protected]>

Author: gaojiaqi7

.github/workflows/devtools.yml

@@ -14,7 +14,7 @@ env:
   AR_x86_64_unknown_uefi: llvm-ar
   CC_x86_64_unknown_uefi: clang
   STABLE_RUST_TOOLCHAIN: 1.58.1
-  NIGHTLY_RUST_TOOLCHAIN: nightly-2021-08-20
+  NIGHTLY_RUST_TOOLCHAIN: nightly-2022-04-07
   TOOLCHAIN_PROFILE: minimal
 
 jobs:

.github/workflows/format.yml

@@ -29,7 +29,7 @@ jobs:
         uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: nightly-2021-08-20
+          toolchain: nightly-2022-04-07
           override: true
           components: clippy
 
@@ -58,7 +58,7 @@ jobs:
         uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: nightly-2021-08-20
+          toolchain: nightly-2022-04-07
           override: true
           components: rustfmt
 

.github/workflows/integration.yml

@@ -13,7 +13,7 @@ env:
   AS: nasm
   AR_x86_64_unknown_uefi: llvm-ar
   CC_x86_64_unknown_uefi: clang
-  RUST_TOOLCHAIN: nightly-2021-08-20
+  RUST_TOOLCHAIN: nightly-2022-04-07
   TOOLCHAIN_PROFILE: minimal
 
 jobs:

.github/workflows/library.yml

@@ -14,7 +14,7 @@ env:
   AR_x86_64_unknown_uefi: llvm-ar
   CC_x86_64_unknown_uefi: clang
   STABLE_RUST_TOOLCHAIN: 1.58.1
-  NIGHTLY_RUST_TOOLCHAIN: nightly-2021-08-20
+  NIGHTLY_RUST_TOOLCHAIN: nightly-2022-04-07
   TOOLCHAIN_PROFILE: minimal
 
 jobs:

.github/workflows/main.yml

@@ -13,7 +13,7 @@ env:
   AS: nasm
   AR_x86_64_unknown_uefi: llvm-ar
   CC_x86_64_unknown_uefi: clang
-  RUST_TOOLCHAIN: nightly-2021-08-20
+  RUST_TOOLCHAIN: nightly-2022-04-07
   TOOLCHAIN_PROFILE: minimal
 
 jobs:

Cargo.lock

@@ -1,6 +1,6 @@
 export CARGO=cargo
 export STABLE_TOOLCHAIN:=1.58.1
-export NIGHTLY_TOOLCHAIN:=nightly-2021-08-20
+export NIGHTLY_TOOLCHAIN:=nightly-2022-04-07
 export BUILD_TYPE:=release
 export PREFIX:=/usr/local
 

Makefile

@@ -17,7 +17,7 @@ RUN apt-get update && \
     && apt-get clean && rm -rf /var/lib/apt/lists/*
 
 # Install rustup and a fixed version of Rust.
-RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain nightly-2021-08-20
+RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain nightly-2022-04-07
 RUN rustup toolchain install 1.58.1
 RUN rustup component add rust-src
 RUN rustup component add llvm-tools-preview

devtools/dev_container/Dockerfile

@@ -12,5 +12,4 @@ linked_list_allocator = "0.9.0"
 log = "0.4.13"
 scroll = { version = "0.10", default-features = false, features = ["derive"]}
 td-layout = { path = "../../td-layout" }
-# Lock down to 0.44, otherwise it depends on inline asm
-x86 = "0.44.0"
+x86 = "0.47.0"

devtools/td-benchmark/Cargo.toml

@@ -3,14 +3,13 @@
 // SPDX-License-Identifier: BSD-2-Clause-Patent
 
 #![no_std]
-#![feature(asm)]
 #![allow(unused)]
 
 #[macro_use]
 extern crate alloc;
-
 use core::alloc::GlobalAlloc;
 use core::alloc::Layout;
+use core::arch::asm;
 use linked_list_allocator::LockedHeap;
 use scroll::Pread;
 use td_layout::RuntimeMemoryLayout;

devtools/td-benchmark/src/lib.rs

@@ -10,5 +10,5 @@ edition = "2018"
 [dependencies]
 linked_list_allocator = "0.9.0"
 spin = { version = "0.9.2", features = ["lazy"]}
-uart_16550 = "=0.2.14"
-x86_64 = "=0.14.6"
+uart_16550 = "0.2.17"
+x86_64 = "0.14.9"

devtools/test-runner-client/Cargo.toml

@@ -62,7 +62,7 @@ fn kernel_main(boot_info: &'static mut BootInfo) -> ! {
 ```toml
 [dependencies]
 # add bootloader
-bootloader = "0.10.9"
+bootloader = "0.10.12"
 
 [package.metadata.bootloader]
 # To map the complete physical memory starting at virtual address.

doc/test_in_no_std.md

@@ -1 +1 @@
-nightly-2021-08-20
+nightly-2022-04-07

rust-toolchain

@@ -12,7 +12,7 @@ bitflags = "1.2.1"
 lazy_static = { version = "1.0", features = ["spin_no_std"] }
 log = "0.4.13"
 tdx-tdcall =  { path = "../tdx-tdcall", optional = true }
-x86_64 = "=0.14.6"
+x86_64 = "0.14.9"
 
 [features]
 tdx = ["tdx-tdcall"]

td-exception/Cargo.toml

@@ -1,5 +1,6 @@
 // Copyright (c) 2021 Intel Corporation
 //
 // SPDX-License-Identifier: BSD-2-Clause-Patent
+use core::arch::global_asm;
 
 global_asm!(include_str!("idt.asm"));

td-exception/src/asm/mod.rs

@@ -2,6 +2,7 @@
 //
 // SPDX-License-Identifier: BSD-2-Clause-Patent
 
+use core::arch::asm;
 #[cfg(feature = "tdx")]
 use tdx_tdcall::tdx;
 

td-exception/src/interrupt.rs

@@ -3,9 +3,8 @@
 // SPDX-License-Identifier: BSD-2-Clause-Patent
 
 #![no_std]
-#![feature(asm)]
 #![feature(naked_functions)]
-#![feature(global_asm)]
+#![feature(asm_sym)]
 
 pub mod asm;
 pub mod idt;

td-exception/src/lib.rs

@@ -13,7 +13,7 @@ log = "0.4.13"
 spin = "0.9.2"
 tdx-tdcall = { path = "../tdx-tdcall", optional = true }
 # Lock down to 0.44, otherwise it depends on inline asm
-x86 = { version = "0.44.0", optional = true }
+x86 = { version = "0.47.0", optional = true }
 
 [features]
 tdx = ["tdx-tdcall"]

td-logger/Cargo.toml

@@ -13,5 +13,5 @@ log = "0.4.13"
 spin = "0.9.2"
 td-layout = { path = "../td-layout" }
 # Lock down to 0.44, otherwise it depends on inline asm
-x86 = "0.44.0"
-x86_64 = "=0.14.6"
+x86 = "0.47.0"
+x86_64 = "0.14.9"

td-paging/Cargo.toml

@@ -1,6 +1,7 @@
 // Copyright (c) 2021 Intel Corporation
 //
 // SPDX-License-Identifier: BSD-2-Clause-Patent
+use core::arch::global_asm;
 
 global_asm!(include_str!("stack_guard_test.asm"));
 #[cfg(feature = "cet-ss")]

td-payload/src/asm/mod.rs

@@ -15,8 +15,6 @@
 
 #![no_std]
 #![cfg_attr(not(test), no_main)]
-#![feature(global_asm)]
-#![feature(asm)]
 #![allow(unused)]
 
 #[macro_use]

td-payload/src/main.rs

@@ -33,9 +33,9 @@ spin = { version = "0.9.2", optional = true }
 td-exception =  { path = "../td-exception", features = ["tdx"], optional = true }
 td-logger =  { path = "../td-logger", optional = true }
 td-paging = { path = "../td-paging", optional = true }
-x86 = { version ="0.44.0", optional = true }
+x86 = { version ="0.47.0", optional = true }
 # Lock down to 0.44, otherwise it depends on inline asm
-x86_64 = { version = "=0.14.6", optional = true }
+x86_64 = { version = "0.14.9", optional = true }
 
 # secure boot
 der = {version = "0.4.5", features = ["derive", "alloc"], optional = true}

td-shim/Cargo.toml

@@ -1,6 +1,8 @@
 // Copyright (c) 2020-2022 Intel Corporation
 //
 // SPDX-License-Identifier: BSD-2-Clause-Patent
+use core::arch::global_asm;
+
 global_asm!(include_str!("switch_stack.asm"));
 global_asm!(include_str!("msr64.asm"));
 global_asm!(include_str!("ap_loop.asm"));

td-shim/src/bin/td-shim/asm/mod.rs

@@ -3,8 +3,6 @@
 // SPDX-License-Identifier: BSD-2-Clause-Patent
 
 #![allow(unused)]
-#![feature(global_asm)]
-#![feature(asm)]
 #![feature(alloc_error_handler)]
 #![cfg_attr(not(test), no_std)]
 #![cfg_attr(not(test), no_main)]

td-shim/src/bin/td-shim/main.rs

@@ -5,6 +5,7 @@
 extern crate alloc;
 
 use alloc::vec::Vec;
+use core::arch::asm;
 use core::cmp::min;
 use core::ops::RangeInclusive;
 use td_layout::memslice::{get_dynamic_mem_slice_mut, get_mem_slice_mut, SliceType};

td-shim/src/bin/td-shim/td/tdx_mailbox.rs

@@ -1,6 +1,7 @@
 // Copyright (c) 2020 Intel Corporation
 //
 // SPDX-License-Identifier: BSD-2-Clause-Patent
+use core::arch::global_asm;
 
 #[cfg(feature = "use_tdx_emulation")]
 global_asm!(include_str!("tdcall_emu.asm"));

tdx-tdcall/src/asm/mod.rs

@@ -3,7 +3,6 @@
 // SPDX-License-Identifier: BSD-2-Clause-Patent
 
 #![no_std]
-#![feature(global_asm)]
 
 #[cfg(feature = "use_tdx_emulation")]
 pub const USE_TDX_EMULATION: bool = true;

tdx-tdcall/src/lib.rs

@@ -9,7 +9,7 @@ edition = "2018"
 
 [dependencies]
 # Keep it as `dependencies` to satisfy bootloader-locator's requirement, though it should be `dev-dependencies`
-bootloader = "=0.10.9"
+bootloader = "0.10.12"
 
 [dev-dependencies]
 td-exception = { path = "../../td-exception", features = ["integration-test"] }

tests/test-td-exception/Cargo.toml

@@ -9,13 +9,13 @@ edition = "2018"
 
 [dependencies]
 # Keep it as `dependencies` to satisfy bootloader-locator's requirement, though it should be `dev-dependencies`
-bootloader = "=0.10.9"
+bootloader = "0.10.12"
 
 [dev-dependencies]
 td-paging = { path = "../../td-paging" }
 td-layout = { path = "../../td-layout" }
 test-runner-client = { path = "../../devtools/test-runner-client" }
-x86_64 = "=0.14.6"
+x86_64 = "0.14.9"
 
 [package.metadata.bootloader]
 map-physical-memory = true

tests/test-td-paging/Cargo.toml

@@ -20,7 +20,7 @@ td-layout = { path = "../../td-layout" }
 scroll = { version = "0.10.0", default-features = false, features = ["derive"]}
 serde = { version = "1.0", default-features = false, features = ["derive"]}
 serde_json = { version = "1.0", default-features = false, features = ["alloc"] }
-x86 = { version = "0.44.0" }
+x86 = { version = "0.47.0" }
 td-shim = { path = "../../td-shim" }
 zerocopy = "0.6.0"