Use infinite loop in panic handlers

aya-rs · Oct 19, 2024 · c96203f · c96203f
1 parent 286823c
commit c96203f
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 10 deletions.
diff --git a/docs/book/programs/xdp.md b/docs/book/programs/xdp.md
@@ -127,9 +127,10 @@ map definitions (for our HashMap) and XDP program macros (`macros::{map, xdp}`)
 Here's how the code looks:
 
 ```rust
+#[cfg(not(test))]
 #[panic_handler]
 fn panic(_info: &core::panic::PanicInfo) -> ! {
-    unsafe { core::hint::unreachable_unchecked() }
+    loop {}
 }
 ```
 
@@ -245,9 +246,10 @@ use network_types::{
     ip::Ipv4Hdr,
 };
 
+#[cfg(not(test))]
 #[panic_handler]
 fn panic(_info: &core::panic::PanicInfo) -> ! {
-    unsafe { core::hint::unreachable_unchecked() }
+    loop {}
 }
 
 #[map]

diff --git a/examples/aya-tool/myapp-ebpf/src/main.rs b/examples/aya-tool/myapp-ebpf/src/main.rs
@@ -44,7 +44,8 @@ unsafe fn try_task_alloc(ctx: LsmContext) -> Result<i32, i32> {
     Ok(0)
 }
 
+#[cfg(not(test))]
 #[panic_handler]
 fn panic(_info: &core::panic::PanicInfo) -> ! {
-    unsafe { core::hint::unreachable_unchecked() }
+    loop {}
 }
diff --git a/examples/cgroup-skb-egress/cgroup-skb-egress-ebpf/src/main.rs b/examples/cgroup-skb-egress/cgroup-skb-egress-ebpf/src/main.rs
@@ -57,7 +57,8 @@ fn try_cgroup_skb_egress(ctx: SkBuffContext) -> Result<i32, i64> {
 
 const ETH_P_IP: u32 = 8;
 
+#[cfg(not(test))]
 #[panic_handler]
 fn panic(_info: &core::panic::PanicInfo) -> ! {
-    unsafe { core::hint::unreachable_unchecked() }
+    loop {}
 }
diff --git a/examples/kprobetcp/kprobetcp-ebpf/src/main.rs b/examples/kprobetcp/kprobetcp-ebpf/src/main.rs
@@ -65,7 +65,8 @@ fn try_kprobetcp(ctx: ProbeContext) -> Result<u32, i64> {
     }
 }
 
+#[cfg(not(test))]
 #[panic_handler]
 fn panic(_info: &core::panic::PanicInfo) -> ! {
-    unsafe { core::hint::unreachable_unchecked() }
+    loop {}
 }
diff --git a/examples/lsm-nice/lsm-nice-ebpf/src/main.rs b/examples/lsm-nice/lsm-nice-ebpf/src/main.rs
@@ -48,7 +48,8 @@ unsafe fn try_task_setnice(ctx: LsmContext) -> Result<i32, i32> {
     Ok(0)
 }
 
+#[cfg(not(test))]
 #[panic_handler]
 fn panic(_info: &core::panic::PanicInfo) -> ! {
-    unsafe { core::hint::unreachable_unchecked() }
+    loop {}
 }
diff --git a/examples/tc-egress/tc-egress-ebpf/src/main.rs b/examples/tc-egress/tc-egress-ebpf/src/main.rs
@@ -49,7 +49,8 @@ fn try_tc_egress(ctx: TcContext) -> Result<i32, ()> {
     Ok(action)
 }
 
+#[cfg(not(test))]
 #[panic_handler]
 fn panic(_info: &core::panic::PanicInfo) -> ! {
-    unsafe { core::hint::unreachable_unchecked() }
+    loop {}
 }
diff --git a/examples/xdp-drop/xdp-drop-ebpf/src/main.rs b/examples/xdp-drop/xdp-drop-ebpf/src/main.rs
@@ -16,9 +16,10 @@ use network_types::{
     ip::Ipv4Hdr,
 };
 
+#[cfg(not(test))]
 #[panic_handler]
 fn panic(_info: &core::panic::PanicInfo) -> ! {
-    unsafe { core::hint::unreachable_unchecked() }
+    loop {}
 }
 
 #[map] // (1)

diff --git a/examples/xdp-hello/xdp-hello-ebpf/src/main.rs b/examples/xdp-hello/xdp-hello-ebpf/src/main.rs
@@ -20,7 +20,8 @@ unsafe fn try_xdp_hello(ctx: XdpContext) -> Result<u32, u32> {
     Ok(xdp_action::XDP_PASS)
 }
 
+#[cfg(not(test))]
 #[panic_handler] // (3)
 fn panic(_info: &core::panic::PanicInfo) -> ! {
-    unsafe { core::hint::unreachable_unchecked() }
+    loop {}
 }
diff --git a/examples/xdp-log/xdp-log-ebpf/src/main.rs b/examples/xdp-log/xdp-log-ebpf/src/main.rs
@@ -12,9 +12,10 @@ use network_types::{
     udp::UdpHdr,
 };
 
+#[cfg(not(test))]
 #[panic_handler]
 fn panic(_info: &core::panic::PanicInfo) -> ! {
-    unsafe { core::hint::unreachable_unchecked() }
+    loop {}
 }
 
 #[xdp]