diff --git a/bpf/kmesh/bpf2go/dualengine/kmeshcgroupskb_bpfeb.go b/bpf/kmesh/bpf2go/dualengine/kmeshcgroupskb_bpfeb.go index cbac535ef..68112e451 100644 --- a/bpf/kmesh/bpf2go/dualengine/kmeshcgroupskb_bpfeb.go +++ b/bpf/kmesh/bpf2go/dualengine/kmeshcgroupskb_bpfeb.go @@ -48,7 +48,12 @@ type KmeshCgroupSkbSockStorageData struct { LastReportNs uint64 Direction uint8 ConnectSuccess uint8 - _ [6]byte + ViaWaypoint bool + HasEncoded bool + HasSetIp bool + _ [3]byte + SkTuple KmeshCgroupSkbBpfSockTuple + _ [4]byte } // LoadKmeshCgroupSkb returns the embedded CollectionSpec for KmeshCgroupSkb. @@ -108,18 +113,17 @@ type KmeshCgroupSkbMapSpecs struct { KmFrontend *ebpf.MapSpec `ebpf:"km_frontend"` KmLogEvent *ebpf.MapSpec `ebpf:"km_log_event"` KmManage *ebpf.MapSpec `ebpf:"km_manage"` - KmOrigDst *ebpf.MapSpec `ebpf:"km_orig_dst"` KmPerfInfo *ebpf.MapSpec `ebpf:"km_perf_info"` KmPerfMap *ebpf.MapSpec `ebpf:"km_perf_map"` KmService *ebpf.MapSpec `ebpf:"km_service"` KmSockstorage *ebpf.MapSpec `ebpf:"km_sockstorage"` - KmTcpProbe *ebpf.MapSpec `ebpf:"km_tcp_probe"` KmTmpbuf *ebpf.MapSpec `ebpf:"km_tmpbuf"` KmWlpolicy *ebpf.MapSpec `ebpf:"km_wlpolicy"` KmeshMap1600 *ebpf.MapSpec `ebpf:"kmesh_map1600"` KmeshMap192 *ebpf.MapSpec `ebpf:"kmesh_map192"` KmeshMap296 *ebpf.MapSpec `ebpf:"kmesh_map296"` KmeshMap64 *ebpf.MapSpec `ebpf:"kmesh_map64"` + MapOfTcpProbe *ebpf.MapSpec `ebpf:"map_of_tcp_probe"` } // KmeshCgroupSkbVariableSpecs contains global variables before they are loaded into the kernel. @@ -157,18 +161,17 @@ type KmeshCgroupSkbMaps struct { KmFrontend *ebpf.Map `ebpf:"km_frontend"` KmLogEvent *ebpf.Map `ebpf:"km_log_event"` KmManage *ebpf.Map `ebpf:"km_manage"` - KmOrigDst *ebpf.Map `ebpf:"km_orig_dst"` KmPerfInfo *ebpf.Map `ebpf:"km_perf_info"` KmPerfMap *ebpf.Map `ebpf:"km_perf_map"` KmService *ebpf.Map `ebpf:"km_service"` KmSockstorage *ebpf.Map `ebpf:"km_sockstorage"` - KmTcpProbe *ebpf.Map `ebpf:"km_tcp_probe"` KmTmpbuf *ebpf.Map `ebpf:"km_tmpbuf"` KmWlpolicy *ebpf.Map `ebpf:"km_wlpolicy"` KmeshMap1600 *ebpf.Map `ebpf:"kmesh_map1600"` KmeshMap192 *ebpf.Map `ebpf:"kmesh_map192"` KmeshMap296 *ebpf.Map `ebpf:"kmesh_map296"` KmeshMap64 *ebpf.Map `ebpf:"kmesh_map64"` + MapOfTcpProbe *ebpf.Map `ebpf:"map_of_tcp_probe"` } func (m *KmeshCgroupSkbMaps) Close() error { @@ -180,18 +183,17 @@ func (m *KmeshCgroupSkbMaps) Close() error { m.KmFrontend, m.KmLogEvent, m.KmManage, - m.KmOrigDst, m.KmPerfInfo, m.KmPerfMap, m.KmService, m.KmSockstorage, - m.KmTcpProbe, m.KmTmpbuf, m.KmWlpolicy, m.KmeshMap1600, m.KmeshMap192, m.KmeshMap296, m.KmeshMap64, + m.MapOfTcpProbe, ) } diff --git a/bpf/kmesh/bpf2go/dualengine/kmeshcgroupskb_bpfel.go b/bpf/kmesh/bpf2go/dualengine/kmeshcgroupskb_bpfel.go index a7094e34a..d0c6103f8 100644 --- a/bpf/kmesh/bpf2go/dualengine/kmeshcgroupskb_bpfel.go +++ b/bpf/kmesh/bpf2go/dualengine/kmeshcgroupskb_bpfel.go @@ -48,7 +48,12 @@ type KmeshCgroupSkbSockStorageData struct { LastReportNs uint64 Direction uint8 ConnectSuccess uint8 - _ [6]byte + ViaWaypoint bool + HasEncoded bool + HasSetIp bool + _ [3]byte + SkTuple KmeshCgroupSkbBpfSockTuple + _ [4]byte } // LoadKmeshCgroupSkb returns the embedded CollectionSpec for KmeshCgroupSkb. @@ -108,18 +113,17 @@ type KmeshCgroupSkbMapSpecs struct { KmFrontend *ebpf.MapSpec `ebpf:"km_frontend"` KmLogEvent *ebpf.MapSpec `ebpf:"km_log_event"` KmManage *ebpf.MapSpec `ebpf:"km_manage"` - KmOrigDst *ebpf.MapSpec `ebpf:"km_orig_dst"` KmPerfInfo *ebpf.MapSpec `ebpf:"km_perf_info"` KmPerfMap *ebpf.MapSpec `ebpf:"km_perf_map"` KmService *ebpf.MapSpec `ebpf:"km_service"` KmSockstorage *ebpf.MapSpec `ebpf:"km_sockstorage"` - KmTcpProbe *ebpf.MapSpec `ebpf:"km_tcp_probe"` KmTmpbuf *ebpf.MapSpec `ebpf:"km_tmpbuf"` KmWlpolicy *ebpf.MapSpec `ebpf:"km_wlpolicy"` KmeshMap1600 *ebpf.MapSpec `ebpf:"kmesh_map1600"` KmeshMap192 *ebpf.MapSpec `ebpf:"kmesh_map192"` KmeshMap296 *ebpf.MapSpec `ebpf:"kmesh_map296"` KmeshMap64 *ebpf.MapSpec `ebpf:"kmesh_map64"` + MapOfTcpProbe *ebpf.MapSpec `ebpf:"map_of_tcp_probe"` } // KmeshCgroupSkbVariableSpecs contains global variables before they are loaded into the kernel. @@ -157,18 +161,17 @@ type KmeshCgroupSkbMaps struct { KmFrontend *ebpf.Map `ebpf:"km_frontend"` KmLogEvent *ebpf.Map `ebpf:"km_log_event"` KmManage *ebpf.Map `ebpf:"km_manage"` - KmOrigDst *ebpf.Map `ebpf:"km_orig_dst"` KmPerfInfo *ebpf.Map `ebpf:"km_perf_info"` KmPerfMap *ebpf.Map `ebpf:"km_perf_map"` KmService *ebpf.Map `ebpf:"km_service"` KmSockstorage *ebpf.Map `ebpf:"km_sockstorage"` - KmTcpProbe *ebpf.Map `ebpf:"km_tcp_probe"` KmTmpbuf *ebpf.Map `ebpf:"km_tmpbuf"` KmWlpolicy *ebpf.Map `ebpf:"km_wlpolicy"` KmeshMap1600 *ebpf.Map `ebpf:"kmesh_map1600"` KmeshMap192 *ebpf.Map `ebpf:"kmesh_map192"` KmeshMap296 *ebpf.Map `ebpf:"kmesh_map296"` KmeshMap64 *ebpf.Map `ebpf:"kmesh_map64"` + MapOfTcpProbe *ebpf.Map `ebpf:"map_of_tcp_probe"` } func (m *KmeshCgroupSkbMaps) Close() error { @@ -180,18 +183,17 @@ func (m *KmeshCgroupSkbMaps) Close() error { m.KmFrontend, m.KmLogEvent, m.KmManage, - m.KmOrigDst, m.KmPerfInfo, m.KmPerfMap, m.KmService, m.KmSockstorage, - m.KmTcpProbe, m.KmTmpbuf, m.KmWlpolicy, m.KmeshMap1600, m.KmeshMap192, m.KmeshMap296, m.KmeshMap64, + m.MapOfTcpProbe, ) } diff --git a/bpf/kmesh/bpf2go/dualengine/kmeshcgroupskbcompat_bpfeb.go b/bpf/kmesh/bpf2go/dualengine/kmeshcgroupskbcompat_bpfeb.go index 7de8437ad..f839db541 100644 --- a/bpf/kmesh/bpf2go/dualengine/kmeshcgroupskbcompat_bpfeb.go +++ b/bpf/kmesh/bpf2go/dualengine/kmeshcgroupskbcompat_bpfeb.go @@ -48,7 +48,12 @@ type KmeshCgroupSkbCompatSockStorageData struct { LastReportNs uint64 Direction uint8 ConnectSuccess uint8 - _ [6]byte + ViaWaypoint bool + HasEncoded bool + HasSetIp bool + _ [3]byte + SkTuple KmeshCgroupSkbCompatBpfSockTuple + _ [4]byte } // LoadKmeshCgroupSkbCompat returns the embedded CollectionSpec for KmeshCgroupSkbCompat. @@ -108,18 +113,17 @@ type KmeshCgroupSkbCompatMapSpecs struct { KmFrontend *ebpf.MapSpec `ebpf:"km_frontend"` KmLogEvent *ebpf.MapSpec `ebpf:"km_log_event"` KmManage *ebpf.MapSpec `ebpf:"km_manage"` - KmOrigDst *ebpf.MapSpec `ebpf:"km_orig_dst"` KmPerfInfo *ebpf.MapSpec `ebpf:"km_perf_info"` KmPerfMap *ebpf.MapSpec `ebpf:"km_perf_map"` KmService *ebpf.MapSpec `ebpf:"km_service"` KmSockstorage *ebpf.MapSpec `ebpf:"km_sockstorage"` - KmTcpProbe *ebpf.MapSpec `ebpf:"km_tcp_probe"` KmTmpbuf *ebpf.MapSpec `ebpf:"km_tmpbuf"` KmWlpolicy *ebpf.MapSpec `ebpf:"km_wlpolicy"` KmeshMap1600 *ebpf.MapSpec `ebpf:"kmesh_map1600"` KmeshMap192 *ebpf.MapSpec `ebpf:"kmesh_map192"` KmeshMap296 *ebpf.MapSpec `ebpf:"kmesh_map296"` KmeshMap64 *ebpf.MapSpec `ebpf:"kmesh_map64"` + MapOfTcpProbe *ebpf.MapSpec `ebpf:"map_of_tcp_probe"` } // KmeshCgroupSkbCompatVariableSpecs contains global variables before they are loaded into the kernel. @@ -157,18 +161,17 @@ type KmeshCgroupSkbCompatMaps struct { KmFrontend *ebpf.Map `ebpf:"km_frontend"` KmLogEvent *ebpf.Map `ebpf:"km_log_event"` KmManage *ebpf.Map `ebpf:"km_manage"` - KmOrigDst *ebpf.Map `ebpf:"km_orig_dst"` KmPerfInfo *ebpf.Map `ebpf:"km_perf_info"` KmPerfMap *ebpf.Map `ebpf:"km_perf_map"` KmService *ebpf.Map `ebpf:"km_service"` KmSockstorage *ebpf.Map `ebpf:"km_sockstorage"` - KmTcpProbe *ebpf.Map `ebpf:"km_tcp_probe"` KmTmpbuf *ebpf.Map `ebpf:"km_tmpbuf"` KmWlpolicy *ebpf.Map `ebpf:"km_wlpolicy"` KmeshMap1600 *ebpf.Map `ebpf:"kmesh_map1600"` KmeshMap192 *ebpf.Map `ebpf:"kmesh_map192"` KmeshMap296 *ebpf.Map `ebpf:"kmesh_map296"` KmeshMap64 *ebpf.Map `ebpf:"kmesh_map64"` + MapOfTcpProbe *ebpf.Map `ebpf:"map_of_tcp_probe"` } func (m *KmeshCgroupSkbCompatMaps) Close() error { @@ -180,18 +183,17 @@ func (m *KmeshCgroupSkbCompatMaps) Close() error { m.KmFrontend, m.KmLogEvent, m.KmManage, - m.KmOrigDst, m.KmPerfInfo, m.KmPerfMap, m.KmService, m.KmSockstorage, - m.KmTcpProbe, m.KmTmpbuf, m.KmWlpolicy, m.KmeshMap1600, m.KmeshMap192, m.KmeshMap296, m.KmeshMap64, + m.MapOfTcpProbe, ) } diff --git a/bpf/kmesh/bpf2go/dualengine/kmeshcgroupskbcompat_bpfel.go b/bpf/kmesh/bpf2go/dualengine/kmeshcgroupskbcompat_bpfel.go index dd3a89741..dd0b30d6c 100644 --- a/bpf/kmesh/bpf2go/dualengine/kmeshcgroupskbcompat_bpfel.go +++ b/bpf/kmesh/bpf2go/dualengine/kmeshcgroupskbcompat_bpfel.go @@ -48,7 +48,12 @@ type KmeshCgroupSkbCompatSockStorageData struct { LastReportNs uint64 Direction uint8 ConnectSuccess uint8 - _ [6]byte + ViaWaypoint bool + HasEncoded bool + HasSetIp bool + _ [3]byte + SkTuple KmeshCgroupSkbCompatBpfSockTuple + _ [4]byte } // LoadKmeshCgroupSkbCompat returns the embedded CollectionSpec for KmeshCgroupSkbCompat. @@ -108,18 +113,17 @@ type KmeshCgroupSkbCompatMapSpecs struct { KmFrontend *ebpf.MapSpec `ebpf:"km_frontend"` KmLogEvent *ebpf.MapSpec `ebpf:"km_log_event"` KmManage *ebpf.MapSpec `ebpf:"km_manage"` - KmOrigDst *ebpf.MapSpec `ebpf:"km_orig_dst"` KmPerfInfo *ebpf.MapSpec `ebpf:"km_perf_info"` KmPerfMap *ebpf.MapSpec `ebpf:"km_perf_map"` KmService *ebpf.MapSpec `ebpf:"km_service"` KmSockstorage *ebpf.MapSpec `ebpf:"km_sockstorage"` - KmTcpProbe *ebpf.MapSpec `ebpf:"km_tcp_probe"` KmTmpbuf *ebpf.MapSpec `ebpf:"km_tmpbuf"` KmWlpolicy *ebpf.MapSpec `ebpf:"km_wlpolicy"` KmeshMap1600 *ebpf.MapSpec `ebpf:"kmesh_map1600"` KmeshMap192 *ebpf.MapSpec `ebpf:"kmesh_map192"` KmeshMap296 *ebpf.MapSpec `ebpf:"kmesh_map296"` KmeshMap64 *ebpf.MapSpec `ebpf:"kmesh_map64"` + MapOfTcpProbe *ebpf.MapSpec `ebpf:"map_of_tcp_probe"` } // KmeshCgroupSkbCompatVariableSpecs contains global variables before they are loaded into the kernel. @@ -157,18 +161,17 @@ type KmeshCgroupSkbCompatMaps struct { KmFrontend *ebpf.Map `ebpf:"km_frontend"` KmLogEvent *ebpf.Map `ebpf:"km_log_event"` KmManage *ebpf.Map `ebpf:"km_manage"` - KmOrigDst *ebpf.Map `ebpf:"km_orig_dst"` KmPerfInfo *ebpf.Map `ebpf:"km_perf_info"` KmPerfMap *ebpf.Map `ebpf:"km_perf_map"` KmService *ebpf.Map `ebpf:"km_service"` KmSockstorage *ebpf.Map `ebpf:"km_sockstorage"` - KmTcpProbe *ebpf.Map `ebpf:"km_tcp_probe"` KmTmpbuf *ebpf.Map `ebpf:"km_tmpbuf"` KmWlpolicy *ebpf.Map `ebpf:"km_wlpolicy"` KmeshMap1600 *ebpf.Map `ebpf:"kmesh_map1600"` KmeshMap192 *ebpf.Map `ebpf:"kmesh_map192"` KmeshMap296 *ebpf.Map `ebpf:"kmesh_map296"` KmeshMap64 *ebpf.Map `ebpf:"kmesh_map64"` + MapOfTcpProbe *ebpf.Map `ebpf:"map_of_tcp_probe"` } func (m *KmeshCgroupSkbCompatMaps) Close() error { @@ -180,18 +183,17 @@ func (m *KmeshCgroupSkbCompatMaps) Close() error { m.KmFrontend, m.KmLogEvent, m.KmManage, - m.KmOrigDst, m.KmPerfInfo, m.KmPerfMap, m.KmService, m.KmSockstorage, - m.KmTcpProbe, m.KmTmpbuf, m.KmWlpolicy, m.KmeshMap1600, m.KmeshMap192, m.KmeshMap296, m.KmeshMap64, + m.MapOfTcpProbe, ) } diff --git a/bpf/kmesh/bpf2go/dualengine/kmeshsendmsg_bpfeb.go b/bpf/kmesh/bpf2go/dualengine/kmeshsendmsg_bpfeb.go index 7f5d79f3e..bdafcf41f 100644 --- a/bpf/kmesh/bpf2go/dualengine/kmeshsendmsg_bpfeb.go +++ b/bpf/kmesh/bpf2go/dualengine/kmeshsendmsg_bpfeb.go @@ -21,6 +21,7 @@ type KmeshSendmsgManagerKey struct { type KmeshSendmsgSockStorageData struct { ConnectNs uint64 + LastReportNs uint64 Direction uint8 ConnectSuccess uint8 ViaWaypoint bool diff --git a/bpf/kmesh/bpf2go/dualengine/kmeshsendmsg_bpfel.go b/bpf/kmesh/bpf2go/dualengine/kmeshsendmsg_bpfel.go index 5335e0062..4aea84e1c 100644 --- a/bpf/kmesh/bpf2go/dualengine/kmeshsendmsg_bpfel.go +++ b/bpf/kmesh/bpf2go/dualengine/kmeshsendmsg_bpfel.go @@ -21,6 +21,7 @@ type KmeshSendmsgManagerKey struct { type KmeshSendmsgSockStorageData struct { ConnectNs uint64 + LastReportNs uint64 Direction uint8 ConnectSuccess uint8 ViaWaypoint bool diff --git a/bpf/kmesh/bpf2go/dualengine/kmeshsendmsgcompat_bpfeb.go b/bpf/kmesh/bpf2go/dualengine/kmeshsendmsgcompat_bpfeb.go index 384b8abbc..899a1f85a 100644 --- a/bpf/kmesh/bpf2go/dualengine/kmeshsendmsgcompat_bpfeb.go +++ b/bpf/kmesh/bpf2go/dualengine/kmeshsendmsgcompat_bpfeb.go @@ -21,6 +21,7 @@ type KmeshSendmsgCompatManagerKey struct { type KmeshSendmsgCompatSockStorageData struct { ConnectNs uint64 + LastReportNs uint64 Direction uint8 ConnectSuccess uint8 ViaWaypoint bool diff --git a/bpf/kmesh/bpf2go/dualengine/kmeshsendmsgcompat_bpfel.go b/bpf/kmesh/bpf2go/dualengine/kmeshsendmsgcompat_bpfel.go index b262f3b9c..4fa9e0d8b 100644 --- a/bpf/kmesh/bpf2go/dualengine/kmeshsendmsgcompat_bpfel.go +++ b/bpf/kmesh/bpf2go/dualengine/kmeshsendmsgcompat_bpfel.go @@ -21,6 +21,7 @@ type KmeshSendmsgCompatManagerKey struct { type KmeshSendmsgCompatSockStorageData struct { ConnectNs uint64 + LastReportNs uint64 Direction uint8 ConnectSuccess uint8 ViaWaypoint bool diff --git a/bpf/kmesh/workload/cgroup_skb.c b/bpf/kmesh/workload/cgroup_skb.c index 7a57fd317..e12dec6c4 100644 --- a/bpf/kmesh/workload/cgroup_skb.c +++ b/bpf/kmesh/workload/cgroup_skb.c @@ -6,7 +6,6 @@ #include #include #include "bpf_log.h" -#include "encoder.h" #include "bpf_common.h" #include "probe.h"