Remove unsafe crate paste

Signed-off-by: Wei Liu <[email protected]>

Author: liuw1

Cargo.lock

@@ -8,7 +8,6 @@ edition = "2021"
 [dependencies]
 global = { path = "../global" }
 log = "0.4.13"
-paste = "1.0"
 
 ring = { version = "0.17.6" }
 spin = "0.9.2"

src/spdm/Cargo.toml

@@ -8,7 +8,6 @@ edition = "2021"
 [dependencies]
 global = { path = "../global" }
 log = "0.4.13"
-paste = "1.0"
 x86 = "0.47.0"
 x86_64 = "0.14.9"
 

src/tdtunnel/Cargo.toml

@@ -2,64 +2,46 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-use paste::paste;
-
 use core::sync::atomic::{AtomicU8, Ordering};
 pub use td_exception::*;
 use td_payload::arch::apic::{disable, enable_and_hlt};
 use td_payload::interrupt_handler_template;
+
 pub const NOTIFY_VALUE_CLEAR: u8 = 0;
 pub const NOTIFY_VALUE_SET: u8 = 1;
 
-#[macro_export]
-macro_rules! register_interrupt {
-    ($name:ident, $notifiy_vector:expr) => {
-
-        paste! {
-            const [<NOTIFY_VECTOR_ $name:upper>]: u8 = $notifiy_vector;
-            static [<NOTIFY_ $name:upper>]: AtomicU8 = AtomicU8::new(NOTIFY_VALUE_CLEAR);
-            interrupt_handler_template!([<vmm_notification_ $name:lower>], _stack, {
-                [<NOTIFY_ $name:upper>].store(NOTIFY_VALUE_SET, Ordering::SeqCst);
-            });
-
-            pub fn [<register_vmm_notification_ $name:lower>]() {
-                // log::info!("Calling {:?}", stringify!([<register_vmm_notification_ $name:lower>]));
-                // #[cfg(test)]
-                // return;
-
-                // Setup interrupt handler
-                unsafe {
-                    idt::register_handler([<NOTIFY_VECTOR_ $name:upper>], [<vmm_notification_ $name:lower>]);
-                }
-            }
-
-            pub fn [<wait_for_vmm_notification_ $name:lower>]() {
-                // #[cfg(test)]
-                // return;
-
-                // log::info!("Calling {:?}", stringify!([<wait_for_vmm_notification_ $name:lower>]));
+// 32~255 are available
+pub const INTERRUPT_VECTOR_WAIT_FOR_REQUEST: u8 = 32;
 
-                while([<NOTIFY_ $name:upper>].load(Ordering::SeqCst) != NOTIFY_VALUE_SET){
-                    enable_and_hlt();
-                    if ([<NOTIFY_ $name:upper>].load(Ordering::SeqCst) == NOTIFY_VALUE_SET){
-                        break;
-                    }
-                }
-                disable();
+// Define a static atomic variable to store the notification state.
+static NOTIFY_WAIT_FOR_REQUEST: AtomicU8 = AtomicU8::new(NOTIFY_VALUE_CLEAR);
+const NOTIFY_VECTOR_WAIT_FOR_REQUEST: u8 = INTERRUPT_VECTOR_WAIT_FOR_REQUEST;
+
+// Define the interrupt handler via the provided interrupt_handler_template macro.
+interrupt_handler_template!(vmm_notification_wait_for_request, _stack, {
+    NOTIFY_WAIT_FOR_REQUEST.store(NOTIFY_VALUE_SET, Ordering::SeqCst);
+});
+
+// Function to register the VMM notification interrupt.
+pub fn register_vmm_notification_wait_for_request() {
+    // Setup interrupt handler.
+    unsafe {
+        idt::register_handler(
+            NOTIFY_VECTOR_WAIT_FOR_REQUEST,
+            vmm_notification_wait_for_request,
+        );
+    }
+}
 
-                // log::debug!("============== WOKE UP ============\n");
-                // log::debug!("NOTIFY_WAIT_FOR_REQUEST:{:?}\n", NOTIFY_WAIT_FOR_REQUEST);
-                // log::debug!("NOTIFY_REPORT_STATUS:{:?}\n", NOTIFY_REPORT_STATUS);
-                // log::debug!("NOTIFY_SPDM_PCI_DOE:{:?}\n", NOTIFY_SPDM_PCI_DOE);
-                // log::debug!("NOTIFY_SHUTDOWN:{:?}\n", NOTIFY_SHUTDOWN);
-                // log::debug!("NOTIFY_SERVICE_QUERY:{:?}\n", NOTIFY_SERVICE_QUERY);
-                [<NOTIFY_ $name:upper>].store(NOTIFY_VALUE_CLEAR, Ordering::SeqCst);
-            }
+// Function to wait for the VMM notification interrupt.
+pub fn wait_for_vmm_notification_wait_for_request() {
+    while NOTIFY_WAIT_FOR_REQUEST.load(Ordering::SeqCst) != NOTIFY_VALUE_SET {
+        enable_and_hlt();
+        if NOTIFY_WAIT_FOR_REQUEST.load(Ordering::SeqCst) == NOTIFY_VALUE_SET {
+            break;
         }
-    };
+    }
+    disable();
+    // Reset notification state.
+    NOTIFY_WAIT_FOR_REQUEST.store(NOTIFY_VALUE_CLEAR, Ordering::SeqCst);
 }
-
-// 32~255 are available
-pub const INTERRUPT_VECTOR_WAIT_FOR_REQUEST: u8 = 32;
-
-register_interrupt!(wait_for_request, INTERRUPT_VECTOR_WAIT_FOR_REQUEST);

src/tdtunnel/src/interrupt.rs

@@ -16,7 +16,6 @@ x86_64 = "0.14.9"
 zerocopy = { version = "0.7.31", features = ["derive"] }
 anyhow = { version = "1.0.68", default-features = false }
 sha2 = { version = "0.10.6", default-features = false, features = ["force-soft"]}
-paste = "1.0"
 bytes = { version="1", default-features=false }
 der = {version = "0.7.9", features = ["oid", "alloc", "derive"]}