RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-04-26 12:58:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: h3: adjust zero-copy sending related code

Browse Source 
Adjust HTTP/3 data emission. First, add HTX as argument to the function
as this is used for other frames emission function. Keep the buffer
argument as this is mandatory for zero-copy. Extend comments related to
this, in particular to explain purposes of both HTX and buffer
arguments.

No function change here. This should however be useful to port a code
equivalent to hq-interop protocol.
This commit is contained in:
Amaury Denoyelle 2023-12-08 15:48:06 +01:00
parent 0e632fc9b4
commit d3987b69c3
1 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/h3.c
View File

@ -1737,10 +1737,17 @@ static int h3_resp_trailers_send(struct qcs *qcs, struct htx *htx)
return 0; return 0;
} }
/* Returns the total of bytes sent. */ /* Convert a series of HTX data blocks from <htx> buffer of size <count> into
static int h3_resp_data_send(struct qcs *qcs, struct buffer *buf, size_t count) * HTTP/3 frames encoded into <qcs> Tx buffer. The caller must also specify the
* underlying HTX area via <buf> as this will be used if zero-copy can be
* performed.
*
* Returns the total bytes of encoded HTTP/3 payload. This corresponds to the
* total bytes of HTX block removed.
*/
static int h3_resp_data_send(struct qcs *qcs, struct htx *htx,
struct buffer *buf, size_t count)
{ {
struct htx *htx;
struct buffer outbuf; struct buffer outbuf;
struct buffer *res; struct buffer *res;
size_t total = 0; size_t total = 0;
@ -1750,8 +1757,6 @@ static int h3_resp_data_send(struct qcs *qcs, struct buffer *buf, size_t count)
TRACE_ENTER(H3_EV_TX_FRAME|H3_EV_TX_DATA, qcs->qcc->conn, qcs); TRACE_ENTER(H3_EV_TX_FRAME|H3_EV_TX_DATA, qcs->qcc->conn, qcs);
htx = htx_from_buf(buf);
new_frame: new_frame:
if (!count || htx_is_empty(htx)) if (!count || htx_is_empty(htx))
goto end; goto end;
@ -1770,6 +1775,10 @@ static int h3_resp_data_send(struct qcs *qcs, struct buffer *buf, size_t count)
/* TODO */ /* TODO */
} }
/* If HTX contains only one DATA block, try to exchange it with MUX
* buffer to perform zero-copy. This is only achievable if MUX buffer
* is currently empty.
*/
if (unlikely(fsize == count && if (unlikely(fsize == count &&
!b_data(res) && !b_data(res) &&
htx_nbblks(htx) == 1 && type == HTX_BLK_DATA)) { htx_nbblks(htx) == 1 && type == HTX_BLK_DATA)) {
@ -1778,19 +1787,20 @@ static int h3_resp_data_send(struct qcs *qcs, struct buffer *buf, size_t count)
TRACE_DATA("perform zero-copy DATA transfer", TRACE_DATA("perform zero-copy DATA transfer",
H3_EV_TX_FRAME|H3_EV_TX_DATA, qcs->qcc->conn, qcs); H3_EV_TX_FRAME|H3_EV_TX_DATA, qcs->qcc->conn, qcs);
/* map an H2 frame to the HTX block so that we can put the /* remap MUX buffer to HTX area, keep an offset for H3 header. */
* frame header there. *res = b_make(buf->area, buf->size,
*/ sizeof(struct htx) + blk->addr - hsize, 0);
*res = b_make(buf->area, buf->size, sizeof(struct htx) + blk->addr - hsize, fsize + hsize);
outbuf = b_make(b_head(res), hsize, 0, 0);
b_putchr(&outbuf, 0x00); /* h3 frame type = DATA */
b_quic_enc_int(&outbuf, fsize, QUIC_VARINT_MAX_SIZE); /* h3 frame length */
/* and exchange with our old area */ /* write H3 header frame before old HTX block. */
b_putchr(res, 0x00); /* h3 frame type = DATA */
b_quic_enc_int(res, fsize, QUIC_VARINT_MAX_SIZE); /* h3 frame length */
b_add(res, fsize);
/* assign old MUX area to HTX buffer. */
buf->area = old_area; buf->area = old_area;
buf->data = buf->head = 0; buf->data = buf->head = 0;
total += fsize; total += fsize;
fsize = 0;
goto end; goto end;
} }
@ -1877,9 +1887,11 @@ static size_t h3_snd_buf(struct qcs *qcs, struct buffer *buf, size_t count)
break; break;
case HTX_BLK_DATA: case HTX_BLK_DATA:
ret = h3_resp_data_send(qcs, buf, count); ret = h3_resp_data_send(qcs, htx, buf, count);
if (ret > 0) { if (ret > 0) {
/* Reload HTX. This is necessary if 0-copy was performed. */
htx = htx_from_buf(buf); htx = htx_from_buf(buf);
total += ret; total += ret;
count -= ret; count -= ret;
if (ret < bsize) if (ret < bsize)