mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-22 14:21:25 +02:00
Code Issues Projects Releases Wiki Activity

MEDIUM: mux-quic: defer stream shut if remaining tx data

Browse Source 
Defer the shutting of a qcs if there is still data in its tx buffers. In
this case, the conn_stream is closed but the qcs is kept with a new flag
QC_SF_DETACH.

On ACK reception, the xprt wake up the shut_tl tasklet if the stream is
flagged with QC_SF_DETACH. This tasklet is responsible to free the qcs
and possibly the qcc when all bidirectional streams are removed.
This commit is contained in:
Amaury Denoyelle 2021-10-08 17:57:41 +02:00
parent ac8ee25659
commit cae0791942
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/haproxy/mux_quic-t.h
View File

@ -202,6 +202,7 @@ enum qcs_tx_st {
#define QC_SF_KILL_CONN 0x00020000 // kill the whole connection with this stream #define QC_SF_KILL_CONN 0x00020000 // kill the whole connection with this stream
#define QC_SF_FIN_STREAM 0x00040000 // FIN bit must be set for last frame of the stream #define QC_SF_FIN_STREAM 0x00040000 // FIN bit must be set for last frame of the stream
#define QC_SF_DETACH 0x00080000
/* QUIC stream descriptor, describing the stream as it appears in the QUIC_CONN, and as /* QUIC stream descriptor, describing the stream as it appears in the QUIC_CONN, and as
* it is being processed in the internal HTTP representation (HTX). * it is being processed in the internal HTTP representation (HTX).

10
src/mux_quic.c
View File

@ -1564,9 +1564,16 @@ static void qc_detach(struct conn_stream *cs)
struct qcc *qcc = qcs->qcc; struct qcc *qcc = qcs->qcc;
TRACE_ENTER(QC_EV_STRM_END, qcs ? qcs->qcc->conn : NULL, qcs); TRACE_ENTER(QC_EV_STRM_END, qcs ? qcs->qcc->conn : NULL, qcs);
if (b_data(&qcs->tx.buf) || b_data(&qcs->tx.xprt_buf)) {
qcs->flags |= QC_SF_DETACH;
goto out;
}
qcs_destroy(qcs); qcs_destroy(qcs);
if (qcc_is_dead(qcc)) if (qcc_is_dead(qcc))
qc_release(qcc); qc_release(qcc);
out:
TRACE_LEAVE(QC_EV_STRM_END, qcs ? qcs->qcc->conn : NULL); TRACE_LEAVE(QC_EV_STRM_END, qcs ? qcs->qcc->conn : NULL);
} }
@ -1603,7 +1610,8 @@ static struct task *qc_deferred_shut(struct task *t, void *ctx, unsigned int sta
TRACE_ENTER(QC_EV_STRM_SHUT, qcc->conn, qcs); TRACE_ENTER(QC_EV_STRM_SHUT, qcc->conn, qcs);
if (qcs->flags & QC_SF_NOTIFIED) { if (qcs->flags & QC_SF_NOTIFIED ||
(b_data(&qcs->tx.buf) || b_data(&qcs->tx.xprt_buf))) {
/* some data processing remains to be done first */ /* some data processing remains to be done first */
goto end; goto end;
} }

3
src/xprt_quic.c
View File

@ -1210,6 +1210,9 @@ static inline void qc_treat_acked_tx_frm(struct quic_frame *frm,
eb64_insert(&qcs->tx.acked_frms, &strm->offset); eb64_insert(&qcs->tx.acked_frms, &strm->offset);
} }
stream_acked |= qcs_try_to_consume(qcs); stream_acked |= qcs_try_to_consume(qcs);
if (qcs->flags & QC_SF_DETACH)
tasklet_wakeup(qcs->shut_tl);
} }
break; break;
default: default: