mirror of
https://passt.top/passt
synced 2025-06-14 03:25:34 +02:00
flow, tcp: Add handling for per-flow timers
tcp_timer() scans the flow table so that it can run tcp_splice_timer() on each spliced connection. More generally, other flow types might want to run similar timers in future. We could add a flow_timer() analagous to tcp_timer(), udp_timer() etc. However, this would need to scan the flow table, which we would have just done in flow_defer_handler(). We'd prefer to just scan the flow table once, dispatching both per-flow deferred events and per-flow timed events if necessary. So, extend flow_defer_handler() to do this. For now we use the same timer interval for all flow types (1s). We can make that more flexible in future if we need to. Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
This commit is contained in:
parent
b43e4483ed
commit
36dfa8b8fb
4 changed files with 21 additions and 12 deletions
16
flow.c
16
flow.c
|
@ -28,6 +28,9 @@ static_assert(ARRAY_SIZE(flow_type_str) == FLOW_NUM_TYPES,
|
|||
/* Global Flow Table */
|
||||
union flow flowtab[FLOW_MAX];
|
||||
|
||||
/* Last time the flow timers ran */
|
||||
static struct timespec flow_timer_run;
|
||||
|
||||
/**
|
||||
* flow_table_compact() - Perform compaction on flow table
|
||||
* @c: Execution context
|
||||
|
@ -86,13 +89,20 @@ void flow_log_(const struct flow_common *f, int pri, const char *fmt, ...)
|
|||
}
|
||||
|
||||
/**
|
||||
* flow_defer_handler() - Handler for per-flow deferred tasks
|
||||
* flow_defer_handler() - Handler for per-flow deferred and timed tasks
|
||||
* @c: Execution context
|
||||
* @now: Current timestamp
|
||||
*/
|
||||
void flow_defer_handler(struct ctx *c)
|
||||
void flow_defer_handler(struct ctx *c, const struct timespec *now)
|
||||
{
|
||||
bool timer = false;
|
||||
union flow *flow;
|
||||
|
||||
if (timespec_diff_ms(now, &flow_timer_run) >= FLOW_TIMER_INTERVAL) {
|
||||
timer = true;
|
||||
flow_timer_run = *now;
|
||||
}
|
||||
|
||||
for (flow = flowtab + c->flow_count - 1; flow >= flowtab; flow--) {
|
||||
switch (flow->f.type) {
|
||||
case FLOW_TCP:
|
||||
|
@ -100,6 +110,8 @@ void flow_defer_handler(struct ctx *c)
|
|||
break;
|
||||
case FLOW_TCP_SPLICE:
|
||||
tcp_splice_flow_defer(c, flow);
|
||||
if (timer)
|
||||
tcp_splice_timer(c, flow);
|
||||
break;
|
||||
default:
|
||||
/* Assume other flow types don't need any handling */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue