Move `panic_handler` to `aya-ebpf`

ebpf/aya-ebpf/src/lib.rs

@@ -134,18 +134,8 @@ pub fn check_bounds_signed(value: i64, lower: i64, upper: i64) -> bool {
 }
 
 #[macro_export]
-macro_rules! prelude {
+macro_rules! main_stub {
     () => {
-        /// Defines our panic handler when compiling for eBPF.
-        ///
-        /// eBPF programs are not allowed to panic, meaning this handler won't actually ever be called.
-        /// Because we compile with `no_std`, we need to define one.
-        #[cfg(target_arch = "bpf")]
-        #[panic_handler]
-        fn panic(_info: &core::panic::PanicInfo) -> ! {
-            loop {}
-        }
-
         #[cfg(not(target_arch = "bpf"))]
         fn main() {
             panic!(r#"eBPF kernels are not designed to be executed in user-space. This main function is only a placeholder to allow the code to compile on the host system (i.e. on any system that is not `target_arch = "bpf"`). This works in tandem with the `no_main` attribute which is only applied when compiling for `target_arch = "bpf"`."#)
@@ -153,6 +143,18 @@ macro_rules! prelude {
     };
 }
 
+/// Defines our panic handler when compiling for eBPF.
+///
+/// eBPF programs are not allowed to panic, meaning this handler won't actually ever be called.
+/// Because we compile with `no_std`, we need to define one.
+///
+/// Including the panic handler within `aya-ebpf` means every eBPF will automatically have this panic handler defined.
+#[cfg(target_arch = "bpf")]
+#[panic_handler]
+fn panic(_info: &core::panic::PanicInfo) -> ! {
+    loop {}
+}
+
 #[inline]
 fn insert<K, V>(
     def: *mut bindings::bpf_map_def,

test/integration-ebpf/src/bpf_probe_read.rs

@@ -1,6 +1,6 @@
 #![cfg_attr(target_arch = "bpf", no_std)]
 #![cfg_attr(target_arch = "bpf", no_main)]
-aya_ebpf::prelude!();
+aya_ebpf::main_stub!();
 
 use aya_ebpf::{
     helpers::{bpf_probe_read_kernel_str_bytes, bpf_probe_read_user_str_bytes},

test/integration-ebpf/src/log.rs

@@ -1,6 +1,6 @@
 #![cfg_attr(target_arch = "bpf", no_std)]
 #![cfg_attr(target_arch = "bpf", no_main)]
-aya_ebpf::prelude!();
+aya_ebpf::main_stub!();
 
 use core::net::{IpAddr, Ipv4Addr, Ipv6Addr};
 

test/integration-ebpf/src/map_test.rs

@@ -3,7 +3,7 @@
 
 #![cfg_attr(target_arch = "bpf", no_std)]
 #![cfg_attr(target_arch = "bpf", no_main)]
-aya_ebpf::prelude!();
+aya_ebpf::main_stub!();
 
 use aya_ebpf::{
     macros::{map, socket_filter},

test/integration-ebpf/src/memmove_test.rs

@@ -1,6 +1,6 @@
 #![cfg_attr(target_arch = "bpf", no_std)]
 #![cfg_attr(target_arch = "bpf", no_main)]
-aya_ebpf::prelude!();
+aya_ebpf::main_stub!();
 
 use core::mem;
 

test/integration-ebpf/src/name_test.rs

@@ -1,6 +1,6 @@
 #![cfg_attr(target_arch = "bpf", no_std)]
 #![cfg_attr(target_arch = "bpf", no_main)]
-aya_ebpf::prelude!();
+aya_ebpf::main_stub!();
 
 use aya_ebpf::{bindings::xdp_action, macros::xdp, programs::XdpContext};
 

test/integration-ebpf/src/pass.rs

@@ -1,6 +1,6 @@
 #![cfg_attr(target_arch = "bpf", no_std)]
 #![cfg_attr(target_arch = "bpf", no_main)]
-aya_ebpf::prelude!();
+aya_ebpf::main_stub!();
 
 use aya_ebpf::{bindings::xdp_action, macros::xdp, programs::XdpContext};
 

test/integration-ebpf/src/raw_tracepoint.rs

@@ -1,6 +1,6 @@
 #![cfg_attr(target_arch = "bpf", no_std)]
 #![cfg_attr(target_arch = "bpf", no_main)]
-aya_ebpf::prelude!();
+aya_ebpf::main_stub!();
 
 use aya_ebpf::{
     macros::{map, raw_tracepoint},

test/integration-ebpf/src/redirect.rs

@@ -1,6 +1,6 @@
 #![cfg_attr(target_arch = "bpf", no_std)]
 #![cfg_attr(target_arch = "bpf", no_main)]
-aya_ebpf::prelude!();
+aya_ebpf::main_stub!();
 
 use aya_ebpf::{
     bindings::xdp_action,

test/integration-ebpf/src/relocations.rs

@@ -1,6 +1,6 @@
 #![cfg_attr(target_arch = "bpf", no_std)]
 #![cfg_attr(target_arch = "bpf", no_main)]
-aya_ebpf::prelude!();
+aya_ebpf::main_stub!();
 
 use core::hint;
 

test/integration-ebpf/src/ring_buf.rs

@@ -1,6 +1,6 @@
 #![cfg_attr(target_arch = "bpf", no_std)]
 #![cfg_attr(target_arch = "bpf", no_main)]
-aya_ebpf::prelude!();
+aya_ebpf::main_stub!();
 
 use aya_ebpf::{
     macros::{map, uprobe},

test/integration-ebpf/src/simple_prog.rs

@@ -3,7 +3,7 @@
 
 #![cfg_attr(target_arch = "bpf", no_std)]
 #![cfg_attr(target_arch = "bpf", no_main)]
-aya_ebpf::prelude!();
+aya_ebpf::main_stub!();
 
 use aya_ebpf::{macros::socket_filter, programs::SkBuffContext};
 

test/integration-ebpf/src/strncmp.rs

@@ -1,6 +1,6 @@
 #![cfg_attr(target_arch = "bpf", no_std)]
 #![cfg_attr(target_arch = "bpf", no_main)]
-aya_ebpf::prelude!();
+aya_ebpf::main_stub!();
 
 use aya_ebpf::{
     cty::c_long,

test/integration-ebpf/src/tcx.rs

@@ -1,6 +1,6 @@
 #![cfg_attr(target_arch = "bpf", no_std)]
 #![cfg_attr(target_arch = "bpf", no_main)]
-aya_ebpf::prelude!();
+aya_ebpf::main_stub!();
 
 use aya_ebpf::{bindings::tcx_action_base::TCX_NEXT, macros::classifier, programs::TcContext};
 

test/integration-ebpf/src/test.rs

@@ -1,6 +1,6 @@
 #![cfg_attr(target_arch = "bpf", no_std)]
 #![cfg_attr(target_arch = "bpf", no_main)]
-aya_ebpf::prelude!();
+aya_ebpf::main_stub!();
 
 use aya_ebpf::{
     bindings::{bpf_ret_code, xdp_action},

test/integration-ebpf/src/two_progs.rs

@@ -2,7 +2,7 @@
 
 #![cfg_attr(target_arch = "bpf", no_std)]
 #![cfg_attr(target_arch = "bpf", no_main)]
-aya_ebpf::prelude!();
+aya_ebpf::main_stub!();
 
 use aya_ebpf::{macros::tracepoint, programs::TracePointContext};
 

test/integration-ebpf/src/uprobe_cookie.rs

@@ -1,6 +1,6 @@
 #![cfg_attr(target_arch = "bpf", no_std)]
 #![cfg_attr(target_arch = "bpf", no_main)]
-aya_ebpf::prelude!();
+aya_ebpf::main_stub!();
 
 use aya_ebpf::{
     EbpfContext as _, helpers,

test/integration-ebpf/src/xdp_sec.rs

@@ -1,6 +1,6 @@
 #![cfg_attr(target_arch = "bpf", no_std)]
 #![cfg_attr(target_arch = "bpf", no_main)]
-aya_ebpf::prelude!();
+aya_ebpf::main_stub!();
 
 use aya_ebpf::{bindings::xdp_action::XDP_PASS, macros::xdp, programs::XdpContext};