mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-07 23:56:57 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: mux-quic: define STREAM frames list in qcc

Browse Source
This commit is contained in:
Amaury Denoyelle 2024-10-16 17:28:48 +02:00
parent 66ed250558
commit 34868a3015
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,6 +68,7 @@ struct qcc {
struct { struct {
struct quic_fctl fc; /* stream flow control applied on sending */ struct quic_fctl fc; /* stream flow control applied on sending */
uint64_t buf_in_flight; /* sum of currently allocated Tx buffer sizes */ uint64_t buf_in_flight; /* sum of currently allocated Tx buffer sizes */
struct list frms; /* prepared STREAM frames */
} tx; } tx;
uint64_t largest_bidi_r; /* largest remote bidi stream ID opened. */ uint64_t largest_bidi_r; /* largest remote bidi stream ID opened. */

16
src/mux_quic.c
View File

@ -2243,7 +2243,6 @@ static int qcs_send(struct qcs *qcs, struct list *frms, uint64_t window_conn)
*/ */
static int qcc_io_send(struct qcc *qcc) static int qcc_io_send(struct qcc *qcc)
{ {
struct list frms = LIST_HEAD_INIT(frms);
/* Temporary list for QCS on error. */ /* Temporary list for QCS on error. */
struct list qcs_failed = LIST_HEAD_INIT(qcs_failed); struct list qcs_failed = LIST_HEAD_INIT(qcs_failed);
struct qcs *qcs, *qcs_tmp, *first_qcs = NULL; struct qcs *qcs, *qcs_tmp, *first_qcs = NULL;
@ -2337,7 +2336,7 @@ static int qcc_io_send(struct qcc *qcc)
if (!qfctl_rblocked(&qcc->tx.fc) && if (!qfctl_rblocked(&qcc->tx.fc) &&
!qfctl_rblocked(&qcs->tx.fc) && window_conn > total) { !qfctl_rblocked(&qcs->tx.fc) && window_conn > total) {
if ((ret = qcs_send(qcs, &frms, window_conn - total)) < 0) { if ((ret = qcs_send(qcs, &qcc->tx.frms, window_conn - total)) < 0) {
/* Temporarily remove QCS from send-list. */ /* Temporarily remove QCS from send-list. */
LIST_DEL_INIT(&qcs->el_send); LIST_DEL_INIT(&qcs->el_send);
LIST_APPEND(&qcs_failed, &qcs->el_send); LIST_APPEND(&qcs_failed, &qcs->el_send);
@ -2361,7 +2360,7 @@ static int qcc_io_send(struct qcc *qcc)
/* Retry sending until no frame to send, data rejected or connection /* Retry sending until no frame to send, data rejected or connection
* flow-control limit reached. * flow-control limit reached.
*/ */
while (qcc_send_frames(qcc, &frms) == 0 && !qfctl_rblocked(&qcc->tx.fc)) { while (qcc_send_frames(qcc, &qcc->tx.frms) == 0 && !qfctl_rblocked(&qcc->tx.fc)) {
window_conn = qfctl_rcap(&qcc->tx.fc); window_conn = qfctl_rcap(&qcc->tx.fc);
resent = 0; resent = 0;
@ -2379,7 +2378,7 @@ static int qcc_io_send(struct qcc *qcc)
BUG_ON(resent > window_conn); BUG_ON(resent > window_conn);
if (!qfctl_rblocked(&qcs->tx.fc) && window_conn > resent) { if (!qfctl_rblocked(&qcs->tx.fc) && window_conn > resent) {
if ((ret = qcs_send(qcs, &frms, window_conn - resent)) < 0) { if ((ret = qcs_send(qcs, &qcc->tx.frms, window_conn - resent)) < 0) {
LIST_DEL_INIT(&qcs->el_send); LIST_DEL_INIT(&qcs->el_send);
LIST_APPEND(&qcs_failed, &qcs->el_send); LIST_APPEND(&qcs_failed, &qcs->el_send);
continue; continue;
@ -2393,10 +2392,10 @@ static int qcc_io_send(struct qcc *qcc)
sent_done: sent_done:
/* Deallocate frames that the transport layer has rejected. */ /* Deallocate frames that the transport layer has rejected. */
if (!LIST_ISEMPTY(&frms)) { if (!LIST_ISEMPTY(&qcc->tx.frms)) {
struct quic_frame *frm, *frm2; struct quic_frame *frm, *frm2;
list_for_each_entry_safe(frm, frm2, &frms, list) list_for_each_entry_safe(frm, frm2, &qcc->tx.frms, list)
qc_frm_free(qcc->conn->handle.qc, &frm); qc_frm_free(qcc->conn->handle.qc, &frm);
} }
@ -2717,6 +2716,10 @@ static void qcc_release(struct qcc *qcc)
struct quic_frame *frm = LIST_ELEM(qcc->lfctl.frms.n, struct quic_frame *, list); struct quic_frame *frm = LIST_ELEM(qcc->lfctl.frms.n, struct quic_frame *, list);
qc_frm_free(qcc->conn->handle.qc, &frm); qc_frm_free(qcc->conn->handle.qc, &frm);
} }
while (!LIST_ISEMPTY(&qcc->tx.frms)) {
struct quic_frame *frm = LIST_ELEM(qcc->tx.frms.n, struct quic_frame *, list);
qc_frm_free(qcc->conn->handle.qc, &frm);
}
if (qcc->app_ops && qcc->app_ops->release) if (qcc->app_ops && qcc->app_ops->release)
qcc->app_ops->release(qcc->ctx); qcc->app_ops->release(qcc->ctx);
@ -2831,6 +2834,7 @@ static void _qcc_init(struct qcc *qcc)
qcc->app_ops = NULL; qcc->app_ops = NULL;
qcc->streams_by_id = EB_ROOT_UNIQUE; qcc->streams_by_id = EB_ROOT_UNIQUE;
LIST_INIT(&qcc->lfctl.frms); LIST_INIT(&qcc->lfctl.frms);
LIST_INIT(&qcc->tx.frms);
} }
static int qmux_init(struct connection *conn, struct proxy *prx, static int qmux_init(struct connection *conn, struct proxy *prx,