mirror/xdp-project-bpf-examples
1
0
Fork 0
mirror of https://github.com/xdp-project/bpf-examples.git synced 2024-05-06 15:54:53 +00:00
Code Issues Projects Releases Wiki Activity

pping: Factor out sending of RTT event

Browse Source 
Extract the logic for filling in and sending an RTT event to a
function. This makes it consistent with other send_*_event() functions
and will make it easier/cleaner to add an option to aggregate the RTT
instead of sending it.

Signed-off-by: Simon Sundberg <simon.sundberg@kau.se>
This commit is contained in:
Simon Sundberg
2022-09-27 13:46:34 +02:00
parent 2578b819d8
commit 22ac4d9192
1 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
pping/pping_kern.c
View File

@@ -703,6 +703,27 @@ static void send_map_full_event(void *ctx, struct packet_info *p_info,
bpf_perf_event_output(ctx, &events, BPF_F_CURRENT_CPU, &me, sizeof(me)); bpf_perf_event_output(ctx, &events, BPF_F_CURRENT_CPU, &me, sizeof(me));
} }
static void send_rtt_event(void *ctx, __u64 rtt, struct flow_state *f_state,
struct packet_info *p_info)
{
struct rtt_event re = {
.event_type = EVENT_TYPE_RTT,
.timestamp = p_info->time,
.flow = p_info->pid.flow,
.padding = 0,
.rtt = rtt,
.min_rtt = f_state->min_rtt,
.sent_pkts = f_state->sent_pkts,
.sent_bytes = f_state->sent_bytes,
.rec_pkts = f_state->rec_pkts,
.rec_bytes = f_state->rec_bytes,
.match_on_egress = !p_info->is_ingress,
.reserved = { 0 },
};
bpf_perf_event_output(ctx, &events, BPF_F_CURRENT_CPU, &re, sizeof(re));
}
/* /*
* Initilizes an "empty" flow state based on the forward direction of the * Initilizes an "empty" flow state based on the forward direction of the
* current packet * current packet
@@ -949,7 +970,7 @@ static void pping_timestamp_packet(struct flow_state *f_state, void *ctx,
static void pping_match_packet(struct flow_state *f_state, void *ctx, static void pping_match_packet(struct flow_state *f_state, void *ctx,
struct packet_info *p_info) struct packet_info *p_info)
{ {
struct rtt_event re = { 0 }; __u64 rtt;
__u64 *p_ts; __u64 *p_ts;
if (!is_flowstate_active(f_state) || !p_info->reply_pid_valid) if (!is_flowstate_active(f_state) || !p_info->reply_pid_valid)
@@ -962,7 +983,7 @@ static void pping_match_packet(struct flow_state *f_state, void *ctx,
if (!p_ts || p_info->time < *p_ts) if (!p_ts || p_info->time < *p_ts)
return; return;
re.rtt = p_info->time - *p_ts; rtt = p_info->time - *p_ts;
// Delete timestamp entry as soon as RTT is calculated // Delete timestamp entry as soon as RTT is calculated
if (bpf_map_delete_elem(&packet_ts, &p_info->reply_pid) == 0) { if (bpf_map_delete_elem(&packet_ts, &p_info->reply_pid) == 0) {
@@ -970,21 +991,11 @@ static void pping_match_packet(struct flow_state *f_state, void *ctx,
debug_increment_autodel(PPING_MAP_PACKETTS); debug_increment_autodel(PPING_MAP_PACKETTS);
} }
if (f_state->min_rtt == 0 || re.rtt < f_state->min_rtt) if (f_state->min_rtt == 0 || rtt < f_state->min_rtt)
f_state->min_rtt = re.rtt; f_state->min_rtt = rtt;
f_state->srtt = calculate_srtt(f_state->srtt, re.rtt); f_state->srtt = calculate_srtt(f_state->srtt, rtt);
// Fill event and push to perf-buffer send_rtt_event(ctx, rtt, f_state, p_info);
re.event_type = EVENT_TYPE_RTT;
re.timestamp = p_info->time;
re.min_rtt = f_state->min_rtt;
re.sent_pkts = f_state->sent_pkts;
re.sent_bytes = f_state->sent_bytes;
re.rec_pkts = f_state->rec_pkts;
re.rec_bytes = f_state->rec_bytes;
re.flow = p_info->pid.flow;
re.match_on_egress = !p_info->is_ingress;
bpf_perf_event_output(ctx, &events, BPF_F_CURRENT_CPU, &re, sizeof(re));
} }
/* /*