MAJOR: mux_quic: release bidi stream only when all sent data is ACKed

Author: a-denoyelle

include/haproxy/mux_quic.h

@@ -53,6 +53,7 @@ int qcc_recv_max_stream_data(struct qcc *qcc, uint64_t id, uint64_t max);
 int qcc_recv_max_streams(struct qcc *qcc, uint64_t max, int bidi);
 int qcc_recv_reset_stream(struct qcc *qcc, uint64_t id, uint64_t err, uint64_t final_size);
 int qcc_recv_stop_sending(struct qcc *qcc, uint64_t id, uint64_t err);
+int qcc_release_remote_stream(struct qcc *qcc, uint64_t id);
 
 static inline int qcm_stream_rx_bufsz(void)
 {

src/mux_quic.c

@@ -118,6 +118,8 @@ static void qcs_free(struct qcs *qcs)
 	}
 	else if (!conn_is_quic(qcc->conn)) {
 		b_free(&qcs->tx.qmux_buf);
+		if (quic_stream_is_remote(qcc, qcs->id))
+			qcc_release_remote_stream(qcc, qcs->id);
 	}
 
 	/* Free Rx buffer. */
@@ -2480,7 +2482,7 @@ int qcc_recv_stop_sending(struct qcc *qcc, uint64_t id, uint64_t err)
 /* Signal the closing of remote stream with id <id>. Flow-control for new
  * streams may be allocated for the peer if needed.
  */
-static int qcc_release_remote_stream(struct qcc *qcc, uint64_t id)
+int qcc_release_remote_stream(struct qcc *qcc, uint64_t id)
 {
 	struct quic_frame *frm;
 	uint64_t conn_max, rem, non_extra, inc;
@@ -2574,7 +2576,6 @@ static void qcs_destroy(struct qcs *qcs)
 {
 	struct qcc *qcc = qcs->qcc;
 	struct connection *conn = qcc->conn;
-	const uint64_t id = qcs->id;
 
 	TRACE_ENTER(QMUX_EV_QCS_END, conn, qcs);
 
@@ -2583,9 +2584,6 @@ static void qcs_destroy(struct qcs *qcs)
 		 * to ensure consistency on connection flow-control calculation.
 		 */
 		BUG_ON(qcs->tx.fc.off_soft != qcs->tx.fc.off_real);
-
-		if (quic_stream_is_remote(qcc, id))
-			qcc_release_remote_stream(qcc, id);
 	}
 
 	qcs_free(qcs);

src/quic_stream.c

@@ -419,6 +419,9 @@ void qc_stream_desc_free(struct qc_stream_desc *stream, int closing)
 		++free_count;
 	}
 
+	if (stream->ctx && quic_stream_is_remote(stream->ctx, stream->by_id.key))
+		qcc_release_remote_stream(stream->ctx, stream->by_id.key);
+
 	if (free_count)
 		offer_buffers(NULL, free_count);