Skip to content

Commit 6cdc638

Browse files
authored
Merge pull request kmesh-net#1015 from LiZhenCheng9527/constant-map
Use bpf map to pass node IP and pod sub gateway. Skip kubelet probe traffic management from ebpf
2 parents 47b3d1a + f14f7d2 commit 6cdc638

29 files changed

+300
-19
lines changed

bpf/include/bpf_log.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,11 @@ lower than 22.09, compile would report an error of bpf_snprintf dont exist */
9090
static inline int map_lookup_log_level()
9191
{
9292
int zero = 0;
93-
int *value = NULL;
93+
struct kmesh_config *value = {0};
9494
value = kmesh_map_lookup_elem(&kmesh_config_map, &zero);
9595
if (!value)
9696
return BPF_LOG_INFO;
97-
return *value;
97+
return value->bpf_log_level;
9898
}
9999

100100
#define BPF_LOG(l, t, f, ...) \

bpf/include/common.h

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,12 @@ struct kmesh_context {
6363
bool via_waypoint;
6464
};
6565

66+
struct kmesh_config {
67+
__u32 bpf_log_level;
68+
__u32 node_ip[4];
69+
__u32 pod_gateway[4];
70+
};
71+
6672
static inline void *kmesh_map_lookup_elem(void *map, const void *key)
6773
{
6874
return bpf_map_lookup_elem(map, key);
@@ -134,8 +140,8 @@ struct {
134140
struct {
135141
__uint(type, BPF_MAP_TYPE_ARRAY);
136142
__uint(max_entries, 1);
137-
__uint(key_size, sizeof(__u32));
138-
__uint(value_size, sizeof(__u32));
143+
__type(key, int);
144+
__type(value, struct kmesh_config);
139145
} kmesh_config_map SEC(".maps");
140146

141147
#if KERNEL_VERSION_HIGHER_5_13_0

bpf/kmesh/bpf2go/dualengine/kmeshcgroupsockworkload_bpfeb.go

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bpf/kmesh/bpf2go/dualengine/kmeshcgroupsockworkload_bpfel.go

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bpf/kmesh/bpf2go/dualengine/kmeshcgroupsockworkloadcompat_bpfeb.go

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bpf/kmesh/bpf2go/dualengine/kmeshcgroupsockworkloadcompat_bpfel.go

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bpf/kmesh/bpf2go/dualengine/kmeshsendmsg_bpfeb.go

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bpf/kmesh/bpf2go/dualengine/kmeshsendmsg_bpfel.go

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bpf/kmesh/bpf2go/dualengine/kmeshsendmsgcompat_bpfeb.go

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bpf/kmesh/bpf2go/dualengine/kmeshsendmsgcompat_bpfel.go

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)