WIP: quic: quic_cc modifications for BBR

Author: haproxyFred

include/haproxy/quic_cc-t.h

@@ -31,6 +31,7 @@
 
 #include <haproxy/buf-t.h>
 #include <haproxy/quic_loss-t.h>
+#include <haproxy/quic_tx-t.h>
 
 #define QUIC_CC_INFINITE_SSTHESH ((uint32_t)-1)
 
@@ -70,7 +71,9 @@ struct quic_cc_event {
 		struct ack {
 			uint64_t acked;
 			uint64_t pn;
+			unsigned int bytes_lost;
 			unsigned int time_sent;
+			unsigned int rtt;
 		} ack;
 		struct loss {
 			unsigned int time_sent;
@@ -90,7 +93,7 @@ struct quic_cc {
 	/* <conn> is there only for debugging purpose. */
 	struct quic_conn *qc;
 	struct quic_cc_algo *algo;
-	uint32_t priv[116];
+	uint32_t priv[158];
 };
 
 struct quic_cc_path {
@@ -119,6 +122,7 @@ struct quic_cc_path {
 	uint64_t ifae_pkts;
 	uint64_t delivery_rate; /* bytes per second */
 	size_t send_quantum;
+	uint32_t recovery_start_ts;
 };
 
 struct quic_cc_algo {
@@ -129,6 +133,16 @@ struct quic_cc_algo {
 	void (*state_trace)(struct buffer *buf, const struct quic_cc *cc);
 	void (*state_cli)(struct buffer *buf, const struct quic_cc_path *path);
 	void (*hystart_start_round)(struct quic_cc *cc, uint64_t pn);
+	struct quic_cc_drs *(*get_drs)(struct quic_cc *cc);
+	void (*on_transmit)(struct quic_cc *cc);
+	void (*drs_on_transmit)(struct quic_cc *cc, struct quic_tx_packet *pkt);
+	void (*on_ack_rcvd)(struct quic_cc *cc, uint32_t acked, uint32_t delivered,
+	                    uint32_t ack_rtt, uint32_t bytes_lost,
+	                    unsigned int largest_pkt_sent_ts);
+	void (*on_pkt_lost)(struct quic_cc *cc,
+	                    struct quic_tx_packet *pkt, uint32_t lost_bytes);
+	void (*congestion_event)(struct quic_cc *cc, uint32_t ts);
+	unsigned long long (*pacing_delay_ns)(const struct quic_cc *cc, int *max_dgram);
 };
 
 #endif /* USE_QUIC */

include/haproxy/quic_cc.h

@@ -35,6 +35,7 @@
 
 void quic_cc_init(struct quic_cc *cc, struct quic_cc_algo *algo, struct quic_conn *qc);
 void quic_cc_event(struct quic_cc *cc, struct quic_cc_event *ev);
+unsigned long long quic_cc_pacing_delay_ns(const struct quic_cc *cc, int *max_dgram);
 void quic_cc_state_trace(struct buffer *buf, const struct quic_cc *cc);
 
 static inline const char *quic_cc_state_str(enum quic_cc_algo_state_type state)
@@ -95,7 +96,8 @@ static inline void quic_cc_path_init(struct quic_cc_path *path, int ipv4, unsign
 	path->ifae_pkts = 0;
 	quic_cc_init(&path->cc, algo, qc);
 	path->delivery_rate = 0;
-	path->send_quantum = path->mtu * 10;
+	path->send_quantum = 64 * 1024;
+	path->recovery_start_ts = TICK_ETERNITY;
 }
 
 /* Return the remaining <room> available on <path> QUIC path for prepared data

src/quic_cc.c

@@ -21,6 +21,7 @@
  */
 
 #include <haproxy/quic_cc.h>
+#include <haproxy/quic_pacing.h>
 
 struct quic_cc_algo *default_quic_cc_algo = &quic_cc_algo_cubic;
 
@@ -40,7 +41,18 @@ void quic_cc_init(struct quic_cc *cc,
 /* Send <ev> event to <cc> congestion controller. */
 void quic_cc_event(struct quic_cc *cc, struct quic_cc_event *ev)
 {
-	cc->algo->event(cc, ev);
+	if (cc->algo->event)
+		cc->algo->event(cc, ev);
+}
+
+unsigned long long quic_cc_pacing_delay_ns(const struct quic_cc *cc, int *max_dgram)
+{
+	int ns_pkts;
+
+	ns_pkts = quic_pacing_ns_pkt(&cc->qc->qcc->tx.pacer);
+	*max_dgram = global.tune.quic_frontend_max_tx_burst * 1000000 / (ns_pkts + 1) + 1;
+
+	return ns_pkts;
 }
 
 void quic_cc_state_trace(struct buffer *buf, const struct quic_cc *cc)

src/quic_cc_cubic.c

@@ -678,6 +678,7 @@ struct quic_cc_algo quic_cc_algo_cubic = {
 	.event       = quic_cc_cubic_event,
 	.slow_start  = quic_cc_cubic_slow_start,
 	.hystart_start_round = quic_cc_cubic_hystart_start_round,
+	.pacing_delay_ns = quic_cc_pacing_delay_ns,
 	.state_trace = quic_cc_cubic_state_trace,
 	.state_cli   = quic_cc_cubic_state_cli,
 };

src/quic_cc_newreno.c

@@ -220,6 +220,7 @@ struct quic_cc_algo quic_cc_algo_nr = {
 	.event       = quic_cc_nr_event,
 	.slow_start  = quic_cc_nr_slow_start,
 	.hystart_start_round = quic_cc_nr_hystart_start_round,
+	.pacing_delay_ns = quic_cc_pacing_delay_ns,
 	.state_trace = quic_cc_nr_state_trace,
 };