Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add metrics of service #629

Closed
wants to merge 2 commits into from
Closed

add metrics of service #629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
33eaba6
add service metrics
LiZhenCheng9527 Jul 29, 2024
b4b60e4
make gen
LiZhenCheng9527 Jul 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 21 additions & 8 deletions bpf/kmesh/probes/metrics.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ struct metric_key {
};

struct metric_data {
__u32 direction; // update on connect
__u32 conn_open; // update on connect
__u32 conn_close; // update on close
__u32 conn_failed; // update on close
Expand Down Expand Up @@ -45,21 +44,38 @@ static inline void construct_metric_key(struct bpf_sock *sk, __u8 direction, str
if (sk->family == AF_INET) {
key->src_ip.ip4 = sk->src_ip4;
key->dst_ip.ip4 = sk->dst_ip4;
} else {
}
if (sk->family == AF_INET6) {
bpf_memcpy(key->src_ip.ip6, sk->src_ip6, IPV6_ADDR_LEN);
bpf_memcpy(key->dst_ip.ip6, sk->dst_ip6, IPV6_ADDR_LEN);
}
key->dst_port = bpf_ntohl(sk->dst_port);
} else {
key->dst_port = bpf_ntohs(sk->dst_port);
}
if (direction == INBOUND) {
if (sk->family == AF_INET) {
key->src_ip.ip4 = sk->dst_ip4;
key->dst_ip.ip4 = sk->src_ip4;
} else {
}
if (sk->family == AF_INET6) {
bpf_memcpy(key->src_ip.ip6, sk->dst_ip6, IPV6_ADDR_LEN);
bpf_memcpy(key->dst_ip.ip6, sk->src_ip6, IPV6_ADDR_LEN);
}
key->dst_port = sk->src_port;
}

if (is_ipv4_mapped_addr(key->src_ip.ip6)) {
key->src_ip.ip4 = key->src_ip.ip6[3];
key->dst_ip.ip4 = key->dst_ip.ip6[3];
key->src_ip.ip6[0] = key->src_ip.ip4;
key->dst_ip.ip6[0] = key->dst_ip.ip4;
key->src_ip.ip6[1] = 0;
key->src_ip.ip6[2] = 0;
key->src_ip.ip6[3] = 0;
key->dst_ip.ip6[1] = 0;
key->dst_ip.ip6[2] = 0;
key->dst_ip.ip6[3] = 0;
}

return;
}

Expand Down Expand Up @@ -87,7 +103,6 @@ metric_on_connect(struct bpf_sock *sk, struct bpf_tcp_sock *tcp_sock, struct soc
metric = (struct metric_data *)bpf_map_lookup_elem(&map_of_metrics, &key);
if (!metric) {
data.conn_open++;
data.direction = storage->direction;
int err = bpf_map_update_elem(&map_of_metrics, &key, &data, BPF_NOEXIST);
if (err) {
BPF_LOG(ERR, PROBE, "metric_on_connect update failed, err is %d\n", err);
Expand All @@ -97,7 +112,6 @@ metric_on_connect(struct bpf_sock *sk, struct bpf_tcp_sock *tcp_sock, struct soc
}

metric->conn_open++;
metric->direction = storage->direction;
notify:
report_metrics(&key);
return;
Expand All @@ -114,7 +128,6 @@ metric_on_close(struct bpf_sock *sk, struct bpf_tcp_sock *tcp_sock, struct sock_
metric = (struct metric_data *)bpf_map_lookup_elem(&map_of_metrics, &key);
if (!metric) {
// connect failed
data.direction = storage->direction;
data.conn_failed++;
int err = bpf_map_update_elem(&map_of_metrics, &key, &data, BPF_NOEXIST);
if (err) {
Expand Down
24 changes: 21 additions & 3 deletions bpf/kmesh/workload/sockops.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,12 @@ static inline bool is_managed_by_kmesh(struct bpf_sock_ops *skops)
struct manager_key key = {0};
if (skops->family == AF_INET)
key.addr.ip4 = skops->local_ip4;
if (skops->family == AF_INET6)
IP6_COPY(key.addr.ip6, skops->local_ip6);
if (skops->family == AF_INET6) {
if (is_ipv4_mapped_addr(skops->local_ip6))
key.addr.ip4 = skops->local_ip4;
else
IP6_COPY(key.addr.ip6, skops->local_ip6);
}

int *value = bpf_map_lookup_elem(&map_of_manager, &key);
if (!value)
Expand Down Expand Up @@ -75,14 +79,28 @@ static inline void extract_skops_to_tuple_reverse(struct bpf_sock_ops *skops, st
tuple_key->ipv4.sport = GET_SKOPS_REMOTE_PORT(skops);
// local_port is host byteorder
tuple_key->ipv4.dport = bpf_htons(GET_SKOPS_LOCAL_PORT(skops));
} else {
}
if (skops->family == AF_INET6) {
bpf_memcpy(tuple_key->ipv6.saddr, skops->remote_ip6, IPV6_ADDR_LEN);
bpf_memcpy(tuple_key->ipv6.daddr, skops->local_ip6, IPV6_ADDR_LEN);
// remote_port is network byteorder
tuple_key->ipv6.sport = GET_SKOPS_REMOTE_PORT(skops);
// local_port is host byteorder
tuple_key->ipv6.dport = bpf_htons(GET_SKOPS_LOCAL_PORT(skops));
}

if (is_ipv4_mapped_addr(tuple_key->ipv6.saddr)) {
tuple_key->ipv4.saddr = tuple_key->ipv6.saddr[3];
tuple_key->ipv4.daddr = tuple_key->ipv6.daddr[3];
tuple_key->ipv6.saddr[0] = tuple_key->ipv4.saddr;
tuple_key->ipv6.daddr[0] = tuple_key->ipv4.daddr;
tuple_key->ipv6.saddr[1] = 0;
tuple_key->ipv6.saddr[2] = 0;
tuple_key->ipv6.saddr[3] = 0;
tuple_key->ipv6.daddr[1] = 0;
tuple_key->ipv6.daddr[2] = 0;
tuple_key->ipv6.daddr[3] = 0;
}
}

// clean map_of_auth
Expand Down
16 changes: 16 additions & 0 deletions pkg/auth/rbac.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,11 @@
continue
}

if msgType == MSG_TYPE_IPV6 {
conn.dstIp = restoreIPv4(conn.dstIp)
conn.srcIp = restoreIPv4(conn.srcIp)
}

if !r.doRbac(&conn) {
log.Infof("Auth denied for connection: %+v", conn)
// If conn is denied, write tuples into XDP map, which includes source/destination IP/Port
Expand Down Expand Up @@ -511,3 +516,14 @@
serviceAccount: workload.GetServiceAccount(),
}
}

// Converting IPv4 data reported in IPv6 form to IPv4
func restoreIPv4(bytes []byte) []byte {
for i := 4; i < 16; i++ {
if bytes[i] != 0 {
return bytes
}
}

return bytes[:4]

Check warning on line 528 in pkg/auth/rbac.go

View check run for this annotation

Codecov / codecov/patch

pkg/auth/rbac.go#L528 

Added line #L528 was not covered by tests
}
Loading
Loading