From: Frédéric Lécaille <flecaille@haproxy.com>
Date: Wed, 19 Jan 2022 16:29:48 +0000 (+0100)
Subject: MINOR: quic: Release RX Initial packets asap
X-Git-Tag: v2.6-dev1~111
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a6255f53e810a2e89abe2c0064daadcc3bb266f7;p=thirdparty%2Fhaproxy.git

MINOR: quic: Release RX Initial packets asap

This is to free up some space in the RX buffer as soon as possible.
---

diff --git a/src/xprt_quic.c b/src/xprt_quic.c
index c1163bc3a0..e707dfcda3 100644
--- a/src/xprt_quic.c
+++ b/src/xprt_quic.c
@@ -2466,6 +2466,7 @@ static int qc_parse_pkt_frms(struct quic_rx_packet *pkt, struct ssl_sock_ctx *ct
 		    TRACE_PROTO("discarding Initial pktns", QUIC_EV_CONN_PRSHPKT, qc);
 		    quic_pktns_discard(qc->els[QUIC_TLS_ENC_LEVEL_INITIAL].pktns, qc);
 		    qc_set_timer(ctx->qc);
+		    qc_el_rx_pkts_del(&qc->els[QUIC_TLS_ENC_LEVEL_INITIAL]);
 		    if (state < QUIC_HS_ST_SERVER_HANDSHAKE)
 			    HA_ATOMIC_STORE(&qc->state, QUIC_HS_ST_SERVER_HANDSHAKE);
 	    }
@@ -2621,6 +2622,7 @@ static int qc_prep_pkts(struct quic_conn *qc, struct qring *qr,
 			TRACE_PROTO("discarding Initial pktns", QUIC_EV_CONN_PHPKTS, qc);
 			quic_pktns_discard(qc->els[QUIC_TLS_ENC_LEVEL_INITIAL].pktns, qc);
 			qc_set_timer(qc);
+			qc_el_rx_pkts_del(&qc->els[QUIC_TLS_ENC_LEVEL_INITIAL]);
 			HA_ATOMIC_STORE(&qc->state, QUIC_HS_ST_CLIENT_HANDSHAKE);
 		}
 		/* If the data for the current encryption level have all been sent,
@@ -3241,7 +3243,6 @@ struct task *quic_conn_io_cb(struct task *t, void *context, unsigned int state)
 			TRACE_PROTO("discarding Handshake pktns", QUIC_EV_CONN_PHPKTS, qc);
 			quic_pktns_discard(qc->els[QUIC_TLS_ENC_LEVEL_HANDSHAKE].pktns, qc);
 			qc_set_timer(qc);
-			qc_el_rx_pkts_del(&qc->els[QUIC_TLS_ENC_LEVEL_INITIAL]);
 			qc_el_rx_pkts_del(&qc->els[QUIC_TLS_ENC_LEVEL_HANDSHAKE]);
 		}