diff --git a/bpf/kmesh/bpf2go/dualengine/kmeshcgroupskb_bpfeb.go b/bpf/kmesh/bpf2go/dualengine/kmeshcgroupskb_bpfeb.go index 68112e451..27cc98f97 100644 --- a/bpf/kmesh/bpf2go/dualengine/kmeshcgroupskb_bpfeb.go +++ b/bpf/kmesh/bpf2go/dualengine/kmeshcgroupskb_bpfeb.go @@ -117,13 +117,13 @@ type KmeshCgroupSkbMapSpecs struct { 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. @@ -165,13 +165,13 @@ type KmeshCgroupSkbMaps struct { 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 { @@ -187,13 +187,13 @@ func (m *KmeshCgroupSkbMaps) Close() error { 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 d0c6103f8..f242a80f7 100644 --- a/bpf/kmesh/bpf2go/dualengine/kmeshcgroupskb_bpfel.go +++ b/bpf/kmesh/bpf2go/dualengine/kmeshcgroupskb_bpfel.go @@ -117,13 +117,13 @@ type KmeshCgroupSkbMapSpecs struct { 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. @@ -165,13 +165,13 @@ type KmeshCgroupSkbMaps struct { 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 { @@ -187,13 +187,13 @@ func (m *KmeshCgroupSkbMaps) Close() error { 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 f839db541..54f8b5e96 100644 --- a/bpf/kmesh/bpf2go/dualengine/kmeshcgroupskbcompat_bpfeb.go +++ b/bpf/kmesh/bpf2go/dualengine/kmeshcgroupskbcompat_bpfeb.go @@ -117,13 +117,13 @@ type KmeshCgroupSkbCompatMapSpecs struct { 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. @@ -165,13 +165,13 @@ type KmeshCgroupSkbCompatMaps struct { 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 { @@ -187,13 +187,13 @@ func (m *KmeshCgroupSkbCompatMaps) Close() error { 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 dd0b30d6c..7a0a905ab 100644 --- a/bpf/kmesh/bpf2go/dualengine/kmeshcgroupskbcompat_bpfel.go +++ b/bpf/kmesh/bpf2go/dualengine/kmeshcgroupskbcompat_bpfel.go @@ -117,13 +117,13 @@ type KmeshCgroupSkbCompatMapSpecs struct { 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. @@ -165,13 +165,13 @@ type KmeshCgroupSkbCompatMaps struct { 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 { @@ -187,13 +187,13 @@ func (m *KmeshCgroupSkbCompatMaps) Close() error { 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/probes/tcp_probe.h b/bpf/kmesh/probes/tcp_probe.h index 77939b783..e516544c4 100644 --- a/bpf/kmesh/probes/tcp_probe.h +++ b/bpf/kmesh/probes/tcp_probe.h @@ -5,6 +5,7 @@ #define __KMESH_BPF_ACCESS_LOG_H__ #include "bpf_common.h" +#include "config.h" // direction enum { diff --git a/bpf/kmesh/workload/cgroup_skb.c b/bpf/kmesh/workload/cgroup_skb.c index a10a65498..9b1fafd04 100644 --- a/bpf/kmesh/workload/cgroup_skb.c +++ b/bpf/kmesh/workload/cgroup_skb.c @@ -8,6 +8,7 @@ #include "bpf_log.h" #include "bpf_common.h" #include "probe.h" +#include "config.h" SEC("cgroup_skb/ingress") int cgroup_skb_ingress_prog(struct __sk_buff *skb) diff --git a/bpf/kmesh/workload/sockops.c b/bpf/kmesh/workload/sockops.c index bceb7f42e..4fe7751cc 100644 --- a/bpf/kmesh/workload/sockops.c +++ b/bpf/kmesh/workload/sockops.c @@ -8,7 +8,6 @@ #include #include "bpf_log.h" #include "workload.h" -#include "config.h" #include "bpf_common.h" #include "probe.h" #include "config.h"