WIP: quic: quic_loss modifications for BBR

Author: haproxyFred

include/haproxy/quic_loss.h

@@ -85,8 +85,9 @@ struct quic_pktns *quic_pto_pktns(struct quic_conn *qc,
                                   unsigned int *pto);
 
 void qc_packet_loss_lookup(struct quic_pktns *pktns, struct quic_conn *qc,
-                           struct list *lost_pkts);
+                           struct list *lost_pkts, uint32_t *bytes_lost);
 int qc_release_lost_pkts(struct quic_conn *qc, struct quic_pktns *pktns,
-                         struct list *pkts, uint64_t now_us);
+                         struct list *pkts, uint64_t now_us,
+                         unsigned int *largest_pkt_sent_ts);
 #endif /* USE_QUIC */
 #endif /* _PROTO_QUIC_LOSS_H */

src/quic_conn.c

@@ -931,10 +931,10 @@ struct task *qc_process_timer(struct task *task, void *ctx, unsigned int state)
 	if (tick_isset(pktns->tx.loss_time)) {
 		struct list lost_pkts = LIST_HEAD_INIT(lost_pkts);
 
-		qc_packet_loss_lookup(pktns, qc, &lost_pkts);
+		qc_packet_loss_lookup(pktns, qc, &lost_pkts, NULL);
 		if (!LIST_ISEMPTY(&lost_pkts))
 		    tasklet_wakeup(qc->wait_event.tasklet);
-		if (qc_release_lost_pkts(qc, pktns, &lost_pkts, now_ms))
+		if (qc_release_lost_pkts(qc, pktns, &lost_pkts, now_ms, NULL))
 			qc_set_timer(qc);
 		goto out;
 	}

src/quic_loss.c

@@ -1,5 +1,6 @@
 #include <import/eb64tree.h>
 
+#include <haproxy/quic_cc-t.h>
 #include <haproxy/quic_conn-t.h>
 #include <haproxy/quic_loss.h>
 #include <haproxy/quic_tls.h>
@@ -151,7 +152,7 @@ struct quic_pktns *quic_pto_pktns(struct quic_conn *qc,
  * Always succeeds.
  */
 void qc_packet_loss_lookup(struct quic_pktns *pktns, struct quic_conn *qc,
-                           struct list *lost_pkts)
+                           struct list *lost_pkts, uint32_t *bytes_lost)
 {
 	struct eb_root *pkts;
 	struct eb64_node *node;
@@ -213,8 +214,14 @@ void qc_packet_loss_lookup(struct quic_pktns *pktns, struct quic_conn *qc,
 			ql->nb_reordered_pkt++;
 
 		if (tick_is_le(loss_time_limit, now_ms) || reordered) {
+			struct quic_cc *cc = &qc->path->cc;
+
+			if (cc->algo->on_pkt_lost)
+				cc->algo->on_pkt_lost(cc, pkt, pkt->rs.lost);
 			eb64_delete(&pkt->pn_node);
 			LIST_APPEND(lost_pkts, &pkt->list);
+			if (bytes_lost)
+				*bytes_lost += pkt->len;
 			ql->nb_lost_pkt++;
 		}
 		else {
@@ -239,7 +246,8 @@ void qc_packet_loss_lookup(struct quic_pktns *pktns, struct quic_conn *qc,
  * CONNECTION_CLOSE was prepared to close the connection ASAP.
  */
 int qc_release_lost_pkts(struct quic_conn *qc, struct quic_pktns *pktns,
-                         struct list *pkts, uint64_t now_us)
+                         struct list *pkts, uint64_t now_us,
+						 uint32_t *largest_pkt_sent_ts)
 {
 	struct quic_tx_packet *pkt, *tmp, *oldest_lost, *newest_lost;
 	uint tot_lost = 0;
@@ -276,14 +284,20 @@ int qc_release_lost_pkts(struct quic_conn *qc, struct quic_pktns *pktns,
 
 	if (!close) {
 		if (newest_lost) {
+			struct quic_cc *cc = &qc->path->cc;
 			/* Sent a congestion event to the controller */
 			struct quic_cc_event ev = { };
 
 			ev.type = QUIC_CC_EVT_LOSS;
 			ev.loss.time_sent = newest_lost->time_sent;
 			ev.loss.count = tot_lost;
 
-			quic_cc_event(&qc->path->cc, &ev);
+			quic_cc_event(cc, &ev);
+			if (cc->algo->congestion_event) {
+				if (largest_pkt_sent_ts)
+					*largest_pkt_sent_ts = newest_lost->time_sent;
+			    cc->algo->congestion_event(cc, newest_lost->time_sent);
+			}
 		}
 
 		/* If an RTT have been already sampled, <rtt_min> has been set.
@@ -295,7 +309,8 @@ int qc_release_lost_pkts(struct quic_conn *qc, struct quic_pktns *pktns,
 			unsigned int period = newest_lost->time_sent - oldest_lost->time_sent;
 
 			if (quic_loss_persistent_congestion(&qc->path->loss, period,
-							    now_ms, qc->max_ack_delay))
+							    now_ms, qc->max_ack_delay) &&
+			    qc->path->cc.algo->slow_start)
 				qc->path->cc.algo->slow_start(&qc->path->cc);
 		}
 	}