mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-11-29 23:01:03 +01:00
Code Issues Projects Releases Wiki Activity

OPTIM: ssl: implement dynamic record size adjustment

Browse Source 
By having the stream interface pass the CF_STREAMER flag to the
snd_buf() primitive, we're able to tell the send layer whether
we're sending large chunks or small ones.

We use this information in SSL to adjust the max record dynamically.
This results in small chunks respecting tune.ssl.maxrecord at the
beginning of a transfer or for small transfers, with an automatic
switch to full records if the exchanges last long. This allows the
receiver to parse HTML contents on the fly without having to retrieve
16kB of data, which is even more important with small initcwnd since
the receiver does not need to wait for round trips to start fetching
new objects. However, sending large files still produces large chunks.

For example, with tune.ssl.maxrecord = 2859, we see 5 write(2885)
sent in two segments each and 6 write(16421).

This idea was first proposed on the haproxy mailing list by Ilya Grigorik.
This commit is contained in:
Willy Tarreau 2014-02-02 02:00:24 +01:00
parent 1049b1f551
commit 7bed945be0
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/types/connection.h
View File

@ -180,6 +180,7 @@ enum {
/* flags that can be passed to xprt->snd_buf() */ /* flags that can be passed to xprt->snd_buf() */
enum { enum {
CO_SFL_MSG_MORE = 0x0001, /* More data to come afterwards */ CO_SFL_MSG_MORE = 0x0001, /* More data to come afterwards */
CO_SFL_STREAMER = 0x0002, /* Producer is continuously streaming data */
}; };
/* xprt_ops describes transport-layer operations for a connection. They /* xprt_ops describes transport-layer operations for a connection. They

3
src/ssl_sock.c
View File

@ -1528,7 +1528,8 @@ static int ssl_sock_from_buf(struct connection *conn, struct buffer *buf, int fl
while (buf->o) { while (buf->o) {
try = bo_contig_data(buf); try = bo_contig_data(buf);
if (global.tune.ssl_max_record && try > global.tune.ssl_max_record) if (!(flags & CO_SFL_STREAMER) &&
global.tune.ssl_max_record && try > global.tune.ssl_max_record)
try = global.tune.ssl_max_record; try = global.tune.ssl_max_record;
ret = SSL_write(conn->xprt_ctx, bo_ptr(buf), try); ret = SSL_write(conn->xprt_ctx, bo_ptr(buf), try);

3
src/stream_interface.c
View File

@ -701,6 +701,9 @@ static void si_conn_send(struct connection *conn)
((chn->flags & (CF_SHUTW|CF_SHUTW_NOW)) == CF_SHUTW_NOW)) ((chn->flags & (CF_SHUTW|CF_SHUTW_NOW)) == CF_SHUTW_NOW))
send_flag |= CO_SFL_MSG_MORE; send_flag |= CO_SFL_MSG_MORE;
if (chn->flags & CF_STREAMER)
send_flag |= CO_SFL_STREAMER;
ret = conn->xprt->snd_buf(conn, chn->buf, send_flag); ret = conn->xprt->snd_buf(conn, chn->buf, send_flag);
if (ret > 0) { if (ret > 0) {
chn->flags |= CF_WRITE_PARTIAL; chn->flags |= CF_WRITE_PARTIAL;