Use correct cfg for panic handler

reviewable/pr1229/r1
Thomas Eizinger 4 weeks ago
parent 9eecbe9d0e
commit c005ad30ed
No known key found for this signature in database
GPG Key ID: 05633CD77196CAF3

@ -72,7 +72,7 @@ pub fn test_bpf_probe_read_kernel_str_bytes(ctx: ProbeContext) {
); );
} }
#[cfg(not(test))] #[cfg(target_arch = "bpf")]
#[panic_handler] #[panic_handler]
fn panic(_info: &core::panic::PanicInfo) -> ! { fn panic(_info: &core::panic::PanicInfo) -> ! {
loop {} loop {}

@ -82,7 +82,7 @@ pub fn test_log(ctx: ProbeContext) {
} }
} }
#[cfg(not(test))] #[cfg(target_arch = "bpf")]
#[panic_handler] #[panic_handler]
fn panic(_info: &core::panic::PanicInfo) -> ! { fn panic(_info: &core::panic::PanicInfo) -> ! {
loop {} loop {}

@ -36,7 +36,7 @@ pub fn simple_prog(_ctx: SkBuffContext) -> i64 {
0 0
} }
#[cfg(not(test))] #[cfg(target_arch = "bpf")]
#[panic_handler] #[panic_handler]
fn panic(_info: &core::panic::PanicInfo) -> ! { fn panic(_info: &core::panic::PanicInfo) -> ! {
loop {} loop {}

@ -54,7 +54,7 @@ fn try_do_dnat(ctx: XdpContext) -> Result<u32, ()> {
Ok(xdp_action::XDP_PASS) Ok(xdp_action::XDP_PASS)
} }
#[cfg(not(test))] #[cfg(target_arch = "bpf")]
#[panic_handler] #[panic_handler]
fn panic(_info: &core::panic::PanicInfo) -> ! { fn panic(_info: &core::panic::PanicInfo) -> ! {
loop {} loop {}

@ -15,7 +15,7 @@ unsafe fn try_pass(_ctx: XdpContext) -> Result<u32, u32> {
Ok(xdp_action::XDP_PASS) Ok(xdp_action::XDP_PASS)
} }
#[cfg(not(test))] #[cfg(target_arch = "bpf")]
#[panic_handler] #[panic_handler]
fn panic(_info: &core::panic::PanicInfo) -> ! { fn panic(_info: &core::panic::PanicInfo) -> ! {
loop {} loop {}

@ -17,7 +17,7 @@ unsafe fn try_pass(_ctx: XdpContext) -> Result<u32, u32> {
Ok(xdp_action::XDP_PASS) Ok(xdp_action::XDP_PASS)
} }
#[cfg(not(test))] #[cfg(target_arch = "bpf")]
#[panic_handler] #[panic_handler]
fn panic(_info: &core::panic::PanicInfo) -> ! { fn panic(_info: &core::panic::PanicInfo) -> ! {
loop {} loop {}

@ -26,7 +26,7 @@ pub fn sys_enter(ctx: RawTracePointContext) -> i32 {
0 0
} }
#[cfg(not(test))] #[cfg(target_arch = "bpf")]
#[panic_handler] #[panic_handler]
fn panic(_info: &core::panic::PanicInfo) -> ! { fn panic(_info: &core::panic::PanicInfo) -> ! {
loop {} loop {}

@ -75,7 +75,7 @@ fn inc_hit(index: u32) {
} }
} }
#[cfg(not(test))] #[cfg(target_arch = "bpf")]
#[panic_handler] #[panic_handler]
fn panic(_info: &core::panic::PanicInfo) -> ! { fn panic(_info: &core::panic::PanicInfo) -> ! {
loop {} loop {}

@ -39,7 +39,7 @@ fn set_result_backward(index: u32, value: u64) {
set_result(index, value); set_result(index, value);
} }
#[cfg(not(test))] #[cfg(target_arch = "bpf")]
#[panic_handler] #[panic_handler]
fn panic(_info: &core::panic::PanicInfo) -> ! { fn panic(_info: &core::panic::PanicInfo) -> ! {
loop {} loop {}

@ -46,7 +46,7 @@ pub fn ring_buf_test(ctx: ProbeContext) {
} }
} }
#[cfg(not(test))] #[cfg(target_arch = "bpf")]
#[panic_handler] #[panic_handler]
fn panic(_info: &core::panic::PanicInfo) -> ! { fn panic(_info: &core::panic::PanicInfo) -> ! {
loop {} loop {}

@ -12,7 +12,7 @@ pub fn simple_prog(_ctx: SkBuffContext) -> i64 {
0 0
} }
#[cfg(not(test))] #[cfg(target_arch = "bpf")]
#[panic_handler] #[panic_handler]
fn panic(_info: &core::panic::PanicInfo) -> ! { fn panic(_info: &core::panic::PanicInfo) -> ! {
loop {} loop {}

@ -27,7 +27,7 @@ pub fn test_bpf_strncmp(ctx: ProbeContext) -> Result<(), c_long> {
Ok(()) Ok(())
} }
#[cfg(not(test))] #[cfg(target_arch = "bpf")]
#[panic_handler] #[panic_handler]
fn panic(_info: &core::panic::PanicInfo) -> ! { fn panic(_info: &core::panic::PanicInfo) -> ! {
loop {} loop {}

@ -8,7 +8,7 @@ pub fn tcx_next(_ctx: TcContext) -> i32 {
TCX_NEXT TCX_NEXT
} }
#[cfg(not(test))] #[cfg(target_arch = "bpf")]
#[panic_handler] #[panic_handler]
fn panic(_info: &core::panic::PanicInfo) -> ! { fn panic(_info: &core::panic::PanicInfo) -> ! {
loop {} loop {}

@ -53,7 +53,7 @@ pub fn test_flow(_ctx: FlowDissectorContext) -> u32 {
bpf_ret_code::BPF_FLOW_DISSECTOR_CONTINUE bpf_ret_code::BPF_FLOW_DISSECTOR_CONTINUE
} }
#[cfg(not(test))] #[cfg(target_arch = "bpf")]
#[panic_handler] #[panic_handler]
fn panic(_info: &core::panic::PanicInfo) -> ! { fn panic(_info: &core::panic::PanicInfo) -> ! {
loop {} loop {}

@ -14,7 +14,7 @@ pub fn test_tracepoint_two(_ctx: TracePointContext) -> u32 {
0 0
} }
#[cfg(not(test))] #[cfg(target_arch = "bpf")]
#[panic_handler] #[panic_handler]
fn panic(_info: &core::panic::PanicInfo) -> ! { fn panic(_info: &core::panic::PanicInfo) -> ! {
loop {} loop {}

@ -18,7 +18,7 @@ pub fn uprobe_cookie(ctx: ProbeContext) {
let _res = RING_BUF.output(&cookie_bytes, 0); let _res = RING_BUF.output(&cookie_bytes, 0);
} }
#[cfg(not(test))] #[cfg(target_arch = "bpf")]
#[panic_handler] #[panic_handler]
fn panic(_info: &core::panic::PanicInfo) -> ! { fn panic(_info: &core::panic::PanicInfo) -> ! {
loop {} loop {}

@ -19,7 +19,7 @@ probe!(xdp_devmap, (map = "devmap"));
probe!(xdp_frags_cpumap, (frags, map = "cpumap")); probe!(xdp_frags_cpumap, (frags, map = "cpumap"));
probe!(xdp_frags_devmap, (frags, map = "devmap")); probe!(xdp_frags_devmap, (frags, map = "devmap"));
#[cfg(not(test))] #[cfg(target_arch = "bpf")]
#[panic_handler] #[panic_handler]
fn panic(_info: &core::panic::PanicInfo) -> ! { fn panic(_info: &core::panic::PanicInfo) -> ! {
loop {} loop {}

Loading…
Cancel
Save