Merge pull request #77 from Freax13/bump/nightly-2024-10-19

bump rust nightly version

Author: Freax13

rust-toolchain.toml

@@ -1,4 +1,4 @@
 [toolchain]
-channel = "nightly-2024-09-10"
+channel = "nightly-2024-10-19"
 targets = ["x86_64-unknown-none", "x86_64-unknown-linux-musl", "i686-unknown-linux-musl"]
 components = ["clippy", "rust-src", "rustfmt"]

tee/kernel/src/exception.rs

@@ -1,7 +1,11 @@
 //! This module is responsible for handling CPU exceptions.
 
 use core::mem::offset_of;
-use core::{alloc::Layout, arch::asm, ptr::null_mut};
+use core::{
+    alloc::Layout,
+    arch::{asm, naked_asm},
+    ptr::null_mut,
+};
 
 use crate::spin::lazy::Lazy;
 use alloc::alloc::alloc;
@@ -165,7 +169,7 @@ pub fn load_idt() {
 #[naked]
 extern "x86-interrupt" fn divide_error_handler(frame: InterruptStackFrame) {
     unsafe {
-        asm!(
+        naked_asm!(
             // Check whether the exception happened in userspace.
             "test word ptr [rsp+16], 3",
             "je {kernel_divide_error_handler}",
@@ -180,7 +184,6 @@ extern "x86-interrupt" fn divide_error_handler(frame: InterruptStackFrame) {
             kernel_divide_error_handler = sym kernel_divide_error_handler,
             VECTOR_OFFSET = const offset_of!(PerCpu, vector),
             HANDLER_OFFSET = const offset_of!(PerCpu, userspace_exception_exit_point),
-            options(noreturn),
         );
     }
 }
@@ -195,7 +198,7 @@ extern "x86-interrupt" fn page_fault_handler(
     error_code: PageFaultErrorCode,
 ) {
     unsafe {
-        asm!(
+        naked_asm!(
             // Check whether the exception happened in userspace.
             "test word ptr [rsp+16], 3",
             "je 66f",
@@ -256,7 +259,6 @@ extern "x86-interrupt" fn page_fault_handler(
             VECTOR_OFFSET = const offset_of!(PerCpu, vector),
             ERROR_CODE_OFFSET = const offset_of!(PerCpu, error_code),
             HANDLER_OFFSET = const offset_of!(PerCpu, userspace_exception_exit_point),
-            options(noreturn),
         );
     }
 }
@@ -300,7 +302,7 @@ extern "x86-interrupt" fn general_protection_fault_handler(
     error_code: u64,
 ) {
     unsafe {
-        asm!(
+        naked_asm!(
             // Check whether the exception happened in userspace.
             "test word ptr [rsp+16], 3",
             "je {kernel_general_protection_fault_handler}",
@@ -317,7 +319,6 @@ extern "x86-interrupt" fn general_protection_fault_handler(
             VECTOR_OFFSET = const offset_of!(PerCpu, vector),
             ERROR_CODE_OFFSET = const offset_of!(PerCpu, error_code),
             HANDLER_OFFSET = const offset_of!(PerCpu, userspace_exception_exit_point),
-            options(noreturn),
         );
     }
 }
@@ -336,7 +337,7 @@ extern "x86-interrupt" fn double_fault_handler(frame: InterruptStackFrame, code:
 #[naked]
 extern "x86-interrupt" fn vc_handler(frame: InterruptStackFrame, error_code: u64) {
     unsafe {
-        asm!(
+        naked_asm!(
             // Check whether the exception happened in userspace.
             "test word ptr [rsp+16], 3",
             "je {kernel_vc_handler}",
@@ -353,15 +354,14 @@ extern "x86-interrupt" fn vc_handler(frame: InterruptStackFrame, error_code: u64
             VECTOR_OFFSET = const offset_of!(PerCpu, vector),
             ERROR_CODE_OFFSET = const offset_of!(PerCpu, error_code),
             HANDLER_OFFSET = const offset_of!(PerCpu, userspace_exception_exit_point),
-            options(noreturn),
         );
     }
 }
 
 #[naked]
 extern "x86-interrupt" fn kernel_vc_handler(frame: InterruptStackFrame, code: u64) {
     unsafe {
-        asm!(
+        naked_asm!(
             "push r11",
             "push r10",
             "push r9",
@@ -390,7 +390,6 @@ extern "x86-interrupt" fn kernel_vc_handler(frame: InterruptStackFrame, code: u6
             "add rsp, 8", // skip error code.
             "iretq",
             kernel_vc_handler_impl = sym kernel_vc_handler_impl,
-            options(noreturn)
         );
     }
 }
@@ -464,13 +463,12 @@ extern "x86-interrupt" fn int0x80_handler(frame: InterruptStackFrame) {
     // The code that entered userspace stored addresses where execution should
     // continue when userspace exits.
     unsafe {
-        asm!(
+        naked_asm!(
             "swapgs",
             "mov byte ptr gs:[{VECTOR_OFFSET}], 0x80",
             "jmp gs:[{HANDLER_OFFSET}]",
             VECTOR_OFFSET = const offset_of!(PerCpu, vector),
             HANDLER_OFFSET = const offset_of!(PerCpu, userspace_exception_exit_point),
-            options(noreturn)
         );
     }
 }

tee/kernel/src/main.rs

@@ -6,7 +6,6 @@
     allocator_api,
     btree_cursors,
     cfg_sanitize,
-    const_mut_refs,
     core_intrinsics,
     drain_keep_rest,
     extract_if,

tee/kernel/src/memory/pagetable.rs

@@ -1165,7 +1165,7 @@ where
     entry: &'a ActivePageTableEntry<L>,
 }
 
-impl<'a, L> Deref for ActivePageTableEntryGuard<'a, L>
+impl<L> Deref for ActivePageTableEntryGuard<'_, L>
 where
     L: TableLevel,
     ActivePageTableEntry<L>: ParentEntry,
@@ -1178,7 +1178,7 @@ where
     }
 }
 
-impl<'a, L> Drop for ActivePageTableEntryGuard<'a, L>
+impl<L> Drop for ActivePageTableEntryGuard<'_, L>
 where
     L: TableLevel,
     ActivePageTableEntry<L>: ParentEntry,

tee/static-page-tables/src/lib.rs

@@ -1,5 +1,5 @@
 #![no_std]
-#![feature(const_mut_refs, const_unsafecell_get_mut, const_ptr_is_null)]
+#![feature(const_ptr_is_null)]
 
 use core::{
     cell::UnsafeCell,

tee/supervisor-snp/src/main.rs

@@ -1,7 +1,6 @@
 #![no_std]
 #![no_main]
 #![feature(
-    const_mut_refs,
     core_intrinsics,
     naked_functions,
     pointer_is_aligned_to,

tee/supervisor-snp/src/reset_vector.rs

@@ -1,4 +1,4 @@
-use core::arch::{asm, global_asm};
+use core::arch::{global_asm, naked_asm};
 
 use crate::main;
 
@@ -12,15 +12,14 @@ extern "sysv64" fn start() -> ! {
     static mut STACK: [u8; STACK_SIZE] = [0; STACK_SIZE];
 
     unsafe {
-        asm!(
+        naked_asm!(
             "lea rsp, [rip + {STACK} + {STACK_SIZE}]",
             "and rsp, ~15",
             "call {PREMAIN}",
             "int3",
             STACK = sym STACK,
             STACK_SIZE = const STACK_SIZE,
             PREMAIN = sym premain,
-            options(noreturn)
         );
     }
 }

tee/supervisor-tdx/src/main.rs

@@ -1,6 +1,6 @@
 #![no_std]
 #![no_main]
-#![feature(abi_x86_interrupt, const_mut_refs, core_intrinsics, sync_unsafe_cell)]
+#![feature(abi_x86_interrupt, core_intrinsics, sync_unsafe_cell)]
 #![allow(internal_features)]
 
 use exception::setup_idt;