1berry/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MINOR: mux-quic: adjust Rx data consumption API

Browse Source 
HTTP/3 data are converted into HTX via qcc_decode_qcs() function. On
completion, these data are removed from QCS Rx buffer via qcs_consume().

This patch adjust qcs_consume() API with several changes. Firstly, the
Rx buffer instance to operate on must now be specified as a new argument
to the function. Secondly, buffer liberation when all data were removed
from qcs_consume() is extracted up to qcc_decode_qcs() caller.

No functional change with this patch. The objective is to have an API
which can be better adapted to multiple Rx buffers per QCS instance.
This commit is contained in:
Amaury Denoyelle 2025-03-04 15:23:28 +01:00
parent a4f31ffeeb
commit 6b5607d66f
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/mux_quic.c
View File

@ -1114,28 +1114,30 @@ static ncb_sz_t qcs_rx_avail_data(struct qcs *qcs)
return b ? ncb_data(&b->ncb, 0) : 0; return b ? ncb_data(&b->ncb, 0) : 0;
} }
/* Remove <bytes> from <qcs> Rx buffer. Flow-control for received offsets may /* Remove <bytes> from <buf> current Rx buffer of <qcs> stream. Flow-control
* be allocated for the peer if needed. * for received offsets may be allocated for the peer if needed.
*/ */
static void qcs_consume(struct qcs *qcs, uint64_t bytes) static void qcs_consume(struct qcs *qcs, uint64_t bytes, struct qc_stream_rxbuf *buf)
{ {
struct qcc *qcc = qcs->qcc; struct qcc *qcc = qcs->qcc;
struct quic_frame *frm; struct quic_frame *frm;
struct qc_stream_rxbuf *rxbuf;
enum ncb_ret ret; enum ncb_ret ret;
TRACE_ENTER(QMUX_EV_QCS_RECV, qcc->conn, qcs); TRACE_ENTER(QMUX_EV_QCS_RECV, qcc->conn, qcs);
rxbuf = qcs_get_curr_rxbuf(qcs); /* <buf> must be current QCS Rx buffer. */
ret = ncb_advance(&rxbuf->ncb, bytes); BUG_ON_HOT(buf->off_node.key > qcs->rx.offset ||
qcs->rx.offset >= buf->off_end);
ret = ncb_advance(&buf->ncb, bytes);
if (ret) { if (ret) {
ABORT_NOW(); /* should not happens because removal only in data */ ABORT_NOW(); /* should not happens because removal only in data */
} }
if (ncb_is_empty(&rxbuf->ncb))
qcs_free_rxbuf(qcs, rxbuf);
qcs->rx.offset += bytes; qcs->rx.offset += bytes;
/* QCS Rx offset must only point directly up to the next buffer. */
BUG_ON_HOT(qcs->rx.offset > buf->off_end);
/* Not necessary to emit a MAX_STREAM_DATA if all data received. */ /* Not necessary to emit a MAX_STREAM_DATA if all data received. */
if (qcs->flags & QC_SF_SIZE_KNOWN) if (qcs->flags & QC_SF_SIZE_KNOWN)
goto conn_fctl; goto conn_fctl;
@ -1223,8 +1225,14 @@ static int qcc_decode_qcs(struct qcc *qcc, struct qcs *qcs)
ret = b_data(&b); ret = b_data(&b);
} }
if (rxbuf) {
if (ret) if (ret)
qcs_consume(qcs, ret); qcs_consume(qcs, ret, rxbuf);
if (ncb_is_empty(&rxbuf->ncb))
qcs_free_rxbuf(qcs, rxbuf);
}
if (ret || (!b_data(&b) && fin)) if (ret || (!b_data(&b) && fin))
qcs_notify_recv(qcs); qcs_notify_recv(qcs);