MAJOR: mux_quic: open bwnd earlier on FIN sent

Author: a-denoyelle

include/haproxy/quic_stream-t.h

@@ -25,6 +25,7 @@ struct qc_stream_buf {
 
 #define QC_SD_FL_RELEASE	0x00000001 /* set when MUX has finished to use this stream */
 #define QC_SD_FL_WAIT_FOR_FIN	0x00000002 /* set if sent FIN is waiting for acknowledgement */
+#define QC_SD_FL_FINALIZED	0x00000004
 
 /* QUIC STREAM descriptor.
  *

include/haproxy/quic_stream.h

@@ -21,6 +21,7 @@ struct buffer *qc_stream_buf_alloc(struct qc_stream_desc *stream,
                                    uint64_t offset, int small);
 struct buffer *qc_stream_buf_realloc(struct qc_stream_desc *stream);
 void qc_stream_buf_release(struct qc_stream_desc *stream);
+void qc_stream_buf_finalize(struct qc_stream_desc *stream);
 
 /* Returns true if nothing to ack yet for stream <s> including FIN bit. */
 static inline int qc_stream_desc_done(const struct qc_stream_desc *s)

src/mux_quic.c

@@ -696,11 +696,12 @@ static void qcm_ctrl_send(struct qc_stream_desc *stream, uint64_t data, uint64_t
 			            QMUX_EV_QCS_SEND, qcc->conn, qcs);
 		}
 		/* Release buffer if everything sent and buf is full or stream is waiting for room. */
-		if (!qcs_prep_bytes(qcs) &&
-		    (b_full(&qcs->tx.stream->buf->buf) || qcs->flags & QC_SF_BLK_MROOM)) {
-			qc_stream_buf_release(qcs->tx.stream);
-			qcs->flags &= ~QC_SF_BLK_MROOM;
-			qcs_notify_send(qcs);
+		if (!qcs_prep_bytes(qcs)) {
+			if (b_full(&qcs->tx.stream->buf->buf) || qcs->flags & QC_SF_BLK_MROOM) {
+				qc_stream_buf_release(qcs->tx.stream);
+				qcs->flags &= ~QC_SF_BLK_MROOM;
+				qcs_notify_send(qcs);
+			}
 		}
 
 		/* Add measurement for send rate. This is done at the MUX layer
@@ -4471,6 +4472,7 @@ static size_t qcm_strm_snd_buf(struct stconn *sc, struct buffer *buf,
 	if (fin) {
 		TRACE_STATE("reached stream fin", QMUX_EV_STRM_SEND, qcs->qcc->conn, qcs);
 		qcs->flags |= QC_SF_FIN_STREAM;
+		qc_stream_buf_finalize(qcs->tx.stream);
 	}
 
 	if (ret || fin) {
@@ -4589,6 +4591,7 @@ static size_t qcm_strm_done_ff(struct stconn *sc)
 	if (sd->iobuf.flags & IOBUF_FL_EOI) {
 		TRACE_STATE("reached stream fin", QMUX_EV_STRM_SEND, qcs->qcc->conn, qcs);
 		qcs->flags |= QC_SF_FIN_STREAM;
+		qc_stream_buf_finalize(qcs->tx.stream);
 	}
 
 	if (!(qcs->flags & QC_SF_FIN_STREAM) && !sd->iobuf.data) {

src/quic_stream.c

@@ -27,7 +27,7 @@ static void qc_stream_buf_free(struct qc_stream_desc *stream,
 
 	eb64_delete(&(*stream_buf)->offset_node);
 
-	if (*stream_buf == stream->buf) {
+	if (*stream_buf == stream->buf && !(stream->flags & QC_SD_FL_FINALIZED)) {
 		/* Reset current buffer ptr. */
 		stream->buf = NULL;
 		room = b_size(buf);
@@ -130,7 +130,7 @@ void qc_stream_desc_release(struct qc_stream_desc *stream,
 		 */
 		if (!b_data(buf))
 			qc_stream_buf_free(stream, &stream_buf);
-		else
+		else if (!(stream->flags & QC_SD_FL_FINALIZED))
 			qc_stream_buf_release(stream);
 	}
 
@@ -231,8 +231,10 @@ static int qc_stream_buf_store_ack(struct qc_stream_buf *buf,
 	}
 
 	buf->room += newly_acked;
-	if (stream->notify_room && qc_stream_buf_is_released(buf, stream))
+	if (stream->notify_room &&
+	    (qc_stream_buf_is_released(buf, stream) || stream->flags & QC_SD_FL_FINALIZED)) {
 		stream->notify_room(stream, newly_acked);
+	}
 
  end:
 	return newly_acked;
@@ -262,7 +264,8 @@ static struct qc_stream_buf *qc_stream_buf_ack(struct qc_stream_buf *buf,
 		bdata_ctr_del(&stream->data, diff);
 
 		/* notify room from acked data if buffer has been released. */
-		if (stream->notify_room && qc_stream_buf_is_released(buf, stream)) {
+		if (stream->notify_room &&
+		    (qc_stream_buf_is_released(buf, stream) || stream->flags & QC_SD_FL_FINALIZED)) {
 			if (diff >= buf->room) {
 				diff -= buf->room;
 				buf->room = 0;
@@ -516,6 +519,8 @@ void qc_stream_buf_release(struct qc_stream_desc *stream)
 	/* current buffer already released */
 	BUG_ON(!stream->buf);
 
+	BUG_ON(stream->flags & QC_SD_FL_FINALIZED);
+
 	room = b_room(&stream->buf->buf) + stream->buf->room;
 	stream->buf = NULL;
 	stream->buf_offset = 0;
@@ -526,3 +531,16 @@ void qc_stream_buf_release(struct qc_stream_desc *stream)
 	if (stream->notify_room && room)
 		stream->notify_room(stream, room);
 }
+
+void qc_stream_buf_finalize(struct qc_stream_desc *stream)
+{
+	uint64_t room;
+
+	/* current buffer already released */
+	BUG_ON(!stream->buf);
+
+	room = b_room(&stream->buf->buf) + stream->buf->room;
+	if (stream->notify_room && room)
+		stream->notify_room(stream, room);
+	stream->flags |= QC_SD_FL_FINALIZED;
+}