diff --git a/bpf/nodejs.c b/bpf/nodejs.c index 1f85e2f30..de28ecc41 100644 --- a/bpf/nodejs.c +++ b/bpf/nodejs.c @@ -12,8 +12,8 @@ volatile const s32 async_wrap_trigger_async_id_off = 0; struct { __uint(type, BPF_MAP_TYPE_LRU_HASH); - __type(key, u64); // the pid_tid - __type(value, u64); // the last AsyncWrap * + __type(key, u64); // the pid_tid + __type(value, u64); // the last AsyncWrap * __uint(max_entries, 1000); // 1000 nodejs services, small number, nodejs is single threaded __uint(pinning, LIBBPF_PIN_BY_NAME); } async_reset_args SEC(".maps"); @@ -34,20 +34,6 @@ int async_reset(struct pt_regs *ctx) { return 0; } -SEC("uretprobe/node:AsyncReset") -int async_reset_ret(struct pt_regs *ctx) { - u64 id = bpf_get_current_pid_tgid(); - - if (!valid_pid(id)) { - return 0; - } - - bpf_dbg_printk("=== uprobe AsyncReset returns id=%d ===", id); - bpf_map_delete_elem(&async_reset_args, &id); - - return 0; -} - SEC("uprobe/node:EmitAsyncInit") int emit_async_init(struct pt_regs *ctx) { u64 id = bpf_get_current_pid_tgid(); @@ -69,13 +55,15 @@ int emit_async_init(struct pt_regs *ctx) { u64 trigger_async_id = 0; bpf_probe_read_user(&async_id, sizeof(u64), ((void *)wrap) + async_wrap_async_id_off); - bpf_probe_read_user(&trigger_async_id, sizeof(u64), ((void *)wrap) + async_wrap_trigger_async_id_off); + bpf_probe_read_user( + &trigger_async_id, sizeof(u64), ((void *)wrap) + async_wrap_trigger_async_id_off); if (async_id) { bpf_map_update_elem(&active_nodejs_ids, &id, &async_id, BPF_ANY); if (trigger_async_id) { bpf_map_update_elem(&nodejs_parent_map, &async_id, &trigger_async_id, BPF_ANY); - bpf_dbg_printk("async_id = %llx, trigger_async_id = %llx", async_id, trigger_async_id); + bpf_dbg_printk( + "async_id = %llx, trigger_async_id = %llx", async_id, trigger_async_id); } else { bpf_dbg_printk("No trigger async id"); } diff --git a/pkg/internal/ebpf/goredis/bpf_arm64_bpfel.o b/pkg/internal/ebpf/goredis/bpf_arm64_bpfel.o index d16d5ab15..9cb608044 100644 Binary files a/pkg/internal/ebpf/goredis/bpf_arm64_bpfel.o and b/pkg/internal/ebpf/goredis/bpf_arm64_bpfel.o differ diff --git a/pkg/internal/ebpf/goredis/bpf_debug_arm64_bpfel.o b/pkg/internal/ebpf/goredis/bpf_debug_arm64_bpfel.o index 56cb9c484..6fe02cfe9 100644 Binary files a/pkg/internal/ebpf/goredis/bpf_debug_arm64_bpfel.o and b/pkg/internal/ebpf/goredis/bpf_debug_arm64_bpfel.o differ diff --git a/pkg/internal/ebpf/goredis/bpf_debug_x86_bpfel.o b/pkg/internal/ebpf/goredis/bpf_debug_x86_bpfel.o index 89d8c3dd2..a1a59a0dc 100644 Binary files a/pkg/internal/ebpf/goredis/bpf_debug_x86_bpfel.o and b/pkg/internal/ebpf/goredis/bpf_debug_x86_bpfel.o differ diff --git a/pkg/internal/ebpf/goredis/bpf_x86_bpfel.o b/pkg/internal/ebpf/goredis/bpf_x86_bpfel.o index 385f2938e..b0ff7fc31 100644 Binary files a/pkg/internal/ebpf/goredis/bpf_x86_bpfel.o and b/pkg/internal/ebpf/goredis/bpf_x86_bpfel.o differ diff --git a/pkg/internal/ebpf/goruntime/bpf_arm64_bpfel.o b/pkg/internal/ebpf/goruntime/bpf_arm64_bpfel.o index 55d96169b..c81a4dbd2 100644 Binary files a/pkg/internal/ebpf/goruntime/bpf_arm64_bpfel.o and b/pkg/internal/ebpf/goruntime/bpf_arm64_bpfel.o differ diff --git a/pkg/internal/ebpf/goruntime/bpf_debug_arm64_bpfel.o b/pkg/internal/ebpf/goruntime/bpf_debug_arm64_bpfel.o index 497216d02..3f6c589cd 100644 Binary files a/pkg/internal/ebpf/goruntime/bpf_debug_arm64_bpfel.o and b/pkg/internal/ebpf/goruntime/bpf_debug_arm64_bpfel.o differ diff --git a/pkg/internal/ebpf/goruntime/bpf_debug_x86_bpfel.o b/pkg/internal/ebpf/goruntime/bpf_debug_x86_bpfel.o index a318fb1ef..178cd4171 100644 Binary files a/pkg/internal/ebpf/goruntime/bpf_debug_x86_bpfel.o and b/pkg/internal/ebpf/goruntime/bpf_debug_x86_bpfel.o differ diff --git a/pkg/internal/ebpf/goruntime/bpf_x86_bpfel.o b/pkg/internal/ebpf/goruntime/bpf_x86_bpfel.o index ebfce8364..800be63c6 100644 Binary files a/pkg/internal/ebpf/goruntime/bpf_x86_bpfel.o and b/pkg/internal/ebpf/goruntime/bpf_x86_bpfel.o differ diff --git a/pkg/internal/ebpf/grpc/bpf_arm64_bpfel.o b/pkg/internal/ebpf/grpc/bpf_arm64_bpfel.o index 8a9fb7f55..64189010f 100644 Binary files a/pkg/internal/ebpf/grpc/bpf_arm64_bpfel.o and b/pkg/internal/ebpf/grpc/bpf_arm64_bpfel.o differ diff --git a/pkg/internal/ebpf/grpc/bpf_debug_arm64_bpfel.o b/pkg/internal/ebpf/grpc/bpf_debug_arm64_bpfel.o index 786595bea..21fb16013 100644 Binary files a/pkg/internal/ebpf/grpc/bpf_debug_arm64_bpfel.o and b/pkg/internal/ebpf/grpc/bpf_debug_arm64_bpfel.o differ diff --git a/pkg/internal/ebpf/grpc/bpf_debug_x86_bpfel.o b/pkg/internal/ebpf/grpc/bpf_debug_x86_bpfel.o index aebab099f..fbd1f10e2 100644 Binary files a/pkg/internal/ebpf/grpc/bpf_debug_x86_bpfel.o and b/pkg/internal/ebpf/grpc/bpf_debug_x86_bpfel.o differ diff --git a/pkg/internal/ebpf/grpc/bpf_tp_arm64_bpfel.o b/pkg/internal/ebpf/grpc/bpf_tp_arm64_bpfel.o index 66fbe5fd3..6317e73a3 100644 Binary files a/pkg/internal/ebpf/grpc/bpf_tp_arm64_bpfel.o and b/pkg/internal/ebpf/grpc/bpf_tp_arm64_bpfel.o differ diff --git a/pkg/internal/ebpf/grpc/bpf_tp_debug_arm64_bpfel.o b/pkg/internal/ebpf/grpc/bpf_tp_debug_arm64_bpfel.o index 68eeab2a5..43ecc4140 100644 Binary files a/pkg/internal/ebpf/grpc/bpf_tp_debug_arm64_bpfel.o and b/pkg/internal/ebpf/grpc/bpf_tp_debug_arm64_bpfel.o differ diff --git a/pkg/internal/ebpf/grpc/bpf_tp_debug_x86_bpfel.o b/pkg/internal/ebpf/grpc/bpf_tp_debug_x86_bpfel.o index 278cc9a1d..3efd715af 100644 Binary files a/pkg/internal/ebpf/grpc/bpf_tp_debug_x86_bpfel.o and b/pkg/internal/ebpf/grpc/bpf_tp_debug_x86_bpfel.o differ diff --git a/pkg/internal/ebpf/grpc/bpf_tp_x86_bpfel.o b/pkg/internal/ebpf/grpc/bpf_tp_x86_bpfel.o index 7e6308936..4b8a702a6 100644 Binary files a/pkg/internal/ebpf/grpc/bpf_tp_x86_bpfel.o and b/pkg/internal/ebpf/grpc/bpf_tp_x86_bpfel.o differ diff --git a/pkg/internal/ebpf/grpc/bpf_x86_bpfel.o b/pkg/internal/ebpf/grpc/bpf_x86_bpfel.o index ec47f8ac1..fa97ea180 100644 Binary files a/pkg/internal/ebpf/grpc/bpf_x86_bpfel.o and b/pkg/internal/ebpf/grpc/bpf_x86_bpfel.o differ diff --git a/pkg/internal/ebpf/httpfltr/bpf_arm64_bpfel.o b/pkg/internal/ebpf/httpfltr/bpf_arm64_bpfel.o index 588aaac8b..8f2ff6376 100644 Binary files a/pkg/internal/ebpf/httpfltr/bpf_arm64_bpfel.o and b/pkg/internal/ebpf/httpfltr/bpf_arm64_bpfel.o differ diff --git a/pkg/internal/ebpf/httpfltr/bpf_debug_arm64_bpfel.o b/pkg/internal/ebpf/httpfltr/bpf_debug_arm64_bpfel.o index 0ce753a05..794108b22 100644 Binary files a/pkg/internal/ebpf/httpfltr/bpf_debug_arm64_bpfel.o and b/pkg/internal/ebpf/httpfltr/bpf_debug_arm64_bpfel.o differ diff --git a/pkg/internal/ebpf/httpfltr/bpf_debug_x86_bpfel.o b/pkg/internal/ebpf/httpfltr/bpf_debug_x86_bpfel.o index 13d7587b6..dfd044b81 100644 Binary files a/pkg/internal/ebpf/httpfltr/bpf_debug_x86_bpfel.o and b/pkg/internal/ebpf/httpfltr/bpf_debug_x86_bpfel.o differ diff --git a/pkg/internal/ebpf/httpfltr/bpf_tp_arm64_bpfel.o b/pkg/internal/ebpf/httpfltr/bpf_tp_arm64_bpfel.o index 11102ebef..f72ae17eb 100644 Binary files a/pkg/internal/ebpf/httpfltr/bpf_tp_arm64_bpfel.o and b/pkg/internal/ebpf/httpfltr/bpf_tp_arm64_bpfel.o differ diff --git a/pkg/internal/ebpf/httpfltr/bpf_tp_debug_arm64_bpfel.o b/pkg/internal/ebpf/httpfltr/bpf_tp_debug_arm64_bpfel.o index a27f1a31e..cba5c5696 100644 Binary files a/pkg/internal/ebpf/httpfltr/bpf_tp_debug_arm64_bpfel.o and b/pkg/internal/ebpf/httpfltr/bpf_tp_debug_arm64_bpfel.o differ diff --git a/pkg/internal/ebpf/httpfltr/bpf_tp_debug_x86_bpfel.o b/pkg/internal/ebpf/httpfltr/bpf_tp_debug_x86_bpfel.o index bb1b1d7c5..c8974a883 100644 Binary files a/pkg/internal/ebpf/httpfltr/bpf_tp_debug_x86_bpfel.o and b/pkg/internal/ebpf/httpfltr/bpf_tp_debug_x86_bpfel.o differ diff --git a/pkg/internal/ebpf/httpfltr/bpf_tp_x86_bpfel.o b/pkg/internal/ebpf/httpfltr/bpf_tp_x86_bpfel.o index d7e5e6593..0ac53dffa 100644 Binary files a/pkg/internal/ebpf/httpfltr/bpf_tp_x86_bpfel.o and b/pkg/internal/ebpf/httpfltr/bpf_tp_x86_bpfel.o differ diff --git a/pkg/internal/ebpf/httpfltr/bpf_x86_bpfel.o b/pkg/internal/ebpf/httpfltr/bpf_x86_bpfel.o index 73b6885d7..79e05f5d2 100644 Binary files a/pkg/internal/ebpf/httpfltr/bpf_x86_bpfel.o and b/pkg/internal/ebpf/httpfltr/bpf_x86_bpfel.o differ diff --git a/pkg/internal/ebpf/httpssl/bpf_arm64_bpfel.o b/pkg/internal/ebpf/httpssl/bpf_arm64_bpfel.o index c04f772f5..0c34de431 100644 Binary files a/pkg/internal/ebpf/httpssl/bpf_arm64_bpfel.o and b/pkg/internal/ebpf/httpssl/bpf_arm64_bpfel.o differ diff --git a/pkg/internal/ebpf/httpssl/bpf_debug_arm64_bpfel.o b/pkg/internal/ebpf/httpssl/bpf_debug_arm64_bpfel.o index bac080b80..b261a8ea7 100644 Binary files a/pkg/internal/ebpf/httpssl/bpf_debug_arm64_bpfel.o and b/pkg/internal/ebpf/httpssl/bpf_debug_arm64_bpfel.o differ diff --git a/pkg/internal/ebpf/httpssl/bpf_debug_x86_bpfel.o b/pkg/internal/ebpf/httpssl/bpf_debug_x86_bpfel.o index 1bff63809..41b3ce3ee 100644 Binary files a/pkg/internal/ebpf/httpssl/bpf_debug_x86_bpfel.o and b/pkg/internal/ebpf/httpssl/bpf_debug_x86_bpfel.o differ diff --git a/pkg/internal/ebpf/httpssl/bpf_tp_arm64_bpfel.o b/pkg/internal/ebpf/httpssl/bpf_tp_arm64_bpfel.o index 46392be75..4933d251e 100644 Binary files a/pkg/internal/ebpf/httpssl/bpf_tp_arm64_bpfel.o and b/pkg/internal/ebpf/httpssl/bpf_tp_arm64_bpfel.o differ diff --git a/pkg/internal/ebpf/httpssl/bpf_tp_debug_arm64_bpfel.o b/pkg/internal/ebpf/httpssl/bpf_tp_debug_arm64_bpfel.o index 11c5e70b8..388efa586 100644 Binary files a/pkg/internal/ebpf/httpssl/bpf_tp_debug_arm64_bpfel.o and b/pkg/internal/ebpf/httpssl/bpf_tp_debug_arm64_bpfel.o differ diff --git a/pkg/internal/ebpf/httpssl/bpf_tp_debug_x86_bpfel.o b/pkg/internal/ebpf/httpssl/bpf_tp_debug_x86_bpfel.o index 24bb549c6..9bc4b765f 100644 Binary files a/pkg/internal/ebpf/httpssl/bpf_tp_debug_x86_bpfel.o and b/pkg/internal/ebpf/httpssl/bpf_tp_debug_x86_bpfel.o differ diff --git a/pkg/internal/ebpf/httpssl/bpf_tp_x86_bpfel.o b/pkg/internal/ebpf/httpssl/bpf_tp_x86_bpfel.o index 9c567291e..de9d44fac 100644 Binary files a/pkg/internal/ebpf/httpssl/bpf_tp_x86_bpfel.o and b/pkg/internal/ebpf/httpssl/bpf_tp_x86_bpfel.o differ diff --git a/pkg/internal/ebpf/httpssl/bpf_x86_bpfel.o b/pkg/internal/ebpf/httpssl/bpf_x86_bpfel.o index 2373b0412..2e3f06d55 100644 Binary files a/pkg/internal/ebpf/httpssl/bpf_x86_bpfel.o and b/pkg/internal/ebpf/httpssl/bpf_x86_bpfel.o differ diff --git a/pkg/internal/ebpf/kafkago/bpf_arm64_bpfel.o b/pkg/internal/ebpf/kafkago/bpf_arm64_bpfel.o index ad723731a..26aecedb9 100644 Binary files a/pkg/internal/ebpf/kafkago/bpf_arm64_bpfel.o and b/pkg/internal/ebpf/kafkago/bpf_arm64_bpfel.o differ diff --git a/pkg/internal/ebpf/kafkago/bpf_debug_arm64_bpfel.o b/pkg/internal/ebpf/kafkago/bpf_debug_arm64_bpfel.o index c4b9b84d9..81ac0406c 100644 Binary files a/pkg/internal/ebpf/kafkago/bpf_debug_arm64_bpfel.o and b/pkg/internal/ebpf/kafkago/bpf_debug_arm64_bpfel.o differ diff --git a/pkg/internal/ebpf/kafkago/bpf_debug_x86_bpfel.o b/pkg/internal/ebpf/kafkago/bpf_debug_x86_bpfel.o index 921d2346f..cf565bd92 100644 Binary files a/pkg/internal/ebpf/kafkago/bpf_debug_x86_bpfel.o and b/pkg/internal/ebpf/kafkago/bpf_debug_x86_bpfel.o differ diff --git a/pkg/internal/ebpf/kafkago/bpf_x86_bpfel.o b/pkg/internal/ebpf/kafkago/bpf_x86_bpfel.o index 45460f257..682681f7c 100644 Binary files a/pkg/internal/ebpf/kafkago/bpf_x86_bpfel.o and b/pkg/internal/ebpf/kafkago/bpf_x86_bpfel.o differ diff --git a/pkg/internal/ebpf/nethttp/bpf_arm64_bpfel.o b/pkg/internal/ebpf/nethttp/bpf_arm64_bpfel.o index ace5522c6..9051ed9c0 100644 Binary files a/pkg/internal/ebpf/nethttp/bpf_arm64_bpfel.o and b/pkg/internal/ebpf/nethttp/bpf_arm64_bpfel.o differ diff --git a/pkg/internal/ebpf/nethttp/bpf_debug_arm64_bpfel.o b/pkg/internal/ebpf/nethttp/bpf_debug_arm64_bpfel.o index e25e5e945..5b4310eb3 100644 Binary files a/pkg/internal/ebpf/nethttp/bpf_debug_arm64_bpfel.o and b/pkg/internal/ebpf/nethttp/bpf_debug_arm64_bpfel.o differ diff --git a/pkg/internal/ebpf/nethttp/bpf_debug_x86_bpfel.o b/pkg/internal/ebpf/nethttp/bpf_debug_x86_bpfel.o index 06a62b918..384da674f 100644 Binary files a/pkg/internal/ebpf/nethttp/bpf_debug_x86_bpfel.o and b/pkg/internal/ebpf/nethttp/bpf_debug_x86_bpfel.o differ diff --git a/pkg/internal/ebpf/nethttp/bpf_tp_arm64_bpfel.o b/pkg/internal/ebpf/nethttp/bpf_tp_arm64_bpfel.o index 3ac3d75cc..9fc1d037f 100644 Binary files a/pkg/internal/ebpf/nethttp/bpf_tp_arm64_bpfel.o and b/pkg/internal/ebpf/nethttp/bpf_tp_arm64_bpfel.o differ diff --git a/pkg/internal/ebpf/nethttp/bpf_tp_debug_arm64_bpfel.o b/pkg/internal/ebpf/nethttp/bpf_tp_debug_arm64_bpfel.o index 0cea086a2..951d6b4f7 100644 Binary files a/pkg/internal/ebpf/nethttp/bpf_tp_debug_arm64_bpfel.o and b/pkg/internal/ebpf/nethttp/bpf_tp_debug_arm64_bpfel.o differ diff --git a/pkg/internal/ebpf/nethttp/bpf_tp_debug_x86_bpfel.o b/pkg/internal/ebpf/nethttp/bpf_tp_debug_x86_bpfel.o index 05d52234e..9a9ef243b 100644 Binary files a/pkg/internal/ebpf/nethttp/bpf_tp_debug_x86_bpfel.o and b/pkg/internal/ebpf/nethttp/bpf_tp_debug_x86_bpfel.o differ diff --git a/pkg/internal/ebpf/nethttp/bpf_tp_x86_bpfel.o b/pkg/internal/ebpf/nethttp/bpf_tp_x86_bpfel.o index dbe59ff06..55cfdadf5 100644 Binary files a/pkg/internal/ebpf/nethttp/bpf_tp_x86_bpfel.o and b/pkg/internal/ebpf/nethttp/bpf_tp_x86_bpfel.o differ diff --git a/pkg/internal/ebpf/nethttp/bpf_x86_bpfel.o b/pkg/internal/ebpf/nethttp/bpf_x86_bpfel.o index 127161a6e..3f8865349 100644 Binary files a/pkg/internal/ebpf/nethttp/bpf_x86_bpfel.o and b/pkg/internal/ebpf/nethttp/bpf_x86_bpfel.o differ diff --git a/pkg/internal/ebpf/nodejs/bpf_arm64_bpfel.go b/pkg/internal/ebpf/nodejs/bpf_arm64_bpfel.go index bf1cac0ba..024c3640a 100644 --- a/pkg/internal/ebpf/nodejs/bpf_arm64_bpfel.go +++ b/pkg/internal/ebpf/nodejs/bpf_arm64_bpfel.go @@ -54,7 +54,6 @@ type bpfSpecs struct { // It can be passed ebpf.CollectionSpec.Assign. type bpfProgramSpecs struct { AsyncReset *ebpf.ProgramSpec `ebpf:"async_reset"` - AsyncResetRet *ebpf.ProgramSpec `ebpf:"async_reset_ret"` EmitAsyncInit *ebpf.ProgramSpec `ebpf:"emit_async_init"` } @@ -113,14 +112,12 @@ func (m *bpfMaps) Close() error { // It can be passed to loadBpfObjects or ebpf.CollectionSpec.LoadAndAssign. type bpfPrograms struct { AsyncReset *ebpf.Program `ebpf:"async_reset"` - AsyncResetRet *ebpf.Program `ebpf:"async_reset_ret"` EmitAsyncInit *ebpf.Program `ebpf:"emit_async_init"` } func (p *bpfPrograms) Close() error { return _BpfClose( p.AsyncReset, - p.AsyncResetRet, p.EmitAsyncInit, ) } diff --git a/pkg/internal/ebpf/nodejs/bpf_arm64_bpfel.o b/pkg/internal/ebpf/nodejs/bpf_arm64_bpfel.o index 9b98da257..f95570f63 100644 Binary files a/pkg/internal/ebpf/nodejs/bpf_arm64_bpfel.o and b/pkg/internal/ebpf/nodejs/bpf_arm64_bpfel.o differ diff --git a/pkg/internal/ebpf/nodejs/bpf_debug_arm64_bpfel.go b/pkg/internal/ebpf/nodejs/bpf_debug_arm64_bpfel.go index b6513ad27..03b590197 100644 --- a/pkg/internal/ebpf/nodejs/bpf_debug_arm64_bpfel.go +++ b/pkg/internal/ebpf/nodejs/bpf_debug_arm64_bpfel.go @@ -54,7 +54,6 @@ type bpf_debugSpecs struct { // It can be passed ebpf.CollectionSpec.Assign. type bpf_debugProgramSpecs struct { AsyncReset *ebpf.ProgramSpec `ebpf:"async_reset"` - AsyncResetRet *ebpf.ProgramSpec `ebpf:"async_reset_ret"` EmitAsyncInit *ebpf.ProgramSpec `ebpf:"emit_async_init"` } @@ -116,14 +115,12 @@ func (m *bpf_debugMaps) Close() error { // It can be passed to loadBpf_debugObjects or ebpf.CollectionSpec.LoadAndAssign. type bpf_debugPrograms struct { AsyncReset *ebpf.Program `ebpf:"async_reset"` - AsyncResetRet *ebpf.Program `ebpf:"async_reset_ret"` EmitAsyncInit *ebpf.Program `ebpf:"emit_async_init"` } func (p *bpf_debugPrograms) Close() error { return _Bpf_debugClose( p.AsyncReset, - p.AsyncResetRet, p.EmitAsyncInit, ) } diff --git a/pkg/internal/ebpf/nodejs/bpf_debug_arm64_bpfel.o b/pkg/internal/ebpf/nodejs/bpf_debug_arm64_bpfel.o index fe42403ed..17e25d000 100644 Binary files a/pkg/internal/ebpf/nodejs/bpf_debug_arm64_bpfel.o and b/pkg/internal/ebpf/nodejs/bpf_debug_arm64_bpfel.o differ diff --git a/pkg/internal/ebpf/nodejs/bpf_debug_x86_bpfel.go b/pkg/internal/ebpf/nodejs/bpf_debug_x86_bpfel.go index 53b51846c..125480914 100644 --- a/pkg/internal/ebpf/nodejs/bpf_debug_x86_bpfel.go +++ b/pkg/internal/ebpf/nodejs/bpf_debug_x86_bpfel.go @@ -54,7 +54,6 @@ type bpf_debugSpecs struct { // It can be passed ebpf.CollectionSpec.Assign. type bpf_debugProgramSpecs struct { AsyncReset *ebpf.ProgramSpec `ebpf:"async_reset"` - AsyncResetRet *ebpf.ProgramSpec `ebpf:"async_reset_ret"` EmitAsyncInit *ebpf.ProgramSpec `ebpf:"emit_async_init"` } @@ -116,14 +115,12 @@ func (m *bpf_debugMaps) Close() error { // It can be passed to loadBpf_debugObjects or ebpf.CollectionSpec.LoadAndAssign. type bpf_debugPrograms struct { AsyncReset *ebpf.Program `ebpf:"async_reset"` - AsyncResetRet *ebpf.Program `ebpf:"async_reset_ret"` EmitAsyncInit *ebpf.Program `ebpf:"emit_async_init"` } func (p *bpf_debugPrograms) Close() error { return _Bpf_debugClose( p.AsyncReset, - p.AsyncResetRet, p.EmitAsyncInit, ) } diff --git a/pkg/internal/ebpf/nodejs/bpf_debug_x86_bpfel.o b/pkg/internal/ebpf/nodejs/bpf_debug_x86_bpfel.o index 066ae1368..be2d00d3d 100644 Binary files a/pkg/internal/ebpf/nodejs/bpf_debug_x86_bpfel.o and b/pkg/internal/ebpf/nodejs/bpf_debug_x86_bpfel.o differ diff --git a/pkg/internal/ebpf/nodejs/bpf_x86_bpfel.go b/pkg/internal/ebpf/nodejs/bpf_x86_bpfel.go index 3084bf242..8c2dbab9c 100644 --- a/pkg/internal/ebpf/nodejs/bpf_x86_bpfel.go +++ b/pkg/internal/ebpf/nodejs/bpf_x86_bpfel.go @@ -54,7 +54,6 @@ type bpfSpecs struct { // It can be passed ebpf.CollectionSpec.Assign. type bpfProgramSpecs struct { AsyncReset *ebpf.ProgramSpec `ebpf:"async_reset"` - AsyncResetRet *ebpf.ProgramSpec `ebpf:"async_reset_ret"` EmitAsyncInit *ebpf.ProgramSpec `ebpf:"emit_async_init"` } @@ -113,14 +112,12 @@ func (m *bpfMaps) Close() error { // It can be passed to loadBpfObjects or ebpf.CollectionSpec.LoadAndAssign. type bpfPrograms struct { AsyncReset *ebpf.Program `ebpf:"async_reset"` - AsyncResetRet *ebpf.Program `ebpf:"async_reset_ret"` EmitAsyncInit *ebpf.Program `ebpf:"emit_async_init"` } func (p *bpfPrograms) Close() error { return _BpfClose( p.AsyncReset, - p.AsyncResetRet, p.EmitAsyncInit, ) } diff --git a/pkg/internal/ebpf/nodejs/bpf_x86_bpfel.o b/pkg/internal/ebpf/nodejs/bpf_x86_bpfel.o index e0e5c1d89..9e11bbca7 100644 Binary files a/pkg/internal/ebpf/nodejs/bpf_x86_bpfel.o and b/pkg/internal/ebpf/nodejs/bpf_x86_bpfel.o differ diff --git a/pkg/internal/ebpf/nodejs/nodejs.go b/pkg/internal/ebpf/nodejs/nodejs.go index 4fb25a36c..e9cca7ec1 100644 --- a/pkg/internal/ebpf/nodejs/nodejs.go +++ b/pkg/internal/ebpf/nodejs/nodejs.go @@ -114,12 +114,10 @@ func (p *Tracer) UProbes() map[string]map[string]ebpfcommon.FunctionPrograms { "_ZN4node9AsyncWrap10AsyncResetEN2v85LocalINS1_6ObjectEEEdb": { Required: false, Start: p.bpfObjects.AsyncReset, - End: p.bpfObjects.AsyncResetRet, }, "_ZN4node9AsyncWrap10AsyncResetERKN2v820FunctionCallbackInfoINS1_5ValueEEE": { Required: false, Start: p.bpfObjects.AsyncReset, - End: p.bpfObjects.AsyncResetRet, }, }, } diff --git a/pkg/internal/ebpf/sarama/bpf_arm64_bpfel.o b/pkg/internal/ebpf/sarama/bpf_arm64_bpfel.o index 5a7ac2cde..85ea6b382 100644 Binary files a/pkg/internal/ebpf/sarama/bpf_arm64_bpfel.o and b/pkg/internal/ebpf/sarama/bpf_arm64_bpfel.o differ diff --git a/pkg/internal/ebpf/sarama/bpf_debug_arm64_bpfel.o b/pkg/internal/ebpf/sarama/bpf_debug_arm64_bpfel.o index a46f40e03..e613cdd1e 100644 Binary files a/pkg/internal/ebpf/sarama/bpf_debug_arm64_bpfel.o and b/pkg/internal/ebpf/sarama/bpf_debug_arm64_bpfel.o differ diff --git a/pkg/internal/ebpf/sarama/bpf_debug_x86_bpfel.o b/pkg/internal/ebpf/sarama/bpf_debug_x86_bpfel.o index 911763c96..d4d3417aa 100644 Binary files a/pkg/internal/ebpf/sarama/bpf_debug_x86_bpfel.o and b/pkg/internal/ebpf/sarama/bpf_debug_x86_bpfel.o differ diff --git a/pkg/internal/ebpf/sarama/bpf_x86_bpfel.o b/pkg/internal/ebpf/sarama/bpf_x86_bpfel.o index abcb0e2ea..fd49e4c93 100644 Binary files a/pkg/internal/ebpf/sarama/bpf_x86_bpfel.o and b/pkg/internal/ebpf/sarama/bpf_x86_bpfel.o differ diff --git a/pkg/internal/ebpf/watcher/bpf_arm64_bpfel.o b/pkg/internal/ebpf/watcher/bpf_arm64_bpfel.o index 30f6586d1..d9d6511b4 100644 Binary files a/pkg/internal/ebpf/watcher/bpf_arm64_bpfel.o and b/pkg/internal/ebpf/watcher/bpf_arm64_bpfel.o differ diff --git a/pkg/internal/ebpf/watcher/bpf_debug_arm64_bpfel.o b/pkg/internal/ebpf/watcher/bpf_debug_arm64_bpfel.o index ebb803ff8..5e2e9d587 100644 Binary files a/pkg/internal/ebpf/watcher/bpf_debug_arm64_bpfel.o and b/pkg/internal/ebpf/watcher/bpf_debug_arm64_bpfel.o differ diff --git a/pkg/internal/ebpf/watcher/bpf_debug_x86_bpfel.o b/pkg/internal/ebpf/watcher/bpf_debug_x86_bpfel.o index af18d1e8f..1e7db1fe7 100644 Binary files a/pkg/internal/ebpf/watcher/bpf_debug_x86_bpfel.o and b/pkg/internal/ebpf/watcher/bpf_debug_x86_bpfel.o differ diff --git a/pkg/internal/ebpf/watcher/bpf_x86_bpfel.o b/pkg/internal/ebpf/watcher/bpf_x86_bpfel.o index 6627abbd8..a25519472 100644 Binary files a/pkg/internal/ebpf/watcher/bpf_x86_bpfel.o and b/pkg/internal/ebpf/watcher/bpf_x86_bpfel.o differ diff --git a/pkg/internal/netolly/ebpf/net_arm64_bpfel.o b/pkg/internal/netolly/ebpf/net_arm64_bpfel.o index a7b7303be..2ab1a1baa 100644 Binary files a/pkg/internal/netolly/ebpf/net_arm64_bpfel.o and b/pkg/internal/netolly/ebpf/net_arm64_bpfel.o differ diff --git a/pkg/internal/netolly/ebpf/net_x86_bpfel.o b/pkg/internal/netolly/ebpf/net_x86_bpfel.o index 0cace8867..064bcda6a 100644 Binary files a/pkg/internal/netolly/ebpf/net_x86_bpfel.o and b/pkg/internal/netolly/ebpf/net_x86_bpfel.o differ diff --git a/pkg/internal/netolly/ebpf/netsk_arm64_bpfel.o b/pkg/internal/netolly/ebpf/netsk_arm64_bpfel.o index 620ef0864..7fbdf1044 100644 Binary files a/pkg/internal/netolly/ebpf/netsk_arm64_bpfel.o and b/pkg/internal/netolly/ebpf/netsk_arm64_bpfel.o differ diff --git a/pkg/internal/netolly/ebpf/netsk_x86_bpfel.o b/pkg/internal/netolly/ebpf/netsk_x86_bpfel.o index 581c13aa3..9af4bf56c 100644 Binary files a/pkg/internal/netolly/ebpf/netsk_x86_bpfel.o and b/pkg/internal/netolly/ebpf/netsk_x86_bpfel.o differ